eoss-ui 0.5.78 → 0.5.79

package/lib/main.js

@@ -3938,7 +3938,7 @@ module.exports = require("runtime-import");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=1008f824&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=460b1704&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4157,7 +4157,9 @@ var render = function () {
                             biserial: _vm.biserial,
                             title: _vm.showNavTitle ? _vm.title : false,
                             showCollapse: _vm.showNavTitle
-                              ? _vm.showCollapse
+                              ? _vm.layout == "side"
+                                ? false
+                                : _vm.showCollapse
                               : false,
                             "menu-tips": _vm.menuTips,
                             "is-default": _vm.isDefault,
@@ -4422,7 +4424,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=1008f824&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=460b1704&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=75d533de&
 var userinfovue_type_template_id_75d533de_render = function () {
@@ -6578,6 +6580,8 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
+//
 
 
 
@@ -6788,7 +6792,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       return this.layout === 'topside' ? this.navBoxWidth : undefined;
     },
     _navWidth: function _navWidth() {
-      return this.layout === 'side' ? this.navBoxWidth : this.layout === 'subsystem' || this.layout === 'topside' ? '0' : this.navWidth;
+      return this.layout === 'side' ? this.navBoxWidth : this.layout === 'topside' ? '0' : this.navWidth;
     },
     showNavTitle: function showNavTitle() {
       return this.layout !== 'topside';
@@ -7127,14 +7131,14 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
           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) {
           var _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["a" /* default */].win.location.hash) {
@@ -7146,14 +7150,14 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
             var _ids2 = this.getId(this.menus, util["a" /* default */].win.location.hash);
             if (_ids2) {
               this.defaultActive = _ids2;
-              this.navIds = _ids2;
+              //this.navIds = ids;
               this.setTitle(_ids2[0]);
             }
           } else if (sessionStorage.getItem('jump') && this.isHistory) {
             var _ids3 = this.getId(this.menus, sessionStorage.getItem('jump'));
             if (_ids3) {
               this.defaultActive = _ids3;
-              this.navIds = _ids3;
+              //this.navIds = ids;
               this.setTitle(_ids3[0]);
             }
           }
@@ -7516,7 +7520,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
           var _ids4 = this.getId(this.menus, util["a" /* default */].win.location.hash);
           if (_ids4) {
             this.defaultActive = _ids4;
-            this.navIds = _ids4;
+            //this.navIds = ids;
             this.setTitle(_ids4[0]);
           }
         }
@@ -7524,7 +7528,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
         var _ids5 = this.getId(this.menus, sessionStorage.getItem('jump'));
         if (_ids5) {
           this.defaultActive = _ids5;
-          this.navIds = _ids5;
+          //this.navIds = ids;
           this.setTitle(_ids5[0]);
         }
       }
@@ -7819,7 +7823,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
           //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;
@@ -7828,18 +7832,21 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
               var subNode = this.getFirst(node);
               if (subNode) {
                 this.active = subNode.id;
-                this.navIds = [node.id].concat(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) {
@@ -7850,7 +7857,10 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
               var _subNode = this.getFirst(node);
               if (_subNode) {
                 this.active = _subNode.id;
-                this.navIds = [node.id].concat(this.getId(node.children, _subNode.url));
+                // this.navIds = [
+                //   node.id,
+                //   ...this.getId(node.children, subNode.url)
+                // ];
               }
             }
             this.isSide = true;
@@ -7858,7 +7868,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
           break;
         case 'sub':
           this.hideSubMenu = false;
-          this.navIds = [node.id];
+          //this.navIds = [node.id];
           if (node.url) {
             this.tabs = [];
           }
@@ -7870,7 +7880,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
             var _subNode2 = this.getFirst(node);
             this.active = [node.id];
             if (_subNode2 && node.id !== _subNode2.id) {
-              this.navIds = this.getId(this.menus, _subNode2.url);
+              //this.navIds = this.getId(this.menus, subNode.url);
               this.$set(this.active, 1, _subNode2.id);
             }
           }
@@ -7894,7 +7904,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
                   } else {
                     this.active = tab.id;
                   }
-                  this.navIds = this.getId(this.menus, tab.url);
+                  //this.navIds = this.getId(this.menus, tab.url);
                 }
               } else {
                 var _tab = (node.fourthTabs || []).filter(function (item) {
@@ -7903,17 +7913,17 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
                 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 {
               if (node.fourthTabs.length) {
                 this.tabs = node.fourthTabs;
                 this.tabsId = this.tabs[0].id;
                 this.handleJump(this.tabs[0].url, 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 {
@@ -7926,14 +7936,14 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
                 } else {
                   this.active = _subNode3.id;
                 }
-                this.navIds = this.getId(this.menus, _subNode3.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) {
@@ -8042,6 +8052,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
     handleJump: function handleJump(page, type, res, param) {
       var _this10 = this;
 
+      this.navIds = this.getId(this.menus, page);
       console.log(page);
       var prevPage = sessionStorage.getItem('jump');
       sessionStorage.setItem('jump', page);