eoss-ui 0.5.97 → 0.5.99

package/packages/dialog/src/main.vue

@@ -385,7 +385,7 @@ export default {
         mini: { width: '800px', height: '400px' },
         sm: { width: '960px', height: '500px' },
         md: { width: '1060px', height: '600px' },
-        lg: { width: '1200px', height: '800px' },
+        lg: { width: '1200px', height: availHeight < 800 ? '560px' : '800px' },
         max: { width: `${availWidth}px`, height: `${availHeight}px` },
         full: { width: '100%', height: '100%' }
       },

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,16 @@ export default {
           icon: 'es-icon-zuomian',
           title: '个人工作台'
         },
-        {
-          type: 'notice',
-          icon: 'es-icon-tongzhi',
-          title: '通知消息'
-        },
         {
           type: 'index',
           icon: 'es-icon-home',
           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);
     }
@@ -1237,6 +1237,7 @@ export default {
       this.wechatScope = res.wechatScope;
       this.download = { ...this.downLoadUrls, ...downloads };
       if (res.sysLogoIco) {
+        localStorage.setItem('sysLogoIco', res.sysLogoIco);
         util.setFavicon(res.sysLogoIco);
       }
     },

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

@@ -167,10 +167,11 @@
     </div>
     <settings
       v-bind="$attrs"
+      layout-type="default"
+      :active="layout"
       :theme="color"
       :predefine="themes"
-      :visible.sync="showSet"
-      :layout="layout"
+      :visible.sync="showSets"
       @change="handleChange"
       @layout="handleLayout"
     ></settings>
@@ -208,7 +209,7 @@
 </template>
 <script>
 import userinfo from './userinfo.vue';
-import settings from './settings.vue';
+import settings from '../public/settings.vue';
 import message from './message.vue';
 import notice from './notice.vue';
 import online from '../public/online.vue';
@@ -400,7 +401,8 @@ export default {
     onlineView: {
       type: [String, Boolean],
       default: true
-    }
+    },
+    newVersion: Boolean
   },
   computed: {
     showHeader() {
@@ -482,10 +484,10 @@ export default {
         );
       }
       let hides = {
-        set: !this.set,
+        set: !this.showSet,
         index: this.doorIndex ? false : true,
         system: true,
-        home: this.homePage ? false : true
+        home: this.homePage ? false : tru
       };
 
       if (this.layout === 'subsystem' || this.application) {
@@ -539,6 +541,11 @@ export default {
           util.updateTheme(val);
         }
       }
+    },
+    scene(val) {
+      if (val) {
+        this.layout = val.toLowerCase();
+      }
     }
   },
   data() {
@@ -607,7 +614,7 @@ export default {
       //刷新路由
       refresh: true,
       //显示设置面板
-      showSet: false,
+      showSets: false,
       //当前设置的主题
       color: util.getStorage('theme') ? util.getStorage('theme') : this.theme,
       //显示用户信息
@@ -635,10 +642,13 @@ export default {
       dialog: {},
       hideSubMenu: false,
       doorIndex: '',
-      topRightToolHide: ''
+      topRightToolHide: '',
+      showSet: this.set
     };
   },
   created() {
+    const layout = localStorage.getItem('layout');
+    layout && (this.layout = layout);
     let params = util.getParams() || {};
     if (params.homePage == 0) {
       this.isLoadHomePage = false;
@@ -783,7 +793,7 @@ export default {
     },
     //显示隐藏设置面板
     handleSet() {
-      this.showSet = !this.showSet;
+      this.showSets = !this.showSets;
     },
     setConfig(results) {
       if (this.socket) {
@@ -892,6 +902,9 @@ export default {
           if (results[i].portalPage || results[i].portalpage) {
             this.doorIndex = results[i].portalPage || results[i].portalpage;
           }
+          if (results[i].multipleVersion) {
+            this.showSet = true;
+          }
           if (results[i].topRightToolHide) {
             this.topRightToolHide = results[i].topRightToolHide;
           }
@@ -1114,6 +1127,13 @@ export default {
     },
     //获取应用导航菜单
     getMenu() {
+      const menuData = store.get('nav');
+      if (menuData && menuData.length) {
+        this.menus = JSON.parse(JSON.stringify(menuData));
+        this.setTips(this.menus);
+        this.setMenu(this.menus);
+        return;
+      }
       let param = this.menuCode ? { menuCode: this.menuCode } : {};
       let params = { ...this.param, ...param };
       util
@@ -1123,7 +1143,7 @@ export default {
             if (res.results && res.results.length) {
               this.menus = JSON.parse(JSON.stringify(res.results));
               this.setTips(this.menus);
-              store.set('nav', this.menus);
+              store.set('nav', JSON.parse(JSON.stringify(res.results)));
               this.setMenu(this.menus);
             } else {
               this.$message.error('未分配菜单权限，请联系管理员！');
@@ -1868,11 +1888,13 @@ export default {
       }
       return false;
     },
-    handleLayout(res, old) {
-      if (res == old) {
+    handleLayout(layout, res, old) {
+      this.$emit('chang-layout', layout);
+      if (res == old || layout == 'simplicity') {
         return;
       }
       this.layout = res;
+      localStorage.setItem('layout', res);
       switch (res) {
         case 'topnav':
           this.navs = this.menus;

package/packages/main/src/main.vue

@@ -2,16 +2,21 @@
   <div class="es-main-box" v-if="isLogin">
     <simplicity
       ref="main"
-      v-if="type == 'simplicity'"
+      v-if="layoutType == 'simplicity'"
       :appCode="appCode"
+      :old-version="multiple"
       v-bind="$attrs"
       v-on="$listeners"
+      @chang-layout="changLayout"
     ></simplicity>
     <main-default
       v-else
+      :new-version="multiple"
+      :scene="layout"
       v-bind="$attrs"
       ref="main"
       v-on="$listeners"
+      @chang-layout="changLayout"
     ></main-default>
 
     <!-- 公用弹窗 -->
@@ -59,6 +64,7 @@ export default {
     MainDefault
   },
   props: {
+    scene: String,
     launch: Boolean,
     type: String,
     launchImage: {
@@ -73,7 +79,8 @@ export default {
     launchTime: {
       type: Number,
       default: 3000
-    }
+    },
+    multiple: Boolean
   },
   computed: {
     _launchImage() {
@@ -91,10 +98,16 @@ export default {
       params: {},
       dialogs: [],
       visibles: [],
-      isLogin: false
+      isLogin: false,
+      layoutType: this.type,
+      layout: this.scene
     };
   },
   created() {
+    const layoutType = localStorage.getItem('layoutType');
+    if (layoutType) {
+      this.layoutType = layoutType;
+    }
     this.params = util.getParams() || {};
     this.sysCode = this.params.sysCode;
     this.appCode = this.params.appCode;
@@ -155,6 +168,18 @@ export default {
     });
   },
   methods: {
+    /**
+     * @desc: 切换布局风格
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    changLayout(res, active) {
+      this.layoutType = res;
+      localStorage.setItem('layoutType', res);
+      if (active) {
+        this.layout = active;
+      }
+    },
     /**
      * @desc:重新登录
      * @author huangbo

package/packages/main/src/{default → public}/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"
@@ -44,9 +44,12 @@
         >
           <div
             class="es-setting-navs es-setting-top-nav"
-            @click.stop="handleLayout('topnav')"
+            @click.stop="handleLayout('default', 'topnav')"
           >
-            <i class="es-icon-gou" v-show="activeName == 'topnav'"></i>
+            <i
+              class="es-icon-gou"
+              v-show="layoutType == 'default' && activeName == 'topnav'"
+            ></i>
           </div>
         </el-tooltip>
         <el-tooltip
@@ -57,10 +60,13 @@
         >
           <div
             class="es-setting-navs es-setting-side-nav"
-            @click.stop="handleLayout('default')"
+            @click.stop="handleLayout('default', 'default')"
           >
             <div class="es-setting-side-sub-nav"></div>
-            <i class="es-icon-gou" v-show="activeName == 'default'"></i>
+            <i
+              class="es-icon-gou"
+              v-show="layoutType == 'default' && activeName == 'default'"
+            ></i>
           </div>
         </el-tooltip>
         <el-tooltip
@@ -71,9 +77,12 @@
         >
           <div
             class="es-setting-navs es-setting-subsystem-nav"
-            @click.stop="handleLayout('subsystem')"
+            @click.stop="handleLayout('default', 'subsystem')"
           >
-            <i class="es-icon-gou" v-show="activeName == 'subsystem'"></i>
+            <i
+              class="es-icon-gou"
+              v-show="layoutType == 'default' && activeName == 'subsystem'"
+            ></i>
           </div>
         </el-tooltip>
         <el-tooltip
@@ -84,22 +93,45 @@
         >
           <div
             class="es-setting-navs es-setting-top-side-nav"
-            @click.stop="handleLayout('topside')"
+            @click.stop="handleLayout('default', 'topside')"
           >
-            <i class="es-icon-gou" v-show="activeName == 'topside'"></i>
+            <i
+              class="es-icon-gou"
+              v-show="layoutType == 'default' && activeName == 'topside'"
+            ></i>
           </div>
         </el-tooltip>
         <el-tooltip
           class="es-setting-navs-item"
           effect="dark"
-          content="侧边菜单布局"
+          content="侧边+按钮菜单布局"
           placement="bottom"
         >
           <div
             class="es-setting-navs es-setting-side-navs"
-            @click.stop="handleLayout('side')"
+            @click.stop="handleLayout('default', 'side')"
           >
-            <i class="es-icon-gou" v-show="activeName == 'side'"></i>
+            <i
+              class="es-icon-gou"
+              v-show="layoutType == 'default' && activeName == 'side'"
+            ></i>
+          </div>
+        </el-tooltip>
+        <el-tooltip
+          class="es-setting-navs-item"
+          effect="dark"
+          content="(新)应用菜单布局"
+          placement="bottom"
+        >
+          <div
+            class="es-setting-navs es-setting-app-nav"
+            @click.stop="handleLayout('simplicity')"
+          >
+            <div class="es-setting-side-sub-nav"></div>
+            <i
+              class="es-icon-gou"
+              v-show="layoutType == 'simplicity' && activeName == 'simplicity'"
+            ></i>
           </div>
         </el-tooltip>
       </div>
@@ -108,6 +140,7 @@
 </template>
 <script>
 import util from 'eoss-ui/src/utils/util';
+import { string } from 'slate';
 export default {
   name: 'message',
   props: {
@@ -123,10 +156,8 @@ export default {
         return ['#a60006', '#409eff'];
       }
     },
-    layout: {
-      type: String,
-      default: 'default'
-    }
+    active: String,
+    layoutType: String
   },
   computed: {
     show: {
@@ -163,7 +194,8 @@ export default {
   data() {
     return {
       color: '',
-      activeName: this.layout
+      layoutName: this.layoutType,
+      activeName: this.active
     };
   },
   mounted() {},
@@ -179,11 +211,11 @@ export default {
       //this.setTheme(res);
     },
     //选择菜单布局
-    handleLayout(res) {
+    handleLayout(res, active) {
       let old = this.activeName;
-      this.activeName = res;
-      this.$emit('update:layout', res);
-      this.$emit('layout', res, old);
+      this.layoutName = res;
+      this.activeName = active;
+      this.$emit('layout', res, active, old);
     }
   }
 };

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>
@@ -115,7 +113,9 @@ export default {
     hide: {
       type: Object,
       default() {
-        return {};
+        return {
+          old: true
+        };
       }
     },
     noticeNum: {
@@ -170,13 +170,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);
     }