From a8d126539b80340f63562ef92fdf736a5141c7ef Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 26 Jul 2023 11:58:48 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=8B=B1=E5=86=99=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/ResetPwdModal.vue        |  1 -
 .../form/helper/WorkflowFormDesign.vue         | 18 +++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/system/user/ResetPwdModal.vue b/src/views/system/user/ResetPwdModal.vue
index 60a6213..45bbf38 100644
--- a/src/views/system/user/ResetPwdModal.vue
+++ b/src/views/system/user/ResetPwdModal.vue
@@ -28,7 +28,6 @@
   import { Form } from 'ant-design-vue';
   import { resetPwd } from '/@/api/platform/system/controller/user';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import {Recordable} from "/#/global";
 
   /** 类型规范统一声明定义区域 */
   interface WindowState {
diff --git a/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue b/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue
index 2b2cdfe..c4bb8c7 100644
--- a/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue
+++ b/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue
@@ -4,6 +4,7 @@
               :canFullscreen="false"
               @register="registerModal"
               @ok="handleSubmit"
+              @visible-change="handleClose"
   >
     <div id="formDesign"/>
   </BasicModal>
@@ -11,17 +12,20 @@
 <script lang="ts" setup>
   import { reactive } from 'vue';
   import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
-  import { loadMicroApp } from 'qiankun';
+  import { loadMicroApp, MicroApp } from 'qiankun';
   import { getSubDefineProps } from '/@/qiankun/state';
   import { GlStateEnum } from '/@/enums/microAppEnum';
   import { useMicroAppStore } from '/@/store/modules/microApp';
+  import { apps } from '/@/qiankun/apps';
 
   interface TableState {
     tag: string;
+    formDesignApp: MicroApp;
   }
 
   const state = reactive<TableState>({
     tag: '',
+    formDesignApp: undefined!
   });
 
   const formDesignProps = {
@@ -32,16 +36,14 @@
   const emit = defineEmits(['success', 'register']);
   const microAppStore = useMicroAppStore();
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data: BoxPayload = { _tag: '' }) => {
-    loadMicroApp({
-      name: 'formDesign',
-      entry: '//localhost:7101',
+    state.formDesignApp = loadMicroApp(Object.assign({} , apps.find(item => item.name == 'form-design'), {
       container: '#formDesign',
       props: {
         ...getSubDefineProps(),
         // 表单设计器props
         [GlStateEnum.FORM_DESIGN_PROPS_KEY]: formDesignProps
       }
-    }, { sandbox: { experimentalStyleIsolation: true }});
+    }), { sandbox: { experimentalStyleIsolation: true }});
     state.tag = data._tag;
     const id = data.record?.id;
     const props: Partial<ModalProps> = { confirmLoading: false };
@@ -56,6 +58,12 @@
     setModalProps(props);
   });
 
+  function handleClose(vis:boolean) {
+    if (!vis) {
+      state.formDesignApp.unmount();
+    }
+  }
+
   /** 处理弹出框提交 */
   async function handleSubmit() {
     try {