eoss-ui 0.5.99 → 0.6.10

package/packages/main/src/main.vue

@@ -8,6 +8,7 @@
       v-bind="$attrs"
       v-on="$listeners"
       @chang-layout="changLayout"
+      @bus-emit="busEmit"
     ></simplicity>
     <main-default
       v-else
@@ -17,6 +18,7 @@
       ref="main"
       v-on="$listeners"
       @chang-layout="changLayout"
+      @bus-emit="busEmit"
     ></main-default>
 
     <!-- 公用弹窗 -->
@@ -31,7 +33,7 @@
           attrs: ['visible', 'url']
         })
       "
-      @closed="handleClosed(item, index)"
+      @close="handleClosed(item, index)"
     >
       <iframe
         v-if="visibles[index]"
@@ -50,7 +52,6 @@ import Simplicity from './simplicity/index.vue';
 import MainDefault from './default/index.vue';
 import util from 'eoss-ui/src/utils/util';
 import WujieVue from 'wujie-vue2';
-const { bus } = WujieVue;
 export default {
   name: 'EsMain',
   inheritAttrs: false,
@@ -100,7 +101,8 @@ export default {
       visibles: [],
       isLogin: false,
       layoutType: this.type,
-      layout: this.scene
+      layout: this.scene,
+      emit: false
     };
   },
   created() {
@@ -125,12 +127,12 @@ export default {
     util.win.windowOpen = this.openPage;
     util.win.refresh = this.$refs.main.handleRefresh;
     util.win.jumpMenu = this.$refs.main.jumpMenu;
-    bus.$on('reLogin', this.handleReLogin);
-    bus.$on('refresh', this.$refs.main.handleRefresh);
-    bus.$on('jumpMenu', this.$refs.main.jumpMenu);
-    bus.$on('emit', function (method, args) {
+    WujieVue.bus.$on('reLogin', this.handleReLogin);
+    WujieVue.bus.$on('refresh', this.$refs.main.handleRefresh);
+    WujieVue.bus.$on('jumpMenu', this.$refs.main.jumpMenu);
+    WujieVue.bus.$on('emit', function (method, args) {
       // 主应用发送事件
-      bus.$emit(method, args);
+      WujieVue.bus.$emit(method, args);
     });
 
     window.addEventListener('message', (method, args) => {
@@ -290,12 +292,18 @@ export default {
         return false;
       }
       let mainConfig = util.getStorage('mainConfig');
-      if (!mainConfig || mainConfig == '{}') {
-        util.getMainConfig((res) => {
-          this.$refs.main.init(res);
+      if (mainConfig) {
+        mainConfig = JSON.parse(mainConfig);
+        this.$nextTick(() => {
+          this.$refs.main.init(mainConfig, true);
+          util.getMainConfig((res) => {
+            this.$refs.main.init(res, false);
+          });
         });
       } else {
-        mainConfig = JSON.parse(mainConfig);
+        util.getMainConfig((res) => {
+          this.$refs.main.init(res, true);
+        });
       }
     },
     /**
@@ -349,8 +357,28 @@ export default {
     handleClosed(res, index) {
       this.dialogs.splice(index, 1);
       this.visibles.splice(index, 1);
+    },
+    /**
+     * @desc:主应用相子应用发送事件
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    busEmit(event, args) {
+      if (this.emit) {
+        WujieVue.bus.$emit(event, args);
+        window.postMessage({ method: event, query: args }, '*');
+        const bus = this.bus || this.$root.Bus;
+        bus && bus.$emit(event, args);
+        this.$emit('busEvent', event, args);
+      }
+      this.emit = true;
     }
   },
-  beforeDestroy() {}
+  beforeDestroy() {
+    WujieVue.bus.$off('reLogin');
+    WujieVue.bus.$off('refresh');
+    WujieVue.bus.$off('jumpMenu');
+    WujieVue.bus.$off('emit');
+  }
 };
 </script>

package/packages/main/src/simplicity/index.vue

@@ -698,13 +698,6 @@ export default {
     }
   },
   created() {
-    let mainConfig = util.getStorage('mainConfig');
-    if (mainConfig) {
-      const results = JSON.parse(mainConfig);
-      if (Object.keys(results).length) {
-        this.init(results);
-      }
-    }
     this.doorIndex = sessionStorage.getItem('doorIndex');
   },
   mounted() {
@@ -734,18 +727,26 @@ export default {
         }
         let pathname = url.substring(url.indexOf('#/') + 1);
         pathname = pathname.split('?')[0];
+        let appCode;
         if (res.path !== '/' && pathname == path) {
           if (res.components) {
             if (!res.components[code]) {
-              console.error('“命名视图”规范属性名称与菜单appCode不一致', res);
+              console.error(
+                '路由“命名视图”规范属性名称与菜单appCode不一致',
+                res,
+                code
+              );
+              appCode = Object.keys(res.components).filter((item) => {
+                return item !== 'default';
+              })[0];
             }
           } else {
             console.error(
-              '请根据“命名视图”规范，正确添加components属性名称',
+              '请根据路由“命名视图”规范，正确添加components属性名称',
               res
             );
           }
-          return pathname;
+          return appCode ? { path: pathname, appCode } : pathname;
         }
         if (res && Object.prototype.hasOwnProperty.call(res, 'children')) {
           let path = this.hasRouter(res.children, url, code);
@@ -761,9 +762,9 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    init(results) {
+    init(results, first) {
       this.setConfig(results);
-      if (this.remote) {
+      if (this.remote && first) {
         this.getApplications();
       }
     },
@@ -776,7 +777,7 @@ export default {
       if (this.socket) {
         this.initWebSocket();
       }
-      sessionStorage.setItem('mainConfig', JSON.stringify(results));
+      localStorage.setItem('mainConfig', JSON.stringify(results));
       util.setStorage({
         type: this.storage,
         key: {
@@ -1094,7 +1095,12 @@ export default {
             let path = this.hasRouter(routes, urls[0], res.appCode);
             if (path && this.routeType !== 'wujie') {
               res.method = 'router';
-              res.path = path;
+              if (typeof path === 'string') {
+                res.path = path;
+              } else {
+                res.path = path.path;
+                res.appCode = path.appCode;
+              }
               res.keys = util.uuid();
             } else {
               let urlopenmode = util.getParams({
@@ -1287,6 +1293,7 @@ export default {
                 this.notice = data[i];
                 if (this.showMsg) {
                   this.$refs.message.getMsg(true);
+                  this.$emit('bus-emit', 'waitdone');
                 }
               }
               if (i === 'menuTipsMap') {
@@ -1515,7 +1522,7 @@ export default {
       if (name == 'userHeadUrl') {
         this.$set(this.userModel, 'userHeadUrl', res);
         store.set('userModel', this.userModel);
-        let mainConfig = JSON.parse(sessionStorage.getItem('mainConfig'));
+        let mainConfig = JSON.parse(localStorage.getItem('mainConfig'));
         sessionStorage.setItem(
           'mainConfig',
           JSON.stringify({ ...mainConfig, userModel: this.userModel })
@@ -1523,8 +1530,8 @@ export default {
       } else {
         this.$set(this.userStyle, 'notify', res);
         store.set('userStyle', this.userStyle);
-        let mainConfig = JSON.parse(sessionStorage.getItem('mainConfig'));
-        sessionStorage.setItem(
+        let mainConfig = JSON.parse(localStorage.getItem('mainConfig'));
+        localStorage.setItem(
           'mainConfig',
           JSON.stringify({ ...mainConfig, userStyle: this.userStyle })
         );
@@ -1715,7 +1722,7 @@ export default {
      * @date 2024年9月7日
      **/
     handleQuit() {
-      this.$confirm('确定注销吗?', '退出系统', {
+      this.$confirm('确定退出吗?', '退出系统', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

package/packages/main/src/simplicity/message.vue

@@ -62,6 +62,7 @@
       :visible.sync="dialog.show"
       :url="dialog.url"
       :param="dialog.params"
+      @close="handleClose"
     ></es-dialog>
   </el-drawer>
 </template>
@@ -217,7 +218,15 @@ export default {
       this.count -= 1;
       this.msgs.splice(index, 1);
       if (this.winopen) {
-        util.win.open(item.handlerUrl);
+        const mywin = util.win.open(item.handlerUrl);
+        if (mywin) {
+          let times = setInterval(() => {
+            if (mywin.closed) {
+              clearInterval(times);
+              this.$parent.$emit('bus-emit', 'waitdone');
+            }
+          }, 1000);
+        }
       } else {
         this.dialog = {
           show: true,
@@ -241,6 +250,10 @@ export default {
         this.$emit('handle', id);
       }
       this.dialog.show = false;
+    },
+    handleClose() {
+      console.log(22222);
+      this.$parent.$emit('bus-emit', 'waitdone');
     }
   }
 };

package/packages/main/src/simplicity/notice.vue

@@ -57,6 +57,7 @@
         :visible.sync="dialog.show"
         :url="dialog.url"
         :param="dialog.params"
+        @close="handleClose"
       ></es-dialog>
     </div>
   </transition>
@@ -152,7 +153,15 @@ export default {
     //处理消息
     handleMessage(item, index) {
       if (item.urlopenmode === 1 || this.winopen) {
-        util.win.open(item.handlerUrl);
+        const mywin = util.win.open(item.handlerUrl);
+        if (mywin) {
+          let times = setInterval(() => {
+            if (mywin.closed) {
+              clearInterval(times);
+              this.$parent.$emit('bus-emit', 'waitdone');
+            }
+          }, 1000);
+        }
       } else {
         this.dialog = {
           show: true,
@@ -172,6 +181,9 @@ export default {
         this.msgs = this.msgs.splice(this.index, 1);
       }
       this.dialog.show = false;
+    },
+    handleClose() {
+      this.$parent.$emit('bus-emit', 'waitdone');
     }
   }
 };

package/packages/radio-group/src/main.vue

@@ -59,7 +59,6 @@ import { findSysCode, getDictList } from 'eoss-ui/src/config/api.js';
 import { debounce } from 'throttle-debounce';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
-import bus from 'eoss-ui/src/utils/bus';
 export default {
   name: 'EsRadioGroup',
   inheritAttrs: false,
@@ -270,10 +269,12 @@ export default {
           if (res.rCode === 0) {
             this.options = JSON.parse(JSON.stringify(res.results));
             if (sysCode || this.dataKey) {
-              bus.$emit(
-                sysCode || this.dataKey,
-                JSON.parse(JSON.stringify(this.options))
-              );
+              const bus = this.bus || this.$root.Bus;
+              bus &&
+                bus.$emit(
+                  sysCode || this.dataKey,
+                  JSON.parse(JSON.stringify(this.options))
+                );
               store.set(sysCode, JSON.parse(JSON.stringify(res.results)));
             }
           }
@@ -303,10 +304,12 @@ export default {
       this.options = val;
     },
     bindEventBus() {
-      bus.$on(this.sysCode || this.dataKey, this.setOptions);
+      const bus = this.bus || this.$root.Bus;
+      bus && bus.$on(this.sysCode || this.dataKey, this.setOptions);
     },
     unbindEventBus() {
-      bus.$off(this.sysCode || this.dataKey, this.setOptions);
+      const bus = this.bus || this.$root.Bus;
+      bus && bus.$off(this.sysCode || this.dataKey, this.setOptions);
     }
   },
   beforeDestroy() {

package/packages/select/src/main.vue

@@ -3,7 +3,6 @@ import { findSysCode, getDictList } from 'eoss-ui/src/config/api.js';
 import { debounce } from 'throttle-debounce';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
-import bus from 'eoss-ui/src/utils/bus';
 export default {
   name: 'EsSelect',
   componentName: 'EsSelect',
@@ -368,10 +367,12 @@ export default {
               this.options = JSON.parse(JSON.stringify(res.results));
             }
             if (sysCode || this.dataKey) {
-              bus.$emit(
-                sysCode || this.dataKey,
-                JSON.parse(JSON.stringify(this.options))
-              );
+              const bus = this.bus || this.$root.Bus;
+              bus &&
+                bus.$emit(
+                  sysCode || this.dataKey,
+                  JSON.parse(JSON.stringify(this.options))
+                );
               store.set(sysCode, JSON.parse(JSON.stringify(this.options)));
             }
           } else {
@@ -606,10 +607,12 @@ export default {
       this.options = val;
     },
     bindEventBus() {
-      bus.$on(this.sysCode || this.dataKey, this.setOptions);
+      const bus = this.bus || this.$root.Bus;
+      bus && bus.$on(this.sysCode || this.dataKey, this.setOptions);
     },
     unbindEventBus() {
-      bus.$off(this.sysCode || this.dataKey, this.setOptions);
+      const bus = this.bus || this.$root.Bus;
+      bus && bus.$off(this.sysCode || this.dataKey, this.setOptions);
     }
   },
   beforeDestroy() {