eoss-ui 0.6.25 → 0.6.27

package/packages/button-group/src/main.vue

@@ -244,7 +244,7 @@ export default {
         if (useCaseCodes && (item.useCaseCode || keyword)) {
           return useCaseCodes.indexOf(item.useCaseCode || keyword) > -1;
         }
-        return true;
+        return item.hide !== true;
       });
       let newBtns = arry.map((item) => {
         let badge;

package/packages/flow/src/processReject.vue

@@ -66,10 +66,10 @@
       </el-form-item>
     </div>
       <el-form-item>
+        <!-- size="small" -->
         <div style="text-align: right">
           <el-button
             type="primary"
-            size="small"
             @click="subProcess('nextNode')"
           >
             提交

package/packages/flow-list/src/main.vue

@@ -112,6 +112,10 @@ export default {
       type: String,
       default: ''
     },
+    params: {
+      type: Object,
+      default: () => {return {}}
+    },
     toolbar: {
       type: Array,
       default: () => []
@@ -977,7 +981,8 @@ export default {
           apprecordid: this.businessId,
           pendingAttr: 0,
           viewType: this.viewType,
-          showSuggest: this.showSuggest
+          showSuggest: this.showSuggest,
+          ...this.params
         }
       };
       util

package/packages/handler/src/main.vue

@@ -12,6 +12,16 @@
           @click="handleClick"
           @change="handleChange"
         ></es-handle-user>
+        <div
+          v-else-if="item.type == 'contact'"
+          class="es-handler-contact"
+          :key="item.type"
+        >
+          <div class="es-contact-label">{{ item.label }}</div>
+          <div class="es-contact-content">
+            <div v-for="ele in item.content" :key="ele">{{ ele }}</div>
+          </div>
+        </div>
         <div v-else-if="item.type === 'date'" class="es-handler-date">
           <div>
             {{ time }}
@@ -115,6 +125,7 @@ export default {
     }
   },
   props: {
+    contact: Object,
     jobScrollbar: Boolean,
     data: Array,
     color: {
@@ -166,20 +177,66 @@ export default {
   computed: {
     lists() {
       if (this.data === undefined) {
+        let list = [
+          {
+            type: 'user'
+          },
+          this.contact ? { ...this.contact, type: 'contact' } : {},
+          {
+            type: 'date'
+          },
+          {
+            type: 'system',
+            icon: 'es-icon-yingyong',
+            title: '切换子系统'
+          },
+          {
+            type: 'home',
+            icon: 'es-icon-zuomian',
+            title: '个人工作台'
+          },
+          {
+            type: 'index',
+            icon: 'es-icon-home',
+            title: '门户'
+          },
+          {
+            type: 'notice',
+            icon: 'es-icon-tongzhi',
+            title: '通知消息'
+          },
+          {
+            type: 'refresh',
+            icon: 'es-icon-shuaxin',
+            title: '刷新'
+          },
+          {
+            type: 'quit',
+            icon: 'es-icon-guanji',
+            title: '退出'
+          },
+          {
+            type: 'set',
+            icon: 'es-icon-xitongguanli',
+            title: '设置'
+          }
+        ].filter((item) => {
+          return Object.keys(item).length;
+        });
         if (Object.keys(this.hide).length) {
-          this.list.forEach((item) => {
+          list.forEach((item) => {
             item.hide = this.hide[item.type];
           });
         }
-        return this.list;
+        return list;
       } else {
         if (Object.keys(this.hide).length) {
           this.data.forEach((item) => {
             item.hide = this.hide[item.type];
           });
         }
-        return this.data;
       }
+      return this.data;
     },
     system() {
       return this.subSystem;
@@ -200,49 +257,6 @@ export default {
     return {
       date: '',
       time: '',
-      list: [
-        {
-          type: 'user'
-        },
-        {
-          type: 'date'
-        },
-        {
-          type: 'system',
-          icon: 'es-icon-yingyong',
-          title: '切换子系统'
-        },
-        {
-          type: 'home',
-          icon: 'es-icon-zuomian',
-          title: '个人工作台'
-        },
-        {
-          type: 'index',
-          icon: 'es-icon-home',
-          title: '门户'
-        },
-        {
-          type: 'notice',
-          icon: 'es-icon-tongzhi',
-          title: '通知消息'
-        },
-        {
-          type: 'refresh',
-          icon: 'es-icon-shuaxin',
-          title: '刷新'
-        },
-        {
-          type: 'quit',
-          icon: 'es-icon-guanji',
-          title: '退出'
-        },
-        {
-          type: 'set',
-          icon: 'es-icon-xitongguanli',
-          title: '设置'
-        }
-      ],
       showPopper: false,
       useCaseCodes: util.getStorage('useCaseCodes')
     };

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","tiyanxinban","shiyongjiuban","zhuomian","scan","youbian","zuobian"]
+["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","zhuomian","scan","youbian","zuobian","saomadenglu","zhanghaodenglu"]

package/packages/login/src/main.vue

@@ -772,9 +772,19 @@ export default {
       const types = this.loginModel.split(',');
       return types.length > 2
         ? {
-            0: { type: '0', icon: 'es-icon-shuru', name: '账号登录' },
+            0: {
+              type: '0',
+              icon: 'es-icon-shuru',
+              icon2: '',
+              name: '账号登录'
+            },
             1: { type: '1', icon: 'es-icon-usb-key', name: '证书登录' },
-            3: { type: '3', icon: 'es-icon-saoma', name: '扫码登录' },
+            3: {
+              type: '3',
+              icon: 'es-icon-saoma',
+              icon2: '',
+              name: '扫码登录'
+            },
             6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
             7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
             9: { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
@@ -782,14 +792,14 @@ export default {
             12: { type: '12', icon: 'es-icon-shuru', name: '账号登录' } //双因素
           }
         : {
-            0: { type: '0', icon: 'es-icon-jianpan', name: '账号登录' },
+            0: { type: '0', icon: 'es-icon-zhanghaodenglu', name: '账号登录' },
             1: { type: '1', icon: 'es-icon-ca', name: '证书登录' },
-            3: { type: '3', icon: 'es-icon-qrcode', name: '扫码登录' },
+            3: { type: '3', icon: 'es-icon-saomadenglu', name: '扫码登录' },
             6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
             7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
             9: { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
             11: { type: '11', icon: 'es-icon-wodeyouxiang', name: '邮箱登录' },
-            12: { type: '12', icon: 'es-icon-jianpan', name: '账号登录' } //双因素
+            12: { type: '12', icon: 'es-icon-zhanghaodenglu', name: '账号登录' } //双因素
           };
     },
     icons() {
@@ -958,7 +968,7 @@ export default {
       launchKey: 'day',
       launchTime: 2000,
       switchActive: this.switchsActive,
-      loginDownloadApp: true
+      loginDownloadApp: this.loginDownloadApps
     };
   },
   beforeCreate() {

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

@@ -35,6 +35,7 @@
         :userModel="userModel"
         :hide="hide"
         :subSystem="subsystem"
+        :contact="contact"
         :online="online"
         :application="application"
         :storage="storage"
@@ -399,7 +400,8 @@ export default {
       type: [String, Boolean],
       default: true
     },
-    newVersion: Boolean
+    newVersion: Boolean,
+    contacts: Object
   },
   computed: {
     showHeader() {
@@ -640,7 +642,8 @@ export default {
       hideSubMenu: false,
       doorIndex: '',
       topRightToolHide: '',
-      showSet: this.set
+      showSet: this.set,
+      contact: this.contacts
     };
   },
   created() {
@@ -893,6 +896,14 @@ export default {
           if (results[i].topRightToolHide) {
             this.topRightToolHide = results[i].topRightToolHide;
           }
+          if (results[i].contact) {
+            let contact = JSON.parse(results[i].contact);
+            let content = contact.content.split(',');
+            this.contact = {
+              ...contact,
+              content
+            };
+          }
         }
         store.set(i, results[i]);
       }
@@ -1360,8 +1371,9 @@ export default {
             return true;
           }
         } else {
-          if (this.menuTips[obj.id] && Number(this.menuTips[obj.id])) {
-            this.$set(obj, 'tips', Number(this.menuTips[obj.id]));
+          let tips = this.menuTips[obj.id] || this.menuTips[obj.appCode];
+          if (tips && Number(tips)) {
+            this.$set(obj, 'tips', tips);
             return true;
           }
         }

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

@@ -1,24 +1,46 @@
 <template>
   <div class="es-simplicity-handler">
-    <div class="es-simplicity-handler-time">{{ time }}</div>
-    <div class="es-simplicity-handler-date">
-      {{ date }}
-    </div>
-    <div class="es-simplicity-online">
-      当前
-      <span
-        class="es-simplicity-online-num"
-        @click="isClick ? handleClick({ type: 'online' }) : ''"
-        :class="{ 'es-pointer': isClick }"
-      >
-        {{ online }}
-      </span>
-      人在线
-    </div>
     <template v-for="item in lists">
+      <div
+        v-if="item.type == 'contact'"
+        class="es-simplicity-contact"
+        :key="item.type"
+      >
+        <div class="es-contact-label">{{ item.label }}</div>
+        <div class="es-contact-content">
+          <div v-for="ele in item.content" :key="ele">{{ ele }}</div>
+        </div>
+      </div>
+      <div
+        class="es-simplicity-date-time"
+        v-else-if="item.type === 'dateTime'"
+        :key="item.type"
+      >
+        <div class="es-simplicity-handler-time">
+          {{ time }}
+        </div>
+        <div class="es-simplicity-handler-date">
+          {{ date }}
+        </div>
+      </div>
+      <div
+        v-else-if="item.type === 'online'"
+        class="es-simplicity-online"
+        :key="item.type"
+      >
+        当前
+        <span
+          class="es-simplicity-online-num"
+          @click="isClick ? handleClick({ type: 'online' }) : ''"
+          :class="{ 'es-pointer': isClick }"
+        >
+          {{ online }}
+        </span>
+        人在线
+      </div>
       <el-badge
         class="es-simplicity-handler-item"
-        v-if="item.type === 'notice'"
+        v-else-if="item.type === 'notice'"
         :key="item.type"
         :value="noticeNum"
         :max="99"
@@ -49,6 +71,11 @@ export default {
   name: 'Handler',
   components: {},
   props: {
+    contact: Object,
+    dateTime: {
+      type: Boolean,
+      default: true
+    },
     search: {
       type: Object,
       default() {
@@ -136,9 +163,20 @@ export default {
   },
   computed: {
     lists() {
+      let df = [];
+      if (this.contact) {
+        df.push({ ...this.contact, type: 'contact' });
+      }
+      if (this.dateTime) {
+        df.push({ type: 'dateTime' });
+      }
+      if (this.online) {
+        df.push({ type: 'online' });
+      }
       let data = this.data
-        ? this.data
+        ? [...df, ...this.data]
         : [
+            ...df,
             this.search,
             this.index,
             this.home,

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

@@ -207,6 +207,7 @@
           v-bind="handleConfig"
           :data="handleData"
           :hide="hide"
+          :contact="contact"
           :online="userNums"
           :notice-num="notice"
           @click="handleClick"
@@ -521,7 +522,9 @@ export default {
       }
     },
     //切换旧版样式
-    oldVersion: Boolean
+    oldVersion: Boolean,
+    //运维联系人
+    contacts: Object
   },
   data() {
     return {
@@ -616,7 +619,9 @@ export default {
       //单位名称
       simpleUserInfo: {},
       topRightToolHide: '',
-      showOld: this.oldVersion
+      showOld: this.oldVersion,
+      //运维联系人
+      contact: this.contacts
     };
   },
   computed: {
@@ -871,6 +876,14 @@ export default {
           if (results[i].topRightToolHide) {
             this.topRightToolHide = results[i].topRightToolHide;
           }
+          if (results[i].contact) {
+            let contact = JSON.parse(results[i].contact);
+            let content = contact.content.split(',');
+            this.contact = {
+              ...contact,
+              content
+            };
+          }
         }
         if (i === 'userModel' && results[i]) {
           if (results[i].userHeadUrl) {
@@ -1250,7 +1263,7 @@ export default {
             this.menuTips[obj.appCode];
           if (num && Number(num)) {
             this.$set(obj, 'tips', Number(num));
-            return this.menuTips[obj.id];
+            return num;
           }
         }
       }