eoss-ui 0.5.77 → 0.5.79

package/packages/main/src/main.vue

@@ -131,7 +131,9 @@
           :sub-icon="subIcon"
           :biserial="biserial"
           :title="showNavTitle ? title : false"
-          :showCollapse="showNavTitle ? showCollapse : false"
+          :showCollapse="
+            showNavTitle ? (layout == 'side' ? false : showCollapse) : false
+          "
           :menu-tips="menuTips"
           :is-default="isDefault"
           :paddingLeft="navPaddingLeft"
@@ -488,7 +490,7 @@ export default {
     _navWidth() {
       return this.layout === 'side'
         ? this.navBoxWidth
-        : this.layout === 'subsystem' || this.layout === 'topside'
+        : this.layout === 'topside'
         ? '0'
         : this.navWidth;
     },
@@ -843,14 +845,14 @@ export default {
           var ids = this.getId(this.menus, applicationid);
           if (ids) {
             this.defaultActive = ids;
-            this.navIds = ids;
+            //this.navIds = ids;
             this.setTitle(ids[0]);
           }
         } else if (sessionStorage.getItem('jump') && this.isHistory) {
           let ids = this.getId(this.menus, sessionStorage.getItem('jump'));
           if (ids) {
             this.defaultActive = ids;
-            this.navIds = ids;
+            //this.navIds = ids;
             this.setTitle(ids[0]);
           }
         } else if (util.win.location.hash) {
@@ -862,14 +864,14 @@ export default {
             let ids = this.getId(this.menus, util.win.location.hash);
             if (ids) {
               this.defaultActive = ids;
-              this.navIds = ids;
+              //this.navIds = ids;
               this.setTitle(ids[0]);
             }
           } else if (sessionStorage.getItem('jump') && this.isHistory) {
             let ids = this.getId(this.menus, sessionStorage.getItem('jump'));
             if (ids) {
               this.defaultActive = ids;
-              this.navIds = ids;
+              //this.navIds = ids;
               this.setTitle(ids[0]);
             }
           }
@@ -1262,7 +1264,7 @@ export default {
           let ids = this.getId(this.menus, util.win.location.hash);
           if (ids) {
             this.defaultActive = ids;
-            this.navIds = ids;
+            //this.navIds = ids;
             this.setTitle(ids[0]);
           }
         }
@@ -1270,7 +1272,7 @@ export default {
         let ids = this.getId(this.menus, sessionStorage.getItem('jump'));
         if (ids) {
           this.defaultActive = ids;
-          this.navIds = ids;
+          //this.navIds = ids;
           this.setTitle(ids[0]);
         }
       }
@@ -1597,7 +1599,7 @@ export default {
           //this.active = '';
           if (this.layout === 'topside') {
             if (this.title !== node.text) {
-              this.navIds = [node.id];
+              //this.navIds = [node.id];
               this.menu = node.children;
               this.active = node.id;
               this.title = node.text;
@@ -1606,21 +1608,21 @@ export default {
               let subNode = this.getFirst(node);
               if (subNode) {
                 this.active = subNode.id;
-                this.navIds = [
-                  node.id,
-                  ...this.getId(node.children, subNode.url)
-                ];
+                // this.navIds = [
+                //   node.id,
+                //   ...this.getId(node.children, subNode.url)
+                // ];
               }
             }
           } else {
-            this.navIds = this.getId(this.menus, node.url);
+            //this.navIds = this.getId(this.menus, node.url);
             this.setTitle(this.navIds[0]);
             this.tabsId = fourthTabs ? node.id : '';
           }
           break;
         case 'sys':
           if (Number(node.urlopenmode) !== 1) {
-            this.navIds = [node.id];
+            //this.navIds = [node.id];
             this.tabs = [];
             this.menu = node.children;
             if (this.title !== node.text) {
@@ -1631,10 +1633,10 @@ export default {
               let subNode = this.getFirst(node);
               if (subNode) {
                 this.active = subNode.id;
-                this.navIds = [
-                  node.id,
-                  ...this.getId(node.children, subNode.url)
-                ];
+                // this.navIds = [
+                //   node.id,
+                //   ...this.getId(node.children, subNode.url)
+                // ];
               }
             }
             this.isSide = true;
@@ -1642,7 +1644,7 @@ export default {
           break;
         case 'sub':
           this.hideSubMenu = false;
-          this.navIds = [node.id];
+          //this.navIds = [node.id];
           if (node.url) {
             this.tabs = [];
           }
@@ -1654,7 +1656,7 @@ export default {
             let subNode = this.getFirst(node);
             this.active = [node.id];
             if (subNode && node.id !== subNode.id) {
-              this.navIds = this.getId(this.menus, subNode.url);
+              //this.navIds = this.getId(this.menus, subNode.url);
               this.$set(this.active, 1, subNode.id);
             }
           }
@@ -1678,7 +1680,7 @@ export default {
                   } else {
                     this.active = tab.id;
                   }
-                  this.navIds = this.getId(this.menus, tab.url);
+                  //this.navIds = this.getId(this.menus, tab.url);
                 }
               } else {
                 let tab = (node.fourthTabs || []).filter((item) => {
@@ -1687,9 +1689,9 @@ export default {
                 if (tab) {
                   this.tabs = node.fourthTabs;
                   this.tabsId = tab.id;
-                  this.navIds = this.getId(this.menus, tab.url);
+                  //this.navIds = this.getId(this.menus, tab.url);
                 } else {
-                  this.navIds = this.getId(this.menus, node.url);
+                  //this.navIds = this.getId(this.menus, node.url);
                 }
               }
             } else {
@@ -1701,7 +1703,7 @@ export default {
                   this.tabs[0].urlopenmode,
                   this.tabs[0]
                 );
-                this.navIds = this.getId(this.menus, this.tabs[0].url);
+                //this.navIds = this.getId(this.menus, this.tabs[0].url);
               }
             }
           } else {
@@ -1714,14 +1716,14 @@ export default {
                 } else {
                   this.active = subNode.id;
                 }
-                this.navIds = this.getId(this.menus, subNode.url);
+                //this.navIds = this.getId(this.menus, subNode.url);
               }
             }
           }
           break;
         case 'tabs':
           this.tabsId = node.id;
-          this.navIds = this.getId(this.menus, node.url);
+          //this.navIds = this.getId(this.menus, node.url);
           break;
       }
       if (node.url) {
@@ -1762,10 +1764,8 @@ export default {
       }
       return false;
     },
-    handleTrigger(res) {},
     //头部工具交互事件
     handleClick(res) {
-      console.log(res);
       const { type } = res;
       switch (type) {
         //刷新
@@ -1824,6 +1824,7 @@ export default {
     },
     //跳转页面
     handleJump(page, type, res, param) {
+      this.navIds = this.getId(this.menus, page);
       console.log(page);
       let prevPage = sessionStorage.getItem('jump');
       sessionStorage.setItem('jump', page);

package/packages/qr-code/src/main.vue

@@ -85,7 +85,7 @@ export default {
   mounted() {
     if (this.auto) {
       let h =
-        this.$refs.qrcode.offsetHeight -
+        (this.$refs.qrcode.offsetHeight || this.$refs.qrcode.offsetWidth) -
         parseInt(util.getStyle(this.$refs.qrcode, 'padding-top'), 10) -
         parseInt(util.getStyle(this.$refs.qrcode, 'padding-bottom'), 10);
       if (h > 0) {

package/packages/selector/src/main.vue

@@ -425,6 +425,8 @@ export default {
           } else {
             this.selected = val;
           }
+        } else {
+          this.selected = [];
         }
       }
     },