eoss-ui 0.5.81-beta3 → 0.5.81-beta4

package/lib/main.js

@@ -3971,8 +3971,8 @@ render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=0794c41f&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=4d97469e&scoped=true&
-var simplicityvue_type_template_id_4d97469e_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=110cff37&scoped=true&
+var simplicityvue_type_template_id_110cff37_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4160,7 +4160,7 @@ var simplicityvue_type_template_id_4d97469e_scoped_true_render = function () {
             attrs: {
               direction: "ltr",
               "modal-class": "es-simplicity-apps-modal",
-              size: _vm.width,
+              size: _vm.width + "px",
               "modal-append-to-body": false,
               "with-header": false,
               visible: _vm.showMenu,
@@ -4365,7 +4365,6 @@ var simplicityvue_type_template_id_4d97469e_scoped_true_render = function () {
             staticClass: "es-simplicity-iframe",
             attrs: { closable: "", "hide-bar": "" },
             on: {
-              "tab-click": _vm.handleTab,
               "tab-remove": _vm.handleRemove,
               "tab-contextmenu": _vm.handleContextmenu,
             },
@@ -4541,11 +4540,11 @@ var simplicityvue_type_template_id_4d97469e_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_4d97469e_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_4d97469e_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_110cff37_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_110cff37_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=4d97469e&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=110cff37&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/avatar.vue?vue&type=template&id=2597c13a&scoped=true&
 var avatarvue_type_template_id_2597c13a_scoped_true_render = function () {
@@ -7991,7 +7990,6 @@ var simplicityvue_type_script_lang_js_this = undefined;
 //
 //
 //
-//
 
 
 
@@ -8140,7 +8138,11 @@ var events = [function (tabs, index) {
     //无界微前端Props属性
     wjProps: Object,
     //无界微前端Attrs属性
-    wjAttrs: Object
+    wjAttrs: Object,
+    menuWidth: {
+      type: Number,
+      default: 220
+    }
   },
   data: function data() {
     return {
@@ -8159,7 +8161,7 @@ var events = [function (tabs, index) {
       //展示菜单导航
       showMenu: false,
       //展示菜单导航宽度
-      width: '296px',
+      width: this.menuWidth,
       //人工智能配置
       aiConfig: null,
       //公用窗口面板配置
@@ -8344,7 +8346,6 @@ var events = [function (tabs, index) {
       this.setConfig(results);
       if (this.remote) {
         this.getApplications();
-        this.getMenus();
       }
     },
 
@@ -8461,6 +8462,7 @@ var events = [function (tabs, index) {
     getApplications: function getApplications() {
       var _this2 = this;
 
+      var loading = utils_util["a" /* default */].loading('', '加载中...');
       utils_util["a" /* default */].ajax({
         url: this.appsUrl,
         defaults: true
@@ -8486,11 +8488,14 @@ var events = [function (tabs, index) {
           } else {
             _this2.$message.error('未分配应用菜单权限，请联系管理员！');
           }
+          _this2.getMenus(loading);
         } else {
+          loading.close();
           var msg = res.msg || '系统错误，请联系管理员！';
           _this2.$message.error(msg);
         }
       }).catch(function (err) {
+        loading.close();
         if (err.message && err.message !== 'canceled') {
           _this2.$message.error(err.message);
         }
@@ -8502,21 +8507,81 @@ var events = [function (tabs, index) {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    getMenus: function getMenus() {
+    getMenus: function getMenus(loading) {
       var _this3 = this;
 
       utils_util["a" /* default */].ajax({ url: this._menuUrl }).then(function (res) {
+        loading.close();
         if (res.rCode === 0) {
           if (res.results && res.results.length) {
             _this3.menus = res.results;
             _this3.setTips(_this3.menus);
             store["a" /* default */].set('nav', _this3.menus);
+            console.log(12121);
+            if (_this3.appCode) {
+              var app = _this3.userApps.filter(function (item) {
+                return item.code === _this3.appCode;
+              })[0];
+              if (app) {
+                _this3.active = app.id;
+                if (app.url) {
+                  var _obj = _this3.getMenu(_this3.menus, app.url);
+                  if (_obj) {
+                    var tab = _this3.setIframeType(_obj);
+                    _this3.tabs = [tab];
+                    _this3.activeName = tab.id;
+                    if (tab.method == 'router') {
+                      var params = utils_util["a" /* default */].getParams({ url: tab.url });
+                      _this3.$router.push({
+                        path: tab.path,
+                        query: params
+                      });
+                    }
+                  }
+                }
+              }
+              if (_this3.tabs.length == 0) {
+                var subMenus = _this3.getMenu(_this3.menus, _this3.appCode, 'appCode');
+                if (subMenus) {
+                  // this.subMenus = subMenus;
+                  // this.showMenu = true;
+                  var _obj2 = _this3.getFirst(subMenus);
+                  if (_obj2) {
+                    var _tab = _this3.setIframeType(_obj2);
+                    _this3.tabs = [_tab];
+                    _this3.activeName = _tab.id;
+                    if (_tab.method == 'router') {
+                      var _params = utils_util["a" /* default */].getParams({ url: _tab.url });
+                      _this3.$router.push({
+                        path: _tab.path,
+                        query: _params
+                      });
+                    }
+                  }
+                } else {
+                  _this3.subMenus = null;
+                  _this3.showMenu = false;
+                }
+              }
+              // this.width = this.menuWidth;
+              // this.$refs.subMenus && this.$refs.subMenus.clearSubmenu();
+            }
             if (_this3.indexUrl) {
-              var obj = _this3.getMenu(_this3.menus, _this3.indexUrl);
-              if (obj) {
-                _this3.tabs = [_this3.setIframeType(obj)];
-                _this3.activeName = obj.id;
-                _this3.homePage = obj;
+              var _obj3 = _this3.getMenu(_this3.menus, _this3.indexUrl);
+              if (_obj3) {
+                if (!_this3.appCode) {
+                  var _tab2 = _this3.setIframeType(_obj3);
+                  _this3.tabs = [_tab2];
+                  _this3.activeName = _tab2.id;
+                  if (_tab2.method == 'router') {
+                    var _params2 = utils_util["a" /* default */].getParams({ url: _tab2.url });
+                    _this3.$router.push({
+                      path: _tab2.path,
+                      query: _params2
+                    });
+                  }
+                }
+                _this3.homePage = _obj3;
               } else {
                 _this3.homePage = _this3.setIframeType({
                   url: _this3.indexUrl,
@@ -8524,25 +8589,33 @@ var events = [function (tabs, index) {
                   id: '0',
                   appCode: 'indexUrl'
                 });
-                _this3.tabs = [_this3.homePage];
-                _this3.activeName = '0';
+                if (!_this3.appCode) {
+                  _this3.tabs = [_this3.homePage];
+                  _this3.activeName = '0';
+                  if (_this3.homePage.method == 'router') {
+                    var _params3 = utils_util["a" /* default */].getParams({ url: _this3.homePage.url });
+                    _this3.$router.push({
+                      path: _this3.homePage.path,
+                      query: _params3
+                    });
+                  }
+                }
               }
-            }
-            if (_this3.initApps && _this3.initApps.length) {
-              var _obj = _this3.getMenu(_this3.menus, _this3.initApps[_this3.initApps.length - 1]);
-              if (_obj) {
-                _this3.tabs.push(_this3.setIframeType(_obj));
-                _this3.activeName = _obj.id;
+            } else if (_this3.initApps && _this3.initApps.length && !_this3.appCode) {
+              var _obj4 = _this3.getMenu(_this3.menus, _this3.initApps[_this3.initApps.length - 1]);
+              if (_obj4) {
+                var _tab3 = _this3.setIframeType(_obj4);
+                _this3.tabs.push(_tab3);
+                _this3.activeName = _tab3.id;
+                if (_tab3.method == 'router') {
+                  var _params4 = utils_util["a" /* default */].getParams({ url: _tab3.url });
+                  _this3.$router.push({
+                    path: _tab3.path,
+                    query: _params4
+                  });
+                }
               }
             }
-            if (_this3.appCode) {
-              var subMenus = _this3.getMenu(_this3.menus, res.code, 'appCode');
-              _this3.subMenus = subMenus ? subMenus : null;
-              _this3.showMenu = subMenus !== false;
-              _this3.showApps = false;
-              _this3.width = '296px';
-              _this3.$refs.subMenus && _this3.$refs.subMenus.clearSubmenu();
-            }
           } else {
             _this3.$message.error('未分配菜单权限，请联系管理员！');
           }
@@ -8551,6 +8624,7 @@ var events = [function (tabs, index) {
           _this3.$message.error(msg);
         }
       }).catch(function (err) {
+        loading.close();
         if (err.message && err.message !== 'canceled') {
           _this3.$message.error(err.message);
         }
@@ -8568,9 +8642,6 @@ var events = [function (tabs, index) {
       var urls = url.split('?');
       if (urls[0].indexOf('.js') > 1 && !isIE) {
         res.method = 'wujie';
-        this.$nextTick(function () {
-          res.refresh = true;
-        });
       } else if (urls[0].indexOf('.dhtml') > 0 || urls[0].indexOf('.html') > 0 && urls[0].indexOf('.html#') === -1) {
         res.method = 'iframe';
       } else {
@@ -8582,14 +8653,7 @@ var events = [function (tabs, index) {
             var path = this.hasRouter(routes, urls[0], res.appCode);
             if (path) {
               res.method = 'router';
-              var params = utils_util["a" /* default */].getParams({ url: url });
-              this.$router.push({
-                path: path,
-                query: params
-              });
-              this.$nextTick(function () {
-                res.refresh = true;
-              });
+              res.path = path;
             } else {
               var urlopenmode = utils_util["a" /* default */].getParams({
                 url: url,
@@ -8599,21 +8663,16 @@ var events = [function (tabs, index) {
                 res.method = 'iframe';
               } else {
                 res.method = 'wujie';
-                this.$nextTick(function () {
-                  res.refresh = true;
-                });
               }
             }
           } else if (urls[0].indexOf('.html') > -1 && urls[0].indexOf('#/') > -1 || urls[0].indexOf('/#/') > -1) {
             res.method = 'wujie';
-            this.$nextTick(function () {
-              res.refresh = true;
-            });
           } else {
             res.method = 'iframe';
           }
         }
       }
+      res.refresh = true;
       return res;
     },
 
@@ -8634,14 +8693,14 @@ var events = [function (tabs, index) {
             return item;
           }
           if (Object.prototype.hasOwnProperty.call(item, 'children') && item.children.length) {
-            var obj = this.getMenu(item.children, res, key);
-            if (obj) {
-              return obj;
+            var _obj5 = this.getMenu(item.children, res, key);
+            if (_obj5) {
+              return _obj5;
             }
           } else if (Object.prototype.hasOwnProperty.call(item, 'fourthTabs') && item.fourthTabs.length) {
-            var _obj2 = this.getMenu(item.fourthTabs, res, key);
-            if (_obj2) {
-              return _obj2;
+            var _obj6 = this.getMenu(item.fourthTabs, res, key);
+            if (_obj6) {
+              return _obj6;
             }
           }
         }
@@ -8649,6 +8708,28 @@ var events = [function (tabs, index) {
       return false;
     },
 
+    /**
+     * @desc:获取菜单第一条数据
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    getFirst: function getFirst(obj) {
+      if (!obj) {
+        return '';
+      }
+      var 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
@@ -8776,7 +8857,7 @@ var events = [function (tabs, index) {
           this.subMenus = res;
           this.showMenu = true;
           this.showApps = false;
-          this.width = '296px';
+          this.width = this.menuWidth;
           this.$refs.subMenus && this.$refs.subMenus.clearSubmenu();
         } else {
           var set = true;
@@ -8791,16 +8872,25 @@ var events = [function (tabs, index) {
               var i = utils_util["a" /* default */].indexOfObj(this.tabs, res, 'id');
               this.activeName = res.id;
               if (i == -1) {
-                this.tabs.push(this.setIframeType(res));
+                var tab = this.setIframeType(res);
+                this.tabs.push(obj);
+                if (tab.method == 'router') {
+                  var params = utils_util["a" /* default */].getParams({ url: tab.url });
+                  this.$router.push({
+                    path: tab.path,
+                    query: params
+                  });
+                }
               }
             }
           }
           if (set && res.code) {
             var 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();
           }
         }
@@ -8850,13 +8940,21 @@ var events = [function (tabs, index) {
      **/
     handlerClickMenu: function handlerClickMenu(res) {
       if (typeof res === 'number') {
-        var num = 296;
-        this.width = num * res + 'px';
+        var num = this.menuWidth;
+        this.width = num * res;
       } else {
         var i = utils_util["a" /* default */].indexOfObj(this.tabs, res, 'id');
         this.activeName = res.id;
         if (i == -1) {
-          this.tabs.push(this.setIframeType(res));
+          var tab = this.setIframeType(res);
+          this.tabs.push(tab);
+          if (tab.method == 'router') {
+            var params = utils_util["a" /* default */].getParams({ url: tab.url });
+            this.$router.push({
+              path: tab.path,
+              query: params
+            });
+          }
         }
         this.showMenu = false;
       }
@@ -8892,29 +8990,6 @@ var events = [function (tabs, index) {
       }
     },
 
-    /**
-     * @desc:选中iframe页签刷新
-     * @author huangbo
-     * @date 2024年9月7日
-     **/
-    handleTab: function handleTab(res) {
-      var index = void 0;
-      if (res) {
-        index = parseInt(res.index);
-      } else {
-        index = utils_util["a" /* default */].indexOfObj(this.tabs, this.activeName, 'id');
-      }
-      var item = this.tabs[index];
-      if (item.method == 'iframe') {
-        item.url = utils_util["a" /* default */].handlerUrl(item.url);
-      } else {
-        item.refresh = false;
-        this.$nextTick(function () {
-          item.refresh = true;
-        });
-      }
-    },
-
     /**
      * @desc:刷新选中iframe页签
      * @author huangbo
@@ -9261,10 +9336,19 @@ var events = [function (tabs, index) {
       var obj = this.getMenu(this.menus, apps[apps.length - 1]);
       if (obj) {
         var i = utils_util["a" /* default */].indexOfObj(this.tabs, obj, 'id');
+        var n = utils_util["a" /* default */].indexOfObj(this.tabs, this.activeName, 'id');
+        this.activeName = obj.id;
         if (i == -1) {
-          this.tabs.push(this.setIframeType(obj));
+          var tab = this.setIframeType(obj);
+          this.tabs.splice(n + 1, 0, tab);
+          if (tab.method == 'router') {
+            var params = utils_util["a" /* default */].getParams({ url: tab.url });
+            this.$router.push({
+              path: tab.path,
+              query: params
+            });
+          }
         }
-        this.activeName = obj.id;
       } else {
         this.$message.error('没有此菜单！');
       }
@@ -9357,11 +9441,11 @@ var events = [function (tabs, index) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_4d97469e_scoped_true_render,
-  simplicityvue_type_template_id_4d97469e_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_110cff37_scoped_true_render,
+  simplicityvue_type_template_id_110cff37_scoped_true_staticRenderFns,
   false,
   null,
-  "4d97469e",
+  "110cff37",
   null
   
 )