eoss-ui 0.5.81-beta3 → 0.5.81-beta5

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

@@ -74,46 +74,31 @@
     </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
+        ref="subMenus"
         :visible.sync="showMenu"
-      >
-        <sub-menu
-          ref="subMenus"
-          :color="menuColor"
-          :backgroundColor="menuBackgroundColor"
-          :menu-icon="menuIcon"
-          v-bind="subMenus"
-          @command="handlerClickMenu"
-        ></sub-menu>
-      </el-drawer>
+        :fold.sync="fold"
+        :size="menuWidth"
+        :title="title"
+        :color="menuColor"
+        :backgroundColor="menuBackgroundColor"
+        :menu-icon="menuIcon"
+        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="handlerClickApp"
+      ></apps>
       <!-- 应用 end -->
 
       <!-- AI -->
@@ -157,7 +142,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>
@@ -192,10 +178,10 @@
       </div>
       <el-tabs
         class="es-simplicity-iframe"
+        :class="{ 'is-open': showMenu, 'is-fold': fold }"
         v-model="activeName"
         closable
         hide-bar
-        @tab-click="handleTab"
         @tab-remove="handleRemove"
         @tab-contextmenu="handleContextmenu"
       >
@@ -211,14 +197,6 @@
           :notice-num="notice"
           @click="handleClick"
         ></handler>
-        <div
-          class="es-simplicity-unfold"
-          ref="box"
-          v-show="!showMenu && subMenus"
-          @click="handleShowMenus"
-        >
-          <i class="el-icon-s-unfold" ref="area"></i>
-        </div>
         <el-tab-pane
           v-for="item in tabs"
           :key="item.id"
@@ -247,7 +225,11 @@
             ></es-wujie>
           </template>
           <template v-else-if="item.method === 'router' && item.refresh">
-            <router-view :name="item.appCode" />
+            <router-page
+              v-bind="item"
+              :show="activeName == item.id"
+              :query="$parent.params"
+            ></router-page>
           </template>
         </el-tab-pane>
       </el-tabs>
@@ -303,6 +285,7 @@ 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,
@@ -315,14 +298,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;
       });
     }
@@ -365,7 +348,7 @@ let events = [
   }
 ];
 export default {
-  name: 'EsMainSimplicity',
+  name: 'Simplicity',
   components: {
     avatar,
     handler,
@@ -374,7 +357,8 @@ export default {
     user,
     message,
     notice,
-    settings
+    settings,
+    routerPage
   },
   props: {
     appCode: String,
@@ -455,7 +439,14 @@ export default {
     //无界微前端Props属性
     wjProps: Object,
     //无界微前端Attrs属性
-    wjAttrs: Object
+    wjAttrs: Object,
+    //菜单宽度
+    menuWidth: {
+      type: Number,
+      default: 220
+    },
+    //路由方式
+    routeType: String
   },
   data() {
     return {
@@ -469,12 +460,14 @@ export default {
       userApps: [],
       //所有菜单
       menus: [],
+      //菜单名称
+      title: '',
       //子菜单
       subMenus: null,
       //展示菜单导航
       showMenu: false,
-      //展示菜单导航宽度
-      width: '296px',
+      //折叠菜单
+      fold: false,
       //人工智能配置
       aiConfig: null,
       //公用窗口面板配置
@@ -607,7 +600,7 @@ export default {
     util.win.refresh = this.handleRefresh;
     util.win.jumpMenu = this.jumpMenu;
     util.win.windowOpen = this.openPage;
-    this.move();
+    this.handleListener();
   },
   methods: {
     /**
@@ -615,13 +608,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;
           }
@@ -647,7 +640,7 @@ export default {
           return pathname;
         }
         if (res && Object.prototype.hasOwnProperty.call(res, 'children')) {
-          let path = this.hasRouter(res.children, url, code, res.name);
+          let path = this.hasRouter(res.children, url, code);
           if (path) {
             return path;
           }
@@ -664,7 +657,6 @@ export default {
       this.setConfig(results);
       if (this.remote) {
         this.getApplications();
-        this.getMenus();
       }
     },
     /**
@@ -784,6 +776,7 @@ export default {
      * @date 2024年9月7日
      **/
     getApplications() {
+      let loading = util.loading('', '加载中...');
       util
         .ajax({
           url: this.appsUrl,
@@ -807,12 +800,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);
           }
@@ -823,20 +819,83 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    getMenus() {
+    getMenus(loading) {
       util
         .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.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;
+                      // if (tab.method == 'router') {
+                      //   let params = util.getParams({ url: tab.url });
+                      //   this.$router.push({
+                      //     path: tab.path,
+                      //     query: { ...this.$parent.params, ...params }
+                      //   });
+                      // }
+                    }
+                  }
+                }
+                if (this.tabs.length == 0) {
+                  let subMenus = this.getMenu(
+                    this.menus,
+                    this.appCode,
+                    'appCode'
+                  );
+                  if (subMenus) {
+                    // this.subMenus = subMenus;
+                    // this.showMenu = true;
+                    let obj = this.getFirst(subMenus);
+                    if (obj) {
+                      let tab = this.setIframeType(obj);
+                      this.tabs = [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 {
+                    this.subMenus = null;
+                    this.showMenu = false;
+                  }
+                }
+                // this.width = this.menuWidth;
+                // this.$refs.subMenus && this.$refs.subMenus.clearSubmenu();
+              }
               if (this.indexUrl) {
                 let obj = this.getMenu(this.menus, this.indexUrl);
                 if (obj) {
-                  this.tabs = [this.setIframeType(obj)];
-                  this.activeName = obj.id;
+                  if (!this.appCode) {
+                    let tab = this.setIframeType(obj);
+                    this.tabs = [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 }
+                    //   });
+                    // }
+                  }
                   this.homePage = obj;
                 } else {
                   this.homePage = this.setIframeType({
@@ -845,28 +904,40 @@ export default {
                     id: '0',
                     appCode: 'indexUrl'
                   });
-                  this.tabs = [this.homePage];
-                  this.activeName = '0';
+                  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 }
+                    //   });
+                    // }
+                  }
                 }
-              }
-              if (this.initApps && this.initApps.length) {
+              } else if (
+                this.initApps &&
+                this.initApps.length &&
+                !this.appCode
+              ) {
                 let obj = this.getMenu(
                   this.menus,
                   this.initApps[this.initApps.length - 1]
                 );
                 if (obj) {
-                  this.tabs.push(this.setIframeType(obj));
-                  this.activeName = obj.id;
+                  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 }
+                  //   });
+                  // }
                 }
               }
-              if (this.appCode) {
-                let subMenus = this.getMenu(this.menus, res.code, 'appCode');
-                this.subMenus = subMenus ? subMenus : null;
-                this.showMenu = subMenus !== false;
-                this.showApps = false;
-                this.width = '296px';
-                this.$refs.subMenus && this.$refs.subMenus.clearSubmenu();
-              }
             } else {
               this.$message.error('未分配菜单权限，请联系管理员！');
             }
@@ -876,6 +947,7 @@ export default {
           }
         })
         .catch((err) => {
+          loading.close();
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -891,9 +963,6 @@ export default {
       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)
@@ -906,16 +975,9 @@ export default {
           const routes = this.$router.options.routes;
           if (routes) {
             let path = this.hasRouter(routes, urls[0], res.appCode);
-            if (path) {
+            if (path && this.routeType !== 'wujie') {
               res.method = 'router';
-              let params = util.getParams({ url: url });
-              this.$router.push({
-                path: path,
-                query: params
-              });
-              this.$nextTick(() => {
-                res.refresh = true;
-              });
+              res.path = path;
             } else {
               let urlopenmode = util.getParams({
                 url: url,
@@ -930,9 +992,6 @@ export default {
                 res.method = 'iframe';
               } else {
                 res.method = 'wujie';
-                this.$nextTick(() => {
-                  res.refresh = true;
-                });
               }
             }
           } else if (
@@ -940,14 +999,12 @@ export default {
             urls[0].indexOf('/#/') > -1
           ) {
             res.method = 'wujie';
-            this.$nextTick(() => {
-              res.refresh = true;
-            });
           } else {
             res.method = 'iframe';
           }
         }
       }
+      res.refresh = true;
       return res;
     },
     /**
@@ -987,6 +1044,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
@@ -1105,6 +1193,8 @@ export default {
      * @date 2024年9月7日
      **/
     handlerClickApp(res) {
+      this.showMsg = false;
+      this.showSet = false;
       if (res) {
         if (res.permission === false) {
           return false;
@@ -1116,8 +1206,6 @@ export default {
           this.subMenus = res;
           this.showMenu = true;
           this.showApps = false;
-          this.width = '296px';
-          this.$refs.subMenus && this.$refs.subMenus.clearSubmenu();
         } else {
           let set = true;
           if (res.url) {
@@ -1131,17 +1219,17 @@ export default {
               let i = util.indexOfObj(this.tabs, res, 'id');
               this.activeName = res.id;
               if (i == -1) {
-                this.tabs.push(this.setIframeType(res));
+                let tab = this.setIframeType(res);
+                this.tabs.push(tab);
               }
             }
           }
           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;
-            this.width = '296px';
-            this.$refs.subMenus && this.$refs.subMenus.clearSubmenu();
           }
         }
         this.active = res.id;
@@ -1150,14 +1238,6 @@ export default {
         this.showApps = !this.showApps;
       }
     },
-    /**
-     * @desc:显示菜单界面
-     * @author huangbo
-     * @date 2024年9月7日
-     **/
-    handleShowMenus() {
-      this.showMenu = true;
-    },
     /**
      * @desc:显示Drawer界面
      * @author huangbo
@@ -1185,16 +1265,13 @@ 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.showMenu = false;
+      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);
       }
     },
     /**
@@ -1231,28 +1308,6 @@ 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
@@ -1297,6 +1352,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`);
@@ -1345,6 +1403,8 @@ export default {
             this.handleQuit();
             break;
           case 'online':
+            this.showMsg = false;
+            this.showSet = false;
             if (this.onlineUrl) {
               this.dialog = {
                 title: '查看在线人员',
@@ -1355,9 +1415,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) {
@@ -1366,10 +1428,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');
@@ -1620,69 +1686,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('没有此菜单！');
       }
     },
-    //移动
-    move() {
-      let area = this.$refs.area;
-      let box = this.$refs.box;
-      let [sTime, eTime] = [0, 0];
-      area.addEventListener('mousedown', (e) => {
-        sTime = new Date().getTime();
-        let { y: downY, x: downX } = e;
-        let { height: winH, width: winW } =
-          document.body.getBoundingClientRect();
-        //防止拖动期间选中和复制网页文本
-        document.body.onselectstart = document.body.oncontextmenu = () => {
-          return false;
-        };
-        document.onmousemove = (eve) => {
-          let size = 40;
-          let { y: moveY, x: moveX } = eve;
-          let { top: boxTop, left: boxLeft } = box.getBoundingClientRect();
-          boxTop += moveY - downY;
-          boxLeft += moveX - downX;
-          boxTop >= winH - size && (boxTop = winH - size);
-          boxTop <= -size && (boxTop = -size);
-          boxLeft >= winW - size && (boxLeft = winW - size);
-          boxLeft <= -size && (boxLeft = -size);
-          if (boxTop < 60) {
-            boxTop = 60;
+    //监听改变菜单
+    handleListener() {
+      util.win.addEventListener(
+        'message',
+        (e) => {
+          var msg = e.data;
+          if (msg.key == 'jump_Menu') {
+            let res = msg.data1;
+            this.jumpMenu(res);
           }
-          if (boxLeft < 80) {
-            boxLeft = 80;
-          }
-          box.style.top = boxTop + 'px';
-          box.style.left = boxLeft + 'px';
-          downY = moveY;
-          downX = moveX;
-        };
-        document.onmouseup = () => {
-          eTime = new Date().getTime();
-          let isClick = eTime - sTime < 200;
-          if (isClick) {
-            let onArea = () => {
-              this.subMenu = [];
-              area.removeEventListener('click', onArea);
-            };
-            area.addEventListener('click', onArea);
-          }
-          document.onmousemove = null;
-          document.body.onselectstart = document.body.oncontextmenu = () => {
-            return true;
-          };
-        };
-      });
+        },
+        false
+      );
     }
   },
   beforeDestroy() {