eoss-ui 0.5.81-beta1 → 0.5.81-beta10

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

@@ -1,30 +1,36 @@
 <template>
   <div class="es-main">
     <div class="es-simplicity-side">
-      <img
-        class="es-simplicity-side-item es-simplicity-logo"
-        v-if="mainLogo"
-        :src="mainLogo"
-      />
-      <el-popover placement="right-start" width="360" trigger="click">
+      <img class="es-simplicity-logo" v-if="mainLogo" :src="mainLogo" />
+      <div class="es-simplicity-org-name">
+        {{ simpleUserInfo.orgShortName || simpleUserInfo.orgName }}
+      </div>
+      <el-popover
+        class="es-simplicity-user-popover"
+        placement="right-start"
+        width="360"
+        trigger="click"
+      >
         <!-- 用户信息 -->
         <user
           :user="user"
           :notifyList="notifyList"
           :notify="notify"
           :contents="userInfoContents"
+          @success="handleSuccess"
           @change="handleChangeConfig"
           @close="handlerClose"
         ></user>
-        <avatar slot="reference" :user="user"> </avatar>
+        <avatar slot="reference" :user="user" :size="56"> </avatar>
         <!-- 用户信息 end -->
       </el-popover>
-      <div class="es-simplicity-side-item es-simplicity-side-Application">
+      <div class="es-simplicity-side-Application">
         <!-- 常用应用 -->
         <el-scrollbar>
           <div
             class="es-simplicity-side-app"
             v-for="item in userApps"
+            :class="{ 'is-active': active == item.id }"
             :key="item.id"
             :title="item.text || item.name"
             @click="handlerClickApp(item)"
@@ -50,6 +56,30 @@
             ></es-icon>
             <div class="es-simplicity-side-app-text">更多</div>
           </div>
+          <div
+            class="es-simplicity-side-app"
+            v-for="(item, index) in newApps"
+            :class="{ 'is-active': active == item.id }"
+            :key="item.id"
+            :title="item.text || item.name"
+          >
+            <i
+              class="el-icon-circle-close"
+              @click.stop="handleDelete(index)"
+            ></i>
+            <el-badge
+              v-bind="getBadge(item)"
+              @click.stop="handlerClickApp(item)"
+            >
+              <es-icon
+                class="es-simplicity-side-app-icon"
+                :contents="item.icons || item.icon || menuIcon"
+              ></es-icon>
+              <div class="es-simplicity-side-app-text">
+                {{ item.text || item.name }}
+              </div>
+            </el-badge>
+          </div>
         </el-scrollbar>
         <!-- 常用应用 end -->
       </div>
@@ -71,63 +101,47 @@
     </div>
     <div class="es-simplicity-main">
       <!-- 菜单 -->
-      <el-drawer
-        class="es-simplicity-subMenus"
-        direction="ltr"
-        modal-class="es-simplicity-apps-modal"
-        :size="width"
-        :modal-append-to-body="false"
-        :with-header="false"
+      <sub-menu
         :visible.sync="showMenu"
-      >
-        <sub-menu
-          ref="subMenus"
-          :color="menuColor"
-          :backgroundColor="menuBackgroundColor"
-          :menu-icon="menuIcon"
-          v-bind="subMenus"
-          @command="handlerClickMenu"
-        ></sub-menu>
-      </el-drawer>
+        :closed.sync="fold"
+        :size="menuWidth"
+        :title="title"
+        :color="menuColor"
+        :backgroundColor="menuBackgroundColor"
+        :menu-icon="menuIcon"
+        :active="subActive"
+        v-bind="subMenus"
+        @command="handlerClickMenu"
+      ></sub-menu>
       <!-- 菜单 end -->
 
       <!-- 应用 -->
-      <el-drawer
-        class="es-simplicity-apps"
-        direction="ltr"
-        modal-class="es-simplicity-apps-modal"
-        size="90%"
-        :modal-append-to-body="false"
-        :with-header="false"
+      <apps
         :visible.sync="showApps"
-      >
-        <apps
-          :menu-icon="menuIcon"
-          :color="appColor"
-          :backgroundColor="appBackgroundColor"
-          :applications="applications"
-          :business="business"
-          :systems="systems"
-          @click="handlerClickApp"
-        ></apps>
-      </el-drawer>
+        :menu-icon="menuIcon"
+        :color="appColor"
+        :backgroundColor="appBackgroundColor"
+        :applications="applications"
+        :business="business"
+        :systems="systems"
+        @click="handlerClickApps"
+      ></apps>
       <!-- 应用 end -->
 
       <!-- AI -->
       <el-drawer
-        class="es-simplicity-subMenus"
+        class="es-simplicity-public-drawer"
         direction="ltr"
         modal-class="es-simplicity-apps-modal"
         size="100%"
         show-close
         :modal-append-to-body="false"
-        :with-header="false"
         :visible.sync="drawer.visible"
       >
-        <i
+        <!-- <i
           class="es-icon-close es-simplicity-drawer-close"
           @click="handleCloseDrawer"
-        ></i>
+        ></i> -->
         <template v-if="drawer.url">
           <template v-if="isIE || drawer.method !== 'wujie'">
             <iframe
@@ -155,7 +169,8 @@
         <el-card class="es-simplicity-tabs-handler" ref="tabsHandler">
           <div
             class="es-simplicity-tabs-handler-item"
-            @click="handleTabsEvents(0)"
+            :class="{ 'is-disabled': isDisabled.refresh }"
+            @click="isDisabled.refresh ? '' : handleTabsEvents(0)"
           >
             刷新
           </div>
@@ -190,10 +205,11 @@
       </div>
       <el-tabs
         class="es-simplicity-iframe"
+        :class="{ 'is-open': showMenu, 'is-fold': fold }"
         v-model="activeName"
         closable
         hide-bar
-        @tab-click="handleTab"
+        opacity
         @tab-remove="handleRemove"
         @tab-contextmenu="handleContextmenu"
       >
@@ -237,10 +253,11 @@
             ></es-wujie>
           </template>
           <template v-else-if="item.method === 'router' && item.refresh">
-            <router-view v-if="!isKeepAlive" :name="item.appCode" />
-            <keep-alive>
-              <router-view v-if="isKeepAlive" :name="item.appCode" />
-            </keep-alive>
+            <router-page
+              v-bind="item"
+              :show="activeName == item.id"
+              :query="$parent.params"
+            ></router-page>
           </template>
         </el-tab-pane>
       </el-tabs>
@@ -296,8 +313,10 @@ import user from './user.vue';
 import message from './message.vue';
 import notice from './notice.vue';
 import settings from './settings.vue';
+import routerPage from './router-page.vue';
 import {
   wss,
+  logout,
   topic,
   getUserAppWithTag,
   getComplexApplications,
@@ -307,14 +326,14 @@ import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
 const isIE = navigator.userAgent.indexOf('MSIE') != -1;
 let events = [
-  (tabs, index) => {
+  (tabs, index, that) => {
     let tab = tabs[index];
 
     if (tab.method == 'iframe') {
       tabs[index].url = util.handlerUrl(tab.url);
     } else {
       tabs[index].refresh = false;
-      this.$nextTick(() => {
+      that.$nextTick(() => {
         tabs[index].refresh = true;
       });
     }
@@ -357,7 +376,7 @@ let events = [
   }
 ];
 export default {
-  name: 'EsMainSimplicity',
+  name: 'Simplicity',
   components: {
     avatar,
     handler,
@@ -366,9 +385,11 @@ export default {
     user,
     message,
     notice,
-    settings
+    settings,
+    routerPage
   },
   props: {
+    appCode: String,
     //logo
     logo: String,
     //菜单、应用默认图标
@@ -446,7 +467,14 @@ export default {
     //无界微前端Props属性
     wjProps: Object,
     //无界微前端Attrs属性
-    wjAttrs: Object
+    wjAttrs: Object,
+    //菜单宽度
+    menuWidth: {
+      type: Number,
+      default: 220
+    },
+    //路由方式
+    routeType: String
   },
   data() {
     return {
@@ -458,14 +486,20 @@ export default {
       mainLogo: this.logo,
       //侧边用户应用
       userApps: [],
+      //点击应用存侧边
+      newApps: [],
       //所有菜单
       menus: [],
+      //菜单名称
+      title: '',
       //子菜单
-      subMenus: [],
+      subMenus: null,
       //展示菜单导航
       showMenu: false,
-      //展示菜单导航宽度
-      width: '296px',
+      //子菜单选中
+      subActive: '',
+      //折叠菜单
+      fold: false,
       //人工智能配置
       aiConfig: null,
       //公用窗口面板配置
@@ -522,7 +556,11 @@ export default {
       //显示页签操作
       showTabsHandler: false,
       //页签对象
-      pane: null
+      pane: null,
+      //选中菜单
+      active: '',
+      //单位名称
+      simpleUserInfo: {}
     };
   },
   computed: {
@@ -594,6 +632,7 @@ export default {
     util.win.refresh = this.handleRefresh;
     util.win.jumpMenu = this.jumpMenu;
     util.win.windowOpen = this.openPage;
+    this.handleListener();
   },
   methods: {
     /**
@@ -601,13 +640,13 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    hasRouter(res, url, code, parentName) {
+    hasRouter(res, url, code) {
       if (!url) {
         return false;
       }
       if (Array.isArray(res)) {
         for (let i in res) {
-          let path = this.hasRouter(res[i], url, code, parentName);
+          let path = this.hasRouter(res[i], url, code);
           if (path) {
             return path;
           }
@@ -620,20 +659,20 @@ export default {
         let pathname = url.substring(url.indexOf('#/') + 1);
         pathname = pathname.split('?')[0];
         if (res.path !== '/' && pathname == path) {
-          if (typeof res.component === 'function') {
-            let component = {};
-            component[code] = res.component;
-            res.component = component;
-            if (parentName) {
-              this.$router.addRoute({ parentName, route: res });
-            } else {
-              this.$router.addRoute(res);
+          if (res.components) {
+            if (!res.components[code]) {
+              console.error('“命名视图”规范属性名称与菜单appCode不一致', res);
             }
+          } else {
+            console.error(
+              '请根据“命名视图”规范，正确添加components属性名称',
+              res
+            );
           }
           return pathname;
         }
         if (res && Object.prototype.hasOwnProperty.call(res, 'children')) {
-          let path = this.hasRouter(res.children, url, code, parentName);
+          let path = this.hasRouter(res.children, url, code);
           if (path) {
             return path;
           }
@@ -650,7 +689,6 @@ export default {
       this.setConfig(results);
       if (this.remote) {
         this.getApplications();
-        this.getMenus();
       }
     },
     /**
@@ -770,6 +808,7 @@ export default {
      * @date 2024年9月7日
      **/
     getApplications() {
+      let loading = util.loading('', '加载中...');
       util
         .ajax({
           url: this.appsUrl,
@@ -793,12 +832,15 @@ export default {
             } else {
               this.$message.error('未分配应用菜单权限，请联系管理员！');
             }
+            this.getMenus(loading);
           } else {
+            loading.close();
             let msg = res.msg || '系统错误，请联系管理员！';
             this.$message.error(msg);
           }
         })
         .catch((err) => {
+          loading.close();
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -809,41 +851,106 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    getMenus(appCode, url) {
-      let params = appCode ? { menuCode: appCode } : {};
+    getMenus(loading) {
       util
-        .ajax({ url: url || this._menuUrl, params: params })
+        .ajax({ url: this._menuUrl })
         .then((res) => {
+          loading.close();
           if (res.rCode === 0) {
             if (res.results && res.results.length) {
               this.menus = res.results;
               this.setTips(this.menus);
               store.set('nav', this.menus);
-              if (this.indexUrl) {
-                let obj = this.getMenu(this.menus, this.indexUrl);
-                if (obj) {
-                  this.tabs = [this.setIframeType(obj)];
-                  this.activeName = obj.id;
-                  this.homePage = obj;
-                } else {
-                  this.homePage = this.setIframeType({
-                    url: this.indexUrl,
-                    text: '工作台',
-                    id: '0',
-                    appCode: 'indexUrl'
-                  });
-                  this.tabs = [this.homePage];
-                  this.activeName = '0';
+              if (this.appCode) {
+                let app = this.userApps.filter((item) => {
+                  return item.code === this.appCode;
+                })[0];
+                if (app) {
+                  this.active = app.id;
+                  if (app.url) {
+                    let obj = this.getMenu(this.menus, app.url);
+                    if (obj) {
+                      let tab = this.setIframeType(obj);
+                      this.tabs = [tab];
+                      this.activeName = tab.id;
+                    } else {
+                      this.tabs = [app];
+                    }
+                  }
                 }
-              }
-              if (this.initApps && this.initApps.length) {
-                let obj = this.getMenu(
+                let subMenus = this.getMenu(
                   this.menus,
-                  this.initApps[this.initApps.length - 1]
+                  this.appCode,
+                  'appCode'
                 );
-                if (obj) {
-                  this.tabs.push(this.setIframeType(obj));
-                  this.activeName = obj.id;
+                if (subMenus) {
+                  if (this.tabs.length == 0) {
+                    let obj = this.getFirst(subMenus);
+                    if (obj) {
+                      this.subActive = obj.id;
+                      let tab = this.setIframeType(obj);
+                      this.tabs = [tab];
+                      this.activeName = tab.id;
+                    } else {
+                      this.subActive = '';
+                    }
+                  }
+                  this.subMenus = subMenus;
+                  this.showMenu = true;
+                } else {
+                  this.subMenus = null;
+                  this.showMenu = false;
+                }
+              } else {
+                if (this.indexUrl) {
+                  let obj = this.getMenu(this.menus, this.indexUrl);
+                  if (obj) {
+                    if (!this.appCode) {
+                      let tab = this.setIframeType(obj);
+                      this.tabs = [tab];
+                      this.activeName = tab.id;
+                    }
+                    this.homePage = obj;
+                  } else {
+                    this.homePage = this.setIframeType({
+                      url: this.indexUrl,
+                      text: '工作台',
+                      id: '0',
+                      appCode: 'indexUrl'
+                    });
+                    if (!this.appCode) {
+                      this.tabs = [this.homePage];
+                      this.activeName = '0';
+                      // if (this.homePage.method == 'router') {
+                      //   let params = util.getParams({ url: this.homePage.url });
+                      //   this.$router.push({
+                      //     path: this.homePage.path,
+                      //     query: { ...this.$parent.params, ...params }
+                      //   });
+                      // }
+                    }
+                  }
+                } else if (
+                  this.initApps &&
+                  this.initApps.length &&
+                  !this.appCode
+                ) {
+                  let obj = this.getMenu(
+                    this.menus,
+                    this.initApps[this.initApps.length - 1]
+                  );
+                  if (obj) {
+                    let tab = this.setIframeType(obj);
+                    this.tabs.push(tab);
+                    this.activeName = tab.id;
+                    // if (tab.method == 'router') {
+                    //   let params = util.getParams({ url: tab.url });
+                    //   this.$router.push({
+                    //     path: tab.path,
+                    //     query: { ...this.$parent.params, ...params }
+                    //   });
+                    // }
+                  }
                 }
               }
             } else {
@@ -855,19 +962,22 @@ export default {
           }
         })
         .catch((err) => {
+          loading.close();
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
         });
     },
+    /**
+     * @desc:设置页面加载类型
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
     setIframeType(res) {
       let { url } = res;
       let urls = url.split('?');
       if (urls[0].indexOf('.js') > 1 && !isIE) {
         res.method = 'wujie';
-        this.$nextTick(() => {
-          res.refresh = true;
-        });
       } else if (
         urls[0].indexOf('.dhtml') > 0 ||
         (urls[0].indexOf('.html') > 0 && urls[0].indexOf('.html#') === -1)
@@ -880,15 +990,9 @@ export default {
           const routes = this.$router.options.routes;
           if (routes) {
             let path = this.hasRouter(routes, urls[0], res.appCode);
-            if (path) {
-              let params = util.getParams({ url: url });
-              this.$router.push({
-                path: path,
-                query: params
-              });
-              this.$nextTick(() => {
-                res.refresh = true;
-              });
+            if (path && this.routeType !== 'wujie') {
+              res.method = 'router';
+              res.path = path;
             } else {
               let urlopenmode = util.getParams({
                 url: url,
@@ -903,9 +1007,6 @@ export default {
                 res.method = 'iframe';
               } else {
                 res.method = 'wujie';
-                this.$nextTick(() => {
-                  res.refresh = true;
-                });
               }
             }
           } else if (
@@ -913,14 +1014,12 @@ export default {
             urls[0].indexOf('/#/') > -1
           ) {
             res.method = 'wujie';
-            this.$nextTick(() => {
-              res.refresh = true;
-            });
           } else {
             res.method = 'iframe';
           }
         }
       }
+      res.refresh = true;
       return res;
     },
     /**
@@ -960,6 +1059,37 @@ export default {
       }
       return false;
     },
+    /**
+     * @desc:获取菜单第一条数据
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    getFirst(obj) {
+      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 && obj.children[openIdex]) {
+        return this.getFirst(obj.children[openIdex]);
+      } else if (
+        obj.fourthTabs &&
+        obj.fourthTabs.length &&
+        obj.fourthTabs[openIdex]
+      ) {
+        return this.getFirst(obj.fourthTabs[openIdex]);
+      } else if (obj.url) {
+        return obj;
+      }
+    },
     /**
      * @desc:遍历设置菜单气泡提醒
      * @author huangbo
@@ -979,31 +1109,30 @@ export default {
           this.$set(obj, 'tips', false);
           delete obj.tips;
         }
-        let flag = false;
+        let flag = 0;
         if (obj.children && obj.children.length) {
           obj.children.forEach((item) => {
-            if (this.setTips(item)) {
-              flag = true;
-            }
+            let n = this.setTips(item);
+            flag += n ? parseInt(n) : 0;
           });
           if (flag) {
-            this.$set(obj, 'tips', true);
-            return true;
+            this.$set(obj, 'tips', flag);
+            return flag;
           }
         } else if (obj.fourthTabs && obj.fourthTabs.length) {
           obj.fourthTabs.forEach((item) => {
-            if (this.setTips(item)) {
-              flag = true;
-            }
+            let n = this.setTips(item);
+            flag += n ? parseInt(n) : 0;
           });
           if (flag) {
-            this.$set(obj, 'tips', true);
-            return true;
+            this.$set(obj, 'tips', flag);
+            return flag;
           }
         } else {
-          if (this.menuTips[obj.id] && Number(this.menuTips[obj.id])) {
-            this.$set(obj, 'tips', Number(this.menuTips[obj.id]));
-            return true;
+          let num = this.menuTips[obj.id] || this.menuTips[obj.code];
+          if (num && Number(num)) {
+            this.$set(obj, 'tips', Number(num));
+            return this.menuTips[obj.id];
           }
         }
       }
@@ -1074,12 +1203,35 @@ export default {
         }
       });
     },
+    /**
+     * @desc:删除更多应用菜单点击
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    handleDelete(index) {
+      this.newApps.splice(index, 1);
+    },
+    /**
+     * @desc:储存更多应用菜单点击
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    handlerClickApps(res) {
+      let i = util.indexOfObj(this.newApps, res, 'id');
+      if (i == -1) {
+        this.newApps.push(res);
+      }
+      this.handlerClickApp(res);
+    },
     /**
      * @desc:侧边应用菜单点击
      * @author huangbo
      * @date 2024年9月7日
      **/
     handlerClickApp(res) {
+      this.showMsg = false;
+      this.showSet = false;
+      this.fold = false;
       if (res) {
         if (res.permission === false) {
           return false;
@@ -1091,33 +1243,52 @@ export default {
           this.subMenus = res;
           this.showMenu = true;
           this.showApps = false;
-          this.width = '296px';
-          this.$refs.subMenus && this.$refs.subMenus.clearSubmenu();
-        } else {
-          if (res.code) {
-            let subMenus = this.getMenu(this.menus, res.code, 'appCode');
-            this.subMenus = subMenus ? subMenus : [];
-            this.showMenu = subMenus !== false;
-            this.showApps = false;
-            this.width = '296px';
-            this.$refs.subMenus && this.$refs.subMenus.clearSubmenu();
-          }
         }
+        let set = true;
         if (res.url) {
           if (res.urlopenmode == 1 || res.openModel == 1) {
+            set = false;
             util.win.open(res.url);
           } else if (res.urlopenmode == 2 || res.openModel == 2) {
+            set = false;
             util.win.location.href = res.url;
           } else {
             let i = util.indexOfObj(this.tabs, res, 'id');
             this.activeName = res.id;
             if (i == -1) {
-              this.tabs.push(this.setIframeType(res));
+              let obj = this.getMenu(this.menus, res.url);
+              if (obj) {
+                let n = util.indexOfObj(this.tabs, obj, 'id');
+                if (n == -1) {
+                  let tab = this.setIframeType(obj);
+                  this.tabs.push(tab);
+                  this.activeName = tab.id;
+                }
+              } else {
+                let tab = this.setIframeType(res);
+                this.tabs.push(tab);
+                this.activeName = tab.id;
+              }
+            }
+          }
+        }
+        if (set && res.code) {
+          let subMenus = this.getMenu(this.menus, res.code, 'appCode');
+          this.title = res.text || res.name;
+          this.subMenus = subMenus ? subMenus : null;
+          this.showMenu = subMenus !== false;
+          this.showApps = false;
+          if (subMenus && subMenus.url) {
+            let i = util.indexOfObj(this.tabs, subMenus, 'id');
+            this.activeName = subMenus.id;
+            if (i == -1) {
+              let tab = this.setIframeType(subMenus);
+              this.tabs.push(tab);
             }
           }
         }
+        this.active = res.id;
       } else {
-        this.showMenu = false;
         this.showApps = !this.showApps;
       }
     },
@@ -1148,17 +1319,24 @@ export default {
      * @date 2024年9月7日
      **/
     handlerClickMenu(res) {
-      if (typeof res === 'number') {
-        let num = 296;
-        this.width = num * res + 'px';
-      } else {
-        let i = util.indexOfObj(this.tabs, res, 'id');
-        this.activeName = res.id;
-        if (i == -1) {
-          this.tabs.push(this.setIframeType(res));
-        }
+      this.showMsg = false;
+      this.showSet = false;
+      let i = util.indexOfObj(this.tabs, res, 'id');
+      this.activeName = res.id;
+      if (i == -1) {
+        let tab = this.setIframeType(res);
+        this.tabs.push(tab);
       }
     },
+
+    /**
+     * @desc:用户详情请求成功
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    handleSuccess(res) {
+      this.simpleUserInfo = res.simpleUserInfo;
+    },
     /**
      * @desc:修改用户配置
      * @author huangbo
@@ -1193,35 +1371,20 @@ export default {
         this.webSocket.destroy();
       }
     },
-    /**
-     * @desc:选中iframe页签刷新
-     * @author huangbo
-     * @date 2024年9月7日
-     **/
-    handleTab(res) {
-      let index;
-      if (res) {
-        index = parseInt(res.index);
-      } else {
-        index = util.indexOfObj(this.tabs, this.activeName, 'id');
-      }
-      let item = this.tabs[index];
-      if (item.method == 'iframe') {
-        item.url = util.handlerUrl(item.url);
-      } else {
-        item.refresh = false;
-        this.$nextTick(() => {
-          item.refresh = true;
-        });
-      }
-    },
     /**
      * @desc:刷新选中iframe页签
      * @author huangbo
      * @date 2024年9月7日
      **/
     handleRefresh() {
-      this.handleTab();
+      let tab = this.tabs[this.activeName];
+      if (tab.method === 'iframe') {
+        tab.url = util.handlerUrl(tab.url);
+      }
+      tab.refresh = false;
+      this.$nextTick(() => {
+        tab.refresh = true;
+      });
     },
     /**
      * @desc:删除iframe
@@ -1259,6 +1422,9 @@ export default {
       if (this.tabs.length == 1) {
         disabled.other = true;
       }
+      if (this.tabs[index].id != this.activeName) {
+        disabled.refresh = true;
+      }
       this.isDisabled = disabled;
       this.$refs.tabsHandler.$el.style.setProperty('left', `${e.x}px`);
       this.$refs.tabsHandler.$el.style.setProperty('top', `${e.y}px`);
@@ -1307,6 +1473,8 @@ export default {
             this.handleQuit();
             break;
           case 'online':
+            this.showMsg = false;
+            this.showSet = false;
             if (this.onlineUrl) {
               this.dialog = {
                 title: '查看在线人员',
@@ -1317,9 +1485,11 @@ export default {
             break;
           case 'notice':
             this.showMsg = !this.showMsg;
+            this.showSet = false;
             break;
           case 'set':
             this.showSet = !this.showSet;
+            this.showMsg = false;
             break;
           case 'home':
             if (this.homePage.id !== this.activeName) {
@@ -1328,10 +1498,14 @@ export default {
                 this.tabs.unshift(this.homePage);
               }
               this.activeName = this.homePage.id;
+              this.showMsg = false;
+              this.showSet = false;
             }
             break;
           case 'search':
             this.handlerSetDrawer(res);
+            this.showMsg = false;
+            this.showSet = false;
             break;
           case 'goView':
             util.win.open(res.path, '_blank');
@@ -1582,17 +1756,36 @@ export default {
       }
     },
     jumpMenu(res) {
-      let apps = res.split(',');
+      let apps = res;
+      if (typeof res === 'string') {
+        apps = res.split(',');
+      }
       let obj = this.getMenu(this.menus, apps[apps.length - 1]);
       if (obj) {
         let i = util.indexOfObj(this.tabs, obj, 'id');
+        let n = util.indexOfObj(this.tabs, this.activeName, 'id');
+        this.activeName = obj.id;
         if (i == -1) {
-          this.tabs.push(this.setIframeType(obj));
+          let tab = this.setIframeType(obj);
+          this.tabs.splice(n + 1, 0, tab);
         }
-        this.activeName = obj.id;
       } else {
         this.$message.error('没有此菜单！');
       }
+    },
+    //监听改变菜单
+    handleListener() {
+      util.win.addEventListener(
+        'message',
+        (e) => {
+          var msg = e.data;
+          if (msg.key == 'jump_Menu') {
+            let res = msg.data1;
+            this.jumpMenu(res);
+          }
+        },
+        false
+      );
     }
   },
   beforeDestroy() {