eoss-ui 0.5.97 → 0.5.98

package/lib/tips.js

@@ -2175,6 +2175,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"],
@@ -2273,7 +2274,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 }));
@@ -2676,7 +2680,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');

package/lib/tree-group.js

@@ -2175,6 +2175,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"],
@@ -2273,7 +2274,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 }));
@@ -2676,7 +2680,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');

package/lib/tree.js

@@ -2175,6 +2175,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"],
@@ -2273,7 +2274,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 }));
@@ -2676,7 +2680,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');

package/lib/upload.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');

package/lib/utils/util.js

@@ -2092,6 +2092,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 = _eossElement.Loading.service({ text: '页面加载中', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.65)' });
       ajax({
         method: 'post',
         url: _api.authCenter,
@@ -2190,7 +2191,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 }));
@@ -2593,7 +2597,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');

package/lib/wujie.js

@@ -2175,6 +2175,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"],
@@ -2273,7 +2274,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 }));
@@ -2676,7 +2680,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');

package/lib/wxlogin.js

@@ -2175,6 +2175,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"],
@@ -2273,7 +2274,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 }));
@@ -2676,7 +2680,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');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.97",
+  "version": "0.5.98",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/data-table/src/main.vue

@@ -454,9 +454,13 @@ export default {
       default: true
     },
     index: {
-      type: [Boolean, Number],
+      type: [Number, Function],
       default: 1
     },
+    accumulated: {
+      type: Boolean,
+      default: true
+    },
     immediate: {
       type: Boolean,
       default: true
@@ -594,17 +598,19 @@ export default {
         }
         if (this.numbers && !types.includes('index')) {
           let index = 1;
-          if (this.orders == 'desc') {
-            index = (num) => {
-              return this.config.totalCount - num;
-            };
-          } else if (this.infiniteScroll) {
-            index = typeof this.index == 'boolean' ? 1 : this.index;
-          } else if (this.index || this.index === 0) {
-            index =
-              this.index === true
-                ? (this.config.pageNum - 1) * this.config.pageSize + 1
-                : this.index;
+          if (typeof this.index === 'function') {
+            index = this.index;
+          } else {
+            if (this.orders == 'desc') {
+              index = (num) => {
+                return this.config.totalCount - num;
+              };
+            } else if (this.accumulated) {
+              index =
+                (this.config.pageNum - 1) * this.config.pageSize + this.index;
+            } else {
+              index = this.index;
+            }
           }
           thead.push({
             type: 'index',

package/packages/handler/src/main.vue

@@ -135,7 +135,7 @@ export default {
     hide: {
       type: Object,
       default() {
-        return { system: true };
+        return { system: true, new: true };
       }
     },
     online: {
@@ -217,16 +217,21 @@ export default {
           icon: 'es-icon-zuomian',
           title: '个人工作台'
         },
-        {
-          type: 'notice',
-          icon: 'es-icon-tongzhi',
-          title: '通知消息'
-        },
         {
           type: 'index',
           icon: 'es-icon-home',
           title: '门户'
         },
+        {
+          type: 'new',
+          icon: 'es-icon-tiyanxinban',
+          title: '体验新版'
+        },
+        {
+          type: 'notice',
+          icon: 'es-icon-tongzhi',
+          title: '通知消息'
+        },
         {
           type: 'refresh',
           icon: 'es-icon-shuaxin',

package/packages/icons/src/icon.json

@@ -1 +1 @@
-["zuomian","monitor","maximize","pointer-up","pointer-left","pointer-down","tri-down","retrograde","rainfall","caveat","print","alarm","table","duigouquan","bumen","mm","accelerate","quanping","password","qing","kaifa","daoru","piaochongicon","instructions","notice","wifi","tishicuo","minganciguanli","switch-off","switch-on","narrow","yidongduan","web","upload","message","go-back","close","shujutongji","folder","edit","enter","dian","wendu","shangwu","shenbao","magnifier","project-add","xiexian","caidan","tupian","yinyu","wenhao","template","daiban","set","zhengwen","cuowu","chenggong","indent","increase","ziliaoku","tuichu","quit","leaf","refresh","statistic","gengduo","lvyou","mail","user","zhishi","weizhi","jinggao","zuzhijigou","xue","fenxiang","jinrong","shanchu","jianhao","jiahao","yinzhang","renyuanqiehuan","gouxuanzhong1","circle","fuxuankuang1","fangkuang","application","wenjianjia","jiaren","xiugai","duanxinguanli","workbench","rizhi","gongwen","qingshi","shiwu","official","baogao","document","wodeyouxiang","ziliaojiaohuan","denglu","podium","fangkuai","xuewei","duoyun","pm","xiajia","huanbao","dunpai","shu","gongzuozheng","more","fenlei","delete","fengsu","bar","yuanqu","duomeiti","youjian","qiye","zuixinzixun","biaoge","omit","diaotou","jiantou-left","jiantou-right","jiantou-up","roles","jiantou-next","chijiuhuacunchu","zhuanhuan","cloudy","form","wuye","tri-up","pointer-right","bianji","tri-right","tri-left","daimaguanli","jiankong","kaifazhong","fujian","bingtu","zhuzhuangtu","lose","rmb","move","xiazai","yiban","laoshi","clear","jinyong","yunxing","weihu","chakan","pifu","ren","gouwuche","loading2","yulan","ziliao","yidong","fenxiang11","kaoqin","change","shidu","portfolio","info","yanjing","laba","camera","xitongxiaoxi","xitongguanli","webduan","wagnz","group","shengqian","jiantou-prev","attention","look","guanzhu","daikuan","tubiao","duigou","star","dayin","xinzeng","reduce","goup","calendar","tree","yingyong","caution","zhuanfa","add","zongtiqixian","daochu","gongwu","ihouse","chilun","weixiu","chengguo","trophy","duiwu","qiehuanjiaose","door","shebei","fangjian","microscope","huaxue","shiyanshianquan","shiyan","qiyexinxi","yewuxinxi","lab","shiyanguanli","yuqing","big-screen","signal-search","database","star-mark","cng","professor","informatization","code","science","price","xunhuan","savings","administration","aid","biao","line","xietong","jingzheng","enterprise","datatable","toubiao","bingdu","keji2","qiyeku5","touzi5","zijinliu","zhishichanquan3","kejifuwu2","zhishichanquan2","zijinanquan","kejifuwu1","geju","yiqingfangkong","kejifuwu","anquanfangkong","shujufuwu","shujuceng","shujugongxiang","flows","setup","shujulian","caiwujianguan","caiwuliushui","mubiaogeju","juxing","fuwuqi","touzijigou","xiezilou","jianzhu","logo","touzhi","zijin","fintech","touzixiangmu","library","touziguanli","zhongda","ziyuan","shujutai","shujudongtai","bank","shujuzhongxin","zhongyaomubiao","touzishijian","caiwuguanli","mingzhong","touzishenpi","jingzhenggeju","property","keji","qiyeku","zhongyaojihui","touzilicai","zhishichanquan","touzi","tzz","menu","xiangmushu","pdf","jiazai","gongsi","rise","jbxx","zwxx","jypx","jcgl","ndkh","grjl","shgx","gou","shijian","fukuan","guoji","shoukuan","down","gongzuotai","gaigedongtai","xitongshezhi","relation","zuzhirenshi","kaohepingjia","caiwujiandu","sanzhongyida","mima","xianshi","zhanghao","bangongshi","checked","checke","help","kuoda","banli","xiaoxi","shouqicaidan","shouqicaidan-right","smile","tongzhi","guanji","shuaxin","guiji","tianjiawenjianjia","yunxiazai","del","touzifangan","zongheguanli","sanzhongyida_mian","gongwenguanli1","heguiguanli","jingyingfenxi","txl","diannao","renliziyuan","caiwuxitong","shiwuguanli","shouye","bangongyongpin","sidebar","zhidulashi","log","fawenguanli","huiyiguanli","zuzhishishi","gongwenqianshou","jinxiupeixun","gongwenbao","jiaohuan","daibanshixiang","richeng","tongxunlu","yongche","yanzheng","daibanxinxi","shuben","fanfu","guangbo","shuzhuangtu","bengqiye","tongguo","dengdai","cross","daichuli","zhenggai","shouli","shujuhecha","guanli","paper-file","wenjian","dakaiwenjian","yewu","jiance","jiheguanli","jinru","arrow-right","lingdao","rencai","prev","next","jianpan","qrcode","bohui","homepage","download","gantanhao","dingding","weixin","pad","ios","android","txt","doc","audioo","video","zip","shuru","duanxin","saoma","youxiang","word","excel","fileword","picture","ppt","ca","usb-key","wenjianjiadakai","yingyonglan","home"]
+["zuomian","monitor","maximize","pointer-up","pointer-left","pointer-down","tri-down","retrograde","rainfall","caveat","print","alarm","table","duigouquan","bumen","mm","accelerate","quanping","password","qing","kaifa","daoru","piaochongicon","instructions","notice","wifi","tishicuo","minganciguanli","switch-off","switch-on","narrow","yidongduan","web","upload","message","go-back","close","shujutongji","folder","edit","enter","dian","wendu","shangwu","shenbao","magnifier","project-add","xiexian","caidan","tupian","yinyu","wenhao","template","daiban","set","zhengwen","cuowu","chenggong","indent","increase","ziliaoku","tuichu","quit","leaf","refresh","statistic","gengduo","lvyou","mail","user","zhishi","weizhi","jinggao","zuzhijigou","xue","fenxiang","jinrong","shanchu","jianhao","jiahao","yinzhang","renyuanqiehuan","gouxuanzhong1","circle","fuxuankuang1","fangkuang","application","wenjianjia","jiaren","xiugai","duanxinguanli","workbench","rizhi","gongwen","qingshi","shiwu","official","baogao","document","wodeyouxiang","ziliaojiaohuan","denglu","podium","fangkuai","xuewei","duoyun","pm","xiajia","huanbao","dunpai","shu","gongzuozheng","more","fenlei","delete","fengsu","bar","yuanqu","duomeiti","youjian","qiye","zuixinzixun","biaoge","omit","diaotou","jiantou-left","jiantou-right","jiantou-up","roles","jiantou-next","chijiuhuacunchu","zhuanhuan","cloudy","form","wuye","tri-up","pointer-right","bianji","tri-right","tri-left","daimaguanli","jiankong","kaifazhong","fujian","bingtu","zhuzhuangtu","lose","rmb","move","xiazai","yiban","laoshi","clear","jinyong","yunxing","weihu","chakan","pifu","ren","gouwuche","loading2","yulan","ziliao","yidong","fenxiang11","kaoqin","change","shidu","portfolio","info","yanjing","laba","camera","xitongxiaoxi","xitongguanli","webduan","wagnz","group","shengqian","jiantou-prev","attention","look","guanzhu","daikuan","tubiao","duigou","star","dayin","xinzeng","reduce","goup","calendar","tree","yingyong","caution","zhuanfa","add","zongtiqixian","daochu","gongwu","ihouse","chilun","weixiu","chengguo","trophy","duiwu","qiehuanjiaose","door","shebei","fangjian","microscope","huaxue","shiyanshianquan","shiyan","qiyexinxi","yewuxinxi","lab","shiyanguanli","yuqing","big-screen","signal-search","database","star-mark","cng","professor","informatization","code","science","price","xunhuan","savings","administration","aid","biao","line","xietong","jingzheng","enterprise","datatable","toubiao","bingdu","keji2","qiyeku5","touzi5","zijinliu","zhishichanquan3","kejifuwu2","zhishichanquan2","zijinanquan","kejifuwu1","geju","yiqingfangkong","kejifuwu","anquanfangkong","shujufuwu","shujuceng","shujugongxiang","flows","setup","shujulian","caiwujianguan","caiwuliushui","mubiaogeju","juxing","fuwuqi","touzijigou","xiezilou","jianzhu","logo","touzhi","zijin","fintech","touzixiangmu","library","touziguanli","zhongda","ziyuan","shujutai","shujudongtai","bank","shujuzhongxin","zhongyaomubiao","touzishijian","caiwuguanli","mingzhong","touzishenpi","jingzhenggeju","property","keji","qiyeku","zhongyaojihui","touzilicai","zhishichanquan","touzi","tzz","menu","xiangmushu","pdf","jiazai","gongsi","rise","jbxx","zwxx","jypx","jcgl","ndkh","grjl","shgx","gou","shijian","fukuan","guoji","shoukuan","down","gongzuotai","gaigedongtai","xitongshezhi","relation","zuzhirenshi","kaohepingjia","caiwujiandu","sanzhongyida","mima","xianshi","zhanghao","bangongshi","checked","checke","help","kuoda","banli","xiaoxi","shouqicaidan","shouqicaidan-right","smile","tongzhi","guanji","shuaxin","guiji","tianjiawenjianjia","yunxiazai","del","touzifangan","zongheguanli","sanzhongyida_mian","gongwenguanli1","heguiguanli","jingyingfenxi","txl","diannao","renliziyuan","caiwuxitong","shiwuguanli","shouye","bangongyongpin","sidebar","zhidulashi","log","fawenguanli","huiyiguanli","zuzhishishi","gongwenqianshou","jinxiupeixun","gongwenbao","jiaohuan","daibanshixiang","richeng","tongxunlu","yongche","yanzheng","daibanxinxi","shuben","fanfu","guangbo","shuzhuangtu","bengqiye","tongguo","dengdai","cross","daichuli","zhenggai","shouli","shujuhecha","guanli","paper-file","wenjian","dakaiwenjian","yewu","jiance","jiheguanli","jinru","arrow-right","lingdao","rencai","prev","next","jianpan","qrcode","bohui","homepage","download","gantanhao","dingding","weixin","pad","ios","android","txt","doc","audioo","video","zip","shuru","duanxin","saoma","youxiang","word","excel","fileword","picture","ppt","ca","usb-key","wenjianjiadakai","yingyonglan","home","tiyanxinban","shiyongjiuban"]

package/packages/login/src/main.vue

@@ -885,7 +885,7 @@ export default {
     if (ceshi == 'true' || ceshi == true) {
       this.loginModel = '0';
     }
-    if (this.isScale) {
+    if (this.isScale || util.getParams('scale')) {
       util.setScale();
       window.addEventListener('resize', this.setScale);
     }

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

@@ -400,7 +400,8 @@ export default {
     onlineView: {
       type: [String, Boolean],
       default: true
-    }
+    },
+    newVersion: Boolean
   },
   computed: {
     showHeader() {
@@ -485,7 +486,8 @@ export default {
         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) {
@@ -635,10 +637,13 @@ export default {
       dialog: {},
       hideSubMenu: false,
       doorIndex: '',
-      topRightToolHide: ''
+      topRightToolHide: '',
+      showNew: this.newVersion
     };
   },
   created() {
+    const layout = localStorage.getItem('layout');
+    layout && (this.layout = layout);
     let params = util.getParams() || {};
     if (params.homePage == 0) {
       this.isLoadHomePage = false;
@@ -892,6 +897,9 @@ export default {
           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;
           }
@@ -1705,6 +1713,13 @@ export default {
         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.win.open(res.path, '_blank');
           break;
@@ -1873,6 +1888,7 @@ export default {
         return;
       }
       this.layout = res;
+      localStorage.setItem('layout', res);
       switch (res) {
         case 'topnav':
           this.navs = this.menus;

package/packages/main/src/default/settings.vue

@@ -34,7 +34,7 @@
       </div>
     </div>
     <div class="es-setting-item">
-      <div class="es-setting-title">导航模式</div>
+      <div class="es-setting-title">菜单风格</div>
       <div class="es-setting-navs-box">
         <el-tooltip
           class="es-setting-navs-item"
@@ -92,7 +92,7 @@
         <el-tooltip
           class="es-setting-navs-item"
           effect="dark"
-          content="侧边菜单布局"
+          content="侧边+按钮菜单布局"
           placement="bottom"
         >
           <div

package/packages/main/src/main.vue

@@ -2,15 +2,19 @@
   <div class="es-main-box" v-if="isLogin">
     <simplicity
       ref="main"
-      v-if="type == 'simplicity'"
+      v-if="layout == 'simplicity'"
       :appCode="appCode"
+      :old-version="multiple"
+      @chang-layout="changLayout"
       v-bind="$attrs"
       v-on="$listeners"
     ></simplicity>
     <main-default
       v-else
+      :new-version="multiple"
       v-bind="$attrs"
       ref="main"
+      @chang-layout="changLayout"
       v-on="$listeners"
     ></main-default>
 
@@ -73,7 +77,8 @@ export default {
     launchTime: {
       type: Number,
       default: 3000
-    }
+    },
+    multiple: Boolean
   },
   computed: {
     _launchImage() {
@@ -91,10 +96,15 @@ export default {
       params: {},
       dialogs: [],
       visibles: [],
-      isLogin: false
+      isLogin: false,
+      layout: this.type
     };
   },
   created() {
+    const layoutType = localStorage.getItem('layoutType');
+    if (layoutType) {
+      this.layout = layoutType;
+    }
     this.params = util.getParams() || {};
     this.sysCode = this.params.sysCode;
     this.appCode = this.params.appCode;
@@ -155,6 +165,15 @@ export default {
     });
   },
   methods: {
+    /**
+     * @desc: 切换布局风格
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    changLayout(res) {
+      this.layout = res;
+      localStorage.setItem('layoutType', res);
+    },
     /**
      * @desc:重新登录
      * @author huangbo

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

@@ -16,31 +16,29 @@
       人在线
     </div>
     <template v-for="item in lists">
-      <template v-if="isShow(item.type)">
-        <el-badge
-          class="es-simplicity-handler-item"
-          v-if="item.type === 'notice'"
-          :key="item.type"
-          :value="noticeNum"
-          :max="99"
-          :hidden="noticeNum === 0"
-        >
-          <div
-            class="es-simplicity-handler-icon"
-            :title="item.title"
-            :class="item.icon"
-            @click="handleClick(item)"
-          ></div>
-        </el-badge>
+      <el-badge
+        class="es-simplicity-handler-item"
+        v-if="item.type === 'notice'"
+        :key="item.type"
+        :value="noticeNum"
+        :max="99"
+        :hidden="noticeNum === 0"
+      >
         <div
-          v-else
-          class="es-simplicity-handler-item es-simplicity-handler-icon"
-          :key="item.type"
+          class="es-simplicity-handler-icon"
           :title="item.title"
           :class="item.icon"
           @click="handleClick(item)"
         ></div>
-      </template>
+      </el-badge>
+      <div
+        v-else
+        class="es-simplicity-handler-item es-simplicity-handler-icon"
+        :key="item.type"
+        :title="item.title"
+        :class="item.icon"
+        @click="handleClick(item)"
+      ></div>
     </template>
   </div>
 </template>
@@ -81,6 +79,16 @@ export default {
         };
       }
     },
+    old: {
+      type: Object,
+      default() {
+        return {
+          type: 'old',
+          icon: 'es-icon-shiyongjiuban',
+          title: '使用旧版'
+        };
+      }
+    },
     notice: {
       type: Object,
       default() {
@@ -115,7 +123,9 @@ export default {
     hide: {
       type: Object,
       default() {
-        return {};
+        return {
+          old: true
+        };
       }
     },
     noticeNum: {
@@ -142,6 +152,7 @@ export default {
             this.search,
             this.index,
             this.home,
+            this.old,
             this.notice,
             this.quit,
             this.set
@@ -170,13 +181,6 @@ export default {
         this.time = util.formatDate('', 'HH:mm:ss');
       });
     },
-    isShow(res) {
-      if (Array.isArray(this.hide)) {
-        return !this.hide.includes(res);
-      } else {
-        return !this.hide[res];
-      }
-    },
     handleClick(res) {
       this.$emit('click', res);
     }