diff --git a/package.json b/package.json index 428ece6..9b48b76 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "axios": "0.27.2", "bpmn-js-token-simulation": "0.10.0", "clipboard": "^2.0.11", + "diagram-js": "^11.4.1", "echarts": "5.4.0", "element-plus": "2.2.21", "file-saver": "2.0.5", @@ -31,6 +32,7 @@ "jsencrypt": "3.3.1", "nprogress": "0.2.0", "pinia": "2.0.22", + "stream-browserify": "^3.0.0", "throttle-debounce": "^5.0.0", "vue": "3.2.45", "vue-cropper": "1.0.3", @@ -44,7 +46,7 @@ "@vitejs/plugin-vue-jsx": "^3.0.0", "@vue/babel-helper-vue-transform-on": "^1.0.2", "@vue/compiler-sfc": "3.2.45", - "bpmn-js": "^11.1.0", + "bpmn-js": "7.4.0", "bpmn-js-properties-panel": "^1.13.1", "camunda-bpmn-moddle": "^7.0.1", "sass": "1.56.1", diff --git a/src/components/ProcessDesigner/index.vue b/src/components/ProcessDesigner/index.vue index 7ef8af0..a65b2e2 100644 --- a/src/components/ProcessDesigner/index.vue +++ b/src/components/ProcessDesigner/index.vue @@ -1,6 +1,6 @@ - +
-
+
- - + + + + - - + diff --git a/src/plugins/package/designer/plugins/extension-moddle/activiti/activitiExtension.js b/src/plugins/package/designer/plugins/extension-moddle/activiti/activitiExtension.js index cee2c94..077a9d5 100644 --- a/src/plugins/package/designer/plugins/extension-moddle/activiti/activitiExtension.js +++ b/src/plugins/package/designer/plugins/extension-moddle/activiti/activitiExtension.js @@ -95,4 +95,4 @@ ActivitiModdleExtension.prototype.canCloneProperty = function ( } }; -module.exports = ActivitiModdleExtension; +export default ActivitiModdleExtension; diff --git a/src/plugins/package/designer/plugins/extension-moddle/camunda/extension.js b/src/plugins/package/designer/plugins/extension-moddle/camunda/extension.js index 16867dd..60a8207 100644 --- a/src/plugins/package/designer/plugins/extension-moddle/camunda/extension.js +++ b/src/plugins/package/designer/plugins/extension-moddle/camunda/extension.js @@ -108,7 +108,7 @@ CamundaModdleExtension.prototype.canHostIn = function (parent) { return true; }; -module.exports = CamundaModdleExtension; +export default CamundaModdleExtension; // helpers ////////// diff --git a/src/plugins/package/designer/plugins/extension-moddle/flowable/flowableExtension.js b/src/plugins/package/designer/plugins/extension-moddle/flowable/flowableExtension.js index 354d30a..663784b 100644 --- a/src/plugins/package/designer/plugins/extension-moddle/flowable/flowableExtension.js +++ b/src/plugins/package/designer/plugins/extension-moddle/flowable/flowableExtension.js @@ -94,4 +94,4 @@ FlowableModdleExtension.prototype.canCloneProperty = function ( } }; -module.exports = FlowableModdleExtension; +export default FlowableModdleExtension; diff --git a/src/plugins/package/designer/test.vue b/src/plugins/package/designer/test.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/plugins/package/highlight/index.js b/src/plugins/package/highlight/index.js index a084c4c..e047311 100644 --- a/src/plugins/package/highlight/index.js +++ b/src/plugins/package/highlight/index.js @@ -1,5 +1,5 @@ -const hljs = require("highlight.js/lib/core"); -hljs.registerLanguage("xml", require("highlight.js/lib/languages/xml")); -hljs.registerLanguage("json", require("highlight.js/lib/languages/json")); +// import hljs from "highlight.js/lib/core"; +// hljs.registerLanguage("xml", () => import("highlight.js/lib/languages/xml")); +// hljs.registerLanguage("json", () => import("highlight.js/lib/languages/json")); -export default hljs; +// export default hljs; diff --git a/src/plugins/package/penal/PropertiesPanel.vue b/src/plugins/package/penal/PropertiesPanel.vue index e33c803..9a8f057 100644 --- a/src/plugins/package/penal/PropertiesPanel.vue +++ b/src/plugins/package/penal/PropertiesPanel.vue @@ -2,49 +2,100 @@
-
常规
- +
+ 常规 +
+
- -
消息与信号
+ +
+ 消息与信号 +
- -
流转条件
- + +
+ 流转条件 +
+
-
表单
+
+ 表单 +
- -
任务
+ +
+ 任务 +
- -
多实例
- + +
+ 多实例 +
+
-
执行监听器
+
+ 执行监听器 +
- -
任务监听器
+ +
+ 任务监听器 +
-
扩展属性
+
+ 扩展属性 +
-
其他
+
+ 其他 +
- diff --git a/src/plugins/package/penal/base/ElementBaseInfo.vue b/src/plugins/package/penal/base/ElementBaseInfo.vue index 303d59d..8a93e3f 100644 --- a/src/plugins/package/penal/base/ElementBaseInfo.vue +++ b/src/plugins/package/penal/base/ElementBaseInfo.vue @@ -1,6 +1,6 @@ - diff --git a/src/plugins/package/penal/flow-condition/FlowCondition.vue b/src/plugins/package/penal/flow-condition/FlowCondition.vue index 94cf823..db6a107 100644 --- a/src/plugins/package/penal/flow-condition/FlowCondition.vue +++ b/src/plugins/package/penal/flow-condition/FlowCondition.vue @@ -1,6 +1,6 @@