From 72cf76c249ccaf89fe25a4c32523cb875e2408e3 Mon Sep 17 00:00:00 2001 From: haha Date: Wed, 21 Aug 2024 23:41:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9flowable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/ProcessDesigner/index.vue | 74 +- .../src/package/designer/ProcessDesigner.vue | 26 +- .../descriptor/flowableDescriptor.json | 15 - .../src/package/penal/PropertiesPanel.vue | 16 +- .../src/package/penal/form/ElementForm.vue | 289 ++++---- .../penal/listeners/UserTaskListeners.vue | 240 +++--- .../src/package/penal/listeners/utilSelf.js | 58 +- .../multi-instance/ElementMultiInstance.vue | 439 ++++------- .../src/package/penal/task/ElementTask.vue | 18 +- .../penal/task/task-components/UserTask.vue | 682 ++---------------- .../src/package/theme/process-panel.scss | 22 - 11 files changed, 527 insertions(+), 1352 deletions(-) diff --git a/yanzhu-ui-vue3/src/components/ProcessDesigner/index.vue b/yanzhu-ui-vue3/src/components/ProcessDesigner/index.vue index 9bbbb1fa..c94f251f 100644 --- a/yanzhu-ui-vue3/src/components/ProcessDesigner/index.vue +++ b/yanzhu-ui-vue3/src/components/ProcessDesigner/index.vue @@ -19,43 +19,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+
+ + + + + + + + + + + + + + + + + + + + camunda + flowable + activiti + + + + + small + default + large + + + + + diff --git a/yanzhu-ui-vue3/src/package/designer/ProcessDesigner.vue b/yanzhu-ui-vue3/src/package/designer/ProcessDesigner.vue index af893837..3f256ff6 100644 --- a/yanzhu-ui-vue3/src/package/designer/ProcessDesigner.vue +++ b/yanzhu-ui-vue3/src/package/designer/ProcessDesigner.vue @@ -20,7 +20,7 @@ 预览 @@ -111,8 +111,7 @@ import camundaModdleExtension from './plugins/extension-moddle/camunda'; import activitiModdleExtension from './plugins/extension-moddle/activiti'; import flowableModdleExtension from './plugins/extension-moddle/flowable'; // 引入json转换与高亮 -// import convert from "xml-js"; -import X2JS from "x2js"; +// import X2JS from "x2js"; import Codemirror from 'codemirror-editor-vue3'; import 'codemirror/theme/monokai.css' @@ -497,23 +496,18 @@ export default { }); }, previewProcessJson() { + // const newConvert = new X2JS(); // this.bpmnModeler.saveXML({ format: true }).then(({ xml }) => { - // this.previewResult = convert.xml2json(xml, { spaces: 2 }); + // const { definitions } = newConvert.xml2js(xml); + // if (definitions) { + // this.previewResult = JSON.stringify(definitions, null, 4); + // } else { + // this.previewResult = ""; + // } + // this.previewType = "json"; // this.previewModelVisible = true; // }); - const newConvert = new X2JS(); - this.bpmnModeler.saveXML({ format: true }).then(({ xml }) => { - const { definitions } = newConvert.xml2js(xml); - if (definitions) { - this.previewResult = JSON.stringify(definitions, null, 4); - } else { - this.previewResult = ""; - } - - this.previewType = "json"; - this.previewModelVisible = true; - }); } } }; diff --git a/yanzhu-ui-vue3/src/package/designer/plugins/descriptor/flowableDescriptor.json b/yanzhu-ui-vue3/src/package/designer/plugins/descriptor/flowableDescriptor.json index 7b661555..c3d25489 100644 --- a/yanzhu-ui-vue3/src/package/designer/plugins/descriptor/flowableDescriptor.json +++ b/yanzhu-ui-vue3/src/package/designer/plugins/descriptor/flowableDescriptor.json @@ -319,21 +319,6 @@ "name": "priority", "isAttr": true, "type": "String" - }, - { - "name": "dataType", - "isAttr": true, - "type": "String" - }, - { - "name": "text", - "isAttr": true, - "type": "String" - }, - { - "name": "deptId", - "isAttr": true, - "type": "String" } ] }, diff --git a/yanzhu-ui-vue3/src/package/penal/PropertiesPanel.vue b/yanzhu-ui-vue3/src/package/penal/PropertiesPanel.vue index 42ded620..0af0dcfb 100644 --- a/yanzhu-ui-vue3/src/package/penal/PropertiesPanel.vue +++ b/yanzhu-ui-vue3/src/package/penal/PropertiesPanel.vue @@ -21,6 +21,7 @@ @@ -37,20 +38,23 @@ - - - - + + + + diff --git a/yanzhu-ui-vue3/src/package/penal/form/ElementForm.vue b/yanzhu-ui-vue3/src/package/penal/form/ElementForm.vue index cdf963bd..8eec129a 100644 --- a/yanzhu-ui-vue3/src/package/penal/form/ElementForm.vue +++ b/yanzhu-ui-vue3/src/package/penal/form/ElementForm.vue @@ -1,155 +1,128 @@