diff --git a/resources/assets/js/components/MicroApps/iframe.vue b/resources/assets/js/components/MicroApps/iframe.vue
index 015d3c4d0..481ad09f6 100644
--- a/resources/assets/js/components/MicroApps/iframe.vue
+++ b/resources/assets/js/components/MicroApps/iframe.vue
@@ -37,6 +37,7 @@ export default {
     data() {
         return {
             src: this.url,
+            onBeforeClose: {},
         }
     },
 
@@ -87,8 +88,26 @@ export default {
             switch (type) {
                 case 'MICRO_APP_READY':
                     this.injectMicroApp()
+                    this.$store.commit('microApps/update', {
+                        name: this.name,
+                        data: {
+                            onBeforeClose: () => {
+                                return new Promise(resolve => {
+                                    const message = {
+                                        id: $A.randomString(16),
+                                        name: this.name
+                                    }
+                                    this.$refs.iframe.contentWindow.postMessage({
+                                        type: 'MICRO_APP_BEFORE_CLOSE',
+                                        message
+                                    }, '*')
+                                    this.onBeforeClose[message.id] = resolve
+                                })
+                            }
+                        }
+                    })
                     break
-                    
+
                 case 'MICRO_APP_METHOD':
                     if (!this.data || !this.data.methods) {
                         return
@@ -109,6 +128,14 @@ export default {
                         }
                     }
                     break
+
+                case 'MICRO_APP_BEFORE_CLOSE':
+                    if (this.onBeforeClose[message.id]) {
+                        this.onBeforeClose[message.id]()
+                        delete this.onBeforeClose[message.id]
+                    }
+                    break
+
                 default:
                     break
             }
@@ -117,7 +144,7 @@ export default {
         // 验证消息是否来自当前 iframe
         isFromCurrentIframe(event) {
             try {
-                const { source } = event
+                const {source} = event
                 return this.$refs.iframe && source === this.$refs.iframe.contentWindow
             } catch (error) {
                 // console.error('Failed to validate message from current iframe:', error)
diff --git a/resources/assets/js/components/MicroApps/index.vue b/resources/assets/js/components/MicroApps/index.vue
index 066b790a6..3f4b36710 100644
--- a/resources/assets/js/components/MicroApps/index.vue
+++ b/resources/assets/js/components/MicroApps/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <MicroModal
-            v-for="(app, key) in apps"
+            v-for="(app, key) in microApps"
             :key="key"
             v-model="app.isOpen"
             :ref="`ref-${app.name}`"
@@ -107,7 +107,6 @@ export default {
 
     data() {
         return {
-            apps: [],
             assistShow: false,
             userSelectOptions: {value: [], config: {}},
         }
@@ -139,9 +138,9 @@ export default {
         themeName() {
             this.closeAllMicroApp()
         },
-        apps: {
-            handler(apps) {
-                this.assistShow = !!apps.find(item => item.isOpen)
+        microApps: {
+            handler(items) {
+                this.assistShow = !!items.find(item => item.isOpen)
             },
             deep: true,
         }
@@ -151,6 +150,7 @@ export default {
         ...mapState([
             'userInfo',
             'themeName',
+            'microApps',
         ]),
     },
 
@@ -175,10 +175,7 @@ export default {
 
         // 加载结束
         finish(name) {
-            const app = this.apps.find(app => app.name == name);
-            if (app) {
-                app.isLoading = false
-            }
+            this.$store.commit('microApps/update', {name, data: {isLoading: false}})
         },
 
         /**
@@ -187,7 +184,7 @@ export default {
          * @returns {*}
          */
         appData(name) {
-            const app = this.apps.find(item => item.name == name);
+            const app = this.microApps.find(item => item.name == name);
             if (!app) {
                 return {};
             }
@@ -238,7 +235,7 @@ export default {
                         this.closeByName(name)
                     },
                     popoutWindow: async (windowConfig = null) => {
-                        const app = this.apps.find(item => item.name == name);
+                        const app = this.microApps.find(item => item.name == name);
                         if (!app) {
                             $A.modalError("应用不存在");
                             return
@@ -272,7 +269,7 @@ export default {
                             },
                         });
                     },
-                    requestAPI: async(params) => {
+                    requestAPI: async (params) => {
                         return await store.dispatch('call', params);
                     },
                     selectUsers: async (params) => {
@@ -307,6 +304,9 @@ export default {
                         }
                         return null;
                     },
+                    isFullScreen: () => {
+                        return window.innerWidth < 768 || this.windowType === 'popout'
+                    },
                 },
             }
         },
@@ -316,7 +316,7 @@ export default {
          * @param config
          */
         async observeMicroApp(config) {
-            if (config.url_type === 'inline_blank') {
+            if (/_blank$/i.test(config.url_type)) {
                 await this.inlineBlank(config)
                 return
             }
@@ -325,7 +325,7 @@ export default {
                 return
             }
 
-            const app = this.apps.find(({name}) => name == config.name);
+            const app = this.microApps.find(({name}) => name == config.name);
             if (app) {
                 // 更新微应用
                 if (app.url != config.url) {
@@ -338,7 +338,8 @@ export default {
                 // 新建微应用
                 config.isLoading = true
                 config.isOpen = false
-                this.apps.push(config)
+                config.onBeforeClose = () => true
+                this.$store.commit('microApps/push', config)
                 requestAnimationFrame(_ => config.isOpen = true)
             }
         },
@@ -353,7 +354,7 @@ export default {
             const appConfig = {
                 ...config,
 
-                url_type: config.url_type === 'iframe' ? 'iframe' : 'inline',
+                url_type: config.url_type.replace(/_blank$/, ''),
                 transparent: true,
                 keep_alive: false,
             };
@@ -444,7 +445,7 @@ export default {
          * @param destroy
          */
         closeMicroApp(name, destroy) {
-            const app = this.apps.find(item => item.name == name);
+            const app = this.microApps.find(item => item.name == name);
             if (!app) {
                 return;
             }
@@ -460,7 +461,7 @@ export default {
          * @param destroy
          */
         closeAllMicroApp(destroy = true) {
-            this.apps.forEach(app => {
+            this.microApps.forEach(app => {
                 app.isOpen = false
                 if (destroy) {
                     microApp.unmountApp(app.name, {destroy: true})
@@ -475,16 +476,38 @@ export default {
          */
         onBeforeClose(name) {
             return new Promise(resolve => {
+                const onClose = () => {
+                    if ($A.isSubElectron) {
+                        $A.Electron.sendMessage('windowDestroy');
+                    } else {
+                        resolve()
+                    }
+                }
+
+                const app = this.microApps.find(item => item.name == name);
+                if (!app) {
+                    onClose()
+                    return
+                }
+
+                if (/^iframe/i.test(app.url_type)) {
+                    const before = app.onBeforeClose();
+                    if (before && before.then) {
+                        before.then(() => {
+                            onClose()
+                        });
+                    } else {
+                        onClose()
+                    }
+                    return
+                }
+
                 microApp.forceSetData(name, {type: 'beforeClose'}, array => {
                     if (!array?.find(item => item === true)) {
                         if ($A.leftExists(name, 'appstore')) {
                             this.$store.dispatch("updateMicroAppsStatus");
                         }
-                        if ($A.isSubElectron) {
-                            $A.Electron.sendMessage('windowDestroy');
-                        } else {
-                            resolve()
-                        }
+                        onClose()
                     }
                 })
             })
@@ -496,7 +519,7 @@ export default {
          */
         onAssistClose() {
             return new Promise(resolve => {
-                const app = this.apps.findLast(item => item.isOpen)
+                const app = this.microApps.findLast(item => item.isOpen)
                 if (app) {
                     this.closeByName(app.name)
                 } else {
diff --git a/resources/assets/js/components/MicroApps/modal.vue b/resources/assets/js/components/MicroApps/modal.vue
index 8ec52245a..736eb4956 100644
--- a/resources/assets/js/components/MicroApps/modal.vue
+++ b/resources/assets/js/components/MicroApps/modal.vue
@@ -178,8 +178,8 @@ export default {
         --modal-body-background-color: transparent;
     }
 
-    // 小屏幕适配
-    @media (max-width: 500px) {
+    // 移动端适配
+    @media (max-width: 768px) {
         --modal-mask-bg: transparent;
         --modal-close-display: none;
         --modal-resize-display: none;
@@ -313,6 +313,7 @@ body.dark-mode-reverse {
                 --modal-mask-bg: rgba(230, 230, 230, 0.6);
                 --modal-close-color: #323232;
             }
+
             &.no-dark-content {
                 --modal-mask-bg: rgba(20, 20, 20, 0.6);
                 --modal-body-background-color: #000000;
diff --git a/resources/assets/js/store/mutations.js b/resources/assets/js/store/mutations.js
index 6fcf93d67..3c6e8d0d7 100644
--- a/resources/assets/js/store/mutations.js
+++ b/resources/assets/js/store/mutations.js
@@ -300,6 +300,25 @@ export default {
     },
 
     // 微应用管理
+    'microApps/push': function(state, data) {
+        state.microApps.push(data)
+    },
+
+    'microApps/update': function(state, {name, data}) {
+        const app = state.microApps.find(item => item.name == name)
+        if (app) {
+            Object.assign(app, data)
+        }
+    },
+
+    'microApps/splice': function(state, {index, data, count = 1}) {
+        if (typeof data === "undefined") {
+            state.microApps.splice(index, count)
+        } else {
+            state.microApps.splice(index, count, data)
+        }
+    },
+    
     'microApps/data': function(state, data) {
         data.unshift({
             id: 'appstore',
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index f7fe0569f..950e08708 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -267,6 +267,7 @@ export default {
     longpressData: {type: '', data: null, element: null},
 
     // 微应用数据
+    microApps: [],
     microAppsIds: [],
     microAppsMenus: [],
 };