eoss-ui 0.5.81-beta13 → 0.5.81-beta15

package/packages/main/src/default/index.vue

@@ -675,20 +675,13 @@ export default {
     let mainConfig = util.getStorage('mainConfig');
     if (mainConfig) {
       const results = JSON.parse(mainConfig);
-      this.init(results);
+      if (Object.keys(results).length) {
+        this.init(results);
+      }
     }
   },
   mounted() {
-    util.win.reLogin = this.handleReLogin;
     this.handleListener();
-    util.win.refresh = this.handleRefresh;
-    util.win.jumpMenu = this.jumpMenu;
-    if (util.win.$wujie) {
-      util.win.$wujie.bus.$on('changeTheme', (res) => {
-        util.updateTheme(res);
-      });
-    }
-    util.win.windowOpen = this.openPage;
     util.win.addEventListener('popstate', this.stateHandle, false);
   },
   methods: {
@@ -983,7 +976,7 @@ export default {
           option.url.indexOf('/#/') > -1 ||
           option.url.indexOf('#/') > -1
         ) {
-          option.isUrlc = true;
+          option.isUrl = true;
           ids = this.getId(this.menus, option.url);
           if (!ids) {
             if (
@@ -1024,6 +1017,9 @@ export default {
           }
         } else {
           ids = option.url.split(',');
+          if (ids.length == 1) {
+            ids = this.getId(this.menus, option.url);
+          }
         }
       } else {
         ids = option.url;
@@ -1041,7 +1037,48 @@ export default {
       }
       for (let i = 0; i < menus.length; i++) {
         let item = menus[i];
-        if (
+        if (item.id === url) {
+          if (item.url) {
+            if (
+              Object.prototype.hasOwnProperty.call(item, 'children') &&
+              item.children.length
+            ) {
+              let id = this.getId(item.children, item.url);
+              if (id) {
+                if (typeof id === 'string') {
+                  this.isTabs = false;
+                }
+                if (item.pid === 'root' || Array.isArray(id)) {
+                  return [item.id].concat(id);
+                } else if (typeof id === 'string') {
+                  return [item.id, id];
+                }
+                return id;
+              }
+            } else if (
+              Object.prototype.hasOwnProperty.call(item, 'fourthTabs') &&
+              item.fourthTabs.length
+            ) {
+              let id = this.getId(item.fourthTabs, item.url);
+              if (id) {
+                if (typeof id === 'string') {
+                  this.isTabs = true;
+                }
+                if (item.pid === 'root') {
+                  return [item.id].concat(id);
+                } else if (typeof id === 'string') {
+                  return [item.id, id];
+                }
+                return id;
+              }
+            } else {
+              return item.id;
+            }
+          } else {
+            console.error(item);
+            return false;
+          }
+        } else if (
           Object.prototype.hasOwnProperty.call(item, 'children') &&
           item.children.length
         ) {
@@ -1073,7 +1110,7 @@ export default {
             }
             return id;
           }
-        } else if (item.id === url || item.url == url) {
+        } else if (item.url == url) {
           return item.id;
         } else {
           if (item.url) {
@@ -1340,7 +1377,7 @@ export default {
       this.sysId = '';
       this.tabsId = '';
       this.active = '';
-      this.getUrl(res, active, param);
+      this.getUrl(res, active[active.length - 1], param);
       if (
         this.layout === 'subsystem' ||
         this.layout === 'subSystem' ||
@@ -1393,7 +1430,7 @@ export default {
         if (this.biserial) {
           this.active = active.slice(
             0,
-            active.length > 2 ? active.length - 1 : active.length
+            this.tabs && this.tabs.length ? active.length - 1 : active.length
           );
         } else {
           this.active = active.slice(1);
@@ -1403,34 +1440,29 @@ export default {
       this.showPage = true;
     },
     //获取页面类型及地址
-    getUrl(res, active, index, param) {
-      index = index === undefined ? 0 : index;
+    getUrl(res, active, param) {
       for (let i = 0; i < res.length; i++) {
         let item = res[i];
-        if (item.id === active[index]) {
-          if (index === active.length - 1) {
+        if (item.id === active) {
+          if (item.url) {
             this.handleJump(item.url, item.urlopenmode, item, param);
             return item.url;
           } else {
-            if (item.children && item.children.length) {
-              index++;
-              let url = this.getUrl(item.children, active, index, param);
-              if (url && index === active.length - 1) {
-                this.tabs = '';
-              }
-              return url;
+            console.error(item);
+          }
+        } else {
+          if (item.children && item.children.length) {
+            let url = this.getUrl(item.children, active, param);
+            if (url) {
+              this.tabs = '';
             }
-            if (item.fourthTabs && item.fourthTabs.length) {
-              index++;
-              let url = this.getUrl(item.fourthTabs, active, index, param);
-              if (url) {
-                this.$set(this, 'tabs', item.fourthTabs);
-              }
-              return url;
+          }
+          if (item.fourthTabs && item.fourthTabs.length) {
+            let url = this.getUrl(item.fourthTabs, active, param);
+            if (url) {
+              this.$set(this, 'tabs', item.fourthTabs);
             }
           }
-        } else if (item.children && item.children.length) {
-          this.getUrl(item.children, active, index, param);
         }
       }
       return false;
@@ -1553,13 +1585,16 @@ export default {
                   }
                   //this.navIds = this.getId(this.menus, tab.url);
                 }
-              } else {
-                let tab = (node.fourthTabs || []).filter((item) => {
+              } else if (node.fourthTabs && node.fourthTabs.length) {
+                this.tabs = [];
+                let tab = node.fourthTabs.filter((item) => {
                   return item.url === node.url;
                 })[0];
                 if (tab) {
-                  this.tabs = node.fourthTabs;
                   this.tabsId = tab.id;
+                  this.$nextTick(() => {
+                    this.tabs = node.fourthTabs;
+                  });
                   //this.navIds = this.getId(this.menus, tab.url);
                 } else {
                   //this.navIds = this.getId(this.menus, node.url);
@@ -1567,8 +1602,10 @@ export default {
               }
             } else {
               if (node.fourthTabs.length) {
-                this.tabs = node.fourthTabs;
                 this.tabsId = this.tabs[0].id;
+                this.$nextTick(() => {
+                  this.tabs = node.fourthTabs;
+                });
                 this.handleJump(
                   this.tabs[0].url,
                   this.tabs[0].urlopenmode,
@@ -1992,124 +2029,6 @@ export default {
         let n = parseInt(this.menuTips[id], 10) - 1;
         this.$set(this.menuTips, id, n);
       }
-    },
-    handleReLogin(res) {
-      if (res && typeof res == 'string') {
-        res = JSON.parse(res);
-      }
-      let msg = '提示';
-      let btn = {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        closeOnClickModal: false,
-        type: 'warning'
-      };
-      if (res) {
-        if (res.rCode === 69) {
-          msg = '该账号在其他地方已登陆!';
-          btn = {
-            confirmButtonText: '确定',
-            closeOnClickModal: false,
-            type: 'warning'
-          };
-        } else {
-          msg = '登录已过期，请重新登录！';
-        }
-      }
-      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([
-                'Authorization',
-                'token',
-                'ssId',
-                'userId',
-                'userName',
-                'auth',
-                'deviceUnique',
-                'menus',
-                'useCaseCodes',
-                'mainConfig',
-                'jump'
-              ]);
-              const loginPage =
-                util.getStorage('login') || util.getStorage('loginPage');
-              try {
-                if (loginPage) {
-                  let src;
-                  if (!util.startWith(loginPage, ['http', '/'], true)) {
-                    let pathname = util.win.top.location.pathname;
-                    if (pathname !== '/') {
-                      pathname = pathname.split('/');
-                      pathname.splice(pathname.length - 1);
-                      pathname = pathname.join('/');
-                      src = pathname + '/' + loginPage.replace('./', '');
-                    } else {
-                      src = pathname + loginPage.replace('./', '');
-                    }
-                  } else {
-                    src = loginPage;
-                  }
-                  util.win.top.location.href = src;
-                } else if (
-                  util.win.top.location.href.indexOf('main.html') > -1
-                ) {
-                  util.win.top.location.href = './login.html';
-                } else {
-                  const hash = util.win.top.location.hash;
-                  if (hash) {
-                    const len = util.win.top.location.href.indexOf(hash);
-                    util.win.top.location.href =
-                      util.win.location.href.slice(0, len) + '#/login';
-                  } else {
-                    util.win.top.location.href = '/login.html';
-                  }
-                }
-              } catch (error) {
-                util.win.postMessage({ type: 1 }, '*');
-              }
-            })
-            .catch((e) => {
-              sessionStorage.removeItem('remind');
-            });
-        }, 2000);
-      }
-    },
-    openPage(url, name, width, height) {
-      let src = url;
-      if (!util.startWith(url, ['http', '/'], true)) {
-        let pathname = window.location.pathname;
-        if (pathname !== '/') {
-          pathname = pathname.split('/');
-          pathname.splice(pathname.length - 1);
-          pathname = pathname.join('/');
-        }
-        src = pathname + url.replace('./', '/');
-      }
-      if (name) {
-        let w = 0;
-        let h = 0;
-        try {
-          w = width ? width : util.win.top.screen.availWidth - 10;
-          h = height ? height : util.win.top.screen.availHeight - 60;
-        } catch (error) {
-          w = width ? width : util.win.screen.availWidth - 10;
-          h = height ? height : util.win.screen.availHeight - 60;
-        }
-        return util.win.open(
-          src,
-          name,
-          `width=${w}px,height=${h}px,resizable=yes,status=yes,menubar=no,scrollbars=yes`
-        );
-      } else {
-        return util.win.open(src);
-      }
     }
   },
   beforeDestroy() {

package/packages/main/src/main.vue

@@ -47,8 +47,111 @@ export default {
     this.appCode = this.params.appCode;
     this.getConfig(this.params);
   },
-  mounted() {},
+  mounted() {
+    if (util.win.$wujie) {
+      util.win.$wujie.bus.$on('changeTheme', (res) => {
+        util.updateTheme(res);
+      });
+    }
+    util.win.reLogin = this.handleReLogin;
+    util.win.windowOpen = this.openPage;
+    util.win.refresh = this.$refs.main.handleRefresh;
+    util.win.jumpMenu = this.$refs.main.jumpMenu;
+  },
   methods: {
+    /**
+     * @desc:重新登录
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    handleReLogin(res) {
+      if (res && typeof res == 'string') {
+        res = JSON.parse(res);
+      }
+      let msg = '提示';
+      let btn = {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        closeOnClickModal: false,
+        type: 'warning'
+      };
+      if (res) {
+        if (res.rCode === 69) {
+          msg = '该账号在其他地方已登陆!';
+          btn = {
+            confirmButtonText: '确定',
+            closeOnClickModal: false,
+            type: 'warning'
+          };
+        } else {
+          msg = '登录已过期，请重新登录！';
+        }
+      }
+      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([
+                'Authorization',
+                'token',
+                'ssId',
+                'userId',
+                'userName',
+                'auth',
+                'deviceUnique',
+                'menus',
+                'useCaseCodes',
+                'mainConfig',
+                'jump'
+              ]);
+              const loginPage =
+                util.getStorage('login') || util.getStorage('loginPage');
+              try {
+                if (loginPage) {
+                  let src;
+                  if (!util.startWith(loginPage, ['http', '/'], true)) {
+                    let pathname = util.win.top.location.pathname;
+                    if (pathname !== '/') {
+                      pathname = pathname.split('/');
+                      pathname.splice(pathname.length - 1);
+                      pathname = pathname.join('/');
+                      src = pathname + '/' + loginPage.replace('./', '');
+                    } else {
+                      src = pathname + loginPage.replace('./', '');
+                    }
+                  } else {
+                    src = loginPage;
+                  }
+                  util.win.top.location.href = src;
+                } else if (
+                  util.win.top.location.href.indexOf('main.html') > -1
+                ) {
+                  util.win.top.location.href = './login.html';
+                } else {
+                  const hash = util.win.top.location.hash;
+                  if (hash) {
+                    const len = util.win.top.location.href.indexOf(hash);
+                    util.win.top.location.href =
+                      util.win.location.href.slice(0, len) + '#/login';
+                  } else {
+                    util.win.top.location.href = '/login.html';
+                  }
+                }
+              } catch (error) {
+                util.win.postMessage({ type: 1 }, '*');
+              }
+            })
+            .catch((e) => {
+              sessionStorage.removeItem('remind');
+            });
+        }, 2000);
+      }
+    },
     /**
      * @desc:获取系统配置
      * @author huangbo
@@ -64,11 +167,47 @@ export default {
       ) {
         return false;
       }
-      if (!util.getStorage('mainConfig')) {
+      let mainConfig = util.getStorage('mainConfig');
+      if (!mainConfig || mainConfig == '{}') {
         util.getMainConfig((res) => {
           this.$refs.main.init(res);
         });
       }
+    },
+    /**
+     * @desc:打开页面
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    openPage(url, name, width, height) {
+      let src = url;
+      if (!util.startWith(url, ['http', '/'], true)) {
+        let pathname = window.location.pathname;
+        if (pathname !== '/') {
+          pathname = pathname.split('/');
+          pathname.splice(pathname.length - 1);
+          pathname = pathname.join('/');
+        }
+        src = pathname + url.replace('./', '/');
+      }
+      if (name) {
+        let w = 0;
+        let h = 0;
+        try {
+          w = width ? width : util.win.top.screen.availWidth - 10;
+          h = height ? height : util.win.top.screen.availHeight - 60;
+        } catch (error) {
+          w = width ? width : util.win.screen.availWidth - 10;
+          h = height ? height : util.win.screen.availHeight - 60;
+        }
+        return util.win.open(
+          src,
+          name,
+          `width=${w}px,height=${h}px,resizable=yes,status=yes,menubar=no,scrollbars=yes`
+        );
+      } else {
+        return util.win.open(src);
+      }
     }
   },
   beforeDestroy() {}

package/packages/main/src/simplicity/index.vue

@@ -323,6 +323,7 @@ import {
   logout,
   topic,
   getUserAppWithTag,
+  recordUserApp,
   getComplexApplications,
   getComplexApplicationsNew
 } from 'eoss-ui/src/config/api.js';
@@ -399,6 +400,11 @@ export default {
       type: String,
       default: dataTableMode
     },
+    //记录菜单点击率作为工作台常用应用数据
+    recordApp: {
+      type: Boolean,
+      default: true
+    },
     appCode: String,
     //logo
     logo: String,
@@ -631,15 +637,13 @@ export default {
     let mainConfig = util.getStorage('mainConfig');
     if (mainConfig) {
       const results = JSON.parse(mainConfig);
-      this.init(results);
+      if (Object.keys(results).length) {
+        this.init(results);
+      }
     }
     this.doorIndex = sessionStorage.getItem('doorIndex');
   },
   mounted() {
-    util.win.reLogin = this.handleReLogin;
-    util.win.refresh = this.handleRefresh;
-    util.win.jumpMenu = this.jumpMenu;
-    util.win.windowOpen = this.openPage;
     this.handleListener();
   },
   methods: {
@@ -1333,6 +1337,18 @@ export default {
      * @date 2024年9月7日
      **/
     handlerClickMenu(res) {
+      if (this.recordApp) {
+        util
+          .ajax({
+            url: recordUserApp,
+            params: {
+              userId: this.user.userId,
+              appId: res.id
+            }
+          })
+          .then(() => {})
+          .catch(() => {});
+      }
       this.showMsg = false;
       this.showSet = false;
       let i = util.indexOfObj(this.tabs, res, 'id');
@@ -1655,123 +1671,6 @@ export default {
         clearTimeout(this.sysMsgOut);
       }
     },
-    handleReLogin(res) {
-      if (res && typeof res == 'string') {
-        res = JSON.parse(res);
-      }
-      let msg = '提示';
-      let btn = {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        closeOnClickModal: false,
-        type: 'warning'
-      };
-      if (res) {
-        if (res.rCode === 69) {
-          msg = '该账号在其他地方已登陆!';
-          btn = {
-            confirmButtonText: '确定',
-            closeOnClickModal: false,
-            type: 'warning'
-          };
-        } else {
-          msg = '登录已过期，请重新登录！';
-        }
-      }
-      cl;
-      let remind = sessionStorage.getItem('remind');
-      if (!remind) {
-        clearTimeout(this.timer);
-        this.timer = setTimeout(() => {
-          sessionStorage.setItem('remind', 1);
-          this.$confirm(msg, btn)
-            .then(() => {
-              util.removeStorage([
-                'Authorization',
-                'token',
-                'ssId',
-                'userId',
-                'userName',
-                'auth',
-                'deviceUnique',
-                'menus',
-                'useCaseCodes',
-                'mainConfig',
-                'jump'
-              ]);
-              const loginPage =
-                util.getStorage('login') || util.getStorage('loginPage');
-              try {
-                if (loginPage) {
-                  let src;
-                  if (!util.startWith(loginPage, ['http', '/'], true)) {
-                    let pathname = util.win.top.location.pathname;
-                    if (pathname !== '/') {
-                      pathname = pathname.split('/');
-                      pathname.splice(pathname.length - 1);
-                      pathname = pathname.join('/');
-                      src = pathname + '/' + loginPage.replace('./', '');
-                    } else {
-                      src = pathname + loginPage.replace('./', '');
-                    }
-                  } else {
-                    src = loginPage;
-                  }
-                  util.win.top.location.href = src;
-                } else if (
-                  util.win.top.location.href.indexOf('main.html') > -1
-                ) {
-                  util.win.top.location.href = './login.html';
-                } else {
-                  const hash = util.win.top.location.hash;
-                  if (hash) {
-                    const len = util.win.top.location.href.indexOf(hash);
-                    util.win.top.location.href =
-                      util.win.location.href.slice(0, len) + '#/login';
-                  } else {
-                    util.win.top.location.href = '/login.html';
-                  }
-                }
-              } catch (error) {
-                util.win.postMessage({ type: 1 }, '*');
-              }
-            })
-            .catch((e) => {
-              sessionStorage.removeItem('remind');
-            });
-        }, 2000);
-      }
-    },
-    openPage(url, name, width, height) {
-      let src = url;
-      if (!util.startWith(url, ['http', '/'], true)) {
-        let pathname = window.location.pathname;
-        if (pathname !== '/') {
-          pathname = pathname.split('/');
-          pathname.splice(pathname.length - 1);
-          pathname = pathname.join('/');
-        }
-        src = pathname + url.replace('./', '/');
-      }
-      if (name) {
-        let w = 0;
-        let h = 0;
-        try {
-          w = width ? width : util.win.top.screen.availWidth - 10;
-          h = height ? height : util.win.top.screen.availHeight - 60;
-        } catch (error) {
-          w = width ? width : util.win.screen.availWidth - 10;
-          h = height ? height : util.win.screen.availHeight - 60;
-        }
-        return util.win.open(
-          src,
-          name,
-          `width=${w}px,height=${h}px,resizable=yes,status=yes,menubar=no,scrollbars=yes`
-        );
-      } else {
-        return util.win.open(src);
-      }
-    },
     jumpMenu(res) {
       let apps = res;
       if (typeof res === 'string') {

package/packages/main/src/simplicity/menu-list.vue

@@ -10,7 +10,7 @@
         v-for="(item, index) in data"
         class="es-simplicity-menus-item"
         :key="item.id"
-        :class="{ 'is-fold': fold }"
+        :class="{ 'is-fold': fold, 'is-active': active == item.id }"
         :title="fold ? item.text || item.name : ''"
         @click="handleClick(item)"
         @mouseenter="handleEnter(item)"