no message

resources/assets/js/components/MicroApps.vue

@@ -103,39 +103,47 @@ export default {
         ]),
 
         appData() {
+            const {initialData} = this.appConfig;
+
             return {
-                vues: {
+                instance: {
                     Vue,
                     store,
                     components: {
                         DialogWrapper,
                         UserSelect,
-                        DatePicker
+                        DatePicker,
+                    },
+                    options: {
+                        shortcuts: $A.timeOptionShortcuts(),
                     }
                 },
 
-                datas: {
+                initialData: {
-                    ...this.appConfig.initialData,
+                    ...initialData,
+
+                    systemInfo: window.systemInfo,
+
+                    isEEUiApp: $A.isEEUiApp,
+                    isElectron: $A.isElectron,
+                    isMainElectron: $A.isMainElectron,
+                    isSubElectron: $A.isSubElectron,
 
-                    // theme: this.themeName,
                     themeName: this.themeName,
                     languages: {
                         languageList,
                         languageName,
-                        // languageType: languageName,
                     },
 
                     userInfo: this.userInfo,
                     userToken: this.userToken,
-
-                    electron: this.$Electron,
                 },
 
-                onClose: () => {
+                handleClose: () => {
                     this.$refs.drawer?.onClose();
                 },
 
-                nextZIndex: () => {
+                nextModalIndex: () => {
                     if (typeof window.modalTransferIndex === 'number') {
                         return window.modalTransferIndex++;
                     }

resources/assets/js/components/Mobile/Back.vue

@@ -6,7 +6,6 @@
 
 <script>
 import {mapState} from "vuex";
-import microApp from '@micro-zoe/micro-app'
 
 export default {
     name: "MobileBack",
@@ -128,20 +127,6 @@ export default {
                     }
                 }
             }
-            // 微应用
-            let microAppIsVisible = false;
-            microApp.setGlobalData({
-                type: 'modalVisible',
-                callback: (appName, isVisible) => {
-                    if (isVisible) {
-                        microAppIsVisible = true;
-                    }
-                }
-            })
-            if (microAppIsVisible) {
-                return true;
-            }
-            //
             return false;
         },
 
@@ -149,22 +134,6 @@ export default {
             // 通用菜单
             this.$store.commit('menu/operation', {})
 
-            // 微应用通知
-            let microAppIsAccept = false;
-            microApp.setGlobalData({
-                type: 'route',
-                action: 'back',
-                route: this.$route,
-                callback: (appName, isAccept) => {
-                    if (isAccept) {
-                        microAppIsAccept = true;
-                    }
-                }
-            })
-            if (microAppIsAccept) {
-                return;
-            }
-
             // 移除模态框
             if (this.$Modal.removeLast()) {
                 return;

resources/assets/js/store/actions.js

@@ -4674,9 +4674,11 @@ export default {
                 displayMode: 'page',
                 isVisible: false,
 
-                appUrl: $A.mainUrl(`apps/okr/okrDetails?data=${value}`),
+                appUrl: $A.mainUrl(`apps/okr/`),
                 initialData: {
-                    model: 'details',
+                    empty: true,
+                    type: 'details',
+                    id: value,
                 },
             });
         } else {
@@ -4686,8 +4688,11 @@ export default {
                 displayMode: 'drawer',
                 isVisible: true,
 
-                appUrl: $A.mainUrl(`apps/okr/${value}`),
+                appUrl: `http://127.0.0.1:5567/apps/okr/${value}`,
-                initialData: {},
+                // appUrl: $A.mainUrl(`apps/okr/${value}`),
+                initialData: {
+                    url: $A.mainUrl()
+                },
             });
         }
     },

resources/assets/sass/components/drawer-overlay.scss

@@ -75,7 +75,6 @@
             position: relative;
             background: #fff;
             border-radius: 18px 18px 0 0;
-            transform: translate(0, 0) scale(1);
             cursor: default;
 
             .ivu-modal-wrap-apply {