eoss-ui 0.4.25 → 0.4.27

package/packages/main/src/main.vue

@@ -690,7 +690,7 @@ export default {
           if (ids) {
             this.defaultActive = ids;
           }
-        } else {
+        } else if (util.win.location.hash) {
           let hash = util.win.location.hash;
           if (hash) {
             hash = hash.split('?')[0];
@@ -700,6 +700,24 @@ export default {
             if (ids) {
               this.defaultActive = ids;
             }
+          } else if (sessionStorage.getItem('jump')) {
+            let ids = this.getId(
+              this.menus,
+              sessionStorage.getItem('jump'),
+              true
+            );
+            if (ids) {
+              this.defaultActive = ids;
+            }
+          }
+        } else if (sessionStorage.getItem('jump')) {
+          let ids = this.getId(
+            this.menus,
+            sessionStorage.getItem('jump'),
+            true
+          );
+          if (ids) {
+            this.defaultActive = ids;
           }
         }
         this.setMenu(this.menus);
@@ -930,7 +948,7 @@ export default {
               if (ids) {
                 this.defaultActive = ids;
               }
-            } else {
+            } else if (util.win.location.hash) {
               let hash = util.win.location.hash;
               if (hash) {
                 hash = hash.split('?')[0];
@@ -940,6 +958,24 @@ export default {
                 if (ids) {
                   this.defaultActive = ids;
                 }
+              } else if (sessionStorage.getItem('jump')) {
+                let ids = this.getId(
+                  this.menus,
+                  sessionStorage.getItem('jump'),
+                  true
+                );
+                if (ids) {
+                  this.defaultActive = ids;
+                }
+              }
+            } else if (sessionStorage.getItem('jump')) {
+              let ids = this.getId(
+                this.menus,
+                sessionStorage.getItem('jump'),
+                true
+              );
+              if (ids) {
+                this.defaultActive = ids;
               }
             }
             this.setTips(this.menus);
@@ -1223,8 +1259,18 @@ export default {
     },
     //应用导航交互
     handleSelect(res, type) {
-      this.isDefault = false;
       const { node } = res;
+      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 = [];
@@ -1399,6 +1445,7 @@ export default {
     //跳转页面
     handleJump(page, type, res) {
       console.log(page);
+      sessionStorage.setItem('jump', page);
       if (util.win.location.hash === page) {
         this.refresh = true;
         return;
@@ -1649,7 +1696,7 @@ export default {
     },
     openPage(url, name, width, height) {
       let src = url;
-      if (!util.startWith(url, ['http', '/'])) {
+      if (!util.startWith(url, ['http', '/'], true)) {
         let pathname = window.location.pathname;
         if (pathname !== '/') {
           pathname = pathname.split('/');

package/packages/menu/src/main.vue

@@ -166,7 +166,7 @@ export default {
         h(
           'div',
           {
-            class: `es-menu-title-text es-menu-title-${this.mode}`
+            class: [`es-menu-title-text es-menu-title-${this.mode}`]
           },
           [
             h(
@@ -200,7 +200,12 @@ export default {
       let 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((ele, index) => {
             if (!ele) {
@@ -230,7 +235,8 @@ export default {
         this.deep &&
         this.mode === 'horizontal' &&
         item.fourthTabs &&
-        item.fourthTabs.length
+        item.fourthTabs.length &&
+        (!item.extendData || item.extendData.businessStatus != 0)
       ) {
         doms = doms.concat(
           item.fourthTabs.map((ele, index) => {
@@ -262,10 +268,12 @@ export default {
           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,
@@ -289,7 +297,11 @@ export default {
   render(h) {
     let doms = [];
     this.data.forEach((item) => {
-      if (item.children && item.children.length) {
+      if (
+        item.children &&
+        item.children.length &&
+        (!item.extendData || item.extendData.businessStatus != 0)
+      ) {
         doms = doms.concat(this.getSub(item, h, 'es-sub-menu'));
       } else {
         const title = [
@@ -310,7 +322,7 @@ export default {
           h(
             'div',
             {
-              class: `es-menu-title-text es-menu-title-${this.mode}`
+              class: [`es-menu-title-text es-menu-title-${this.mode}`]
             },
             [
               h(
@@ -348,7 +360,8 @@ export default {
             {
               class: [`es-menu-item-${this.mode}`],
               props: {
-                paddingLeft: this.paddingLeft
+                paddingLeft: this.paddingLeft,
+                disabled: item.extendData && item.extendData.businessStatus == 0
               },
               attrs: {
                 data: item,

package/packages/theme-chalk/lib/icons.css

@@ -0,0 +1 @@
+.es-icons{display:inline-block}.es-icons.es-icon-readonly{-webkit-appearance:none;background-color:#fff;background-image:none;border-radius:3px;border:1px solid #d9d9d9;-webkit-box-sizing:border-box;box-sizing:border-box;color:rgba(0,0,0,.75);display:inline-block;font-size:inherit;height:40px;line-height:40px;outline:0;padding:0 15px;-webkit-transition:border-color .2s cubic-bezier(.645,.045,.355,1);transition:border-color .2s cubic-bezier(.645,.045,.355,1);width:100%;position:relative}.es-icons .el-input-group__prepend{width:auto;line-height:38px;position:absolute;z-index:3;left:2px;top:2px;right:62px;bottom:2px;border:0;background-color:#fff;padding:0 12px}.es-icons .es-iconfont{color:#606266;font-size:20px}.es-icons .el-input__inner{border-radius:3px!important;color:transparent;padding-right:60px}.es-icons .el-input__suffix{height:auto;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.es-icon-list{clear:both;overflow:hidden;list-style:none;padding:0!important;border:1px solid #eaeefb;border-radius:4px}.es-icon-list li{float:left;width:148px;text-align:center;height:120px;line-height:120px;color:#666;font-size:13px;border-right:1px solid #eee;border-bottom:1px solid #eee;margin-right:-1px;margin-bottom:-1px;-webkit-box-sizing:border-box;box-sizing:border-box}.es-icon-list li span{display:inline-block;line-height:normal;vertical-align:middle;font-family:'Helvetica Neue',Helvetica,'PingFang SC','Hiragino Sans GB','Microsoft YaHei',SimSun,sans-serif;color:#99a9bf;-webkit-transition:color .15s linear;transition:color .15s linear}.es-icon-list li i{display:block;font-size:32px;margin-bottom:15px;color:#606266;-webkit-transition:color .15s linear;transition:color .15s linear}.es-icon-list li .icon-name{display:inline-block;padding:0 3px;height:1em}.es-icon-list li:hover i,.es-icon-list li:hover span{color:#5cb6ff}