eoss-ui 0.4.24 → 0.4.26

package/packages/handler/src/main.vue

@@ -37,7 +37,11 @@
           <li
             v-for="ele in system"
             class="es-sub-system-item"
-            :class="{ 'es-disabled': application && !ele.hasPermission }"
+            :class="{
+              'es-disabled':
+                (application && !ele.hasPermission) ||
+                (ele.extendData && ele.extendData.businessStatus == 0)
+            }"
             :key="ele.id"
             :title="ele.text"
             @click.stop="handleSelect({ node: ele })"
@@ -159,7 +163,7 @@ export default {
       deep: true,
       handler(val) {
         if (val !== undefined) {
-          this.lists.forEach(item => {
+          this.lists.forEach((item) => {
             item.hide = val[item.type];
           });
         }
@@ -241,7 +245,22 @@ export default {
     },
     handleSelect(res) {
       const { node } = res;
-      if (!this.application || node.hasPermission) {
+      console.log(node);
+      if (
+        node.extendData &&
+        node.extendData.businessStatus == 0 &&
+        node.extendData.businessWarnMsg
+      ) {
+        this.$alert(node.extendData.businessWarnMsg, '提示', {
+          type: 'warning'
+        });
+      }
+      if (
+        !this.application &&
+        !node.hasPermission &&
+        node.extendData &&
+        node.extendData.businessStatus != 0
+      ) {
         this.$emit('select', res);
       }
     },
@@ -254,7 +273,7 @@ export default {
         .then(() => {
           util
             .ajax({ method: 'post', url: logout })
-            .then(res => {
+            .then((res) => {
               if (res.rCode == 0) {
                 util.removeStorage([
                   'Authorization',
@@ -293,13 +312,13 @@ export default {
                 }
               }
             })
-            .catch(err => {
+            .catch((err) => {
               if (err.message && err.message !== 'canceled') {
                 this.$message.error(err.message);
               }
             });
         })
-        .catch(e => {});
+        .catch((e) => {});
     }
   }
 };

package/packages/main/src/main.vue

@@ -286,6 +286,7 @@ export default {
       type: String,
       default: ''
     },
+    param: Object,
     header: {
       type: Boolean,
       default: true
@@ -665,7 +666,7 @@ export default {
           }
         });
     },
-      // 将chalk写入到页面中
+    // 将chalk写入到页面中
     handleColorToPage(globalThalk) {
       const thalk = document.getElementById('chalk-style');
       if (!thalk) {
@@ -689,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];
@@ -699,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);
@@ -917,7 +936,7 @@ export default {
     //获取应用导航菜单
     getMenu() {
       util
-        .ajax({ url: this.action })
+        .ajax({ url: this.action, params: this.param ? this.param : {} })
         .then((res) => {
           if (res.rCode === 0) {
             this.menus = JSON.parse(JSON.stringify(res.results));
@@ -929,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];
@@ -939,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);
@@ -1222,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 = [];
@@ -1398,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;
@@ -1648,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

@@ -70,7 +70,7 @@ export default {
         } else {
           this.$nextTick(() => {
             let w = 0;
-            Array.from(this.$refs.menu.$el.children).forEach(item => {
+            Array.from(this.$refs.menu.$el.children).forEach((item) => {
               w += item.offsetWidth;
             });
             const styles = window.getComputedStyle(this.$refs.menu.$el);
@@ -114,7 +114,7 @@ export default {
         this.$refs.menu.close(this.menuId);
       } else {
         let openedMenus = item.rootMenu.openedMenus;
-        openedMenus.forEach(item => {
+        openedMenus.forEach((item) => {
           if (keyPath.indexOf(item) == -1) {
             this.$refs.menu.close(item);
           }
@@ -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,
@@ -288,17 +296,24 @@ export default {
   },
   render(h) {
     let doms = [];
-    this.data.forEach(item => {
-      if (item.children && item.children.length) {
+    this.data.forEach((item) => {
+      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 = [
           h('i', {
-            class: item.icons
-              ? this.unicode(item.icons)
-                ? item.icons
-                : 'es-icons iconfont'
-              : 'es-icon-application',
+            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)
                 ? {}
@@ -307,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(
@@ -343,8 +358,10 @@ export default {
           h(
             'el-menu-item',
             {
+              class: [`es-menu-item-${this.mode}`],
               props: {
-                paddingLeft: this.paddingLeft
+                paddingLeft: this.paddingLeft,
+                disabled: item.extendData && item.extendData.businessStatus == 0
               },
               attrs: {
                 data: item,