fix: 冲突

src/views/workflow/model/helper/WorkflowModelDesign.vue

@@ -40,37 +40,40 @@
   const microAppStore = useMicroAppStore();
   const [registerModal, { setModalProps, closeModal, changeLoading }] = useModalInner(async (data: BoxPayload = { _tag: '' }) => {
     changeLoading();
-    state.workflowDesignApp = loadMicroApp(Object.assign({} , apps.find(item => item.name == 'workflow-design'), {
+    // fix冲突: 延迟 100ms 后加载控制bpmn.js设计器跟model动画先后顺序,这样可以兼容非点击方式展开
-      container: '#workflowDesign',
+    setTimeout(function () {
-      props: {
+      state.workflowDesignApp = loadMicroApp(Object.assign({} , apps.find(item => item.name == 'workflow-design'), {
-        ...getSubDefineProps(),
+        container: '#workflowDesign',
-        [GlStateEnum.WORKFLOW_DESIGN_APP_PROPS_KEY]: workflowDesignProps
+        props: {
-      }
+          ...getSubDefineProps(),
-    }), { sandbox: { experimentalStyleIsolation: true }});
+          [GlStateEnum.WORKFLOW_DESIGN_APP_PROPS_KEY]: workflowDesignProps
-    state.workflowDesignApp.mountPromise.then(async () => {
+        }
-      // 处理清除脏数据
+      }), { sandbox: { experimentalStyleIsolation: true }});
-      state.tag = data._tag;
+      state.workflowDesignApp.mountPromise.then(async () => {
-      const id = data.record?.id;
+        // 处理清除脏数据
-      const workflowDesignApp: Recordable = microAppStore.getWorkflowDesignApp(WORKFLOW_DESIGN_APP_COMPONENTS.DESIGN),
+        state.tag = data._tag;
+        const id = data.record?.id;
+        const workflowDesignApp: Recordable = microAppStore.getWorkflowDesignApp(WORKFLOW_DESIGN_APP_COMPONENTS.DESIGN),
             workflowRef: Recordable = workflowDesignApp.getRef().$refs['workflow-design'];
-      workflowRef.setBpmnXml('');
+        workflowRef.setBpmnXml('');
-      workflowRef.reset();
+        workflowRef.reset();
-      // 处理设置数据
+        // 处理设置数据
-      const props: Partial<ModalProps> = { loading: false };
+        const props: Partial<ModalProps> = { loading: false };
-      switch (state.tag) {
+        switch (state.tag) {
-        case 'add':
+          case 'add':
-          props.title = '新增流程模型';
+            props.title = '新增流程模型';
-          break;
+            break;
-        case 'edit':
+          case 'edit':
-          props.title = '编辑流程模型';
+            props.title = '编辑流程模型';
-          const modelRepresentation = await getModel(id);
+            const modelRepresentation = await getModel(id);
-          workflowRef.setModelData(modelRepresentation);
+            workflowRef.setModelData(modelRepresentation);
-          const bpmnXml = await getModelXml(id);
+            const bpmnXml = await getModelXml(id);
-          workflowRef.setBpmnXml(bpmnXml);
+            workflowRef.setBpmnXml(bpmnXml);
-          break;
+            break;
-      }
+        }
-      setModalProps(props);
+        setModalProps(props);
-    });
+      });
+    }, 100);
   });
   function handleVisibleChange(visible: boolean) {
     !visible && state.workflowDesignApp.unmount();