eoss-ui 0.4.25 → 0.4.26

package/lib/main.js

@@ -2766,7 +2766,7 @@ module.exports = require("stompjs");
 // 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=23fb4503&
+// 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=60ce43f9&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3185,7 +3185,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=23fb4503&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=60ce43f9&
 
 // 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=d575fa30&
 var userinfovue_type_template_id_d575fa30_render = function () {
@@ -5415,7 +5415,7 @@ var log = util["a" /* default */].getParams('console');
           if (ids) {
             this.defaultActive = ids;
           }
-        } else {
+        } else if (util["a" /* default */].win.location.hash) {
           var hash = util["a" /* default */].win.location.hash;
           if (hash) {
             hash = hash.split('?')[0];
@@ -5425,6 +5425,16 @@ var log = util["a" /* default */].getParams('console');
             if (_ids) {
               this.defaultActive = _ids;
             }
+          } else if (sessionStorage.getItem('jump')) {
+            var _ids2 = this.getId(this.menus, sessionStorage.getItem('jump'), true);
+            if (_ids2) {
+              this.defaultActive = _ids2;
+            }
+          }
+        } else if (sessionStorage.getItem('jump')) {
+          var _ids3 = this.getId(this.menus, sessionStorage.getItem('jump'), true);
+          if (_ids3) {
+            this.defaultActive = _ids3;
           }
         }
         this.setMenu(this.menus);
@@ -5644,17 +5654,27 @@ var log = util["a" /* default */].getParams('console');
             if (ids) {
               _this5.defaultActive = ids;
             }
-          } else {
+          } else if (util["a" /* default */].win.location.hash) {
             var hash = util["a" /* default */].win.location.hash;
             if (hash) {
               hash = hash.split('?')[0];
             }
             if (hash !== '#/' && hash !== '#/main') {
-              var _ids2 = _this5.getId(_this5.menus, util["a" /* default */].win.location.hash, true);
-              if (_ids2) {
-                _this5.defaultActive = _ids2;
+              var _ids4 = _this5.getId(_this5.menus, util["a" /* default */].win.location.hash, true);
+              if (_ids4) {
+                _this5.defaultActive = _ids4;
+              }
+            } else if (sessionStorage.getItem('jump')) {
+              var _ids5 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
+              if (_ids5) {
+                _this5.defaultActive = _ids5;
               }
             }
+          } else if (sessionStorage.getItem('jump')) {
+            var _ids6 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
+            if (_ids6) {
+              _this5.defaultActive = _ids6;
+            }
           }
           _this5.setTips(_this5.menus);
           store["a" /* default */].set('nav', _this5.menus);
@@ -5917,9 +5937,15 @@ var log = util["a" /* default */].getParams('console');
 
     //应用导航交互
     handleSelect: function handleSelect(res, type) {
-      this.isDefault = false;
       var node = res.node;
 
+      if (node.extendData && node.extendData.businessStatus == 0 && node.extendData.businessWarnMsg) {
+        this.$alert(node.extendData.businessWarnMsg, '提示', {
+          type: 'warning'
+        });
+        return;
+      }
+      this.isDefault = false;
       switch (type) {
         case 'nav':
           this.tabs = [];
@@ -6094,6 +6120,7 @@ var log = util["a" /* default */].getParams('console');
       var _this9 = this;
 
       console.log(page);
+      sessionStorage.setItem('jump', page);
       if (util["a" /* default */].win.location.hash === page) {
         this.refresh = true;
         return;
@@ -6326,7 +6353,7 @@ var log = util["a" /* default */].getParams('console');
     },
     openPage: function openPage(url, name, width, height) {
       var src = url;
-      if (!util["a" /* default */].startWith(url, ['http', '/'])) {
+      if (!util["a" /* default */].startWith(url, ['http', '/'], true)) {
         var pathname = window.location.pathname;
         if (pathname !== '/') {
           pathname = pathname.split('/');

package/lib/menu.js

@@ -352,7 +352,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         class: [item.icons ? this.unicode(item.icons) ? item.icons : 'es-icons iconfont' : 'es-icon-application', 'es-menu-item-icon'],
         domProps: item.icons === '' || this.unicode(item.icons) ? {} : { innerHTML: item.icons }
       }), h('div', {
-        class: 'es-menu-title-text es-menu-title-' + this.mode
+        class: ['es-menu-title-text es-menu-title-' + this.mode]
       }, [h('el-badge', {
         class: ['es-badge', {
           'es-badge-right': item.tips && typeof item.tips !== 'boolean',
@@ -368,7 +368,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         }
       }, [item.text])])];
       var doms = [h('template', { slot: 'title' }, this.titleIcons ? title : [title[1]])];
-      if (this.deep && item.children && item.children.length) {
+      if (this.deep && item.children && item.children.length && (!item.extendData || item.extendData.businessStatus != 0)) {
         doms = doms.concat(item.children.map(function (ele, index) {
           if (!ele) {
             console.error('\u5BF9\u8C61\u5B50\u6570\u636E\u4E2D\u7B2C[' + index + ']\u6761\u6570\u636E\u9519\u8BEF', item);
@@ -386,7 +386,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           },
           attrs: { index: item.id, key: item.id }
         }, doms)];
-      } else if (this.deep && this.mode === 'horizontal' && item.fourthTabs && item.fourthTabs.length) {
+      } else if (this.deep && this.mode === 'horizontal' && item.fourthTabs && item.fourthTabs.length && (!item.extendData || item.extendData.businessStatus != 0)) {
         doms = doms.concat(item.fourthTabs.map(function (ele, index) {
           if (!ele) {
             console.error('\u5BF9\u8C61\u5B50\u6570\u636E\u4E2D\u7B2C[' + index + ']\u6761\u6570\u636E\u9519\u8BEF', item);
@@ -406,9 +406,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         }, doms)];
       } else {
         return [h('el-menu-item', {
-          class: 'es-menu-item ' + (this.deep ? '' : 'es-item-' + this.mode),
+          class: ['es-menu-item ' + (this.deep ? '' : 'es-item-' + this.mode)],
           props: {
-            paddingLeft: this.paddingLeft
+            paddingLeft: this.paddingLeft,
+            disabled: item.extendData && item.extendData.businessStatus == 0
           },
           attrs: {
             data: item,
@@ -431,14 +432,14 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
     var doms = [];
     this.data.forEach(function (item) {
-      if (item.children && item.children.length) {
+      if (item.children && item.children.length && (!item.extendData || item.extendData.businessStatus != 0)) {
         doms = doms.concat(_this4.getSub(item, h, 'es-sub-menu'));
       } else {
         var title = [h('i', {
           class: [item.icons ? _this4.unicode(item.icons) ? item.icons : 'es-icons iconfont' : 'es-icon-application', 'es-menu-item-icon'],
           domProps: item.icons === '' || _this4.unicode(item.icons) ? {} : { innerHTML: item.icons }
         }), h('div', {
-          class: 'es-menu-title-text es-menu-title-' + _this4.mode
+          class: ['es-menu-title-text es-menu-title-' + _this4.mode]
         }, [h('el-badge', {
           class: ['es-badge', {
             'es-badge-right': item.tips && typeof item.tips !== 'boolean',
@@ -456,7 +457,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         doms.push(h('el-menu-item', {
           class: ['es-menu-item-' + _this4.mode],
           props: {
-            paddingLeft: _this4.paddingLeft
+            paddingLeft: _this4.paddingLeft,
+            disabled: item.extendData && item.extendData.businessStatus == 0
           },
           attrs: {
             data: item,