eoss-ui 0.5.81-beta3 → 0.5.81-beta4

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

@@ -78,7 +78,7 @@
         class="es-simplicity-subMenus"
         direction="ltr"
         modal-class="es-simplicity-apps-modal"
-        :size="width"
+        :size="width + 'px'"
         :modal-append-to-body="false"
         :with-header="false"
         :visible.sync="showMenu"
@@ -195,7 +195,6 @@
         v-model="activeName"
         closable
         hide-bar
-        @tab-click="handleTab"
         @tab-remove="handleRemove"
         @tab-contextmenu="handleContextmenu"
       >
@@ -455,7 +454,11 @@ export default {
     //无界微前端Props属性
     wjProps: Object,
     //无界微前端Attrs属性
-    wjAttrs: Object
+    wjAttrs: Object,
+    menuWidth: {
+      type: Number,
+      default: 220
+    }
   },
   data() {
     return {
@@ -474,7 +477,7 @@ export default {
       //展示菜单导航
       showMenu: false,
       //展示菜单导航宽度
-      width: '296px',
+      width: this.menuWidth,
       //人工智能配置
       aiConfig: null,
       //公用窗口面板配置
@@ -664,7 +667,6 @@ export default {
       this.setConfig(results);
       if (this.remote) {
         this.getApplications();
-        this.getMenus();
       }
     },
     /**
@@ -784,6 +786,7 @@ export default {
      * @date 2024年9月7日
      **/
     getApplications() {
+      let loading = util.loading('', '加载中...');
       util
         .ajax({
           url: this.appsUrl,
@@ -807,12 +810,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 +829,84 @@ 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);
+              console.log(12121);
+              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: 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: 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: params
+                      });
+                    }
+                  }
                   this.homePage = obj;
                 } else {
                   this.homePage = this.setIframeType({
@@ -845,28 +915,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: 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: 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 +958,7 @@ export default {
           }
         })
         .catch((err) => {
+          loading.close();
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -891,9 +974,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)
@@ -908,14 +988,7 @@ export default {
             let path = this.hasRouter(routes, urls[0], res.appCode);
             if (path) {
               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 +1003,6 @@ export default {
                 res.method = 'iframe';
               } else {
                 res.method = 'wujie';
-                this.$nextTick(() => {
-                  res.refresh = true;
-                });
               }
             }
           } else if (
@@ -940,14 +1010,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 +1055,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
@@ -1116,7 +1215,7 @@ export default {
           this.subMenus = res;
           this.showMenu = true;
           this.showApps = false;
-          this.width = '296px';
+          this.width = this.menuWidth;
           this.$refs.subMenus && this.$refs.subMenus.clearSubmenu();
         } else {
           let set = true;
@@ -1131,16 +1230,25 @@ 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(obj);
+                if (tab.method == 'router') {
+                  let params = util.getParams({ url: tab.url });
+                  this.$router.push({
+                    path: tab.path,
+                    query: params
+                  });
+                }
               }
             }
           }
           if (set && res.code) {
             let subMenus = this.getMenu(this.menus, res.code, 'appCode');
+            console.log(subMenus);
             this.subMenus = subMenus ? subMenus : null;
             this.showMenu = subMenus !== false;
             this.showApps = false;
-            this.width = '296px';
+            this.width = this.menuWidth;
             this.$refs.subMenus && this.$refs.subMenus.clearSubmenu();
           }
         }
@@ -1186,13 +1294,21 @@ export default {
      **/
     handlerClickMenu(res) {
       if (typeof res === 'number') {
-        let num = 296;
-        this.width = num * res + 'px';
+        let num = this.menuWidth;
+        this.width = num * res;
       } else {
         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 (tab.method == 'router') {
+            let params = util.getParams({ url: tab.url });
+            this.$router.push({
+              path: tab.path,
+              query: params
+            });
+          }
         }
         this.showMenu = false;
       }
@@ -1231,28 +1347,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
@@ -1624,10 +1718,19 @@ export default {
       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);
+          if (tab.method == 'router') {
+            let params = util.getParams({ url: tab.url });
+            this.$router.push({
+              path: tab.path,
+              query: params
+            });
+          }
         }
-        this.activeName = obj.id;
       } else {
         this.$message.error('没有此菜单！');
       }