From 82778014b864d5dcd905fb56e990f4d296982225 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 6 May 2025 22:12:38 +0800
Subject: [PATCH] no message

---
 package.json                                  |  2 +-
 .../js/components/DrawerOverlay/index.vue     | 25 ++++---
 resources/assets/js/components/MicroApps.vue  | 75 +++++++++++--------
 resources/assets/js/store/actions.js          | 14 +---
 resources/assets/sass/pages/_.scss            |  1 -
 .../assets/sass/pages/page-microapp.scss      |  8 --
 6 files changed, 62 insertions(+), 63 deletions(-)
 delete mode 100644 resources/assets/sass/pages/page-microapp.scss

diff --git a/package.json b/package.json
index ff2cae059..93acf88d9 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
         "dayjs": "^1.11.13",
         "dexie": "^3.2.3",
         "echarts": "^5.2.2",
-        "element-sea": "^2.15.10-8",
+        "element-sea": "^2.15.10-9",
         "file-loader": "^6.2.0",
         "highlight.js": "^11.7.0",
         "inquirer": "^8.2.0",
diff --git a/resources/assets/js/components/DrawerOverlay/index.vue b/resources/assets/js/components/DrawerOverlay/index.vue
index 6c7c57077..e2e7b57b4 100644
--- a/resources/assets/js/components/DrawerOverlay/index.vue
+++ b/resources/assets/js/components/DrawerOverlay/index.vue
@@ -8,12 +8,13 @@
         :footer-hide="true"
         :transition-names="[$A.isAndroid() ? '' : `drawer-slide-${transitionName}`, '']"
         :beforeClose="beforeClose"
-        fullscreen
-        :class-name="className">
+        :class-name="className"
+        fullscreen>
         <div v-if="isFullscreen" class="overlay-body">
             <slot/>
         </div>
-        <DrawerOverlayView v-else
+        <DrawerOverlayView
+            v-else
             :placement="transitionName"
             :size="size"
             :minSize="minSize"
@@ -44,11 +45,15 @@ export default {
             default: true
         },
         placement: {
-            validator (value) {
+            validator(value) {
                 return ['right', 'bottom'].includes(value)
             },
             default: 'bottom'
         },
+        forceFullscreen: {
+            type: Boolean,
+            default: false
+        },
         size: {
             type: [Number, String],
             default: "100%"
@@ -72,7 +77,6 @@ export default {
     data() {
         return {
             show: this.value,
-            isFullscreen: false
         }
     },
     watch: {
@@ -82,12 +86,12 @@ export default {
         show(v) {
             this.value !== v && this.$emit("input", v)
         },
-        windowWidth(val){
-            this.isFullscreen = val < 500 && this.placement != 'bottom'
-        }
     },
     computed: {
-        transitionName(){
+        isFullscreen() {
+            return this.forceFullscreen || (this.windowWidth < 500 && this.placement != 'bottom')
+        },
+        transitionName() {
             return this.isFullscreen ? 'bottom' : this.placement
         },
         className() {
@@ -107,9 +111,6 @@ export default {
             return array.join(" ");
         },
     },
-    mounted() {
-        this.isFullscreen = this.windowWidth < 500  && this.placement != 'bottom'
-    },
     methods: {
         onClose() {
             this.$refs.modal.close();
diff --git a/resources/assets/js/components/MicroApps.vue b/resources/assets/js/components/MicroApps.vue
index 1d1ba0ef6..42be1a2da 100644
--- a/resources/assets/js/components/MicroApps.vue
+++ b/resources/assets/js/components/MicroApps.vue
@@ -1,34 +1,24 @@
 <template>
-    <micro-app
-        v-if="appConfig.displayMode=='page'"
-        v-show="appConfig.isVisible"
-        :name="appConfig.appName"
-        :url="appConfig.appUrl"
-        :data="appData"
-        @created="created"
-        @beforemount="beforemount"
-        @mounted="mounted"
-        @unmount="unmount"
-        @error="error"/>
     <DrawerOverlay
-        v-else-if="appConfig.displayMode=='drawer'"
-        v-model="appConfig.isVisible"
         ref="drawer"
+        v-model="appConfig.isOpen"
         placement="right"
-        modal-class="micro-apps-modal"
-        drawer-class="micro-apps-drawer"
+        modal-class="micro-app-modal"
+        drawer-class="micro-app-drawer"
+        :force-fullscreen="appConfig.forceFullscreen"
         :size="1200">
-        <div v-if="appConfig.isVisible" class="page-microapp">
+        <div v-if="appConfig.isOpen" class="micro-app-wrapper">
             <micro-app
                 :name="appConfig.appName"
                 :url="appConfig.appUrl"
+                :keep-alive="appConfig.keepAlive"
                 :data="appData"
                 @created="created"
                 @beforemount="beforemount"
                 @mounted="mounted"
                 @unmount="unmount"
                 @error="error"/>
-            <div v-if="loadIng > 0" class="microapp-load">
+            <div v-if="loadIng > 0" class="micro-app-load">
                 <Loading/>
             </div>
         </div>
@@ -36,17 +26,30 @@
 </template>
 
 <style lang="scss">
-.micro-apps-modal {
+.micro-app-modal {
     .ivu-modal-close {
         display: none;
     }
 }
 
-.micro-apps-drawer {
+.micro-app-drawer {
     .overlay-content {
         overflow: hidden;
     }
 }
+
+.micro-app-wrapper {
+    .micro-app-load {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        align-items: center;
+        display: flex;
+        justify-content: center;
+    }
+}
 </style>
 
 <script>
@@ -77,7 +80,6 @@ export default {
     mounted() {
         microApp.start({
             'iframe': true,
-            'keep-alive': true,         // 全局开启保活模式
             'router-mode': 'state',     // 路由设置为state模式
         })
 
@@ -103,7 +105,7 @@ export default {
         ]),
 
         appData() {
-            const {initialData} = this.appConfig;
+            const {initialData, appName} = this.appConfig;
 
             return {
                 instance: {
@@ -123,24 +125,30 @@ export default {
                     ...initialData,
 
                     systemInfo: window.systemInfo,
+                    baseUrl: $A.mainUrl(),
 
                     isEEUIApp: $A.isEEUIApp,
                     isElectron: $A.isElectron,
                     isMainElectron: $A.isMainElectron,
                     isSubElectron: $A.isSubElectron,
 
-                    themeName: this.themeName,
                     languages: {
                         languageList,
                         languageName,
                     },
+                    themeName: this.themeName,
 
                     userInfo: this.userInfo,
                     userToken: this.userToken,
                 },
 
-                handleClose: () => {
-                    this.$refs.drawer?.onClose();
+                handleClose: (destroy = false) => {
+                    this.$refs.drawer.onClose();
+                    if (destroy) {
+                        setTimeout(_ => {
+                            microApp.unmountApp(appName, {destroy: true})
+                        }, 301)
+                    }
                 },
 
                 nextModalIndex: () => {
@@ -201,17 +209,19 @@ export default {
             // 处理数据
             config = Object.assign({
                 appName: 'micro-app',       // 微应用唯一标识名称
-                displayMode: 'drawer',      // 显示模式: 'page'-全屏模式, 'drawer'-抽屉模式
-                isVisible: true,            // 是否显示微应用(true/false)
                 appUrl: null,               // 微应用的入口URL地址
                 initialData: {},            // 初始化时传递给微应用的数据对象
+                forceFullscreen: false,     // 是否强制全屏(true/false)，默认自动适应
+                keepAlive: true,            // 是否开启微应用保活(true/false)，默认开启
+
                 isLoading: true,            // 私有参数，是否显示加载状态(true/false)
+                isOpen: false,              // 私有参数，是否打开微应用(true/false)
             }, config);
 
-            // 判断卸载上一次
-            const item = appMaps.get(config.appName)
-            if (item) {
-                if (item.displayMode != config.displayMode || item.appUrl != config.appUrl) {
+            // 判断卸载上次
+            const lastApp = appMaps.get(config.appName)
+            if (lastApp) {
+                if (lastApp.displayMode != config.displayMode || lastApp.appUrl != config.appUrl) {
                     microApp.unmountApp(config.appName, {destroy: true})
                 } else {
                     config.isLoading = false;
@@ -220,6 +230,11 @@ export default {
 
             // 更新数据
             appMaps.set(config.appName, this.appConfig = config);
+
+            // 打开微应用
+            this.$nextTick(_ => {
+                this.appConfig.isOpen = true
+            })
         }
     }
 }
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 60c87874e..b756e2fd9 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -4671,28 +4671,20 @@ export default {
             // 打开详情页
             emitter.emit('openMicroApp', {
                 appName: 'okr-details',
-                displayMode: 'page',
-                isVisible: false,
-
-                appUrl: $A.mainUrl(`apps/okr/`),
+                appUrl: `http://127.0.0.1:5567/apps/okr/`,
+                // appUrl: $A.mainUrl('apps/okr/'),
                 initialData: {
-                    empty: true,
                     type: 'details',
                     id: value,
                 },
+                forceFullscreen: true,
             });
         } else {
             // 打开列表、统计
             emitter.emit('openMicroApp', {
                 appName: `okr-${value}`,
-                displayMode: 'drawer',
-                isVisible: true,
-
                 appUrl: `http://127.0.0.1:5567/apps/okr/${value}`,
                 // appUrl: $A.mainUrl(`apps/okr/${value}`),
-                initialData: {
-                    url: $A.mainUrl()
-                },
             });
         }
     },
diff --git a/resources/assets/sass/pages/_.scss b/resources/assets/sass/pages/_.scss
index 874f7a7aa..9dac943c1 100755
--- a/resources/assets/sass/pages/_.scss
+++ b/resources/assets/sass/pages/_.scss
@@ -8,6 +8,5 @@
 @import "page-project";
 @import "page-setting";
 @import "page-approve";
-@import "page-microapp";
 @import "page-apply";
 @import "components/_";
diff --git a/resources/assets/sass/pages/page-microapp.scss b/resources/assets/sass/pages/page-microapp.scss
deleted file mode 100644
index 795c174de..000000000
--- a/resources/assets/sass/pages/page-microapp.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.page-microapp {
-    .microapp-load {
-        align-items: center;
-        display: flex;
-        justify-content: center;
-        height: 100vh;
-    }
-}