eoss-ui 0.5.97 → 0.5.98

package/lib/main.js

@@ -2174,6 +2174,7 @@ var isLogined = function isLogined(_ref8) {
     next && next();
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
+      var loadingInstance = eoss_element__WEBPACK_IMPORTED_MODULE_5__["Loading"].service({ text: '页面加载中', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.65)' });
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -2272,7 +2273,10 @@ var isLogined = function isLogined(_ref8) {
             }
           });
         }
-      }).catch(function (e) {});
+        loadingInstance.close();
+      }).catch(function (e) {
+        loadingInstance.close();
+      });
     } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
@@ -2675,7 +2679,7 @@ var setScale = function setScale() {
   } else {
     n = 1;
   }
-  if (zoom === 1) {
+  if (zoom === 1 && window.innerWidth === width) {
     document.body.style.removeProperty('transform');
     document.body.style.removeProperty('width');
     document.body.style.removeProperty('height');
@@ -3979,7 +3983,7 @@ module.exports = require("wujie-vue2");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=c342434c&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=6f2b9926&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3989,12 +3993,19 @@ var render = function () {
         "div",
         { staticClass: "es-main-box" },
         [
-          _vm.type == "simplicity"
+          _vm.layout == "simplicity"
             ? _c(
                 "simplicity",
                 _vm._g(
                   _vm._b(
-                    { ref: "main", attrs: { appCode: _vm.appCode } },
+                    {
+                      ref: "main",
+                      attrs: {
+                        appCode: _vm.appCode,
+                        "old-version": _vm.multiple,
+                      },
+                      on: { "chang-layout": _vm.changLayout },
+                    },
                     "simplicity",
                     _vm.$attrs,
                     false
@@ -4005,7 +4016,16 @@ var render = function () {
             : _c(
                 "main-default",
                 _vm._g(
-                  _vm._b({ ref: "main" }, "main-default", _vm.$attrs, false),
+                  _vm._b(
+                    {
+                      ref: "main",
+                      attrs: { "new-version": _vm.multiple },
+                      on: { "chang-layout": _vm.changLayout },
+                    },
+                    "main-default",
+                    _vm.$attrs,
+                    false
+                  ),
                   _vm.$listeners
                 )
               ),
@@ -4055,13 +4075,13 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=c342434c&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=6f2b9926&
 
 // EXTERNAL MODULE: ./src/config/image.js
 var config_image = __webpack_require__(18);
 
-// 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=03f1f7f2&scoped=true&
-var simplicityvue_type_template_id_03f1f7f2_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=38f18b0d&scoped=true&
+var simplicityvue_type_template_id_38f18b0d_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4688,11 +4708,11 @@ var simplicityvue_type_template_id_03f1f7f2_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_03f1f7f2_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_03f1f7f2_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_38f18b0d_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_38f18b0d_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=03f1f7f2&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=38f18b0d&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=1560e8bf&scoped=true&
 var avatarvue_type_template_id_1560e8bf_scoped_true_render = function () {
@@ -4850,8 +4870,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var avatar = (component.exports);
-// 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/handler.vue?vue&type=template&id=7eac3976&scoped=true&
-var handlervue_type_template_id_7eac3976_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/handler.vue?vue&type=template&id=d8a0cc36&scoped=true&
+var handlervue_type_template_id_d8a0cc36_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4884,58 +4904,54 @@ var handlervue_type_template_id_7eac3976_scoped_true_render = function () {
       ]),
       _vm._l(_vm.lists, function (item) {
         return [
-          _vm.isShow(item.type)
-            ? [
-                item.type === "notice"
-                  ? _c(
-                      "el-badge",
-                      {
-                        key: item.type,
-                        staticClass: "es-simplicity-handler-item",
-                        attrs: {
-                          value: _vm.noticeNum,
-                          max: 99,
-                          hidden: _vm.noticeNum === 0,
-                        },
-                      },
-                      [
-                        _c("div", {
-                          staticClass: "es-simplicity-handler-icon",
-                          class: item.icon,
-                          attrs: { title: item.title },
-                          on: {
-                            click: function ($event) {
-                              _vm.handleClick(item)
-                            },
-                          },
-                        }),
-                      ]
-                    )
-                  : _c("div", {
-                      key: item.type,
-                      staticClass:
-                        "es-simplicity-handler-item es-simplicity-handler-icon",
-                      class: item.icon,
-                      attrs: { title: item.title },
-                      on: {
-                        click: function ($event) {
-                          _vm.handleClick(item)
-                        },
+          item.type === "notice"
+            ? _c(
+                "el-badge",
+                {
+                  key: item.type,
+                  staticClass: "es-simplicity-handler-item",
+                  attrs: {
+                    value: _vm.noticeNum,
+                    max: 99,
+                    hidden: _vm.noticeNum === 0,
+                  },
+                },
+                [
+                  _c("div", {
+                    staticClass: "es-simplicity-handler-icon",
+                    class: item.icon,
+                    attrs: { title: item.title },
+                    on: {
+                      click: function ($event) {
+                        _vm.handleClick(item)
                       },
-                    }),
-              ]
-            : _vm._e(),
+                    },
+                  }),
+                ]
+              )
+            : _c("div", {
+                key: item.type,
+                staticClass:
+                  "es-simplicity-handler-item es-simplicity-handler-icon",
+                class: item.icon,
+                attrs: { title: item.title },
+                on: {
+                  click: function ($event) {
+                    _vm.handleClick(item)
+                  },
+                },
+              }),
         ]
       }),
     ],
     2
   )
 }
-var handlervue_type_template_id_7eac3976_scoped_true_staticRenderFns = []
-handlervue_type_template_id_7eac3976_scoped_true_render._withStripped = true
+var handlervue_type_template_id_d8a0cc36_scoped_true_staticRenderFns = []
+handlervue_type_template_id_d8a0cc36_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/handler.vue?vue&type=template&id=7eac3976&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/handler.vue?vue&type=template&id=d8a0cc36&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/handler.vue?vue&type=script&lang=js&
 //
@@ -4983,8 +4999,6 @@ handlervue_type_template_id_7eac3976_scoped_true_render._withStripped = true
 //
 //
 //
-//
-//
 
 
 /* harmony default export */ var handlervue_type_script_lang_js_ = ({
@@ -5021,6 +5035,16 @@ handlervue_type_template_id_7eac3976_scoped_true_render._withStripped = true
         };
       }
     },
+    old: {
+      type: Object,
+      default: function _default() {
+        return {
+          type: 'old',
+          icon: 'es-icon-shiyongjiuban',
+          title: '使用旧版'
+        };
+      }
+    },
     notice: {
       type: Object,
       default: function _default() {
@@ -5055,7 +5079,9 @@ handlervue_type_template_id_7eac3976_scoped_true_render._withStripped = true
     hide: {
       type: Object,
       default: function _default() {
-        return {};
+        return {
+          old: true
+        };
       }
     },
     noticeNum: {
@@ -5079,7 +5105,7 @@ handlervue_type_template_id_7eac3976_scoped_true_render._withStripped = true
     lists: function lists() {
       var _this = this;
 
-      var data = this.data ? this.data : [this.search, this.index, this.home, this.notice, this.quit, this.set];
+      var data = this.data ? this.data : [this.search, this.index, this.home, this.old, this.notice, this.quit, this.set];
       return data.filter(function (item) {
         return !_this.hide[item.type];
       });
@@ -5107,13 +5133,6 @@ handlervue_type_template_id_7eac3976_scoped_true_render._withStripped = true
         _this2.time = util["a" /* default */].formatDate('', 'HH:mm:ss');
       });
     },
-    isShow: function isShow(res) {
-      if (Array.isArray(this.hide)) {
-        return !this.hide.includes(res);
-      } else {
-        return !this.hide[res];
-      }
-    },
     handleClick: function handleClick(res) {
       this.$emit('click', res);
     }
@@ -5134,11 +5153,11 @@ handlervue_type_template_id_7eac3976_scoped_true_render._withStripped = true
 
 var handler_component = Object(componentNormalizer["a" /* default */])(
   simplicity_handlervue_type_script_lang_js_,
-  handlervue_type_template_id_7eac3976_scoped_true_render,
-  handlervue_type_template_id_7eac3976_scoped_true_staticRenderFns,
+  handlervue_type_template_id_d8a0cc36_scoped_true_render,
+  handlervue_type_template_id_d8a0cc36_scoped_true_staticRenderFns,
   false,
   null,
-  "7eac3976",
+  "d8a0cc36",
   null
   
 )
@@ -9994,7 +10013,9 @@ var events = [function (tabs, index, that) {
       default: function _default() {
         return sessionStorage.getItem('host') || '';
       }
-    }
+    },
+    //切换旧版样式
+    oldVersion: Boolean
   },
   data: function data() {
     return {
@@ -10088,7 +10109,8 @@ var events = [function (tabs, index, that) {
       active: '',
       //单位名称
       simpleUserInfo: {},
-      topRightToolHide: ''
+      topRightToolHide: '',
+      showOld: this.oldVersion
     };
   },
 
@@ -10139,7 +10161,8 @@ var events = [function (tabs, index, that) {
       }
       var hides = {
         home: this.indexUrl ? false : true,
-        index: this.doorIndex ? false : true
+        index: this.doorIndex ? false : true,
+        old: this.showOld ? false : true
       };
 
       if (this.layout === 'subsystem' || this.application) {
@@ -10325,6 +10348,9 @@ var events = [function (tabs, index, that) {
           if (results[i].portalPage || results[i].portalpage) {
             this.doorIndex = results[i].portalPage || results[i].portalpage;
           }
+          if (results[i].multipleVersion || results[i].oldVersion) {
+            this.showOld = results[i].oldVersion ? results[i].oldVersion : true;
+          }
           if (results[i].topRightToolHide) {
             this.topRightToolHide = results[i].topRightToolHide;
           }
@@ -10410,6 +10436,20 @@ var events = [function (tabs, index, that) {
             _this2.menus = res.results;
             _this2.setTips(_this2.menus);
             store["a" /* default */].set('nav', _this2.menus);
+            if (_this2.indexUrl) {
+              var obj = _this2.getMenu(_this2.menus, _this2.indexUrl);
+              obj = obj ? obj : {
+                url: _this2.indexUrl,
+                text: '工作台',
+                id: '0',
+                appCode: 'indexUrl'
+              };
+              _this2.homePage = _this2.setIframeType(obj);
+              if (!_this2.appCode) {
+                _this2.tabs = [_this2.homePage];
+                _this2.activeName = _this2.homePage.id;
+              }
+            }
             if (_this2.appCode) {
               var code = _this2.sysCode || _this2.appCode;
               var app = _this2.userApps.filter(function (item) {
@@ -10418,9 +10458,9 @@ var events = [function (tabs, index, that) {
               if (app) {
                 _this2.active = app.id;
                 if (app.url) {
-                  var obj = _this2.getMenu(_this2.menus, app.url);
-                  if (obj) {
-                    var tab = _this2.setIframeType(obj);
+                  var _obj = _this2.getMenu(_this2.menus, app.url);
+                  if (_obj) {
+                    var tab = _this2.setIframeType(_obj);
                     _this2.tabs = [tab];
                     _this2.activeName = tab.id;
                   } else {
@@ -10431,13 +10471,13 @@ var events = [function (tabs, index, that) {
               if (_this2.sysCode) {
                 var subMenus = _this2.getMenu(_this2.menus, _this2.sysCode, 'appCode');
                 if (subMenus) {
-                  var _obj = _this2.getMenu(_this2.menus, _this2.appCode, 'appCode');
-                  if (_obj) {
-                    if (!_obj.url) {
-                      _obj = _this2.getFirst(_obj);
+                  var _obj2 = _this2.getMenu(_this2.menus, _this2.appCode, 'appCode');
+                  if (_obj2) {
+                    if (!_obj2.url) {
+                      _obj2 = _this2.getFirst(_obj2);
                     }
-                    _this2.subActive = _obj.id;
-                    var _tab = _this2.setIframeType(_obj);
+                    _this2.subActive = _obj2.id;
+                    var _tab = _this2.setIframeType(_obj2);
                     _this2.tabs = [_tab];
                     _this2.activeName = _tab.id;
                   } else {
@@ -10453,10 +10493,10 @@ var events = [function (tabs, index, that) {
                 var _subMenus = _this2.getMenu(_this2.menus, _this2.appCode, 'appCode');
                 if (_subMenus) {
                   if (_this2.tabs.length == 0) {
-                    var _obj2 = _this2.getFirst(_subMenus);
-                    if (_obj2) {
-                      _this2.subActive = _obj2.id;
-                      var _tab2 = _this2.setIframeType(_obj2);
+                    var _obj3 = _this2.getFirst(_subMenus);
+                    if (_obj3) {
+                      _this2.subActive = _obj3.id;
+                      var _tab2 = _this2.setIframeType(_obj3);
                       _this2.tabs = [_tab2];
                       _this2.activeName = _tab2.id;
                     } else {
@@ -10470,35 +10510,12 @@ var events = [function (tabs, index, that) {
                   _this2.showMenu = false;
                 }
               }
-            } else {
-              if (_this2.indexUrl) {
-                var _obj3 = _this2.getMenu(_this2.menus, _this2.indexUrl);
-                if (_obj3) {
-                  if (!_this2.appCode) {
-                    var _tab3 = _this2.setIframeType(_obj3);
-                    _this2.tabs = [_tab3];
-                    _this2.activeName = _tab3.id;
-                  }
-                  _this2.homePage = _obj3;
-                } else {
-                  _this2.homePage = _this2.setIframeType({
-                    url: _this2.indexUrl,
-                    text: '工作台',
-                    id: '0',
-                    appCode: 'indexUrl'
-                  });
-                  if (!_this2.appCode) {
-                    _this2.tabs = [_this2.homePage];
-                    _this2.activeName = '0';
-                  }
-                }
-              } else if (_this2.initApps && _this2.initApps.length && !_this2.appCode) {
-                var _obj4 = _this2.getMenu(_this2.menus, _this2.initApps[_this2.initApps.length - 1]);
-                if (_obj4) {
-                  var _tab4 = _this2.setIframeType(_obj4);
-                  _this2.tabs.push(_tab4);
-                  _this2.activeName = _tab4.id;
-                }
+            } else if (_this2.initApps && _this2.initApps.length && !_this2.indexUrl) {
+              var _obj4 = _this2.getMenu(_this2.menus, _this2.initApps[_this2.initApps.length - 1]);
+              if (_obj4) {
+                var _tab3 = _this2.setIframeType(_obj4);
+                _this2.tabs.push(_tab3);
+                _this2.activeName = _tab3.id;
               }
             }
           } else {
@@ -10817,9 +10834,9 @@ var events = [function (tabs, index, that) {
                   }
                 }
               } else {
-                var _tab5 = this.setIframeType(res);
-                this.tabs.push(_tab5);
-                this.activeName = _tab5.id;
+                var _tab4 = this.setIframeType(res);
+                this.tabs.push(_tab4);
+                this.activeName = _tab4.id;
               }
             } else {
               if (res.method == 'iframe') {
@@ -10844,8 +10861,8 @@ var events = [function (tabs, index, that) {
               var _i = util["a" /* default */].indexOfObj(this.tabs, subMenus, 'id');
               this.activeName = subMenus.id;
               if (_i == -1) {
-                var _tab6 = this.setIframeType(subMenus);
-                this.tabs.push(_tab6);
+                var _tab5 = this.setIframeType(subMenus);
+                this.tabs.push(_tab5);
               } else {
                 if (subMenus.method == 'iframe') {
                   subMenus.url = util["a" /* default */].handlerUrl(subMenus.url);
@@ -10904,15 +10921,15 @@ var events = [function (tabs, index, that) {
         this.tabs.push(tab);
         this.activeName = res.id;
       } else {
-        var _tab7 = this.tabs[i];
-        if (_tab7.method === 'iframe') {
+        var _tab6 = this.tabs[i];
+        if (_tab6.method === 'iframe') {
           this.activeName = res.id;
-          this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab7.url));
+          this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab6.url));
         } else {
-          if (_tab7.method === 'wujie' && _tab7.appCode) {
-            window.document.querySelector('iframe[name=' + _tab7.appCode + ']').contentWindow.location.reload(true);
+          if (_tab6.method === 'wujie' && _tab6.appCode) {
+            window.document.querySelector('iframe[name=' + _tab6.appCode + ']').contentWindow.location.reload(true);
           }
-          if (_tab7.method === 'router') {
+          if (_tab6.method === 'router') {
             this.$set(this.tabs[i], 'keys', util["a" /* default */].uuid());
           }
           this.activeName = res.id;
@@ -10971,14 +10988,14 @@ var events = [function (tabs, index, that) {
       if (tab.method === 'iframe') {
         tab.url = util["a" /* default */].handlerUrl(tab.url);
       } else {
-        var _tab8 = this.tabs[i];
-        if (_tab8.method === 'iframe') {
-          this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab8.url));
+        var _tab7 = this.tabs[i];
+        if (_tab7.method === 'iframe') {
+          this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab7.url));
         }
-        if (_tab8.method === 'wujie' && _tab8.appCode) {
-          window.document.querySelector('iframe[name=' + _tab8.appCode + ']').contentWindow.location.reload(true);
+        if (_tab7.method === 'wujie' && _tab7.appCode) {
+          window.document.querySelector('iframe[name=' + _tab7.appCode + ']').contentWindow.location.reload(true);
         }
-        if (_tab8.method === 'router') {
+        if (_tab7.method === 'router') {
           this.$set(this.tabs[i], 'keys', util["a" /* default */].uuid());
         }
       }
@@ -11091,6 +11108,13 @@ var events = [function (tabs, index, that) {
           case 'index':
             util["a" /* default */].win.open(this.doorIndex, '_self');
             break;
+          case 'old':
+            if (typeof this.showOld === 'string') {
+              window.location.href = this.showOld;
+            } else {
+              this.$emit('chang-layout', 'default');
+            }
+            break;
           case 'set':
             this.showSet = !this.showSet;
             this.showMsg = false;
@@ -11259,14 +11283,14 @@ var events = [function (tabs, index, that) {
           var tab = this.setIframeType(obj);
           this.tabs.splice(n + 1, 0, tab);
         } else {
-          var _tab9 = this.tabs[i];
-          if (_tab9.method === 'iframe') {
-            this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab9.url));
+          var _tab8 = this.tabs[i];
+          if (_tab8.method === 'iframe') {
+            this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab8.url));
           }
-          if (_tab9.method === 'wujie' && _tab9.appCode) {
-            window.document.querySelector('iframe[name=' + _tab9.appCode + ']').contentWindow.location.reload(true);
+          if (_tab8.method === 'wujie' && _tab8.appCode) {
+            window.document.querySelector('iframe[name=' + _tab8.appCode + ']').contentWindow.location.reload(true);
           }
-          if (_tab9.method === 'router') {
+          if (_tab8.method === 'router') {
             this.$set(this.tabs[i], 'keys', util["a" /* default */].uuid());
           }
         }
@@ -11327,18 +11351,18 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_03f1f7f2_scoped_true_render,
-  simplicityvue_type_template_id_03f1f7f2_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_38f18b0d_scoped_true_render,
+  simplicityvue_type_template_id_38f18b0d_scoped_true_staticRenderFns,
   false,
   null,
-  "03f1f7f2",
+  "38f18b0d",
   null
   
 )
 
 /* harmony default export */ var simplicity = (simplicity_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/index.vue?vue&type=template&id=3c855b6a&
-var defaultvue_type_template_id_3c855b6a_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/default/index.vue?vue&type=template&id=149ff0da&
+var defaultvue_type_template_id_149ff0da_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -11725,11 +11749,11 @@ var defaultvue_type_template_id_3c855b6a_render = function () {
     1
   )
 }
-var defaultvue_type_template_id_3c855b6a_staticRenderFns = []
-defaultvue_type_template_id_3c855b6a_render._withStripped = true
+var defaultvue_type_template_id_149ff0da_staticRenderFns = []
+defaultvue_type_template_id_149ff0da_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=3c855b6a&
+// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=149ff0da&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/userinfo.vue?vue&type=template&id=d207c2e8&
 var userinfovue_type_template_id_d207c2e8_render = function () {
@@ -12211,8 +12235,8 @@ var default_userinfo_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var default_userinfo = (default_userinfo_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/settings.vue?vue&type=template&id=2d7a058d&
-var settingsvue_type_template_id_2d7a058d_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/default/settings.vue?vue&type=template&id=52aa078c&
+var settingsvue_type_template_id_52aa078c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -12291,7 +12315,7 @@ var settingsvue_type_template_id_2d7a058d_render = function () {
         1
       ),
       _c("div", { staticClass: "es-setting-item" }, [
-        _c("div", { staticClass: "es-setting-title" }, [_vm._v("导航模式")]),
+        _c("div", { staticClass: "es-setting-title" }, [_vm._v("菜单风格")]),
         _c(
           "div",
           { staticClass: "es-setting-navs-box" },
@@ -12455,7 +12479,7 @@ var settingsvue_type_template_id_2d7a058d_render = function () {
                 staticClass: "es-setting-navs-item",
                 attrs: {
                   effect: "dark",
-                  content: "侧边菜单布局",
+                  content: "侧边+按钮菜单布局",
                   placement: "bottom",
                 },
               },
@@ -12494,11 +12518,11 @@ var settingsvue_type_template_id_2d7a058d_render = function () {
     ]
   )
 }
-var settingsvue_type_template_id_2d7a058d_staticRenderFns = []
-settingsvue_type_template_id_2d7a058d_render._withStripped = true
+var settingsvue_type_template_id_52aa078c_staticRenderFns = []
+settingsvue_type_template_id_52aa078c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/default/settings.vue?vue&type=template&id=2d7a058d&
+// CONCATENATED MODULE: ./packages/main/src/default/settings.vue?vue&type=template&id=52aa078c&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/settings.vue?vue&type=script&lang=js&
 //
@@ -12701,8 +12725,8 @@ settingsvue_type_template_id_2d7a058d_render._withStripped = true
 
 var default_settings_component = Object(componentNormalizer["a" /* default */])(
   src_default_settingsvue_type_script_lang_js_,
-  settingsvue_type_template_id_2d7a058d_render,
-  settingsvue_type_template_id_2d7a058d_staticRenderFns,
+  settingsvue_type_template_id_52aa078c_render,
+  settingsvue_type_template_id_52aa078c_staticRenderFns,
   false,
   null,
   null,
@@ -13826,7 +13850,8 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
     onlineView: {
       type: [String, Boolean],
       default: true
-    }
+    },
+    newVersion: Boolean
   },
   computed: {
     showHeader: function showHeader() {
@@ -13898,7 +13923,8 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
         set: !this.set,
         index: this.doorIndex ? false : true,
         system: true,
-        home: this.homePage ? false : true
+        home: this.homePage ? false : true,
+        new: this.showNew ? false : true
       };
 
       if (this.layout === 'subsystem' || this.application) {
@@ -14048,10 +14074,13 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       dialog: {},
       hideSubMenu: false,
       doorIndex: '',
-      topRightToolHide: ''
+      topRightToolHide: '',
+      showNew: this.newVersion
     };
   },
   created: function created() {
+    var layout = localStorage.getItem('layout');
+    layout && (this.layout = layout);
     var params = util["a" /* default */].getParams() || {};
     if (params.homePage == 0) {
       this.isLoadHomePage = false;
@@ -14293,6 +14322,9 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
           if (results[i].portalPage || results[i].portalpage) {
             this.doorIndex = results[i].portalPage || results[i].portalpage;
           }
+          if (results[i].multipleVersion || results[i].newVersion) {
+            this.showNew = results[i].newVersion ? results[i].newVersion : true;
+          }
           if (results[i].topRightToolHide) {
             this.topRightToolHide = results[i].topRightToolHide;
           }
@@ -15054,6 +15086,13 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
         case 'set':
           this.handleSet();
           break;
+        case 'new':
+          if (typeof this.showNew === 'string') {
+            window.location.href = this.showNew;
+          } else {
+            this.$emit('chang-layout', 'simplicity');
+          }
+          break;
         case 'goView':
           util["a" /* default */].win.open(res.path, '_blank');
           break;
@@ -15219,6 +15258,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
         return;
       }
       this.layout = res;
+      localStorage.setItem('layout', res);
       switch (res) {
         case 'topnav':
           this.navs = this.menus;
@@ -15393,8 +15433,8 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
 
 var default_component = Object(componentNormalizer["a" /* default */])(
   src_defaultvue_type_script_lang_js_,
-  defaultvue_type_template_id_3c855b6a_render,
-  defaultvue_type_template_id_3c855b6a_staticRenderFns,
+  defaultvue_type_template_id_149ff0da_render,
+  defaultvue_type_template_id_149ff0da_staticRenderFns,
   false,
   null,
   null,
@@ -15449,6 +15489,10 @@ var external_wujie_vue2_default = /*#__PURE__*/__webpack_require__.n(external_wu
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -15485,7 +15529,8 @@ var bus = external_wujie_vue2_default.a.bus;
     launchTime: {
       type: Number,
       default: 3000
-    }
+    },
+    multiple: Boolean
   },
   computed: {
     _launchImage: function _launchImage() {
@@ -15501,10 +15546,15 @@ var bus = external_wujie_vue2_default.a.bus;
       params: {},
       dialogs: [],
       visibles: [],
-      isLogin: false
+      isLogin: false,
+      layout: this.type
     };
   },
   created: function created() {
+    var layoutType = localStorage.getItem('layoutType');
+    if (layoutType) {
+      this.layout = layoutType;
+    }
     this.params = util["a" /* default */].getParams() || {};
     this.sysCode = this.params.sysCode;
     this.appCode = this.params.appCode;
@@ -15568,6 +15618,16 @@ var bus = external_wujie_vue2_default.a.bus;
   },
 
   methods: {
+    /**
+     * @desc: 切换布局风格
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    changLayout: function changLayout(res) {
+      this.layout = res;
+      localStorage.setItem('layoutType', res);
+    },
+
     /**
      * @desc:重新登录
      * @author huangbo