From 3a61651a98004f6671845ca73ce186a9eeff3bfa Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Mon, 19 Dec 2022 14:21:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8A=82=E7=82=B9=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysFormController.java         |    5 +
 .../flowable/listener/FlowTaskListener.java   |    2 +
 ruoyi-ui/src/api/flowable/form.js             |    7 +
 .../nodePanel/property/multiInstance.vue      |    6 +-
 .../Process/components/nodePanel/startEnd.vue |   12 +-
 .../Process/components/nodePanel/task.vue     |   33 +-
 .../components/Process/flowable/flowable.json | 2392 ++++++++---------
 .../components/Process/flowable/showConfig.js |    3 -
 ruoyi-ui/src/components/Process/index.vue     |   79 -
 .../views/flowable/task/todo/detail/index.vue |   12 +-
 10 files changed, 1248 insertions(+), 1303 deletions(-)

diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/SysFormController.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/SysFormController.java
index c579f775..0eea9888 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/SysFormController.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/SysFormController.java
@@ -49,6 +49,11 @@ public class SysFormController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/formList")
+    public AjaxResult formList(SysForm sysForm) {
+        List<SysForm> list = SysFormService.selectSysFormList(sysForm);
+        return AjaxResult.success(list);
+    }
     /**
      * 导出流程表单列表
      */
diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/FlowTaskListener.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/FlowTaskListener.java
index 53e89e3a..78203855 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/FlowTaskListener.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/FlowTaskListener.java
@@ -26,6 +26,8 @@ public class FlowTaskListener implements TaskListener{
 
         log.info("任务监听器:{}", JSON.toJSONString(delegateTask));
         // TODO  获取事件类型 delegateTask.getEventName(),可以通过监听器给任务执行人发送相应的通知消息
+
+
     }
 
 }
diff --git a/ruoyi-ui/src/api/flowable/form.js b/ruoyi-ui/src/api/flowable/form.js
index fcc46d61..30966bde 100644
--- a/ruoyi-ui/src/api/flowable/form.js
+++ b/ruoyi-ui/src/api/flowable/form.js
@@ -8,6 +8,13 @@ export function listForm(query) {
     params: query
   })
 }
+export function listAllForm(query) {
+  return request({
+    url: '/flowable/form/formList',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询流程表单详细
 export function getForm(formId) {
diff --git a/ruoyi-ui/src/components/Process/components/nodePanel/property/multiInstance.vue b/ruoyi-ui/src/components/Process/components/nodePanel/property/multiInstance.vue
index 5912ea7f..3637ea1c 100644
--- a/ruoyi-ui/src/components/Process/components/nodePanel/property/multiInstance.vue
+++ b/ruoyi-ui/src/components/Process/components/nodePanel/property/multiInstance.vue
@@ -25,7 +25,8 @@
 
 <script>
 import mixinPanel from '@/components/Process/common/mixinPanel'
-import { formatJsonKeyValue } from '@/components/Process/common/parseElement'
+import {formatJsonKeyValue} from '@/components/Process/common/parseElement'
+
 export default {
   mixins: [mixinPanel],
   data() {
@@ -106,8 +107,7 @@ export default {
         loopCharacteristics.$attrs[this.prefix + 'elementVariable'] = this.formData.elementVariable
 
         if (this.formData.completionCondition) {
-          const completionCondition = model.create('bpmn:Expression', {body: this.formData.completionCondition})
-          loopCharacteristics['completionCondition'] = completionCondition
+          loopCharacteristics['completionCondition'] = model.create('bpmn:Expression', {body: this.formData.completionCondition})
         }
         this.updateProperties({loopCharacteristics: loopCharacteristics})
       } else {
diff --git a/ruoyi-ui/src/components/Process/components/nodePanel/startEnd.vue b/ruoyi-ui/src/components/Process/components/nodePanel/startEnd.vue
index 2740bf6a..987cf965 100644
--- a/ruoyi-ui/src/components/Process/components/nodePanel/startEnd.vue
+++ b/ruoyi-ui/src/components/Process/components/nodePanel/startEnd.vue
@@ -60,12 +60,12 @@ export default {
             label: '发起人',
             show: !!_this.showConfig.initiator
           },
-          {
-            xType: 'input',
-            name: 'formKey',
-            label: '表单标识key',
-            show: !!_this.showConfig.formKey
-          }
+          // {
+          //   xType: 'input',
+          //   name: 'formKey',
+          //   label: '表单标识key',
+          //   show: !!_this.showConfig.formKey
+          // }
         ]
       }
     }
diff --git a/ruoyi-ui/src/components/Process/components/nodePanel/task.vue b/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
index 58e94eca..44307461 100644
--- a/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
+++ b/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
@@ -122,7 +122,7 @@ import { commonParse, userTaskParse } from '../../common/parseElement'
 import FlowUser from '@/components/flow/User'
 import FlowRole from '@/components/flow/Role'
 import FlowExp from '@/components/flow/Expression'
-import log from "@/views/monitor/job/log";
+import { listAllForm } from '@/api/flowable/form'
 
 export default {
   components: {
@@ -162,9 +162,7 @@ export default {
       userVisible: false,
       roleVisible: false,
       expVisible: false,
-      formData: {
-        userTypeOption: 'assignee',
-      },
+      formData: {},
       assignee: null,
       candidateUsers: null,
       candidateGroups: null,
@@ -182,6 +180,8 @@ export default {
       expList: this.exps,
       // 表达式类型
       expType: null,
+      // 表单列表
+      formList: [],
     }
   },
   computed: {
@@ -222,6 +222,7 @@ export default {
             xType: 'select',
             name: 'userType',
             label: '用户类型',
+            // clearable: true,
             dic: _this.userTypeOption,
             // rules: [{ required: true, message: '用户类型不能为空' }],
             show: !!_this.showConfig.userType
@@ -266,10 +267,18 @@ export default {
             label: '优先级',
             show: !!_this.showConfig.priority
           },
+          // {
+          //   xType: 'input',
+          //   name: 'formKey',
+          //   label: '表单标识key',
+          //   show: !!_this.showConfig.formKey
+          // },
           {
-            xType: 'input',
+            xType: 'select',
             name: 'formKey',
             label: '表单标识key',
+            clearable: true,
+            dic: { data: _this.formList, label: 'formName', value: 'formId' },
             show: !!_this.showConfig.formKey
           },
           {
@@ -417,7 +426,10 @@ export default {
     this.computedExecutionListenerLength()
     this.computedTaskListenerLength()
     this.computedHasMultiInstance()
-    this.checkValuesEcho()
+    // 人员信息回显
+    this.checkValuesEcho();
+    // 加载表单列表
+    this.getListForm();
   },
   methods: {
     computedExecutionListenerLength() {
@@ -435,6 +447,15 @@ export default {
         this.hasMultiInstance = false
       }
     },
+    // 获取表单信息
+    getListForm(){
+      listAllForm().then(res =>{
+        res.data.forEach(item =>{
+          item.formId = item.formId.toString();
+        })
+        this.formList = res.data;
+      })
+    },
     // 设计器右侧表单数据回显
     checkValuesEcho(){
       const that = this;
diff --git a/ruoyi-ui/src/components/Process/flowable/flowable.json b/ruoyi-ui/src/components/Process/flowable/flowable.json
index 88cda879..268752e8 100644
--- a/ruoyi-ui/src/components/Process/flowable/flowable.json
+++ b/ruoyi-ui/src/components/Process/flowable/flowable.json
@@ -1,1204 +1,1194 @@
 {
-    "name": "Flowable",
-    "uri": "http://flowable.org/bpmn",
-    "prefix": "flowable",
-    "xml": {
-      "tagAlias": "lowerCase"
+  "name": "Flowable",
+  "uri": "http://flowable.org/bpmn",
+  "prefix": "flowable",
+  "xml": {
+    "tagAlias": "lowerCase"
+  },
+  "associations": [],
+  "types": [
+    {
+      "name": "InOutBinding",
+      "superClass": ["Element"],
+      "isAbstract": true,
+      "properties": [
+        {
+          "name": "source",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "sourceExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "target",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "businessKey",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "local",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "variables",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
     },
-    "associations": [],
-    "types": [
-      {
-        "name": "InOutBinding",
-        "superClass": ["Element"],
-        "isAbstract": true,
-        "properties": [
-          {
-            "name": "source",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "sourceExpression",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "target",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "businessKey",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "local",
-            "isAttr": true,
-            "type": "Boolean",
-            "default": false
-          },
-          {
-            "name": "variables",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "In",
-        "superClass": ["InOutBinding"],
-        "meta": {
-          "allowedIn": ["bpmn:CallActivity"]
-        }
-      },
-      {
-        "name": "Out",
-        "superClass": ["InOutBinding"],
-        "meta": {
-          "allowedIn": ["bpmn:CallActivity"]
-        }
-      },
-      {
-        "name": "AsyncCapable",
-        "isAbstract": true,
-        "extends": ["bpmn:Activity", "bpmn:Gateway", "bpmn:Event"],
-        "properties": [
-          {
-            "name": "async",
-            "isAttr": true,
-            "type": "Boolean",
-            "default": false
-          },
-          {
-            "name": "asyncBefore",
-            "isAttr": true,
-            "type": "Boolean",
-            "default": false
-          },
-          {
-            "name": "asyncAfter",
-            "isAttr": true,
-            "type": "Boolean",
-            "default": false
-          },
-          {
-            "name": "exclusive",
-            "isAttr": true,
-            "type": "Boolean",
-            "default": true
-          }
-        ]
-      },
-      {
-        "name": "flowable:in",
-        "superClass": ["Element"],
-        "properties": [
-          {
-            "name": "source",
-            "type": "string",
-            "isAttr": true
-          },
-          {
-            "name": "target",
-            "type": "string",
-            "isAttr": true
-          }
-        ]
-      },
-      {
-        "name": "flowable:out",
-        "superClass": ["Element"],
-        "properties": [
-          {
-            "name": "source",
-            "type": "string",
-            "isAttr": true
-          },
-          {
-            "name": "target",
-            "type": "string",
-            "isAttr": true
-          }
-        ]
-      },
-      {
-        "name": "BoundaryEvent",
-        "superClass": ["CatchEvent"],
-        "properties": [
-          {
-            "name": "cancelActivity",
-            "default": true,
-            "isAttr": true,
-            "type": "Boolean"
-          },
-          {
-            "name": "attachedToRef",
-            "type": "Activity",
-            "isAttr": true,
-            "isReference": true
-          }
-        ]
-      },
-      {
-        "name": "JobPriorized",
-        "isAbstract": true,
-        "extends": ["bpmn:Process", "flowable:AsyncCapable"],
-        "properties": [
-          {
-            "name": "jobPriority",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "SignalEventDefinition",
-        "isAbstract": true,
-        "extends": ["bpmn:SignalEventDefinition"],
-        "properties": [
-          {
-            "name": "async",
-            "isAttr": true,
-            "type": "Boolean",
-            "default": false
-          }
-        ]
-      },
-      {
-        "name": "ErrorEventDefinition",
-        "isAbstract": true,
-        "extends": ["bpmn:ErrorEventDefinition"],
-        "properties": [
-          {
-            "name": "errorCodeVariable",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "errorMessageVariable",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "Error",
-        "isAbstract": true,
-        "extends": ["bpmn:Error"],
-        "properties": [
-          {
-            "name": "flowable:errorMessage",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "PotentialStarter",
-        "superClass": ["Element"],
-        "properties": [
-          {
-            "name": "resourceAssignmentExpression",
-            "type": "bpmn:ResourceAssignmentExpression"
-          }
-        ]
-      },
-      {
-        "name": "UserTask",
-        "isAbstract": true,
-        "extends": ["bpmn:UserTask"],
-        "properties": [
-          {
-            "name": "timerEventDefinition",
-            "type": "Expression"
-          },
-          {
-            "name": "multiInstanceLoopCharacteristics",
-            "type": "MultiInstanceLoopCharacteristics"
-          }
-        ]
-      },
-      {
-        "name": "StartEvent",
-        "isAbstract": true,
-        "extends": ["bpmn:StartEvent"],
-        "properties": [
-          {
-            "name": "timerEventDefinition",
-            "type": "Expression"
-          }
-        ]
-      },
-      {
-        "name": "FormSupported",
-        "isAbstract": true,
-        "extends": ["bpmn:StartEvent", "bpmn:UserTask"],
-        "properties": [
-          {
-            "name": "formHandlerClass",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "formKey",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "TemplateSupported",
-        "isAbstract": true,
-        "extends": ["bpmn:Process", "bpmn:FlowElement"],
-        "properties": [
-          {
-            "name": "modelerTemplate",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "Initiator",
-        "isAbstract": true,
-        "extends": ["bpmn:StartEvent"],
-        "properties": [
-          {
-            "name": "initiator",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "ScriptTask",
-        "isAbstract": true,
-        "extends": ["bpmn:ScriptTask"],
-        "properties": [
-          {
-            "name": "resultVariable",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "resource",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "Process",
-        "isAbstract": true,
-        "extends": ["bpmn:Process"],
-        "properties": [
-          {
-            "name": "candidateStarterGroups",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "candidateStarterUsers",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "versionTag",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "historyTimeToLive",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "isStartableInTasklist",
-            "isAttr": true,
-            "type": "Boolean",
-            "default": true
-          }
-        ]
-      },
-      {
-        "name": "EscalationEventDefinition",
-        "isAbstract": true,
-        "extends": ["bpmn:EscalationEventDefinition"],
-        "properties": [
-          {
-            "name": "escalationCodeVariable",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "FormalExpression",
-        "isAbstract": true,
-        "extends": ["bpmn:FormalExpression"],
-        "properties": [
-          {
-            "name": "resource",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "Assignable",
-        "extends": ["bpmn:UserTask"],
-        "properties": [
-          {
-            "name": "candidateGroups",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "dueDate",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "followUpDate",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "priority",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "CallActivity",
-        "extends": ["bpmn:CallActivity"],
-        "properties": [
-          {
-            "name": "calledElementBinding",
-            "isAttr": true,
-            "type": "String",
-            "default": "latest"
-          },
-          {
-            "name": "calledElementVersion",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "calledElementVersionTag",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "calledElementTenantId",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "caseRef",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "caseBinding",
-            "isAttr": true,
-            "type": "String",
-            "default": "latest"
-          },
-          {
-            "name": "caseVersion",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "caseTenantId",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "variableMappingClass",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "variableMappingDelegateExpression",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "ServiceTaskLike",
-        "extends": [
-          "bpmn:ServiceTask",
-          "bpmn:BusinessRuleTask",
-          "bpmn:SendTask",
-          "bpmn:MessageEventDefinition"
-        ],
-        "properties": [
-          {
-            "name": "expression",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "class",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "delegateExpression",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "resultVariable",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "ExclusiveGateway",
-        "isAbstract": true,
-        "extends": ["bpmn:ExclusiveGateway"],
-        "properties": [
-          {
-            "name": "serviceClass",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "DmnCapable",
-        "extends": ["bpmn:BusinessRuleTask"],
-        "properties": [
-          {
-            "name": "decisionRef",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "decisionRefBinding",
-            "isAttr": true,
-            "type": "String",
-            "default": "latest"
-          },
-          {
-            "name": "decisionRefVersion",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "mapDecisionResult",
-            "isAttr": true,
-            "type": "String",
-            "default": "resultList"
-          },
-          {
-            "name": "decisionRefTenantId",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "ExternalCapable",
-        "extends": ["flowable:ServiceTaskLike"],
-        "properties": [
-          {
-            "name": "type",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "topic",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "TaskPriorized",
-        "extends": ["bpmn:Process", "flowable:ExternalCapable"],
-        "properties": [
-          {
-            "name": "taskPriority",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "Properties",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": ["*"]
-        },
-        "properties": [
-          {
-            "name": "values",
-            "type": "Property",
-            "isMany": true
-          }
-        ]
-      },
-      {
-        "name": "Property",
-        "superClass": ["Element"],
-        "properties": [
-          {
-            "name": "id",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "name",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "value",
-            "type": "String",
-            "isAttr": true
-          }
-        ]
-      },
-      {
-        "name": "Connector",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": ["flowable:ServiceTaskLike"]
-        },
-        "properties": [
-          {
-            "name": "inputOutput",
-            "type": "InputOutput"
-          },
-          {
-            "name": "connectorId",
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "InputOutput",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": ["bpmn:FlowNode", "flowable:Connector"]
-        },
-        "properties": [
-          {
-            "name": "inputOutput",
-            "type": "InputOutput"
-          },
-          {
-            "name": "connectorId",
-            "type": "String"
-          },
-          {
-            "name": "inputParameters",
-            "isMany": true,
-            "type": "InputParameter"
-          },
-          {
-            "name": "outputParameters",
-            "isMany": true,
-            "type": "OutputParameter"
-          }
-        ]
-      },
-      {
-        "name": "InputOutputParameter",
-        "properties": [
-          {
-            "name": "name",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "value",
-            "isBody": true,
-            "type": "String"
-          },
-          {
-            "name": "definition",
-            "type": "InputOutputParameterDefinition"
-          }
-        ]
-      },
-      {
-        "name": "InputOutputParameterDefinition",
-        "isAbstract": true
-      },
-      {
-        "name": "List",
-        "superClass": ["InputOutputParameterDefinition"],
-        "properties": [
-          {
-            "name": "items",
-            "isMany": true,
-            "type": "InputOutputParameterDefinition"
-          }
-        ]
-      },
-      {
-        "name": "Map",
-        "superClass": ["InputOutputParameterDefinition"],
-        "properties": [
-          {
-            "name": "entries",
-            "isMany": true,
-            "type": "Entry"
-          }
-        ]
-      },
-      {
-        "name": "Entry",
-        "properties": [
-          {
-            "name": "key",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "value",
-            "isBody": true,
-            "type": "String"
-          },
-          {
-            "name": "definition",
-            "type": "InputOutputParameterDefinition"
-          }
-        ]
-      },
-      {
-        "name": "Value",
-        "superClass": ["InputOutputParameterDefinition"],
-        "properties": [
-          {
-            "name": "id",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "name",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "value",
-            "isBody": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "Script",
-        "superClass": ["InputOutputParameterDefinition"],
-        "properties": [
-          {
-            "name": "scriptFormat",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "resource",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "value",
-            "isBody": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "Field",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": [
-            "flowable:ServiceTaskLike",
-            "flowable:ExecutionListener",
-            "flowable:TaskListener"
-          ]
-        },
-        "properties": [
-          {
-            "name": "name",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "expression",
-            "isAttr": true,
-            "type": "expression"
-          },
-          {
-            "name": "string",
-            "type": "string"
-          },
-          {
-            "name": "stringValue",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "string",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": [
-            "flowable:Field"
-          ]
-        },
-        "properties": [
-          {
-            "name": "body",
-            "isBody": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "expression",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": [
-            "flowable:Field"
-          ]
-        },
-        "properties": [
-          {
-            "name": "body",
-            "isBody": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "InputParameter",
-        "superClass": ["InputOutputParameter"]
-      },
-      {
-        "name": "OutputParameter",
-        "superClass": ["InputOutputParameter"]
-      },
-      {
-        "name": "Collectable",
-        "isAbstract": true,
-        "extends": ["bpmn:MultiInstanceLoopCharacteristics"],
-        "superClass": ["flowable:AsyncCapable"],
-        "properties": [
-          {
-            "name": "collection",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "elementVariable",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "SequenceFlow",
-        "superClass": ["FlowElement"],
-        "properties": [
-          {
-            "name": "isImmediate",
-            "isAttr": true,
-            "type": "Boolean"
-          },
-          {
-            "name": "conditionExpression",
-            "type": "Expression"
-          },
-          {
-            "name": "sourceRef",
-            "type": "FlowNode",
-            "isAttr": true,
-            "isReference": true
-          },
-          {
-            "name": "targetRef",
-            "type": "FlowNode",
-            "isAttr": true,
-            "isReference": true
-          }
-        ]
-      },
-      {
-        "name": "MultiInstanceLoopCharacteristics",
-        "superClass": ["LoopCharacteristics"],
-        "properties": [
-          {
-            "name": "isSequential",
-            "default": false,
-            "isAttr": true,
-            "type": "Boolean"
-          },
-          {
-            "name": "collection",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "elementVariable",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "behavior",
-            "type": "MultiInstanceBehavior",
-            "default": "All",
-            "isAttr": true
-          },
-          {
-            "name": "loopCardinality",
-            "type": "Expression",
-            "xml": {
-              "serialize": "xsi:type"
-            }
-          },
-          {
-            "name": "loopDataInputRef",
-            "type": "ItemAwareElement",
-            "isReference": true
-          },
-          {
-            "name": "loopDataOutputRef",
-            "type": "ItemAwareElement",
-            "isReference": true
-          },
-          {
-            "name": "inputDataItem",
-            "type": "DataInput",
-            "xml": {
-              "serialize": "property"
-            }
-          },
-          {
-            "name": "outputDataItem",
-            "type": "DataOutput",
-            "xml": {
-              "serialize": "property"
-            }
-          },
-          {
-            "name": "complexBehaviorDefinition",
-            "type": "ComplexBehaviorDefinition",
-            "isMany": true
-          },
-          {
-            "name": "completionCondition",
-            "type": "Expression",
-            "xml": {
-              "serialize": "xsi:type"
-            }
-          },
-          {
-            "name": "oneBehaviorEventRef",
-            "type": "EventDefinition",
-            "isAttr": true,
-            "isReference": true
-          },
-          {
-            "name": "noneBehaviorEventRef",
-            "type": "EventDefinition",
-            "isAttr": true,
-            "isReference": true
-          }
-        ]
-      },
-      {
-        "name": "FailedJobRetryTimeCycle",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": ["flowable:AsyncCapable", "bpmn:MultiInstanceLoopCharacteristics"]
-        },
-        "properties": [
-          {
-            "name": "body",
-            "isBody": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "ExecutionListener",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": [
-            "bpmn:Task",
-            "bpmn:ServiceTask",
-            "bpmn:UserTask",
-            "bpmn:BusinessRuleTask",
-            "bpmn:ScriptTask",
-            "bpmn:ReceiveTask",
-            "bpmn:ManualTask",
-            "bpmn:ExclusiveGateway",
-            "bpmn:SequenceFlow",
-            "bpmn:ParallelGateway",
-            "bpmn:InclusiveGateway",
-            "bpmn:EventBasedGateway",
-            "bpmn:StartEvent",
-            "bpmn:IntermediateCatchEvent",
-            "bpmn:IntermediateThrowEvent",
-            "bpmn:EndEvent",
-            "bpmn:BoundaryEvent",
-            "bpmn:CallActivity",
-            "bpmn:SubProcess",
-            "bpmn:Process"
-          ]
-        },
-        "properties": [
-          {
-            "name": "expression",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "class",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "delegateExpression",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "event",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "script",
-            "type": "Script"
-          },
-          {
-            "name": "fields",
-            "type": "Field",
-            "isMany": true
-          }
-        ]
-      },
-      {
-        "name": "TaskListener",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": ["bpmn:UserTask"]
-        },
-        "properties": [
-          {
-            "name": "expression",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "class",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "delegateExpression",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "event",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "script",
-            "type": "Script"
-          },
-          {
-            "name": "fields",
-            "type": "Field",
-            "isMany": true
-          }
-        ]
-      },
-      {
-        "name": "FormProperty",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": ["bpmn:StartEvent", "bpmn:UserTask"]
-        },
-        "properties": [
-          {
-            "name": "id",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "name",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "type",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "required",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "readable",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "writable",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "variable",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "expression",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "datePattern",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "default",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "values",
-            "type": "Value",
-            "isMany": true
-          }
-        ]
-      },
-      {
-        "name": "FormData",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": ["bpmn:StartEvent", "bpmn:UserTask"]
-        },
-        "properties": [
-          {
-            "name": "fields",
-            "type": "FormField",
-            "isMany": true
-          },
-          {
-            "name": "businessKey",
-            "type": "String",
-            "isAttr": true
-          }
-        ]
-      },
-      {
-        "name": "FormField",
-        "superClass": ["Element"],
-        "properties": [
-          {
-            "name": "id",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "label",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "type",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "datePattern",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "defaultValue",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "properties",
-            "type": "Properties"
-          },
-          {
-            "name": "validation",
-            "type": "Validation"
-          },
-          {
-            "name": "values",
-            "type": "Value",
-            "isMany": true
-          }
-        ]
-      },
-      {
-        "name": "Validation",
-        "superClass": ["Element"],
-        "properties": [
-          {
-            "name": "constraints",
-            "type": "Constraint",
-            "isMany": true
-          }
-        ]
-      },
-      {
-        "name": "Constraint",
-        "superClass": ["Element"],
-        "properties": [
-          {
-            "name": "name",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "config",
-            "type": "String",
-            "isAttr": true
-          }
-        ]
-      },
-      {
-        "name": "ConditionalEventDefinition",
-        "isAbstract": true,
-        "extends": ["bpmn:ConditionalEventDefinition"],
-        "properties": [
-          {
-            "name": "variableName",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "variableEvent",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
+    {
+      "name": "In",
+      "superClass": ["InOutBinding"],
+      "meta": {
+        "allowedIn": ["bpmn:CallActivity"]
       }
-    ],
-    "emumerations": []
-  }
+    },
+    {
+      "name": "Out",
+      "superClass": ["InOutBinding"],
+      "meta": {
+        "allowedIn": ["bpmn:CallActivity"]
+      }
+    },
+    {
+      "name": "AsyncCapable",
+      "isAbstract": true,
+      "extends": ["bpmn:Activity", "bpmn:Gateway", "bpmn:Event"],
+      "properties": [
+        {
+          "name": "async",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "asyncBefore",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "asyncAfter",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "exclusive",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": true
+        }
+      ]
+    },
+    {
+      "name": "flowable:in",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "source",
+          "type": "string",
+          "isAttr": true
+        },
+        {
+          "name": "target",
+          "type": "string",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "flowable:out",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "source",
+          "type": "string",
+          "isAttr": true
+        },
+        {
+          "name": "target",
+          "type": "string",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "BoundaryEvent",
+      "superClass": ["CatchEvent"],
+      "properties": [
+        {
+          "name": "cancelActivity",
+          "default": true,
+          "isAttr": true,
+          "type": "Boolean"
+        },
+        {
+          "name": "attachedToRef",
+          "type": "Activity",
+          "isAttr": true,
+          "isReference": true
+        }
+      ]
+    },
+    {
+      "name": "JobPriorized",
+      "isAbstract": true,
+      "extends": ["bpmn:Process", "flowable:AsyncCapable"],
+      "properties": [
+        {
+          "name": "jobPriority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "SignalEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:SignalEventDefinition"],
+      "properties": [
+        {
+          "name": "async",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        }
+      ]
+    },
+    {
+      "name": "ErrorEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:ErrorEventDefinition"],
+      "properties": [
+        {
+          "name": "errorCodeVariable",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "errorMessageVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Error",
+      "isAbstract": true,
+      "extends": ["bpmn:Error"],
+      "properties": [
+        {
+          "name": "flowable:errorMessage",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "PotentialStarter",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "resourceAssignmentExpression",
+          "type": "bpmn:ResourceAssignmentExpression"
+        }
+      ]
+    },
+    {
+      "name": "UserTask",
+      "isAbstract": true,
+      "extends": ["bpmn:UserTask"],
+      "properties": [
+        {
+          "name": "timerEventDefinition",
+          "type": "Expression"
+        },
+        {
+          "name": "multiInstanceLoopCharacteristics",
+          "type": "MultiInstanceLoopCharacteristics"
+        }
+      ]
+    },
+    {
+      "name": "StartEvent",
+      "isAbstract": true,
+      "extends": ["bpmn:StartEvent"],
+      "properties": [
+        {
+          "name": "timerEventDefinition",
+          "type": "Expression"
+        }
+      ]
+    },
+    {
+      "name": "FormSupported",
+      "isAbstract": true,
+      "extends": ["bpmn:StartEvent", "bpmn:UserTask"],
+      "properties": [
+        {
+          "name": "formHandlerClass",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "formKey",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "TemplateSupported",
+      "isAbstract": true,
+      "extends": ["bpmn:Process", "bpmn:FlowElement"],
+      "properties": [
+        {
+          "name": "modelerTemplate",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Initiator",
+      "isAbstract": true,
+      "extends": ["bpmn:StartEvent"],
+      "properties": [
+        {
+          "name": "initiator",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ScriptTask",
+      "isAbstract": true,
+      "extends": ["bpmn:ScriptTask"],
+      "properties": [
+        {
+          "name": "resultVariable",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Process",
+      "isAbstract": true,
+      "extends": ["bpmn:Process"],
+      "properties": [
+        {
+          "name": "candidateStarterGroups",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateStarterUsers",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "versionTag",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "historyTimeToLive",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "isStartableInTasklist",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": true
+        }
+      ]
+    },
+    {
+      "name": "EscalationEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:EscalationEventDefinition"],
+      "properties": [
+        {
+          "name": "escalationCodeVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "FormalExpression",
+      "isAbstract": true,
+      "extends": ["bpmn:FormalExpression"],
+      "properties": [
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Assignable",
+      "extends": ["bpmn:UserTask"],
+      "properties": [
+        {
+          "name": "candidateGroups",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "dueDate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "followUpDate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "priority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "CallActivity",
+      "extends": ["bpmn:CallActivity"],
+      "properties": [
+        {
+          "name": "calledElementBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "calledElementVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "calledElementVersionTag",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "calledElementTenantId",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseRef",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "caseVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseTenantId",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableMappingClass",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableMappingDelegateExpression",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ServiceTaskLike",
+      "extends": [
+        "bpmn:ServiceTask",
+        "bpmn:BusinessRuleTask",
+        "bpmn:SendTask",
+        "bpmn:MessageEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resultVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ExclusiveGateway",
+      "isAbstract": true,
+      "extends": ["bpmn:ExclusiveGateway"],
+      "properties": [
+        {
+          "name": "serviceClass",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "DmnCapable",
+      "extends": ["bpmn:BusinessRuleTask"],
+      "properties": [
+        {
+          "name": "decisionRef",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "decisionRefBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "decisionRefVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "mapDecisionResult",
+          "isAttr": true,
+          "type": "String",
+          "default": "resultList"
+        },
+        {
+          "name": "decisionRefTenantId",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ExternalCapable",
+      "extends": ["flowable:ServiceTaskLike"],
+      "properties": [
+        {
+          "name": "type",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "topic",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "TaskPriorized",
+      "extends": ["bpmn:Process", "flowable:ExternalCapable"],
+      "properties": [
+        {
+          "name": "taskPriority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Properties",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["*"]
+      },
+      "properties": [
+        {
+          "name": "values",
+          "type": "Property",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Property",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "value",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "Connector",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["flowable:ServiceTaskLike"]
+      },
+      "properties": [
+        {
+          "name": "inputOutput",
+          "type": "InputOutput"
+        },
+        {
+          "name": "connectorId",
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InputOutput",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:FlowNode", "flowable:Connector"]
+      },
+      "properties": [
+        {
+          "name": "inputOutput",
+          "type": "InputOutput"
+        },
+        {
+          "name": "connectorId",
+          "type": "String"
+        },
+        {
+          "name": "inputParameters",
+          "isMany": true,
+          "type": "InputParameter"
+        },
+        {
+          "name": "outputParameters",
+          "isMany": true,
+          "type": "OutputParameter"
+        }
+      ]
+    },
+    {
+      "name": "InputOutputParameter",
+      "properties": [
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        },
+        {
+          "name": "definition",
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "InputOutputParameterDefinition",
+      "isAbstract": true
+    },
+    {
+      "name": "List",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "items",
+          "isMany": true,
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "Map",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "entries",
+          "isMany": true,
+          "type": "Entry"
+        }
+      ]
+    },
+    {
+      "name": "Entry",
+      "properties": [
+        {
+          "name": "key",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        },
+        {
+          "name": "definition",
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "Value",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "id",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Script",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "scriptFormat",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Field",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": [
+          "flowable:ServiceTaskLike",
+          "flowable:ExecutionListener",
+          "flowable:TaskListener"
+        ]
+      },
+      "properties": [
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "expression"
+        },
+        {
+          "name": "string",
+          "type": "string"
+        },
+        {
+          "name": "stringValue",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "string",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": [
+          "flowable:Field"
+        ]
+      },
+      "properties": [
+        {
+          "name": "body",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "expression",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": [
+          "flowable:Field"
+        ]
+      },
+      "properties": [
+        {
+          "name": "body",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InputParameter",
+      "superClass": ["InputOutputParameter"]
+    },
+    {
+      "name": "OutputParameter",
+      "superClass": ["InputOutputParameter"]
+    },
+    {
+      "name": "Collectable",
+      "isAbstract": true,
+      "extends": ["bpmn:MultiInstanceLoopCharacteristics"],
+      "superClass": ["flowable:AsyncCapable"],
+      "properties": [
+        {
+          "name": "collection",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "elementVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "SequenceFlow",
+      "superClass": ["FlowElement"],
+      "properties": [
+        {
+          "name": "isImmediate",
+          "isAttr": true,
+          "type": "Boolean"
+        },
+        {
+          "name": "conditionExpression",
+          "type": "Expression"
+        },
+        {
+          "name": "sourceRef",
+          "type": "FlowNode",
+          "isAttr": true,
+          "isReference": true
+        },
+        {
+          "name": "targetRef",
+          "type": "FlowNode",
+          "isAttr": true,
+          "isReference": true
+        }
+      ]
+    },
+    {
+      "name": "MultiInstanceLoopCharacteristics",
+      "superClass": ["LoopCharacteristics"],
+      "properties": [
+        {
+          "name": "isSequential",
+          "default": false,
+          "isAttr": true,
+          "type": "Boolean"
+        },
+        {
+          "name": "behavior",
+          "type": "MultiInstanceBehavior",
+          "default": "All",
+          "isAttr": true
+        },
+        {
+          "name": "loopCardinality",
+          "type": "Expression",
+          "xml": {
+            "serialize": "xsi:type"
+          }
+        },
+        {
+          "name": "loopDataInputRef",
+          "type": "ItemAwareElement",
+          "isReference": true
+        },
+        {
+          "name": "loopDataOutputRef",
+          "type": "ItemAwareElement",
+          "isReference": true
+        },
+        {
+          "name": "inputDataItem",
+          "type": "DataInput",
+          "xml": {
+            "serialize": "property"
+          }
+        },
+        {
+          "name": "outputDataItem",
+          "type": "DataOutput",
+          "xml": {
+            "serialize": "property"
+          }
+        },
+        {
+          "name": "complexBehaviorDefinition",
+          "type": "ComplexBehaviorDefinition",
+          "isMany": true
+        },
+        {
+          "name": "completionCondition",
+          "type": "Expression",
+          "xml": {
+            "serialize": "xsi:type"
+          }
+        },
+        {
+          "name": "oneBehaviorEventRef",
+          "type": "EventDefinition",
+          "isAttr": true,
+          "isReference": true
+        },
+        {
+          "name": "noneBehaviorEventRef",
+          "type": "EventDefinition",
+          "isAttr": true,
+          "isReference": true
+        }
+      ]
+    },
+    {
+      "name": "FailedJobRetryTimeCycle",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["flowable:AsyncCapable", "bpmn:MultiInstanceLoopCharacteristics"]
+      },
+      "properties": [
+        {
+          "name": "body",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ExecutionListener",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": [
+          "bpmn:Task",
+          "bpmn:ServiceTask",
+          "bpmn:UserTask",
+          "bpmn:BusinessRuleTask",
+          "bpmn:ScriptTask",
+          "bpmn:ReceiveTask",
+          "bpmn:ManualTask",
+          "bpmn:ExclusiveGateway",
+          "bpmn:SequenceFlow",
+          "bpmn:ParallelGateway",
+          "bpmn:InclusiveGateway",
+          "bpmn:EventBasedGateway",
+          "bpmn:StartEvent",
+          "bpmn:IntermediateCatchEvent",
+          "bpmn:IntermediateThrowEvent",
+          "bpmn:EndEvent",
+          "bpmn:BoundaryEvent",
+          "bpmn:CallActivity",
+          "bpmn:SubProcess",
+          "bpmn:Process"
+        ]
+      },
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "event",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "script",
+          "type": "Script"
+        },
+        {
+          "name": "fields",
+          "type": "Field",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "TaskListener",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "event",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "script",
+          "type": "Script"
+        },
+        {
+          "name": "fields",
+          "type": "Field",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormProperty",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:StartEvent", "bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "required",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "readable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "writable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "variable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "expression",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "datePattern",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "default",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "values",
+          "type": "Value",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormData",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:StartEvent", "bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "fields",
+          "type": "FormField",
+          "isMany": true
+        },
+        {
+          "name": "businessKey",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "FormField",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "label",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "datePattern",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "defaultValue",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "properties",
+          "type": "Properties"
+        },
+        {
+          "name": "validation",
+          "type": "Validation"
+        },
+        {
+          "name": "values",
+          "type": "Value",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Validation",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "constraints",
+          "type": "Constraint",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Constraint",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "config",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "ConditionalEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:ConditionalEventDefinition"],
+      "properties": [
+        {
+          "name": "variableName",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableEvent",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    }
+  ],
+  "emumerations": []
+}
diff --git a/ruoyi-ui/src/components/Process/flowable/showConfig.js b/ruoyi-ui/src/components/Process/flowable/showConfig.js
index 69ba83e5..b372ec47 100644
--- a/ruoyi-ui/src/components/Process/flowable/showConfig.js
+++ b/ruoyi-ui/src/components/Process/flowable/showConfig.js
@@ -10,9 +10,6 @@ export default {
     assignee: true,
     candidateUsers: true,
     candidateGroups: true,
-    // assigneeFixed: true,
-    // candidateUsersFixed: true,
-    // candidateGroupsFixed: true,
     async: true,
     priority: true,
     formKey: true,
diff --git a/ruoyi-ui/src/components/Process/index.vue b/ruoyi-ui/src/components/Process/index.vue
index b79af00a..dc08c4dc 100644
--- a/ruoyi-ui/src/components/Process/index.vue
+++ b/ruoyi-ui/src/components/Process/index.vue
@@ -87,15 +87,10 @@ export default {
       type: Boolean,
       default: false
     },
-    taskList: {
-      type: Array,
-      default: () => []
-    }
   },
   data() {
     return {
       modeler: null,
-      // taskList: [],
       zoom: 1
     }
   },
@@ -163,9 +158,6 @@ export default {
         await this.modeler.importXML(data)
         this.adjustPalette()
         this.fitViewport()
-        if (this.taskList !==undefined && this.taskList.length > 0 ) {
-          this.fillColor()
-        }
       } catch (err) {
         console.error(err.message, err.warnings)
       }
@@ -222,77 +214,6 @@ export default {
         console.log(e)
       }
     },
-    fillColor() {
-      const canvas = this.modeler.get('canvas')
-      this.modeler._definitions.rootElements[0].flowElements.forEach(n => {
-        const completeTask = this.taskList.find(m => m.key === n.id)
-        const todoTask = this.taskList.find(m => !m.completed)
-        const endTask = this.taskList[this.taskList.length - 1]
-        if (n.$type === 'bpmn:UserTask') {
-          if (completeTask) {
-            canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
-            n.outgoing?.forEach(nn => {
-              const targetTask = this.taskList.find(m => m.key === nn.targetRef.id)
-              if (targetTask) {
-                if (todoTask && completeTask.key === todoTask.key && !todoTask.completed){
-                  canvas.addMarker(nn.id, todoTask.completed ? 'highlight' : 'highlight-todo')
-                  canvas.addMarker(nn.targetRef.id, todoTask.completed ? 'highlight' : 'highlight-todo')
-                }else {
-                  canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
-                  canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
-                }
-              }
-            })
-          }
-        }
-        // 排他网关
-        else if (n.$type === 'bpmn:ExclusiveGateway') {
-          if (completeTask) {
-            canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
-            n.outgoing?.forEach(nn => {
-              const targetTask = this.taskList.find(m => m.key === nn.targetRef.id)
-              if (targetTask) {
-
-                canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
-                canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
-              }
-
-            })
-          }
-
-        }
-        // 并行网关
-        else if (n.$type === 'bpmn:ParallelGateway') {
-          if (completeTask) {
-            canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
-            n.outgoing?.forEach(nn => {
-              debugger
-              const targetTask = this.taskList.find(m => m.key === nn.targetRef.id)
-              if (targetTask) {
-                canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
-                canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
-              }
-            })
-          }
-        }
-        else if (n.$type === 'bpmn:StartEvent') {
-          n.outgoing.forEach(nn => {
-            const completeTask = this.taskList.find(m => m.key === nn.targetRef.id)
-            if (completeTask) {
-              canvas.addMarker(nn.id, 'highlight')
-              canvas.addMarker(n.id, 'highlight')
-              return
-            }
-          })
-        }
-        else if (n.$type === 'bpmn:EndEvent') {
-          if (endTask.key === n.id && endTask.completed) {
-            canvas.addMarker(n.id, 'highlight')
-            return
-          }
-        }
-      })
-    },
     // 对外 api
     getProcess() {
       const element = this.getProcessElement()
diff --git a/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue b/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
index ba31c373..f7d15d08 100644
--- a/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
@@ -497,11 +497,13 @@ export default {
           }
         } else {
           // 最后一个任务节点
-          console.log(this.taskForm, "流程审批提交表单数据")
-          complete(this.taskForm).then(response => {
-            this.$modal.msgSuccess(response.msg);
-            this.goBack();
-          });
+          // console.log(this.taskForm, "流程审批提交表单数据")
+          // complete(this.taskForm).then(response => {
+          //   this.$modal.msgSuccess(response.msg);
+          //   this.goBack();
+          // });
+          this.completeOpen = true;
+          this.completeTitle = "流程审批";
         }
       })
     },