diff --git a/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue b/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue index 41abc99..cb38320 100644 --- a/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue +++ b/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue @@ -6,6 +6,7 @@ :showCancelBtn="false" :showOkBtn="false" @register="registerModal" + @visible-change="handleVisibleChange" >
@@ -56,7 +57,6 @@ const microAppStore = useMicroAppStore(); const [registerModal, { setModalProps, closeModal, changeLoading }] = useModalInner(async (data: BoxPayload = { _tag: '' }) => { changeLoading(); - state.formDesignApp?.unmount(); state.formDesignApp = loadMicroApp(Object.assign({} , apps.find(item => item.name == 'form-design'), { container: '#formDesign', props: { @@ -89,6 +89,10 @@ setModalProps(props); }); + function handleVisibleChange(visible: boolean) { + !visible && state.formDesignApp?.unmount(); + } + /** 处理弹出框提交 */ async function handleSubmitForm(status: string) { try { diff --git a/src/views/workflow/model/helper/WorkflowModelDesign.vue b/src/views/workflow/model/helper/WorkflowModelDesign.vue index c981727..d389963 100644 --- a/src/views/workflow/model/helper/WorkflowModelDesign.vue +++ b/src/views/workflow/model/helper/WorkflowModelDesign.vue @@ -7,6 +7,7 @@ :showOkBtn="false" :wrapperProps="{ modalFooterHeight: 0 }" @register="registerModal" + @visible-change="handleVisibleChange" > @@ -42,7 +43,6 @@ changeLoading(); // fix冲突: 延迟 100ms 后加载控制bpmn.js设计器跟model动画先后顺序,这样可以兼容非点击方式展开 setTimeout(function () { - state.workflowDesignApp?.unmount(); state.workflowDesignApp = loadMicroApp(Object.assign({} , apps.find(item => item.name == 'workflow-design'), { container: '#workflowDesign', props: { @@ -76,6 +76,9 @@ }); }, 100); }); + function handleVisibleChange(visible: boolean) { + !visible && state.workflowDesignApp?.unmount(); + }