eoss-ui 0.7.68 → 0.7.70

package/packages/main/src/main.vue

@@ -134,6 +134,12 @@ export default {
       isIE: /MSIE|Trident/.test(navigator.userAgent)
     };
   },
+  watch: {
+    layoutType() {
+      // 当主题变化时，重新绑定一次事件 防止事件丢失 或者绑定错误
+      this.bindEvent();
+    }
+  },
   created() {
     const layoutType = localStorage.getItem('layoutType');
     if (layoutType) {
@@ -159,70 +165,76 @@ export default {
     ) {
       return false;
     }
-    if (this.isLogin) {
-      if (util.win.$wujie) {
-        util.win.$wujie.bus.$on('changeTheme', (res) => {
-          util.updateTheme(res);
-        });
-      }
-      this.$nextTick(() => {
-        this.getConfig();
-        const bus = this.bus || this.$root.Bus;
-        if (bus) {
-          bus.$on('reLogin', this.handleReLogin);
-          bus.$on('refresh', this.$refs.main.handleRefresh);
-          bus.$on('windowOpen', this.winOpen);
-          bus.$on('windowClose', this.winClose);
-          bus.$on('jumpMenu', this.$refs.main.jumpMenu);
-          bus.$on('emit', (method, args) => {
-            // 主应用发送事件
-            bus.$emit(method, args);
+    this.bindEvent();
+  },
+  methods: {
+    /**
+     * @desc: 绑定事件
+     **/
+    bindEvent() {
+      if (this.isLogin) {
+        if (util.win.$wujie) {
+          util.win.$wujie.bus.$on('changeTheme', (res) => {
+            util.updateTheme(res);
           });
         }
-        util.win.reLogin = this.handleReLogin;
-        util.win.windowOpen = this.winOpen;
-        util.win.windowClose = this.winClose;
-        util.win.refresh = this.$refs.main.handleRefresh;
-        util.win.jumpMenu = this.$refs.main.jumpMenu;
-        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('windowOpen', this.winOpen);
-        WujieVue.bus.$on('windowClose', this.winClose);
-        WujieVue.bus.$on('emit', (method, args) => {
-          // 主应用发送事件
-          WujieVue.bus.$emit(method, args);
-        });
+        this.$nextTick(() => {
+          this.getConfig();
+          const bus = this.bus || this.$root.Bus;
+          if (bus) {
+            bus.$on('reLogin', this.handleReLogin);
+            bus.$on('refresh', this.$refs.main.handleRefresh);
+            bus.$on('windowOpen', this.winOpen);
+            bus.$on('windowClose', this.winClose);
+            bus.$on('jumpMenu', this.$refs.main.jumpMenu);
+            bus.$on('emit', (method, args) => {
+              // 主应用发送事件
+              bus.$emit(method, args);
+            });
+          }
+          util.win.reLogin = this.handleReLogin;
+          util.win.windowOpen = this.winOpen;
+          util.win.windowClose = this.winClose;
+          util.win.refresh = this.$refs.main.handleRefresh;
+          util.win.jumpMenu = this.$refs.main.jumpMenu;
+          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('windowOpen', this.winOpen);
+          WujieVue.bus.$on('windowClose', this.winClose);
+          WujieVue.bus.$on('emit', (method, args) => {
+            // 主应用发送事件
+            WujieVue.bus.$emit(method, args);
+          });
 
-        window.addEventListener('message', this.handleMessage);
-      });
-    } else {
-      const loginPage =
-        util.getStorage('login') || util.getStorage('loginPage');
-      if (loginPage) {
-        window.location.replace(loginPage);
-      } else if (document.referrer) {
-        const referrerUrl = new URL(document.referrer);
-        if (referrerUrl.host !== window.location.host) {
-          window.location.replace(document.referrer);
-        } else if (
-          window.location.href.indexOf('main.html') > -1 ||
-          window.location.href.indexOf('index.html') > -1 ||
-          document.referrer.indexOf('main.html') > -1 ||
-          document.referrer.indexOf('index.html') > -1
-        ) {
+          window.addEventListener('message', this.handleMessage);
+        });
+      } else {
+        const loginPage =
+          util.getStorage('login') || util.getStorage('loginPage');
+        if (loginPage) {
+          window.location.replace(loginPage);
+        } else if (document.referrer) {
+          const referrerUrl = new URL(document.referrer);
+          if (referrerUrl.host !== window.location.host) {
+            window.location.replace(document.referrer);
+          } else if (
+            window.location.href.indexOf('main.html') > -1 ||
+            window.location.href.indexOf('index.html') > -1 ||
+            document.referrer.indexOf('main.html') > -1 ||
+            document.referrer.indexOf('index.html') > -1
+          ) {
+            window.location.href = './login.html';
+          } else {
+            next('/login');
+          }
+        } else if (window.location.href.indexOf('main.html') > -1) {
           window.location.href = './login.html';
         } else {
           next('/login');
         }
-      } else if (window.location.href.indexOf('main.html') > -1) {
-        window.location.href = './login.html';
-      } else {
-        next('/login');
       }
-    }
-  },
-  methods: {
+    },
     /**
      * @desc: 切换布局风格
      * @author huangbo

package/packages/main/src/public/settings.vue

@@ -133,7 +133,7 @@
         >
           <div
             class="es-setting-navs es-setting-app-nav"
-            @click.stop="handleLayout('simplicity')"
+            @click.stop="handleLayout('simplicity', 'simplicity')"
           >
             <div class="es-setting-side-sub-nav"></div>
             <es-icon
@@ -151,7 +151,7 @@
         >
           <div
             class="es-setting-navs es-setting-top-nav-side"
-            @click.stop="handleLayout('simplicityTop')"
+            @click.stop="handleLayout('simplicityTop', 'simplicityTop')"
           >
             <div class="es-setting-side-sub-nav"></div>
             <es-icon

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

@@ -1454,13 +1454,17 @@ export default {
         let num = 0;
         obj.forEach((item) => {
           let n = this.setTips(item);
-          num += n ? parseInt(n) : 0;
-          this.$set(obj, 'tips', num);
-          this.setDot(this.userApps, item.appCode, num);
-          this.setDot(this.applications, item.appCode, num);
-          this.setDot(this.business, item.appCode, num);
-          this.setDot(this.systems, item.appCode, num);
+          n = n ? parseInt(n) : 0;
+          num += n;
+          if (n) {
+            this.$set(obj, 'tips', n);
+            this.setDot(this.userApps, item.appCode, n);
+            this.setDot(this.applications, item.appCode, n);
+            this.setDot(this.business, item.appCode, n);
+            this.setDot(this.systems, item.appCode, n);
+          }
         });
+        return num;
       } else {
         if (
           (obj.children && obj.children.length) ||