eoss-ui 0.4.61 → 0.4.63

package/packages/form/src/main.vue

@@ -545,6 +545,21 @@
                         >
                         </es-data-table>
                       </template>
+                      <es-flow-list
+                        v-else-if="
+                          (item.type === 'flow-list' ||
+                            item.type === 'flowList') &&
+                          _businessId
+                        "
+                        :businessId="_businessId"
+                        v-bind="
+                          handleExclAttribute({
+                            data: item,
+                            attrs: ['events', 'visible', 'type']
+                          })
+                        "
+                        v-on="item.events"
+                      ></es-flow-list>
                       <es-icons
                         v-else-if="item.type === 'icon'"
                         v-bind="
@@ -1390,6 +1405,20 @@
                     >
                     </es-data-table>
                   </template>
+                  <es-flow-list
+                    v-else-if="
+                      (item.type === 'flow-list' || item.type === 'flowList') &&
+                      _businessId
+                    "
+                    :businessId="_businessId"
+                    v-bind="
+                      handleExclAttribute({
+                        data: item,
+                        attrs: ['events', 'visible', 'type']
+                      })
+                    "
+                    v-on="item.events"
+                  ></es-flow-list>
                   <es-icons
                     v-else-if="item.type === 'icon'"
                     v-bind="
@@ -2306,6 +2335,21 @@
                       >
                       </es-data-table>
                     </template>
+                    <es-flow-list
+                      v-else-if="
+                        (item.type === 'flow-list' ||
+                          item.type === 'flowList') &&
+                        _businessId
+                      "
+                      :businessId="_businessId"
+                      v-bind="
+                        handleExclAttribute({
+                          data: item,
+                          attrs: ['events', 'visible', 'type']
+                        })
+                      "
+                      v-on="item.events"
+                    ></es-flow-list>
                     <es-icons
                       v-else-if="item.type === 'icon'"
                       v-bind="
@@ -3095,6 +3139,20 @@
                   >
                   </es-data-table>
                 </template>
+                <es-flow-list
+                  v-else-if="
+                    (item.type === 'flow-list' || item.type === 'flowList') &&
+                    _businessId
+                  "
+                  :businessId="_businessId"
+                  v-bind="
+                    handleExclAttribute({
+                      data: item,
+                      attrs: ['events', 'visible', 'type']
+                    })
+                  "
+                  v-on="item.events"
+                ></es-flow-list>
                 <es-icons
                   v-else-if="item.type === 'icon'"
                   v-bind="
@@ -3910,6 +3968,11 @@ export default {
         }
       }
       return buttons;
+    },
+    _businessId() {
+      return typeof this.autoId === 'string'
+        ? this.models[this.autoId]
+        : this.models['id'];
     }
   },
   watch: {

package/packages/handler/src/main.vue

@@ -287,7 +287,7 @@ export default {
                     util.getStorage('login') || util.getStorage('loginPage');
                   if (loginPage) {
                     let src;
-                    if (!util.startWith(loginPage, ['http', '/'])) {
+                    if (!util.startWith(loginPage, ['http', '/'], true)) {
                       let pathname = util.win.top.location.pathname;
                       if (pathname !== '/') {
                         pathname = pathname.split('/');

package/packages/login/src/main.vue

@@ -740,6 +740,16 @@ export default {
     };
   },
   created() {
+    util.removeStorage([
+      'remind',
+      'ssId',
+      'token',
+      'Authorization',
+      'deviceUnique',
+      'userId',
+      'userName',
+      'useCaseCodes'
+    ]);
     this.code = util.getParams('code');
     if (this.code) {
       this.doWechatLogin(this.code);
@@ -1314,7 +1324,6 @@ export default {
             type: 'success',
             duration: 1500,
             onClose: () => {
-              sessionStorage.removeItem('remind');
               if (this.toUrl) {
                 window.location.href = this.toUrl;
               } else if (results.doorIndex && this.doorIndex) {

package/packages/main/src/main.vue

@@ -26,6 +26,7 @@
           :popperClass="`el-menu--popup-${layout}`"
           :data="navs"
           :deep="layout === 'topnav'"
+          :height="layout === 'topnav' ? '370px' : undefined"
           :default-active="topActive"
           @select="
             (res) => {
@@ -221,7 +222,7 @@
       :theme="color"
       :predefine="themes"
       :visible.sync="showSet"
-      :layout.sync="layout"
+      :layout="layout"
       @change="handleChange"
       @layout="handleLayout"
     ></settings>
@@ -389,6 +390,10 @@ export default {
     userHeight: {
       type: String,
       default: '740px'
+    },
+    history: {
+      type: Boolean,
+      default: true
     }
   },
   computed: {
@@ -415,7 +420,6 @@ export default {
       return true;
     },
     navWidth() {
-      console.log(this.layout === 'topside' ? '230px' : undefined, 9000);
       return this.layout === 'topside' ? '230px' : undefined;
     },
     showNavTitle() {
@@ -603,7 +607,8 @@ export default {
       isHeader: '',
       isSide: null,
       navIds: null,
-      timer: null
+      timer: null,
+      pid: null
     };
   },
   created() {
@@ -701,6 +706,15 @@ export default {
         thalk.innerText = globalThalk;
       }
     },
+    setTitle(id) {
+      for (let i = 0; i < this.menus.length; i++) {
+        let item = this.menus[i];
+        if (item.id == id) {
+          this.title = item.text;
+          return item;
+        }
+      }
+    },
     renderMenu() {
       if (this.data !== undefined && this.data.length) {
         this.menus = JSON.parse(JSON.stringify(this.data));
@@ -710,6 +724,8 @@ export default {
           var ids = this.getId(this.menus, applicationid);
           if (ids) {
             this.defaultActive = ids;
+            this.navIds = ids;
+            this.setTitle(ids[0]);
           }
         } else if (util.win.location.hash) {
           let hash = util.win.location.hash;
@@ -720,8 +736,10 @@ export default {
             let ids = this.getId(this.menus, util.win.location.hash, true);
             if (ids) {
               this.defaultActive = ids;
+              this.navIds = ids;
+              this.setTitle(ids[0]);
             }
-          } else if (sessionStorage.getItem('jump')) {
+          } else if (sessionStorage.getItem('jump') && this.history) {
             let ids = this.getId(
               this.menus,
               sessionStorage.getItem('jump'),
@@ -729,9 +747,11 @@ export default {
             );
             if (ids) {
               this.defaultActive = ids;
+              this.navIds = ids;
+              this.setTitle(ids[0]);
             }
           }
-        } else if (sessionStorage.getItem('jump')) {
+        } else if (sessionStorage.getItem('jump') && this.history) {
           let ids = this.getId(
             this.menus,
             sessionStorage.getItem('jump'),
@@ -739,6 +759,8 @@ export default {
           );
           if (ids) {
             this.defaultActive = ids;
+            this.navIds = ids;
+            this.setTitle(ids[0]);
           }
         }
         this.setMenu(this.menus);
@@ -791,7 +813,8 @@ export default {
           key: {
             userId: results.userModel.userId,
             userName: results.userModel.username,
-            useCaseCodes: results.resourceCodes
+            useCaseCodes:
+              results.resourceCodes || results.userModel.resourceCodes
           }
         });
       }
@@ -831,9 +854,6 @@ export default {
         if (i === 'subsystemName') {
           document.title = results[i];
         }
-        if (i === 'resourceCodes') {
-          sessionStorage.setItem('useCaseCodes', results[i]);
-        }
         if (i === 'sysLogoIco' && results[i]) {
           sessionStorage.setItem('sysLogoIco', results[i]);
           util.setFavicon(results[i]);
@@ -989,8 +1009,10 @@ export default {
                 let ids = this.getId(this.menus, util.win.location.hash, true);
                 if (ids) {
                   this.defaultActive = ids;
+                  this.navIds = ids;
+                  this.setTitle(ids[0]);
                 }
-              } else if (sessionStorage.getItem('jump')) {
+              } else if (sessionStorage.getItem('jump') && this.history) {
                 let ids = this.getId(
                   this.menus,
                   sessionStorage.getItem('jump'),
@@ -998,9 +1020,11 @@ export default {
                 );
                 if (ids) {
                   this.defaultActive = ids;
+                  this.navIds = ids;
+                  this.setTitle(ids[0]);
                 }
               }
-            } else if (sessionStorage.getItem('jump')) {
+            } else if (sessionStorage.getItem('jump') && this.history) {
               let ids = this.getId(
                 this.menus,
                 sessionStorage.getItem('jump'),
@@ -1008,6 +1032,8 @@ export default {
               );
               if (ids) {
                 this.defaultActive = ids;
+                this.navIds = ids;
+                this.setTitle(ids[0]);
               }
             }
             this.setTips(this.menus);
@@ -1026,7 +1052,6 @@ export default {
     },
     //设置默认左侧导航
     setMenu(res) {
-      console.log(9000);
       if (this.defaultActive && this.defaultActive.length) {
         this.isDefault = false;
         this.setDefault(res, this.defaultActive);
@@ -1116,11 +1141,21 @@ export default {
       if (!obj) {
         return '';
       }
+      let openIdex = 0;
+      if (
+        obj.extendData &&
+        (obj.extendData.subDefOpenIndex || obj.extendData.subDefOpen)
+      ) {
+        openIdex = parseInt(
+          obj.extendData.subDefOpenIndex || obj.extendData.subDefOpen,
+          10
+        );
+      }
       if (obj.children && obj.children.length) {
-        return this.getFirst(obj.children[0]);
+        return this.getFirst(obj.children[openIdex]);
       } else if (obj.fourthTabs && obj.fourthTabs.length) {
         if (this.layout === 'topnav') {
-          return this.getFirst(obj.fourthTabs[0]);
+          return this.getFirst(obj.fourthTabs[openIdex]);
         } else {
           this.tabs = obj.fourthTabs;
           if (obj.url) {
@@ -1297,13 +1332,20 @@ export default {
       let _url = params._baseUrl ? params._baseUrl : './primary.html';
       return util.urlJoinParams({ url: _url, param: obj });
     },
-    handleOpenNav(res) {
-      console.log(res, 777);
-    },
     //应用导航交互
     handleSelect(res, type, open) {
-      console.log(type);
-      const { node } = res;
+      console.log(type, 11);
+      const { node, fourthTabs } = res;
+      let openIdex = 0;
+      if (
+        node.extendData &&
+        (node.extendData.subDefOpenIndex || node.extendData.subDefOpen)
+      ) {
+        openIdex = parseInt(
+          node.extendData.subDefOpenIndex || node.extendData.subDefOpen,
+          10
+        );
+      }
       if (!open) {
         if (
           node.extendData &&
@@ -1326,32 +1368,20 @@ export default {
             this.navIds = [node.id];
             this.menu = node.children;
             this.title = node.text;
-            let subNode = this.getFirst(node.children[0]);
-            if (subNode) {
-              this.active = subNode.id;
-              this.navIds = [node.id, ...this.getId(subNode.url)];
+            if (this.setFirstAsDefault) {
+              let subNode = this.getFirst(node.children[openIdex]);
+              if (subNode) {
+                this.active = subNode.id;
+                this.navIds = [
+                  node.id,
+                  ...this.getId(node.children, subNode.url, true)
+                ];
+              }
             }
           } else {
             this.navIds = this.getId(this.menus, node.url, true);
-            if (node.url) {
-              let tab = node.fourthTabs.filter((item) => {
-                return item.url === node.url;
-              })[0];
-              if (tab) {
-                this.tabs = node.fourthTabs;
-                this.tabsId = tab.id;
-              }
-            } 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.setTitle(ids[0]);
+            this.tabsId = fourthTabs ? node.id : '';
           }
           break;
         case 'sys':
@@ -1360,7 +1390,9 @@ export default {
             this.tabs = [];
             this.menu = node.children;
             this.title = node.text;
-            this.active = this.getFirst(node.children[0]).id;
+            if (this.setFirstAsDefault) {
+              this.active = this.getFirst(node.children[openIdex]).id;
+            }
             this.isSide = true;
           }
           break;
@@ -1371,10 +1403,9 @@ export default {
           }
           if (this.setFirstAsDefault) {
             let subNode = this.getFirst(node);
-            this.$set(this.active, 0, node.id);
+            this.active = [node.id];
             if (subNode && node.id !== subNode.id) {
-              console.log(subNode, subNode.url);
-              console.log(this.getId(this.menus, subNode.url, true));
+              this.navIds = this.getId(this.menus, subNode.url, true);
               this.$set(this.active, 1, subNode.id);
             }
           }
@@ -1401,6 +1432,7 @@ export default {
                 } else {
                   this.active = tab.id;
                 }
+                this.navIds = this.getId(this.menus, tab.url, true);
               }
             } else {
               let tab = (node.fourthTabs || []).filter((item) => {
@@ -1409,6 +1441,9 @@ export default {
               if (tab) {
                 this.tabs = node.fourthTabs;
                 this.tabsId = tab.id;
+                this.navIds = this.getId(this.menus, tab.url, true);
+              } else {
+                this.navIds = this.getId(this.menus, node.url, true);
               }
             }
           } else if (node.fourthTabs.length) {
@@ -1419,10 +1454,12 @@ export default {
               this.tabs[0].urlopenmode,
               this.tabs[0]
             );
+            this.navIds = this.getId(this.menus, this.tabs[0].url, true);
           }
           break;
         case 'tabs':
           this.tabsId = node.id;
+          this.navIds = this.getId(this.menus, node.url, true);
           break;
       }
       if (node.url) {
@@ -1521,6 +1558,13 @@ export default {
     handleJump(page, type, res) {
       console.log(page);
       sessionStorage.setItem('jump', page);
+      if (res) {
+        if (res.fourthTabs && res.fourthTabs.length) {
+          this.pid = res.id;
+        } else {
+          this.pid = res.pid;
+        }
+      }
       if (util.win.location.hash === page) {
         this.refresh = true;
         return;
@@ -1617,26 +1661,101 @@ export default {
           break;
       }
     },
+    getFourthTabs(menus, id) {
+      if (Array.isArray(menus)) {
+        for (let i = 0; i < menus.length; i++) {
+          let fourth = this.getFourthTabs(menus[i], id);
+          if (fourth) {
+            return fourth;
+          }
+        }
+      } else {
+        if (menus.fourthTabs && menus.fourthTabs.length) {
+          for (let i = 0; i < menus.fourthTabs.length; i++) {
+            let item = menus.fourthTabs[i];
+            if (item.id === id) {
+              return item;
+            }
+          }
+        }
+        if (menus.children && menus.children.length) {
+          for (let i = 0; i < menus.children.length; i++) {
+            let fourth = this.getFourthTabs(menus.children[i], id);
+            if (fourth) {
+              return fourth;
+            }
+          }
+        }
+      }
+      return false;
+    },
     handleLayout(res, old) {
+      this.layout = res;
       switch (res) {
         case 'topnav':
           this.navs = this.menus;
           this.tabs = [];
           this.subsystem = [];
-          switch (old) {
-            case 'subsystem':
-              break;
-            default:
-              this.topActive = this.active.length
-                ? this.active[this.active.length - 1]
-                : '';
-              console.log(this.active, this.topActive, 666);
+          this.topActive =
+            this.navIds && this.navIds.length
+              ? this.navIds[this.navIds.length - 1]
+              : '';
+          break;
+        case 'subsystem':
+          this.subsystem = this.menus;
+          this.navs = [];
+          this.tabs = [];
+          if (this.navIds && this.navIds.length) {
+            let node = this.setTitle(this.navIds[0]);
+            this.active = JSON.parse(JSON.stringify(this.navIds)).slice(1);
+            let tabs = this.getFourthTabs(this.menus, this.pid);
+            if (tabs) {
+              this.active.pop();
+              this.tabs = tabs.fourthTabs;
+              this.tabsId = this.navIds[this.navIds.length - 1];
+            }
+            this.menu = node.children;
+            this.title = node.text;
+          } else {
+            //this.navIds = [this.menus[0].id]
+            this.menu = this.menus[0].children;
+            this.title = this.menus[0].text;
+          }
+          break;
+        case 'topside':
+          this.navs = this.menus;
+          this.subsystem = [];
+          this.tabs = [];
+          if (this.navIds && this.navIds.length) {
+            let node = this.setTitle(this.navIds[0]);
+            this.active = JSON.parse(JSON.stringify(this.navIds)).slice(1);
+            let tabs = this.getFourthTabs(this.menus, this.pid);
+            if (tabs) {
+              this.active.pop();
+              this.tabs = tabs.fourthTabs;
+              this.tabsId = this.navIds[this.navIds.length - 1];
+            }
+            this.topActive = this.navIds[0];
+            this.menu = node.children;
+          } else {
+            this.menu = this.menus[0].children;
+            this.topActive = this.menus[0].id;
           }
           break;
+        default:
+          this.navs = [];
+          this.subsystem = [];
+          this.menu = this.menus;
+          if (this.navIds && this.navIds.length) {
+            this.active = JSON.parse(JSON.stringify(this.navIds));
+            let tabs = this.getFourthTabs(this.menus, this.pid);
+            if (tabs) {
+              this.active.pop();
+              this.tabs = tabs.fourthTabs;
+              this.tabsId = this.navIds[this.navIds.length - 1];
+            }
+          }
       }
-      console.log(this.sysId, this.topActive, this.active, this.tabsId);
-      //this.setMenu(this.menus);
-      console.log(this.layout, old, this.hide);
     },
     //监听改变菜单
     handleListener() {
@@ -1755,9 +1874,13 @@ export default {
           msg = '登录已过期，请重新登录！';
         }
       }
-      !this.timer &&
-        (this.timer = setTimeout(() => {
+      cl;
+      let remind = sessionStorage.getItem('remind');
+      if (!remind) {
+        clearTimeout(this.timer);
+        this.timer = setTimeout(() => {
           console.log('handleReLogin');
+          sessionStorage.setItem('remind', 1);
           this.$confirm(msg, btn)
             .then(() => {
               util.removeStorage([
@@ -1777,7 +1900,7 @@ export default {
                 util.getStorage('login') || util.getStorage('loginPage');
               if (loginPage) {
                 let src;
-                if (!util.startWith(loginPage, ['http', '/'])) {
+                if (!util.startWith(loginPage, ['http', '/'], true)) {
                   let pathname = util.win.top.location.pathname;
                   if (pathname !== '/') {
                     pathname = pathname.split('/');
@@ -1805,10 +1928,10 @@ export default {
               }
             })
             .catch((e) => {
-              clearTimeout(this.timer);
-              this.timer = null;
+              sessionStorage.removeItem('remind');
             });
-        }, 1000));
+        }, 2000);
+      }
     },
     openPage(url, name, width, height) {
       let src = url;

package/packages/main/src/userinfo.vue

@@ -345,14 +345,14 @@ export default {
             officeTel: this.values.officetel,
             phone: this.values.phone,
             oldPassword:
-              initLogin && initLogin.secret
+              initLogin && initLogin.secret && this.values.oldpassword
                 ? util.esmEncrypt({
                     data: this.values.oldpassword,
                     key: initLogin.secret
                   })
                 : this.values.oldpassword,
             password:
-              initLogin && initLogin.secret
+              initLogin && initLogin.secret && this.values.password
                 ? util.esmEncrypt({
                     data: this.values.password,
                     key: initLogin.secret
@@ -374,7 +374,7 @@ export default {
                     util.getStorage('login') || util.getStorage('loginPage');
                   if (loginPage) {
                     let src;
-                    if (!util.startWith(loginPage, ['http', '/'])) {
+                    if (!util.startWith(loginPage, ['http', '/'], true)) {
                       let pathname = util.win.top.location.pathname;
                       if (pathname !== '/') {
                         pathname = pathname.split('/');

package/packages/menu/src/main.vue

@@ -124,6 +124,7 @@ export default {
         key: key,
         path: keyPath,
         node: item.$attrs.data,
+        fourthTabs: item.$attrs.fourthTabs,
         item: item,
         mode: this.mode
       });
@@ -148,7 +149,7 @@ export default {
         mode: this.mode
       });
     },
-    getSub(item, h, popper) {
+    getSub(item, h, popper, fourthTabs) {
       if (popper) {
         popper +=
           this.popperClass !== undefined
@@ -255,7 +256,7 @@ export default {
             if (!ele) {
               console.error(`对象子数据中第[${index}]条数据错误`, item);
             } else {
-              return this.getSub(ele, h, popper);
+              return this.getSub(ele, h, popper, true);
             }
           })
         );
@@ -290,7 +291,8 @@ export default {
               attrs: {
                 data: item,
                 index: item.id,
-                key: item.id
+                key: item.id,
+                fourthTabs: fourthTabs
               }
             },
             this.titleIcons ? title : [title[1]]

package/packages/nav/src/main.vue

@@ -103,7 +103,6 @@ export default {
         this.defaultActive.length
           ? this.defaultActive[0]
           : undefined;
-      console.log(active, 555);
       return active;
     },
     menuActive() {
@@ -113,7 +112,6 @@ export default {
           : this.defaultActive.length
           ? this.defaultActive[this.defaultActive.length - 1]
           : undefined;
-      console.log(active, 444);
       return active;
     },
     boxWidth() {