Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzwf
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzwf
提交
7a1a7183
提交
7a1a7183
编写于
5月 05, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibizdev提交
上级
cb8dc3fc
变更
26
隐藏空白字符变更
内嵌
并排
正在显示
26 个修改的文件
包含
483 行增加
和
31 行删除
+483
-31
wfprocess-definition_en_US.ts
...lanres/wfprocess-definition/wfprocess-definition_en_US.ts
+8
-1
wfprocess-definition_zh_CN.ts
...lanres/wfprocess-definition/wfprocess-definition_zh_CN.ts
+8
-1
wfgroups.ts
app_web/src/mock/entity/wfgroups/wfgroups.ts
+42
-0
wfmembers.ts
app_web/src/mock/entity/wfmembers/wfmembers.ts
+42
-0
wfprocess-definitions.ts
...ock/entity/wfprocess-definitions/wfprocess-definitions.ts
+42
-0
wfsystems.ts
app_web/src/mock/entity/wfsystems/wfsystems.ts
+42
-0
wfusers.ts
app_web/src/mock/entity/wfusers/wfusers.ts
+42
-0
default-searchform-base.vue
...definition/default-searchform/default-searchform-base.vue
+34
-6
default-searchform-model.ts
...definition/default-searchform/default-searchform-model.ts
+5
-0
main-form-base.vue
...widgets/wfprocess-definition/main-form/main-form-base.vue
+83
-5
main-form-model.ts
...widgets/wfprocess-definition/main-form/main-form-model.ts
+15
-0
main-form-service.ts
...dgets/wfprocess-definition/main-form/main-form-service.ts
+0
-1
main-grid-model.ts
...widgets/wfprocess-definition/main-grid/main-grid-model.ts
+5
-0
config.xml
config.xml
+0
-5
Dockerfile
ibzwf-app/ibzwf-app-web/src/main/docker/Dockerfile
+1
-1
ibzwf-app-web.yaml
ibzwf-app/ibzwf-app-web/src/main/docker/ibzwf-app-web.yaml
+1
-1
application-web-dev.yml
.../ibzwf-app-web/src/main/resources/application-web-dev.yml
+1
-1
application-web-prod.yml
...ibzwf-app-web/src/main/resources/application-web-prod.yml
+1
-1
WFProcessDefinition.java
.../cn/ibizlab/core/workflow/domain/WFProcessDefinition.java
+42
-0
WFProcessDefinitionSearchContext.java
...ore/workflow/filter/WFProcessDefinitionSearchContext.java
+7
-0
h2_table.xml
ibzwf-core/src/main/resources/liquibase/h2_table.xml
+7
-1
WFProcessDefinitionMapper.xml
...orkflow/wfprocessdefinition/WFProcessDefinitionMapper.xml
+3
-3
WFProcessDefinitionDTO.java
.../main/java/cn/ibizlab/api/dto/WFProcessDefinitionDTO.java
+48
-0
PermissionSyncJob.java
.../src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
+1
-1
AuthPermissionEvaluator.java
...ava/cn/ibizlab/util/security/AuthPermissionEvaluator.java
+2
-2
SimpleUserService.java
.../main/java/cn/ibizlab/util/service/SimpleUserService.java
+1
-1
未找到文件。
app_web/src/locale/lanres/wfprocess-definition/wfprocess-definition_en_US.ts
浏览文件 @
7a1a7183
...
@@ -6,6 +6,9 @@ export default {
...
@@ -6,6 +6,9 @@ export default {
modelversion
:
'模型版本'
,
modelversion
:
'模型版本'
,
modelenable
:
'模型是否启用'
,
modelenable
:
'模型是否启用'
,
pssystemid
:
'系统标识'
,
pssystemid
:
'系统标识'
,
md5check
:
'校验'
,
bpmnfile
:
'BPMN'
,
deploykey
:
'DeployKey'
,
},
},
views
:
{
views
:
{
editview
:
{
editview
:
{
...
@@ -29,10 +32,13 @@ export default {
...
@@ -29,10 +32,13 @@ export default {
srfdeid
:
""
,
srfdeid
:
""
,
srfsourcekey
:
""
,
srfsourcekey
:
""
,
definitionkey
:
"DefinitionKey"
,
definitionkey
:
"DefinitionKey"
,
deploykey
:
"DefinitionKey"
,
definitionname
:
"流程定义名称"
,
definitionname
:
"流程定义名称"
,
pssystemid
:
"系统标识"
,
pssystemid
:
"系统标识"
,
modelversion
:
"模型版本"
,
modelversion
:
"模型版本"
,
modelenable
:
"模型是否启用"
,
modelenable
:
"模型是否启用"
,
bpmnfile
:
"BPMN"
,
md5check
:
"校验"
,
},
},
uiactions
:
{
uiactions
:
{
},
},
...
@@ -51,7 +57,8 @@ export default {
...
@@ -51,7 +57,8 @@ export default {
default_searchform
:
{
default_searchform
:
{
details
:
{
details
:
{
formpage1
:
"常规条件"
,
formpage1
:
"常规条件"
,
n_definitionname_like
:
"流程定义名称(文本包含(%))"
,
n_deploykey_like
:
"DefinitionKey"
,
n_definitionname_like
:
"流程定义名称"
,
},
},
uiactions
:
{
uiactions
:
{
},
},
...
...
app_web/src/locale/lanres/wfprocess-definition/wfprocess-definition_zh_CN.ts
浏览文件 @
7a1a7183
...
@@ -5,6 +5,9 @@ export default {
...
@@ -5,6 +5,9 @@ export default {
modelversion
:
'模型版本'
,
modelversion
:
'模型版本'
,
modelenable
:
'模型是否启用'
,
modelenable
:
'模型是否启用'
,
pssystemid
:
'系统标识'
,
pssystemid
:
'系统标识'
,
md5check
:
'校验'
,
bpmnfile
:
'BPMN'
,
deploykey
:
'DeployKey'
,
},
},
views
:
{
views
:
{
editview
:
{
editview
:
{
...
@@ -28,10 +31,13 @@ export default {
...
@@ -28,10 +31,13 @@ export default {
srfdeid
:
''
,
srfdeid
:
''
,
srfsourcekey
:
''
,
srfsourcekey
:
''
,
definitionkey
:
'DefinitionKey'
,
definitionkey
:
'DefinitionKey'
,
deploykey
:
'DefinitionKey'
,
definitionname
:
'流程定义名称'
,
definitionname
:
'流程定义名称'
,
pssystemid
:
'系统标识'
,
pssystemid
:
'系统标识'
,
modelversion
:
'模型版本'
,
modelversion
:
'模型版本'
,
modelenable
:
'模型是否启用'
,
modelenable
:
'模型是否启用'
,
bpmnfile
:
'BPMN'
,
md5check
:
'校验'
,
},
},
uiactions
:
{
uiactions
:
{
},
},
...
@@ -50,7 +56,8 @@ export default {
...
@@ -50,7 +56,8 @@ export default {
default_searchform
:
{
default_searchform
:
{
details
:
{
details
:
{
formpage1
:
'常规条件'
,
formpage1
:
'常规条件'
,
n_definitionname_like
:
'流程定义名称(文本包含(%))'
,
n_deploykey_like
:
'DefinitionKey'
,
n_definitionname_like
:
'流程定义名称'
,
},
},
uiactions
:
{
uiactions
:
{
},
},
...
...
app_web/src/mock/entity/wfgroups/wfgroups.ts
浏览文件 @
7a1a7183
...
@@ -6,6 +6,48 @@ const mock = MockAdapter.getInstance();
...
@@ -6,6 +6,48 @@ const mock = MockAdapter.getInstance();
const
mockDatas
:
Array
<
any
>
=
[
const
mockDatas
:
Array
<
any
>
=
[
];
];
//getwflink
mock
.
onGet
(
new
RegExp
(
/^
\/
wfcore
\/
ibzwf-app-web
\/
wfgroups
\/[
a-zA-Z0-9
\-\;]
+
\/
usertasks
\/[
a-zA-Z0-9
\-\;]
+
\/
ways$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:wfgroup 方法: getwflink"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
{}];
}
return
[
status
,[
{
"sequenceFlowId"
:
"dfdsfdsfdsfdsfds"
,
"sequenceFlowName"
:
"同意"
,
"taskId"
:
"aaaaddddccccddddd"
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processInstanceId"
:
"ddlfldldfldsfds"
,
"refViewKey"
:
""
},
{
"sequenceFlowId"
:
"ddssdfdfdfdfsfdf"
,
"sequenceFlowName"
:
"不同意"
,
"taskId"
:
"aaaaddddccccddddd"
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processInstanceId"
:
"ddfdsldlfdlldsf"
,
"refViewKey"
:
"workorder_ltform_editview"
}
]];
});
// getwfstep
mock
.
onGet
(
new
RegExp
(
/^
\/
wfcore
\/
ibzwf-app-web
\/
wfgroups
\/
process-definitions-nodes$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:wfgroup 方法: getwfstep"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
{}];
}
return
[
status
,
[
{
"userTaskId"
:
"sddfddfd-dfdf-fdfd-fdf-dfdfd"
,
"userTaskName"
:
"待审"
,
"cnt"
:
0
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processDefinitionName"
:
"工单审批流程v1"
},
{
"userTaskId"
:
"sddfddfd-dfdf-fdfd-fdf-87927"
,
"userTaskName"
:
"待分配"
,
"cnt"
:
3
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processDefinitionName"
:
"工单审批流程v1"
}
]];
});
// createBatch
// createBatch
mock
.
onPost
(
new
RegExp
(
/^
\/
wfgroups
\/
batch$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onPost
(
new
RegExp
(
/^
\/
wfgroups
\/
batch$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:wfgroup 方法: createBatch"
);
console
.
groupCollapsed
(
"实体:wfgroup 方法: createBatch"
);
...
...
app_web/src/mock/entity/wfmembers/wfmembers.ts
浏览文件 @
7a1a7183
...
@@ -6,6 +6,48 @@ const mock = MockAdapter.getInstance();
...
@@ -6,6 +6,48 @@ const mock = MockAdapter.getInstance();
const
mockDatas
:
Array
<
any
>
=
[
const
mockDatas
:
Array
<
any
>
=
[
];
];
//getwflink
mock
.
onGet
(
new
RegExp
(
/^
\/
wfcore
\/
ibzwf-app-web
\/
wfmembers
\/[
a-zA-Z0-9
\-\;]
+
\/
usertasks
\/[
a-zA-Z0-9
\-\;]
+
\/
ways$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:wfmember 方法: getwflink"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
{}];
}
return
[
status
,[
{
"sequenceFlowId"
:
"dfdsfdsfdsfdsfds"
,
"sequenceFlowName"
:
"同意"
,
"taskId"
:
"aaaaddddccccddddd"
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processInstanceId"
:
"ddlfldldfldsfds"
,
"refViewKey"
:
""
},
{
"sequenceFlowId"
:
"ddssdfdfdfdfsfdf"
,
"sequenceFlowName"
:
"不同意"
,
"taskId"
:
"aaaaddddccccddddd"
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processInstanceId"
:
"ddfdsldlfdlldsf"
,
"refViewKey"
:
"workorder_ltform_editview"
}
]];
});
// getwfstep
mock
.
onGet
(
new
RegExp
(
/^
\/
wfcore
\/
ibzwf-app-web
\/
wfmembers
\/
process-definitions-nodes$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:wfmember 方法: getwfstep"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
{}];
}
return
[
status
,
[
{
"userTaskId"
:
"sddfddfd-dfdf-fdfd-fdf-dfdfd"
,
"userTaskName"
:
"待审"
,
"cnt"
:
0
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processDefinitionName"
:
"工单审批流程v1"
},
{
"userTaskId"
:
"sddfddfd-dfdf-fdfd-fdf-87927"
,
"userTaskName"
:
"待分配"
,
"cnt"
:
3
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processDefinitionName"
:
"工单审批流程v1"
}
]];
});
// createBatch
// createBatch
mock
.
onPost
(
new
RegExp
(
/^
\/
wfmembers
\/
batch$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onPost
(
new
RegExp
(
/^
\/
wfmembers
\/
batch$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:wfmember 方法: createBatch"
);
console
.
groupCollapsed
(
"实体:wfmember 方法: createBatch"
);
...
...
app_web/src/mock/entity/wfprocess-definitions/wfprocess-definitions.ts
浏览文件 @
7a1a7183
...
@@ -6,6 +6,48 @@ const mock = MockAdapter.getInstance();
...
@@ -6,6 +6,48 @@ const mock = MockAdapter.getInstance();
const
mockDatas
:
Array
<
any
>
=
[
const
mockDatas
:
Array
<
any
>
=
[
];
];
//getwflink
mock
.
onGet
(
new
RegExp
(
/^
\/
wfcore
\/
ibzwf-app-web
\/
wfprocessdefinitions
\/[
a-zA-Z0-9
\-\;]
+
\/
usertasks
\/[
a-zA-Z0-9
\-\;]
+
\/
ways$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:wfprocessdefinition 方法: getwflink"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
{}];
}
return
[
status
,[
{
"sequenceFlowId"
:
"dfdsfdsfdsfdsfds"
,
"sequenceFlowName"
:
"同意"
,
"taskId"
:
"aaaaddddccccddddd"
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processInstanceId"
:
"ddlfldldfldsfds"
,
"refViewKey"
:
""
},
{
"sequenceFlowId"
:
"ddssdfdfdfdfsfdf"
,
"sequenceFlowName"
:
"不同意"
,
"taskId"
:
"aaaaddddccccddddd"
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processInstanceId"
:
"ddfdsldlfdlldsf"
,
"refViewKey"
:
"workorder_ltform_editview"
}
]];
});
// getwfstep
mock
.
onGet
(
new
RegExp
(
/^
\/
wfcore
\/
ibzwf-app-web
\/
wfprocessdefinitions
\/
process-definitions-nodes$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:wfprocessdefinition 方法: getwfstep"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
{}];
}
return
[
status
,
[
{
"userTaskId"
:
"sddfddfd-dfdf-fdfd-fdf-dfdfd"
,
"userTaskName"
:
"待审"
,
"cnt"
:
0
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processDefinitionName"
:
"工单审批流程v1"
},
{
"userTaskId"
:
"sddfddfd-dfdf-fdfd-fdf-87927"
,
"userTaskName"
:
"待分配"
,
"cnt"
:
3
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processDefinitionName"
:
"工单审批流程v1"
}
]];
});
// createBatch
// createBatch
mock
.
onPost
(
new
RegExp
(
/^
\/
wfprocessdefinitions
\/
batch$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onPost
(
new
RegExp
(
/^
\/
wfprocessdefinitions
\/
batch$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:wfprocessdefinition 方法: createBatch"
);
console
.
groupCollapsed
(
"实体:wfprocessdefinition 方法: createBatch"
);
...
...
app_web/src/mock/entity/wfsystems/wfsystems.ts
浏览文件 @
7a1a7183
...
@@ -6,6 +6,48 @@ const mock = MockAdapter.getInstance();
...
@@ -6,6 +6,48 @@ const mock = MockAdapter.getInstance();
const
mockDatas
:
Array
<
any
>
=
[
const
mockDatas
:
Array
<
any
>
=
[
];
];
//getwflink
mock
.
onGet
(
new
RegExp
(
/^
\/
wfcore
\/
ibzwf-app-web
\/
wfsystems
\/[
a-zA-Z0-9
\-\;]
+
\/
usertasks
\/[
a-zA-Z0-9
\-\;]
+
\/
ways$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:wfsystem 方法: getwflink"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
{}];
}
return
[
status
,[
{
"sequenceFlowId"
:
"dfdsfdsfdsfdsfds"
,
"sequenceFlowName"
:
"同意"
,
"taskId"
:
"aaaaddddccccddddd"
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processInstanceId"
:
"ddlfldldfldsfds"
,
"refViewKey"
:
""
},
{
"sequenceFlowId"
:
"ddssdfdfdfdfsfdf"
,
"sequenceFlowName"
:
"不同意"
,
"taskId"
:
"aaaaddddccccddddd"
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processInstanceId"
:
"ddfdsldlfdlldsf"
,
"refViewKey"
:
"workorder_ltform_editview"
}
]];
});
// getwfstep
mock
.
onGet
(
new
RegExp
(
/^
\/
wfcore
\/
ibzwf-app-web
\/
wfsystems
\/
process-definitions-nodes$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:wfsystem 方法: getwfstep"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
{}];
}
return
[
status
,
[
{
"userTaskId"
:
"sddfddfd-dfdf-fdfd-fdf-dfdfd"
,
"userTaskName"
:
"待审"
,
"cnt"
:
0
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processDefinitionName"
:
"工单审批流程v1"
},
{
"userTaskId"
:
"sddfddfd-dfdf-fdfd-fdf-87927"
,
"userTaskName"
:
"待分配"
,
"cnt"
:
3
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processDefinitionName"
:
"工单审批流程v1"
}
]];
});
// createBatch
// createBatch
mock
.
onPost
(
new
RegExp
(
/^
\/
wfsystems
\/
batch$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onPost
(
new
RegExp
(
/^
\/
wfsystems
\/
batch$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:wfsystem 方法: createBatch"
);
console
.
groupCollapsed
(
"实体:wfsystem 方法: createBatch"
);
...
...
app_web/src/mock/entity/wfusers/wfusers.ts
浏览文件 @
7a1a7183
...
@@ -6,6 +6,48 @@ const mock = MockAdapter.getInstance();
...
@@ -6,6 +6,48 @@ const mock = MockAdapter.getInstance();
const
mockDatas
:
Array
<
any
>
=
[
const
mockDatas
:
Array
<
any
>
=
[
];
];
//getwflink
mock
.
onGet
(
new
RegExp
(
/^
\/
wfcore
\/
ibzwf-app-web
\/
wfusers
\/[
a-zA-Z0-9
\-\;]
+
\/
usertasks
\/[
a-zA-Z0-9
\-\;]
+
\/
ways$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:wfuser 方法: getwflink"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
{}];
}
return
[
status
,[
{
"sequenceFlowId"
:
"dfdsfdsfdsfdsfds"
,
"sequenceFlowName"
:
"同意"
,
"taskId"
:
"aaaaddddccccddddd"
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processInstanceId"
:
"ddlfldldfldsfds"
,
"refViewKey"
:
""
},
{
"sequenceFlowId"
:
"ddssdfdfdfdfsfdf"
,
"sequenceFlowName"
:
"不同意"
,
"taskId"
:
"aaaaddddccccddddd"
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processInstanceId"
:
"ddfdsldlfdlldsf"
,
"refViewKey"
:
"workorder_ltform_editview"
}
]];
});
// getwfstep
mock
.
onGet
(
new
RegExp
(
/^
\/
wfcore
\/
ibzwf-app-web
\/
wfusers
\/
process-definitions-nodes$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:wfuser 方法: getwfstep"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
{}];
}
return
[
status
,
[
{
"userTaskId"
:
"sddfddfd-dfdf-fdfd-fdf-dfdfd"
,
"userTaskName"
:
"待审"
,
"cnt"
:
0
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processDefinitionName"
:
"工单审批流程v1"
},
{
"userTaskId"
:
"sddfddfd-dfdf-fdfd-fdf-87927"
,
"userTaskName"
:
"待分配"
,
"cnt"
:
3
,
"processDefinitionKey"
:
"support-workorders-approve-v1"
,
"processDefinitionName"
:
"工单审批流程v1"
}
]];
});
// createBatch
// createBatch
mock
.
onPost
(
new
RegExp
(
/^
\/
wfusers
\/
batch$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onPost
(
new
RegExp
(
/^
\/
wfusers
\/
batch$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:wfuser 方法: createBatch"
);
console
.
groupCollapsed
(
"实体:wfuser 方法: createBatch"
);
...
...
app_web/src/widgets/wfprocess-definition/default-searchform/default-searchform-base.vue
浏览文件 @
7a1a7183
...
@@ -4,7 +4,13 @@
...
@@ -4,7 +4,13 @@
<row>
<row>
<i-col
span=
"20"
>
<i-col
span=
"20"
>
<row>
<row>
<i-col
v-show=
"detailsModel.n_definitionname_like.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<i-col
v-show=
"detailsModel.n_deploykey_like.visible"
:style=
"
{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item
name=
'n_deploykey_like'
:itemRules=
"this.rules.n_deploykey_like"
class=
''
:caption=
"$t('entities.wfprocessdefinition.default_searchform.details.n_deploykey_like')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.n_deploykey_like.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<input-box
v-model=
"data.n_deploykey_like"
@
enter=
"onEnter($event)"
:disabled=
"detailsModel.n_deploykey_like.disabled"
type=
'text'
style=
"width:100px;"
></input-box>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.n_definitionname_like.visible"
:style=
"
{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item
name=
'n_definitionname_like'
:itemRules=
"this.rules.n_definitionname_like"
class=
''
:caption=
"$t('entities.wfprocessdefinition.default_searchform.details.n_definitionname_like')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.n_definitionname_like.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-form-item
name=
'n_definitionname_like'
:itemRules=
"this.rules.n_definitionname_like"
class=
''
:caption=
"$t('entities.wfprocessdefinition.default_searchform.details.n_definitionname_like')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.n_definitionname_like.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<input-box
v-model=
"data.n_definitionname_like"
@
enter=
"onEnter($event)"
:disabled=
"detailsModel.n_definitionname_like.disabled"
type=
'text'
style=
"width:100px;"
></input-box>
<input-box
v-model=
"data.n_definitionname_like"
@
enter=
"onEnter($event)"
:disabled=
"detailsModel.n_definitionname_like.disabled"
type=
'text'
style=
"width:100px;"
></input-box>
</app-form-item>
</app-form-item>
...
@@ -250,6 +256,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
...
@@ -250,6 +256,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
* @memberof DefaultBase
*/
*/
protected
data
:
any
=
{
protected
data
:
any
=
{
n_deploykey_like
:
null
,
n_definitionname_like
:
null
,
n_definitionname_like
:
null
,
};
};
...
@@ -260,11 +267,17 @@ export default class DefaultBase extends Vue implements ControlInterface {
...
@@ -260,11 +267,17 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
* @memberof DefaultBase
*/
*/
protected
rules
:
any
=
{
protected
rules
:
any
=
{
n_deploykey_like
:
[
{
type
:
'string'
,
message
:
'DefinitionKey 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'DefinitionKey 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'DefinitionKey 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'DefinitionKey 值不能为空'
,
trigger
:
'blur'
},
],
n_definitionname_like
:
[
n_definitionname_like
:
[
{
type
:
'string'
,
message
:
'流程定义名称
(文本包含(%))
值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'流程定义名称 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'流程定义名称
(文本包含(%))
值必须为字符串类型'
,
trigger
:
'blur'
},
{
type
:
'string'
,
message
:
'流程定义名称 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'流程定义名称
(文本包含(%))
值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'流程定义名称 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'流程定义名称
(文本包含(%))
值不能为空'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'流程定义名称 值不能为空'
,
trigger
:
'blur'
},
],
],
}
}
...
@@ -277,10 +290,24 @@ export default class DefaultBase extends Vue implements ControlInterface {
...
@@ -277,10 +290,24 @@ export default class DefaultBase extends Vue implements ControlInterface {
protected
detailsModel
:
any
=
{
protected
detailsModel
:
any
=
{
formpage1
:
new
FormPageModel
({
caption
:
'常规条件'
,
detailType
:
'FORMPAGE'
,
name
:
'formpage1'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
})
formpage1
:
new
FormPageModel
({
caption
:
'常规条件'
,
detailType
:
'FORMPAGE'
,
name
:
'formpage1'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
})
,
,
n_definitionname_like
:
new
FormItemModel
({
caption
:
'流程定义名称(文本包含(%))'
,
detailType
:
'FORMITEM'
,
name
:
'n_definitionname_like'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
n_deploykey_like
:
new
FormItemModel
({
caption
:
'DefinitionKey'
,
detailType
:
'FORMITEM'
,
name
:
'n_deploykey_like'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
n_definitionname_like
:
new
FormItemModel
({
caption
:
'流程定义名称'
,
detailType
:
'FORMITEM'
,
name
:
'n_definitionname_like'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
,
};
};
/**
* 监控表单属性 n_deploykey_like 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@
Watch
(
'data.n_deploykey_like'
)
onN_deploykey_likeChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'n_deploykey_like'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
/**
* 监控表单属性 n_definitionname_like 值
* 监控表单属性 n_definitionname_like 值
*
*
...
@@ -315,6 +342,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
...
@@ -315,6 +342,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
}
}
/**
/**
...
...
app_web/src/widgets/wfprocess-definition/default-searchform/default-searchform-model.ts
浏览文件 @
7a1a7183
...
@@ -25,6 +25,11 @@ export default class DefaultModel {
...
@@ -25,6 +25,11 @@ export default class DefaultModel {
prop
:
'srffrontuf'
,
prop
:
'srffrontuf'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
name
:
'n_deploykey_like'
,
prop
:
'deploykey'
,
dataType
:
'TEXT'
,
},
{
{
name
:
'n_definitionname_like'
,
name
:
'n_definitionname_like'
,
prop
:
'definitionname'
,
prop
:
'definitionname'
,
...
...
app_web/src/widgets/wfprocess-definition/main-form/main-form-base.vue
浏览文件 @
7a1a7183
...
@@ -7,9 +7,9 @@
...
@@ -7,9 +7,9 @@
<app-form-group
layoutType=
"TABLE_24COL"
titleStyle=
""
class=
''
uiActionGroup=
"detailsModel.group1.uiActionGroup"
@
groupuiactionclick=
"groupUIActionClick($event)"
:caption=
"$t('entities.wfprocessdefinition.main_form.details.group1')"
:isShowCaption=
"true"
uiStyle=
"DEFAULT"
:titleBarCloseMode=
"0"
:isInfoGroupMode=
"false"
>
<app-form-group
layoutType=
"TABLE_24COL"
titleStyle=
""
class=
''
uiActionGroup=
"detailsModel.group1.uiActionGroup"
@
groupuiactionclick=
"groupUIActionClick($event)"
:caption=
"$t('entities.wfprocessdefinition.main_form.details.group1')"
:isShowCaption=
"true"
uiStyle=
"DEFAULT"
:titleBarCloseMode=
"0"
:isInfoGroupMode=
"false"
>
<row>
<row>
<i-col
v-show=
"detailsModel.de
finition
key.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<i-col
v-show=
"detailsModel.de
ploy
key.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'de
finitionkey'
:itemRules=
"this.rules.definitionkey"
class=
''
:caption=
"$t('entities.wfprocessdefinition.main_form.details.definitionkey')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.definition
key.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-form-item
name=
'de
ploykey'
:itemRules=
"this.rules.deploykey"
class=
''
:caption=
"$t('entities.wfprocessdefinition.main_form.details.deploykey')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.deploy
key.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<input-box
v-model=
"data.de
finitionkey"
@
enter=
"onEnter($event)"
unit=
""
:disabled=
"detailsModel.definition
key.disabled"
type=
'text'
style=
""
></input-box>
<input-box
v-model=
"data.de
ploykey"
@
enter=
"onEnter($event)"
unit=
""
:disabled=
"detailsModel.deploy
key.disabled"
type=
'text'
style=
""
></input-box>
</app-form-item>
</app-form-item>
</i-col>
</i-col>
...
@@ -36,6 +36,18 @@
...
@@ -36,6 +36,18 @@
<dropdown-list
v-model=
"data.modelenable"
:data=
"data"
:itemParam=
"
{}" :disabled="detailsModel.modelenable.disabled" style="width:100px;width: 100px;" tag='YesNo' codelistType='STATIC' placeholder='请选择...'>
</dropdown-list>
<dropdown-list
v-model=
"data.modelenable"
:data=
"data"
:itemParam=
"
{}" :disabled="detailsModel.modelenable.disabled" style="width:100px;width: 100px;" tag='YesNo' codelistType='STATIC' placeholder='请选择...'>
</dropdown-list>
</app-form-item>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.bpmnfile.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'bpmnfile'
:itemRules=
"this.rules.bpmnfile"
class=
''
:caption=
"$t('entities.wfprocessdefinition.main_form.details.bpmnfile')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.bpmnfile.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-file-upload
:formState=
"formState"
:ignorefieldvaluechange=
"ignorefieldvaluechange"
@
formitemvaluechange=
"onFormItemValueChange"
:data=
"JSON.stringify(this.data)"
name=
'bpmnfile'
:value=
"data.bpmnfile"
:disabled=
"detailsModel.bpmnfile.disabled"
uploadparams=
''
exportparams=
''
:customparams=
"
{}" style="overflow: auto;">
</app-file-upload>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.md5check.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'md5check'
:itemRules=
"this.rules.md5check"
class=
''
:caption=
"$t('entities.wfprocessdefinition.main_form.details.md5check')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.md5check.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<input-box
v-model=
"data.md5check"
@
enter=
"onEnter($event)"
unit=
""
:disabled=
"detailsModel.md5check.disabled"
type=
'text'
style=
""
></input-box>
</app-form-item>
</i-col>
</i-col>
</row>
</row>
...
@@ -342,10 +354,13 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -342,10 +354,13 @@ export default class MainBase extends Vue implements ControlInterface {
srfdeid
:
null
,
srfdeid
:
null
,
srfsourcekey
:
null
,
srfsourcekey
:
null
,
definitionkey
:
null
,
definitionkey
:
null
,
deploykey
:
null
,
definitionname
:
null
,
definitionname
:
null
,
pssystemid
:
null
,
pssystemid
:
null
,
modelversion
:
null
,
modelversion
:
null
,
modelenable
:
null
,
modelenable
:
null
,
bpmnfile
:
null
,
md5check
:
null
,
wfprocessdefinition
:
null
,
wfprocessdefinition
:
null
,
};
};
...
@@ -436,11 +451,17 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -436,11 +451,17 @@ export default class MainBase extends Vue implements ControlInterface {
{
required
:
false
,
type
:
'string'
,
message
:
'DefinitionKey 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'DefinitionKey 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'DefinitionKey 值不能为空'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'DefinitionKey 值不能为空'
,
trigger
:
'blur'
},
],
],
deploykey
:
[
{
type
:
'string'
,
message
:
'DefinitionKey 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'DefinitionKey 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
true
,
type
:
'string'
,
message
:
'DefinitionKey 值不能为空'
,
trigger
:
'change'
},
{
required
:
true
,
type
:
'string'
,
message
:
'DefinitionKey 值不能为空'
,
trigger
:
'blur'
},
],
definitionname
:
[
definitionname
:
[
{
type
:
'string'
,
message
:
'流程定义名称 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'流程定义名称 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'流程定义名称 值必须为字符串类型'
,
trigger
:
'blur'
},
{
type
:
'string'
,
message
:
'流程定义名称 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
fals
e
,
type
:
'string'
,
message
:
'流程定义名称 值不能为空'
,
trigger
:
'change'
},
{
required
:
tru
e
,
type
:
'string'
,
message
:
'流程定义名称 值不能为空'
,
trigger
:
'change'
},
{
required
:
fals
e
,
type
:
'string'
,
message
:
'流程定义名称 值不能为空'
,
trigger
:
'blur'
},
{
required
:
tru
e
,
type
:
'string'
,
message
:
'流程定义名称 值不能为空'
,
trigger
:
'blur'
},
],
],
pssystemid
:
[
pssystemid
:
[
{
type
:
'string'
,
message
:
'系统标识 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'系统标识 值必须为字符串类型'
,
trigger
:
'change'
},
...
@@ -460,6 +481,18 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -460,6 +481,18 @@ export default class MainBase extends Vue implements ControlInterface {
{
required
:
false
,
type
:
'number'
,
message
:
'模型是否启用 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'number'
,
message
:
'模型是否启用 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'number'
,
message
:
'模型是否启用 值不能为空'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'number'
,
message
:
'模型是否启用 值不能为空'
,
trigger
:
'blur'
},
],
],
bpmnfile
:
[
{
type
:
'string'
,
message
:
'BPMN 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'BPMN 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
true
,
type
:
'string'
,
message
:
'BPMN 值不能为空'
,
trigger
:
'change'
},
{
required
:
true
,
type
:
'string'
,
message
:
'BPMN 值不能为空'
,
trigger
:
'blur'
},
],
md5check
:
[
{
type
:
'string'
,
message
:
'校验 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'校验 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'校验 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'校验 值不能为空'
,
trigger
:
'blur'
},
],
}
}
/**
/**
...
@@ -488,6 +521,8 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -488,6 +521,8 @@ export default class MainBase extends Vue implements ControlInterface {
srfsourcekey
:
new
FormItemModel
({
caption
:
''
,
detailType
:
'FORMITEM'
,
name
:
'srfsourcekey'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
srfsourcekey
:
new
FormItemModel
({
caption
:
''
,
detailType
:
'FORMITEM'
,
name
:
'srfsourcekey'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
,
definitionkey
:
new
FormItemModel
({
caption
:
'DefinitionKey'
,
detailType
:
'FORMITEM'
,
name
:
'definitionkey'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
definitionkey
:
new
FormItemModel
({
caption
:
'DefinitionKey'
,
detailType
:
'FORMITEM'
,
name
:
'definitionkey'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
deploykey
:
new
FormItemModel
({
caption
:
'DefinitionKey'
,
detailType
:
'FORMITEM'
,
name
:
'deploykey'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
1
})
,
,
definitionname
:
new
FormItemModel
({
caption
:
'流程定义名称'
,
detailType
:
'FORMITEM'
,
name
:
'definitionname'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
definitionname
:
new
FormItemModel
({
caption
:
'流程定义名称'
,
detailType
:
'FORMITEM'
,
name
:
'definitionname'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
,
...
@@ -496,6 +531,10 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -496,6 +531,10 @@ export default class MainBase extends Vue implements ControlInterface {
modelversion
:
new
FormItemModel
({
caption
:
'模型版本'
,
detailType
:
'FORMITEM'
,
name
:
'modelversion'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
modelversion
:
new
FormItemModel
({
caption
:
'模型版本'
,
detailType
:
'FORMITEM'
,
name
:
'modelversion'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
,
modelenable
:
new
FormItemModel
({
caption
:
'模型是否启用'
,
detailType
:
'FORMITEM'
,
name
:
'modelenable'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
modelenable
:
new
FormItemModel
({
caption
:
'模型是否启用'
,
detailType
:
'FORMITEM'
,
name
:
'modelenable'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
bpmnfile
:
new
FormItemModel
({
caption
:
'BPMN'
,
detailType
:
'FORMITEM'
,
name
:
'bpmnfile'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
md5check
:
new
FormItemModel
({
caption
:
'校验'
,
detailType
:
'FORMITEM'
,
name
:
'md5check'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
,
};
};
...
@@ -595,6 +634,18 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -595,6 +634,18 @@ export default class MainBase extends Vue implements ControlInterface {
this
.
formDataChange
({
name
:
'definitionkey'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
this
.
formDataChange
({
name
:
'definitionkey'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
}
/**
* 监控表单属性 deploykey 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@
Watch
(
'data.deploykey'
)
onDeploykeyChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'deploykey'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
/**
* 监控表单属性 definitionname 值
* 监控表单属性 definitionname 值
*
*
...
@@ -643,6 +694,30 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -643,6 +694,30 @@ export default class MainBase extends Vue implements ControlInterface {
this
.
formDataChange
({
name
:
'modelenable'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
this
.
formDataChange
({
name
:
'modelenable'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
}
/**
* 监控表单属性 bpmnfile 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@
Watch
(
'data.bpmnfile'
)
onBpmnfileChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'bpmnfile'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 md5check 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@
Watch
(
'data.md5check'
)
onMd5checkChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'md5check'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
/**
* 重置表单项值
* 重置表单项值
...
@@ -693,6 +768,9 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -693,6 +768,9 @@ export default class MainBase extends Vue implements ControlInterface {
}
}
/**
/**
...
...
app_web/src/widgets/wfprocess-definition/main-form/main-form-model.ts
浏览文件 @
7a1a7183
...
@@ -55,6 +55,11 @@ export default class MainModel {
...
@@ -55,6 +55,11 @@ export default class MainModel {
prop
:
'definitionkey'
,
prop
:
'definitionkey'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
name
:
'deploykey'
,
prop
:
'deploykey'
,
dataType
:
'TEXT'
,
},
{
{
name
:
'definitionname'
,
name
:
'definitionname'
,
prop
:
'definitionname'
,
prop
:
'definitionname'
,
...
@@ -75,6 +80,16 @@ export default class MainModel {
...
@@ -75,6 +80,16 @@ export default class MainModel {
prop
:
'modelenable'
,
prop
:
'modelenable'
,
dataType
:
'YESNO'
,
dataType
:
'YESNO'
,
},
},
{
name
:
'bpmnfile'
,
prop
:
'bpmnfile'
,
dataType
:
'TEXT'
,
},
{
name
:
'md5check'
,
prop
:
'md5check'
,
dataType
:
'TEXT'
,
},
{
{
name
:
'wfprocessdefinition'
,
name
:
'wfprocessdefinition'
,
prop
:
'definitionkey'
,
prop
:
'definitionkey'
,
...
...
app_web/src/widgets/wfprocess-definition/main-form/main-form-service.ts
浏览文件 @
7a1a7183
...
@@ -160,7 +160,6 @@ export default class MainService extends ControlService {
...
@@ -160,7 +160,6 @@ export default class MainService extends ControlService {
@
Errorlog
@
Errorlog
public
add
(
action
:
string
,
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
public
add
(
action
:
string
,
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
const
{
data
:
Data
,
context
:
Context
}
=
this
.
handleRequestData
(
action
,
context
,
data
);
const
{
data
:
Data
,
context
:
Context
}
=
this
.
handleRequestData
(
action
,
context
,
data
);
Object
.
assign
(
Data
,{
definitionkey
:
data
.
definitionkey
,
srffrontuf
:
'1'
});
return
new
Promise
((
resolve
:
any
,
reject
:
any
)
=>
{
return
new
Promise
((
resolve
:
any
,
reject
:
any
)
=>
{
let
result
:
Promise
<
any
>
;
let
result
:
Promise
<
any
>
;
const
_appEntityService
:
any
=
this
.
appEntityService
;
const
_appEntityService
:
any
=
this
.
appEntityService
;
...
...
app_web/src/widgets/wfprocess-definition/main-grid/main-grid-model.ts
浏览文件 @
7a1a7183
...
@@ -70,6 +70,11 @@ export default class MainModel {
...
@@ -70,6 +70,11 @@ export default class MainModel {
name
:
'wfprocessdefinition'
,
name
:
'wfprocessdefinition'
,
prop
:
'definitionkey'
,
prop
:
'definitionkey'
,
},
},
{
name
:
'n_deploykey_like'
,
prop
:
'n_deploykey_like'
,
dataType
:
'TEXT'
,
},
{
{
name
:
'n_definitionname_like'
,
name
:
'n_definitionname_like'
,
prop
:
'n_definitionname_like'
,
prop
:
'n_definitionname_like'
,
...
...
config.xml
浏览文件 @
7a1a7183
...
@@ -38,11 +38,6 @@
...
@@ -38,11 +38,6 @@
git clone -b master $para2 ibzwf/
git clone -b master $para2 ibzwf/
export NODE_OPTIONS=--max-old-space-size=4096
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzwf/
cd ibzwf/
mvn clean package -Pweb
cd ibzwf-app/ibzwf-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzwf-app-web.yaml dev --with-registry-auth
</command>
</command>
</hudson.tasks.Shell>
</hudson.tasks.Shell>
</builders>
</builders>
...
...
ibzwf-app/ibzwf-app-web/src/main/docker/Dockerfile
浏览文件 @
7a1a7183
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-app-web.jar
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-app-web.jar
EXPOSE
30003
EXPOSE
8080
ADD
ibzwf-app-web.jar /ibzwf-app-web.jar
ADD
ibzwf-app-web.jar /ibzwf-app-web.jar
ibzwf-app/ibzwf-app-web/src/main/docker/ibzwf-app-web.yaml
浏览文件 @
7a1a7183
...
@@ -3,7 +3,7 @@ services:
...
@@ -3,7 +3,7 @@ services:
ibzwf-app-web
:
ibzwf-app-web
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-app-web:latest
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-app-web:latest
ports
:
ports
:
-
"
30003:30003
"
-
"
8080:8080
"
networks
:
networks
:
-
agent_network
-
agent_network
deploy
:
deploy
:
...
...
ibzwf-app/ibzwf-app-web/src/main/resources/application-web-dev.yml
浏览文件 @
7a1a7183
server
:
server
:
port
:
30003
port
:
8080
\ No newline at end of file
\ No newline at end of file
ibzwf-app/ibzwf-app-web/src/main/resources/application-web-prod.yml
浏览文件 @
7a1a7183
server
:
server
:
port
:
30003
port
:
8080
#zuul网关路由设置
#zuul网关路由设置
zuul
:
zuul
:
...
...
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessDefinition.java
浏览文件 @
7a1a7183
...
@@ -68,6 +68,27 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
...
@@ -68,6 +68,27 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
@JSONField
(
name
=
"pssystemid"
)
@JSONField
(
name
=
"pssystemid"
)
@JsonProperty
(
"pssystemid"
)
@JsonProperty
(
"pssystemid"
)
private
String
pssystemid
;
private
String
pssystemid
;
/**
* 校验
*/
@TableField
(
value
=
"md5check"
)
@JSONField
(
name
=
"md5check"
)
@JsonProperty
(
"md5check"
)
private
String
md5check
;
/**
* BPMN
*/
@TableField
(
value
=
"bpmnfile"
)
@JSONField
(
name
=
"bpmnfile"
)
@JsonProperty
(
"bpmnfile"
)
private
String
bpmnfile
;
/**
* DeployKey
*/
@TableField
(
value
=
"deploykey"
)
@JSONField
(
name
=
"deploykey"
)
@JsonProperty
(
"deploykey"
)
private
String
deploykey
;
...
@@ -99,6 +120,27 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
...
@@ -99,6 +120,27 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
this
.
pssystemid
=
pssystemid
;
this
.
pssystemid
=
pssystemid
;
this
.
modify
(
"pssystemid"
,
pssystemid
);
this
.
modify
(
"pssystemid"
,
pssystemid
);
}
}
/**
* 设置 [校验]
*/
public
void
setMd5check
(
String
md5check
){
this
.
md5check
=
md5check
;
this
.
modify
(
"md5check"
,
md5check
);
}
/**
* 设置 [BPMN]
*/
public
void
setBpmnfile
(
String
bpmnfile
){
this
.
bpmnfile
=
bpmnfile
;
this
.
modify
(
"bpmnfile"
,
bpmnfile
);
}
/**
* 设置 [DeployKey]
*/
public
void
setDeploykey
(
String
deploykey
){
this
.
deploykey
=
deploykey
;
this
.
modify
(
"deploykey"
,
deploykey
);
}
}
}
...
...
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/filter/WFProcessDefinitionSearchContext.java
浏览文件 @
7a1a7183
...
@@ -33,6 +33,13 @@ public class WFProcessDefinitionSearchContext extends QueryWrapperContext<WFProc
...
@@ -33,6 +33,13 @@ public class WFProcessDefinitionSearchContext extends QueryWrapperContext<WFProc
this
.
getSelectCond
().
like
(
"definitionname"
,
n_definitionname_like
);
this
.
getSelectCond
().
like
(
"definitionname"
,
n_definitionname_like
);
}
}
}
}
private
String
n_deploykey_like
;
//[DeployKey]
public
void
setN_deploykey_like
(
String
n_deploykey_like
)
{
this
.
n_deploykey_like
=
n_deploykey_like
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_deploykey_like
)){
this
.
getSelectCond
().
like
(
"deploykey"
,
n_deploykey_like
);
}
}
/**
/**
* 启用快速搜索
* 启用快速搜索
...
...
ibzwf-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
7a1a7183
...
@@ -92,7 +92,7 @@
...
@@ -92,7 +92,7 @@
</createTable>
</createTable>
</changeSet>
</changeSet>
<!--输出实体[WF_DEFINITION]数据结构 -->
<!--输出实体[WF_DEFINITION]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-wf_definition-
34
-7"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-wf_definition-
47
-7"
>
<createTable
tableName=
"IBZWFDEFINITION"
>
<createTable
tableName=
"IBZWFDEFINITION"
>
<column
name=
"DEFINITIONKEY"
remarks=
""
type=
"VARCHAR(100)"
>
<column
name=
"DEFINITIONKEY"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_WF_DEFINITION_DEFINITIONKEY"
/>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_WF_DEFINITION_DEFINITIONKEY"
/>
...
@@ -105,6 +105,12 @@
...
@@ -105,6 +105,12 @@
</column>
</column>
<column
name=
"PSSYSTEMID"
remarks=
""
type=
"VARCHAR(100)"
>
<column
name=
"PSSYSTEMID"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
</column>
<column
name=
"MD5CHECK"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
<column
name=
"BPMNFILE"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
<column
name=
"DEPLOYKEY"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
</createTable>
</createTable>
</changeSet>
</changeSet>
<!--输出实体[WF_GROUP_MEMBER]数据结构 -->
<!--输出实体[WF_GROUP_MEMBER]数据结构 -->
...
...
ibzwf-core/src/main/resources/mapper/workflow/wfprocessdefinition/WFProcessDefinitionMapper.xml
浏览文件 @
7a1a7183
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select
id=
"selectById"
resultMap=
"WFProcessDefinitionResultMap"
databaseId=
"mysql"
>
<select
id=
"selectById"
resultMap=
"WFProcessDefinitionResultMap"
databaseId=
"mysql"
>
<![CDATA[select t1.* from (SELECT t1.`
DEFINITIONKEY`, t1.`DEFINITIONNAME
`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID` FROM `IBZWFDEFINITION` t1 ) t1 where definitionkey=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`
BPMNFILE`, t1.`DEFINITIONKEY`, t1.`DEFINITIONNAME`, t1.`DEPLOYKEY`, t1.`MD5CHECK
`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID` FROM `IBZWFDEFINITION` t1 ) t1 where definitionkey=#{id}]]>
</select>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...
@@ -27,13 +27,13 @@
...
@@ -27,13 +27,13 @@
<!--数据查询[Default]-->
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"mysql"
>
<sql
id=
"Default"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`
DEFINITIONKEY`, t1.`DEFINITIONNAME
`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID` FROM `IBZWFDEFINITION` t1
<![CDATA[ SELECT t1.`
BPMNFILE`, t1.`DEFINITIONKEY`, t1.`DEFINITIONNAME`, t1.`DEPLOYKEY`, t1.`MD5CHECK
`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID` FROM `IBZWFDEFINITION` t1
]]>
]]>
</sql>
</sql>
<!--数据查询[View]-->
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"mysql"
>
<sql
id=
"View"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`
DEFINITIONKEY`, t1.`DEFINITIONNAME
`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID` FROM `IBZWFDEFINITION` t1
<![CDATA[ SELECT t1.`
BPMNFILE`, t1.`DEFINITIONKEY`, t1.`DEFINITIONNAME`, t1.`DEPLOYKEY`, t1.`MD5CHECK
`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID` FROM `IBZWFDEFINITION` t1
]]>
]]>
</sql>
</sql>
...
...
ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/dto/WFProcessDefinitionDTO.java
浏览文件 @
7a1a7183
...
@@ -63,6 +63,30 @@ public class WFProcessDefinitionDTO extends DTOBase implements Serializable {
...
@@ -63,6 +63,30 @@ public class WFProcessDefinitionDTO extends DTOBase implements Serializable {
@JsonProperty
(
"pssystemid"
)
@JsonProperty
(
"pssystemid"
)
private
String
pssystemid
;
private
String
pssystemid
;
/**
* 属性 [MD5CHECK]
*
*/
@JSONField
(
name
=
"md5check"
)
@JsonProperty
(
"md5check"
)
private
String
md5check
;
/**
* 属性 [BPMNFILE]
*
*/
@JSONField
(
name
=
"bpmnfile"
)
@JsonProperty
(
"bpmnfile"
)
private
String
bpmnfile
;
/**
* 属性 [DEPLOYKEY]
*
*/
@JSONField
(
name
=
"deploykey"
)
@JsonProperty
(
"deploykey"
)
private
String
deploykey
;
/**
/**
* 设置 [DEFINITIONNAME]
* 设置 [DEFINITIONNAME]
...
@@ -96,6 +120,30 @@ public class WFProcessDefinitionDTO extends DTOBase implements Serializable {
...
@@ -96,6 +120,30 @@ public class WFProcessDefinitionDTO extends DTOBase implements Serializable {
this
.
modify
(
"pssystemid"
,
pssystemid
);
this
.
modify
(
"pssystemid"
,
pssystemid
);
}
}
/**
* 设置 [MD5CHECK]
*/
public
void
setMd5check
(
String
md5check
){
this
.
md5check
=
md5check
;
this
.
modify
(
"md5check"
,
md5check
);
}
/**
* 设置 [BPMNFILE]
*/
public
void
setBpmnfile
(
String
bpmnfile
){
this
.
bpmnfile
=
bpmnfile
;
this
.
modify
(
"bpmnfile"
,
bpmnfile
);
}
/**
* 设置 [DEPLOYKEY]
*/
public
void
setDeploykey
(
String
deploykey
){
this
.
deploykey
=
deploykey
;
this
.
modify
(
"deploykey"
,
deploykey
);
}
}
}
ibzwf-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
浏览文件 @
7a1a7183
...
@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
...
@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
@Value
(
"${ibiz.enablePermissionValid:false}"
)
@Value
(
"${ibiz.enablePermissionValid:false}"
)
boolean
enablePermissionValid
;
//是否开启权限校验
boolean
enablePermissionValid
;
//是否开启权限校验
@Value
(
"${ibiz.systemid:
0A91C1B1-3B67-4EDA-9572-5DB491871FEE
}"
)
@Value
(
"${ibiz.systemid:
2C40DFCD-0DF5-47BF-91A5-C45F810B0001
}"
)
private
String
systemId
;
private
String
systemId
;
@Override
@Override
...
...
ibzwf-util/src/main/java/cn/ibizlab/util/security/AuthPermissionEvaluator.java
浏览文件 @
7a1a7183
...
@@ -69,7 +69,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
...
@@ -69,7 +69,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
return
false
;
return
false
;
List
gridParamList
=
(
ArrayList
)
gridParam
;
List
gridParamList
=
(
ArrayList
)
gridParam
;
if
(
action
.
equals
(
"DELETE"
)){
//grid delete
if
(
action
.
equals
IgnoreCase
(
"DELETE"
)){
//grid delete
//准备参数
//准备参数
Object
srfKey
=
gridParamList
.
get
(
0
);
Object
srfKey
=
gridParamList
.
get
(
0
);
EntityBase
entity
=
(
EntityBase
)
gridParamList
.
get
(
1
);
EntityBase
entity
=
(
EntityBase
)
gridParamList
.
get
(
1
);
...
@@ -145,7 +145,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
...
@@ -145,7 +145,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
JSONObject
permissionList
=
userPermission
.
getJSONObject
(
"userPermissionList"
);
JSONObject
permissionList
=
userPermission
.
getJSONObject
(
"userPermissionList"
);
String
entityName
=
entity
.
getClass
().
getSimpleName
();
String
entityName
=
entity
.
getClass
().
getSimpleName
();
if
(
action
.
equals
(
"CREATE"
)){
if
(
action
.
equals
IgnoreCase
(
"CREATE"
)){
return
validDEActionHasPermission
(
permissionList
,
entityName
,
action
);
return
validDEActionHasPermission
(
permissionList
,
entityName
,
action
);
}
}
else
{
else
{
...
...
ibzwf-util/src/main/java/cn/ibizlab/util/service/SimpleUserService.java
浏览文件 @
7a1a7183
...
@@ -22,7 +22,7 @@ public class SimpleUserService implements AuthenticationUserService{
...
@@ -22,7 +22,7 @@ public class SimpleUserService implements AuthenticationUserService{
@Value
(
"${ibiz.enablePermissionValid:false}"
)
@Value
(
"${ibiz.enablePermissionValid:false}"
)
boolean
enablePermissionValid
;
//是否开启权限校验
boolean
enablePermissionValid
;
//是否开启权限校验
@Value
(
"${ibiz.systemid:
0A91C1B1-3B67-4EDA-9572-5DB491871FEE
}"
)
@Value
(
"${ibiz.systemid:
2C40DFCD-0DF5-47BF-91A5-C45F810B0001
}"
)
private
String
systemid
;
private
String
systemid
;
@Autowired
@Autowired
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录