From 4323983092596938074a1b8b9746cd0b68c5f434 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Fri, 22 Apr 2022 14:28:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/controller/api/ActivitiController.java       | 2 +-
 .../editor-app/configuration/toolbar-default-actions.js   | 7 +++----
 module-activiti/src/main/resources/static/stencilset.json | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/controller/api/ActivitiController.java b/module-activiti/src/main/java/ink/wgink/module/activiti/controller/api/ActivitiController.java
index 65eafc60..a4c63b9a 100644
--- a/module-activiti/src/main/java/ink/wgink/module/activiti/controller/api/ActivitiController.java
+++ b/module-activiti/src/main/java/ink/wgink/module/activiti/controller/api/ActivitiController.java
@@ -44,7 +44,7 @@ public class ActivitiController extends DefaultBaseController {
     @PostMapping("create")
     @CheckRequestBodyAnnotation
     public SuccessResultData create(@RequestBody ActivitiVO activitiVO) throws UnsupportedEncodingException {
-        if (RegexUtil.isLetterOrNumber(activitiVO.getModelKey())) {
+        if (!RegexUtil.isLetterOrNumber(activitiVO.getModelKey())) {
             throw new ParamsException("模型Key只能是字符和数字");
         }
         return new SuccessResultData<>(activitiService.create(activitiVO));
diff --git a/module-activiti/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js b/module-activiti/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js
index c33b865a..23d40714 100644
--- a/module-activiti/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js
+++ b/module-activiti/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js
@@ -66,7 +66,7 @@ KISBPM.TOOLBAR = {
                     top.dialog.msg('流程的 流程名称 不能为空');
                     return;
                 }
-                if(!json.properties.description) {
+                if(!json.properties.documentation) {
                     top.dialog.msg('流程的 流程描述 不能为空');
                     return;
                 }
@@ -78,12 +78,11 @@ KISBPM.TOOLBAR = {
                 var modelMetaData = scope.editor.getModelMetaData();
                 // 构建oaNodeManages管理列表
                 var oaNodeManages = KISBPM.TOOLBAR.ACTIONS.listOaNodeManage(json);
-                console.log(oaNodeManages)
                 var params = {
                     jsonXml: JSON.stringify(json),
                     svgXml: svgDOM,
-                    name: modelMetaData.name,
-                    description: modelMetaData.description,
+                    name: json.properties.name,
+                    description: json.properties.documentation,
                     isOa: oaNodeManages.length > 0 ? true : false,
                     oaNodeManages: oaNodeManages
                 }
diff --git a/module-activiti/src/main/resources/static/stencilset.json b/module-activiti/src/main/resources/static/stencilset.json
index 356943c1..bb2848d9 100644
--- a/module-activiti/src/main/resources/static/stencilset.json
+++ b/module-activiti/src/main/resources/static/stencilset.json
@@ -35,9 +35,9 @@
         {
           "id": "name",
           "type": "String",
-          "title": "元素名称",
+          "title": "流程名称",
           "value": "",
-          "description": "元素名称",
+          "description": "流程名称",
           "popular": true,
           "refToView": "text_name"
         }
@@ -49,9 +49,9 @@
         {
           "id": "documentation",
           "type": "Text",
-          "title": "描述",
+          "title": "流程描述",
           "value": "",
-          "description": "元素描述",
+          "description": "流程描述",
           "popular": true
         }
       ]