From 04d31bd81402c735620a75a2ff8502f329304ab7 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 15 May 2025 16:56:08 +0800
Subject: [PATCH] no message

---
 resources/assets/js/components/MicroApps/index.vue | 8 ++++----
 resources/assets/js/pages/manage.vue               | 6 +++++-
 resources/assets/js/pages/manage/application.vue   | 9 ++++-----
 resources/assets/js/pages/single/apps.vue          | 2 +-
 resources/assets/js/store/actions.js               | 7 +++++--
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/resources/assets/js/components/MicroApps/index.vue b/resources/assets/js/components/MicroApps/index.vue
index 9e70af570..5894fbb83 100644
--- a/resources/assets/js/components/MicroApps/index.vue
+++ b/resources/assets/js/components/MicroApps/index.vue
@@ -131,11 +131,11 @@ export default {
     },
 
     mounted() {
-        emitter.on('openMicroApp', this.openMicroApp);
+        emitter.on('observeMicroApp', this.observeMicroApp);
     },
 
     beforeDestroy() {
-        emitter.off('openMicroApp', this.openMicroApp);
+        emitter.off('observeMicroApp', this.observeMicroApp);
     },
 
     watch: {
@@ -346,7 +346,7 @@ export default {
         },
 
         /**
-         * 打开微应用
+         * 观察打开微应用
          * @param config
          *  - name              应用名称
          *  - url               应用地址
@@ -355,7 +355,7 @@ export default {
          *  - keepAlive         是否开启微应用保活 (true/false)，默认 true
          *  - disableScopecss   是否禁用样式隔离 (true/false)，默认 false
          */
-        openMicroApp(config) {
+        observeMicroApp(config) {
             // 处理数据
             config.name = config.name || 'micro-app'
             config.url = config.url || null
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index e166f9a1c..c40f3cf30 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -1184,7 +1184,11 @@ export default {
                     this.settingRoute(act)
                     break;
                 case 'appstore':
-                    emitter.emit('openMicroApp', {name: 'appstore', url: $A.mainUrl('appstore/web/'), disableScopecss: true});
+                    this.$store.dispatch("openMicroApp", {
+                        name: 'appstore',
+                        url: $A.mainUrl('appstore/web/'),
+                        disableScopecss: true,
+                    });
                     break;
             }
         },
diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue
index d9f38501d..d1f4e3c58 100644
--- a/resources/assets/js/pages/manage/application.vue
+++ b/resources/assets/js/pages/manage/application.vue
@@ -22,7 +22,7 @@
                             :xl="{ span: 6 }"
                             :xxl="{ span: 3 }">
                             <div class="apply-col">
-                                <div @click="microClick(item)">
+                                <div @click="applyClick({value: 'microApp'}, item)">
                                     <div class="logo">
                                         <div class="apply-icon no-dark-content" :style="{backgroundImage: `url(${item.icon})`}"></div>
                                     </div>
@@ -449,13 +449,12 @@ export default {
             }
             return item.value == type && num > 0
         },
-        // 点击微应用
-        microClick(item) {
-            this.$store.dispatch("openMicroApp", item);
-        },
         // 点击应用
         applyClick(item, area = '') {
             switch (item.value) {
+                case 'microApp':
+                    this.$store.dispatch("openMicroApp", area);
+                    return
                 case 'approve':
                 case 'calendar':
                 case 'file':
diff --git a/resources/assets/js/pages/single/apps.vue b/resources/assets/js/pages/single/apps.vue
index 1f520deab..c8d21c867 100644
--- a/resources/assets/js/pages/single/apps.vue
+++ b/resources/assets/js/pages/single/apps.vue
@@ -21,7 +21,7 @@ export default {
             return
         }
 
-        this.$refs.app.openMicroApp(app)
+        this.$refs.app.observeMicroApp(app)
     }
 }
 </script>
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index efb7f23ea..54d672e9f 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -4666,14 +4666,17 @@ export default {
             return
         }
         const event = {
-            name: `${item.app_name}_${item.key}`,
+            name: item.app_name || item.name,
             url: $A.mainUrl(item.url),
         }
+        if (item.key) {
+            event.name += `_${item.key}`
+        }
         for (let key in item) {
             if (['props', 'transparent', 'keepAlive', 'disableScopecss'].includes(key)) {
                 event[key] = item[key]
             }
         }
-        emitter.emit('openMicroApp', event);
+        emitter.emit('observeMicroApp', event);
     },
 }