diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 2b80e4a0..59b03797 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -38,10 +38,10 @@ "dependencies": { "@riophae/vue-treeselect": "0.4.0", "axios": "0.24.0", - "bpmn-js": "7.5.0", + "bpmn-js": "^11.1.0", "clipboard": "2.0.8", "core-js": "3.25.3", - "diagram-js": "5.1.1", + "diagram-js": "^11.4.1", "echarts": "5.4.0", "element-ui": "2.15.10", "file-saver": "2.0.5", @@ -62,8 +62,7 @@ "vue-router": "3.4.9", "vuedraggable": "2.24.3", "vuex": "3.6.0", - "xcrud": "0.4.1", - "bpmn-moddle": "7.0.4" + "xcrud": "^0.4.19" }, "devDependencies": { "@babel/parser": "^7.20.5", 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 db249b97..c4ffbf38 100644 --- a/ruoyi-ui/src/components/Process/components/nodePanel/property/multiInstance.vue +++ b/ruoyi-ui/src/components/Process/components/nodePanel/property/multiInstance.vue @@ -83,7 +83,9 @@ export default { const cache = JSON.parse(JSON.stringify(this.element.businessObject.loopCharacteristics ?? {})) cache.completionCondition = cache.completionCondition?.body // 拼接多实例对象 - Object.assign(cache,this.element.businessObject.loopCharacteristics.$attrs) + if (this.element.businessObject.loopCharacteristics) { + Object.assign(cache, this.element.businessObject.loopCharacteristics.$attrs) + } this.formData = formatJsonKeyValue(cache) }, methods: { diff --git a/ruoyi-ui/src/components/Process/index.vue b/ruoyi-ui/src/components/Process/index.vue index dc08c4dc..9c8beee9 100644 --- a/ruoyi-ui/src/components/Process/index.vue +++ b/ruoyi-ui/src/components/Process/index.vue @@ -110,7 +110,7 @@ export default { translate: ['value', customTranslate] } ], - moduleExtensions: { + moddleExtensions: { flowable: FlowableModule } })