diff --git a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue index be28f850d5..215f3aaf0a 100644 --- a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue +++ b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue @@ -118,6 +118,7 @@ export default { componentName: "MyProcessDesigner", props: { value: String, // xml 字符串 + valueWatch: true, // xml 字符串的 watch 状态 processId: String, // 流程 key 标识 processName: String, // 流程 name 名字 formId: Number, // 流程 form 表单编号 @@ -252,11 +253,6 @@ export default { this.bpmnModeler = null; }); }, - watch: { - value: function (newValue) { // 在 xmlString 发生变化时,重新创建,从而绘制流程图 - this.createNewDiagram(newValue); - } - }, methods: { initBpmnModeler() { if (this.bpmnModeler) return; @@ -307,7 +303,7 @@ export default { let newName = this.processName || `业务流程_${new Date().getTime()}`; let xmlString = xml || DefaultEmptyXML(newId, newName, this.prefix); try { - console.log(this.bpmnModeler.importXML); + // console.log(this.bpmnModeler.importXML); let { warnings } = await this.bpmnModeler.importXML(xmlString); if (warnings && warnings.length) { warnings.forEach(warn => console.warn(warn)); diff --git a/yudao-ui-admin/src/views/bpm/model/modelEditor.vue b/yudao-ui-admin/src/views/bpm/model/modelEditor.vue index 19413d0408..91be300a70 100644 --- a/yudao-ui-admin/src/views/bpm/model/modelEditor.vue +++ b/yudao-ui-admin/src/views/bpm/model/modelEditor.vue @@ -2,7 +2,7 @@
- @@ -30,7 +30,7 @@ export default { components: { MyProcessPalette }, data() { return { - xmlString: "", // BPMN XML + xmlString: undefined, // BPMN XML modeler: null, reloadIndex: 0, controlDrawerVisible: false, @@ -72,21 +72,6 @@ export default { console.log(modeler); }, 10); }, - reloadProcessDesigner(deep) { - this.controlForm.additionalModel = []; - for (let key in this.addis) { - if (this.addis[key]) { - this.controlForm.additionalModel.push(this.addis[key]); - } - } - deep && (this.xmlString = undefined); - this.reloadIndex += 1; - this.modeler = null; // 避免 panel 异常 - // if (deep) { - // this.xmlString = undefined; - // this.$refs.processDesigner.processRestart(); - // } - }, save(bpmnXml) { const data = { ...this.model,