Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
在你之后
activiti7-workflow
提交
74f1e65d
A
activiti7-workflow
项目概览
在你之后
/
activiti7-workflow
与 Fork 源项目一致
Fork自
jwxkk / activiti7-workflow
通知
4
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
activiti7-workflow
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
74f1e65d
编写于
12月 31, 2020
作者:
2
28569050@qq.com
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
postman接口导出,swgUI访问权限配置,bpmnjs表单输入消失bug修复
上级
4d9dd79c
变更
4
展开全部
隐藏空白更改
内联
并排
Showing
4 changed file
with
90 addition
and
75 deletion
+90
-75
postman接口可直接导入BPMN.postman_collection.json
postman接口可直接导入BPMN.postman_collection.json
+0
-0
src/main/java/com/imooc/activitiweb/util/PathMapping.java
src/main/java/com/imooc/activitiweb/util/PathMapping.java
+3
-0
src/main/resources/resources/bpmnjs/dist/index.js
src/main/resources/resources/bpmnjs/dist/index.js
+44
-38
src/main/resources/resources/bpmnjs/resources/properties-panel/provider/activiti/parts/FormProps.js
...ces/properties-panel/provider/activiti/parts/FormProps.js
+43
-37
未找到文件。
postman接口可直接导入BPMN.postman_collection.json
0 → 100644
浏览文件 @
74f1e65d
此差异已折叠。
点击以展开。
src/main/java/com/imooc/activitiweb/util/PathMapping.java
浏览文件 @
74f1e65d
...
...
@@ -13,5 +13,8 @@ public class PathMapping implements WebMvcConfigurer {
//String[] resourceLocation = new String[]{"file:D:\\WangJianIDEA_Test\\activiti-imooc\\src\\main\\resources\\resources\\bpmn\\","classpath:/resources/"};
registry
.
addResourceHandler
(
"/**"
).
addResourceLocations
(
"classpath:/resources/"
);
//默认也有这个路径映射
registry
.
addResourceHandler
(
"/bpmn/**"
).
addResourceLocations
(
GlobalConfig
.
BPMN_PathMapping
);
registry
.
addResourceHandler
(
"swagger-ui.html"
).
addResourceLocations
(
"classpath:/META-INF/resources/"
);
registry
.
addResourceHandler
(
"/webjars/**"
).
addResourceLocations
(
"classpath:/META-INF/resources/webjars/"
);
}
}
src/main/resources/resources/bpmnjs/dist/index.js
浏览文件 @
74f1e65d
此差异已折叠。
点击以展开。
src/main/resources/resources/bpmnjs/resources/properties-panel/provider/activiti/parts/FormProps.js
浏览文件 @
74f1e65d
...
...
@@ -77,7 +77,7 @@ function formFieldTextField(options, getSelectedFormField) {
function
ensureFormKeyAndDataSupported
(
element
)
{
return
(
is
(
element
,
'
bpmn:StartEvent
'
)
&&
!
is
(
element
.
parent
,
'
bpmn:SubProcess
'
)
is
(
element
,
'
bpmn:StartEvent
'
)
&&
!
is
(
element
.
parent
,
'
bpmn:SubProcess
'
)
)
||
is
(
element
,
'
bpmn:UserTask
'
);
}
...
...
@@ -140,26 +140,26 @@ module.exports = function(group, element, bpmnFactory, translate) {
extensionElements
=
elementHelper
.
createElement
(
'
bpmn:ExtensionElements
'
,
{
values
:
[]
},
bo
,
bpmnFactory
);
commands
.
push
(
cmdHelper
.
updateProperties
(
element
,
{
extensionElements
:
extensionElements
}));
}
/* var formData = formHelper.getFormData(element);
if (!formData) {
formData = elementHelper.createElement('activiti:FormData', { fields: [] }, extensionElements, bpmnFactory);
commands.push(cmdHelper.addAndRemoveElementsFromList(
element,
extensionElements,
'values',
'extensionElements',
[formData],
[]
));
}*/
/* var formData = formHelper.getFormData(element);
if (!formData) {
formData = elementHelper.createElement('activiti:FormData', { fields: [] }, extensionElements, bpmnFactory);
commands.push(cmdHelper.addAndRemoveElementsFromList(
element,
extensionElements,
'values',
'extensionElements',
[formData],
[]
));
}*/
/**activiti 是向 extensionElements 下追加元素,而不是 formData 下,*/
var
field
=
elementHelper
.
createElement
(
'
activiti:FormProperty
'
,
{
id
:
value
},
extensionElements
,
bpmnFactory
);
if
(
typeof
extensionElements
.
values
!==
'
undefined
'
)
{
commands
.
push
(
cmdHelper
.
addElementsTolist
(
element
,
extensionElements
,
'
values
'
,
[
field
]));
}
else
{
commands
.
push
(
cmdHelper
.
updateBusinessObject
(
element
,
extensionElements
,
{
values
:
[
field
]
values
:
[
field
]
}));
}
return
commands
;
...
...
@@ -173,9 +173,9 @@ module.exports = function(group, element, bpmnFactory, translate) {
commands
.
push
(
removeEntry
(
getBusinessObject
(
element
),
element
,
extensionElements
));
}
else
{
commands
.
push
(
cmdHelper
.
removeElementsFromList
(
element
,
extensionElements
,
'
values
'
,
null
,
[
entry
]));
/* if (entry.id === formData.get('businessKey')) {
commands.push(cmdHelper.updateBusinessObject(element, extensionElements, { 'businessKey': undefined }));
}*/
/* if (entry.id === formData.get('businessKey')) {
commands.push(cmdHelper.updateBusinessObject(element, extensionElements, { 'businessKey': undefined }));
}*/
}
return
commands
;
...
...
@@ -287,18 +287,24 @@ module.exports = function(group, element, bpmnFactory, translate) {
}));
// [FormData] form field label text input field
group
.
entries
.
push
(
formFieldT
extField
({
group
.
entries
.
push
(
entryFactory
.
t
extField
({
id
:
'
form-field-label
'
,
label
:
translate
(
'
Label
'
),
modelProperty
:
'
label
'
},
getSelectedFormField
));
modelProperty
:
'
label
'
,
hidden
:
function
(
element
,
node
)
{
return
!
getSelectedFormField
(
element
,
node
);
}
}));
// [FormData] form field defaultValue text input field
group
.
entries
.
push
(
formFieldT
extField
({
group
.
entries
.
push
(
entryFactory
.
t
extField
({
id
:
'
form-field-defaultValue
'
,
label
:
translate
(
'
Default Value
'
),
modelProperty
:
'
defaultValue
'
},
getSelectedFormField
));
modelProperty
:
'
defaultValue
'
,
hidden
:
function
(
element
,
node
)
{
return
!
getSelectedFormField
(
element
,
node
);
}
}));
// [FormData] form field enum values label
...
...
@@ -334,10 +340,10 @@ module.exports = function(group, element, bpmnFactory, translate) {
id
=
generateValueId
();
var
enumValue
=
elementHelper
.
createElement
(
'
activiti:Value
'
,
{
id
:
id
,
name
:
undefined
},
getBusinessObject
(
element
),
bpmnFactory
'
activiti:Value
'
,
{
id
:
id
,
name
:
undefined
},
getBusinessObject
(
element
),
bpmnFactory
);
return
cmdHelper
.
addElementsTolist
(
element
,
selectedFormField
,
'
values
'
,
[
enumValue
]);
...
...
@@ -406,10 +412,10 @@ module.exports = function(group, element, bpmnFactory, translate) {
}
var
newConstraint
=
elementHelper
.
createElement
(
'
activiti:Constraint
'
,
{
name
:
undefined
,
config
:
undefined
},
validation
,
bpmnFactory
'
activiti:Constraint
'
,
{
name
:
undefined
,
config
:
undefined
},
validation
,
bpmnFactory
);
commands
.
push
(
cmdHelper
.
addElementsTolist
(
element
,
validation
,
'
constraints
'
,
[
newConstraint
]));
...
...
@@ -432,11 +438,11 @@ module.exports = function(group, element, bpmnFactory, translate) {
currentConstraint
=
constraints
[
idx
];
commands
.
push
(
cmdHelper
.
removeElementsFromList
(
element
,
formField
.
validation
,
'
constraints
'
,
null
,
[
currentConstraint
]
element
,
formField
.
validation
,
'
constraints
'
,
null
,
[
currentConstraint
]
));
if
(
constraints
.
length
===
1
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录