Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理问题

Browse Source
This commit is contained in:
wanggeng 2022-04-22 14:28:39 +08:00
parent 3117256719
commit 4323983092
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module-activiti/src/main/java/ink/wgink/module/activiti/controller/api/ActivitiController.java
View File

@ -44,7 +44,7 @@ public class ActivitiController extends DefaultBaseController {
@PostMapping("create") @PostMapping("create")
@CheckRequestBodyAnnotation @CheckRequestBodyAnnotation
public SuccessResultData create(@RequestBody ActivitiVO activitiVO) throws UnsupportedEncodingException { public SuccessResultData create(@RequestBody ActivitiVO activitiVO) throws UnsupportedEncodingException {
if (RegexUtil.isLetterOrNumber(activitiVO.getModelKey())) { if (!RegexUtil.isLetterOrNumber(activitiVO.getModelKey())) {
throw new ParamsException("模型Key只能是字符和数字"); throw new ParamsException("模型Key只能是字符和数字");
} }
return new SuccessResultData<>(activitiService.create(activitiVO)); return new SuccessResultData<>(activitiService.create(activitiVO));

7
module-activiti/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js
View File

@ -66,7 +66,7 @@ KISBPM.TOOLBAR = {
top.dialog.msg('流程的 流程名称 不能为空'); top.dialog.msg('流程的 流程名称 不能为空');
return; return;
} }
if(!json.properties.description) { if(!json.properties.documentation) {
top.dialog.msg('流程的 流程描述 不能为空'); top.dialog.msg('流程的 流程描述 不能为空');
return; return;
} }
@ -78,12 +78,11 @@ KISBPM.TOOLBAR = {
var modelMetaData = scope.editor.getModelMetaData(); var modelMetaData = scope.editor.getModelMetaData();
// 构建oaNodeManages管理列表 // 构建oaNodeManages管理列表
var oaNodeManages = KISBPM.TOOLBAR.ACTIONS.listOaNodeManage(json); var oaNodeManages = KISBPM.TOOLBAR.ACTIONS.listOaNodeManage(json);
console.log(oaNodeManages)
var params = { var params = {
jsonXml: JSON.stringify(json), jsonXml: JSON.stringify(json),
svgXml: svgDOM, svgXml: svgDOM,
name: modelMetaData.name, name: json.properties.name,
description: modelMetaData.description, description: json.properties.documentation,
isOa: oaNodeManages.length > 0 ? true : false, isOa: oaNodeManages.length > 0 ? true : false,
oaNodeManages: oaNodeManages oaNodeManages: oaNodeManages
} }

8
module-activiti/src/main/resources/static/stencilset.json
View File

@ -35,9 +35,9 @@
{ {
"id": "name", "id": "name",
"type": "String", "type": "String",
"title": "元素名称", "title": "流程名称",
"value": "", "value": "",
"description": "元素名称", "description": "流程名称",
"popular": true, "popular": true,
"refToView": "text_name" "refToView": "text_name"
} }
@ -49,9 +49,9 @@
{ {
"id": "documentation", "id": "documentation",
"type": "Text", "type": "Text",
"title": "描述", "title": "流程描述",
"value": "", "value": "",
"description": "元素描述", "description": "流程描述",
"popular": true "popular": true
} }
] ]