eoss-ui 0.4.23 → 0.4.25

package/packages/flow/src/main.vue

@@ -1038,7 +1038,7 @@ export default {
     saveInfo(type, btn) {
       if (this.isFlow) {
         if (!type) {
-          if (btn.before) {
+          if (btn && btn.before) {
             btn
               .before(
                 Object.prototype.hasOwnProperty.call(btn, 'code') ? btn.code : 1
@@ -1049,7 +1049,9 @@ export default {
               .catch((e) => {});
           } else if (this.beforeSubmit != undefined) {
             this.beforeSubmit(
-              Object.prototype.hasOwnProperty.call(btn, 'code') ? btn.code : 1
+              btn && Object.prototype.hasOwnProperty.call(btn, 'code')
+                ? btn.code
+                : 1
             )
               .then((next) => {
                 this.$emit('save', this.businessIds);
@@ -1060,7 +1062,7 @@ export default {
           }
         }
       } else {
-        if (btn.before && !type) {
+        if (btn && btn.before && !type) {
           btn
             .before(
               Object.prototype.hasOwnProperty.call(btn, 'code') ? btn.code : 2
@@ -1073,7 +1075,9 @@ export default {
           this.subFun(this.saveFlowInfo);
         } else if (!type && this.beforeSubmit != undefined) {
           this.beforeSubmit(
-            Object.prototype.hasOwnProperty.call(btn, 'code') ? btn.code : 2
+            btn && Object.prototype.hasOwnProperty.call(btn, 'code')
+              ? btn.code
+              : 2
           )
             .then((next) => {
               this.saveFlowInfo();
@@ -1501,7 +1505,6 @@ export default {
                   showid: data.nextUserList[0].userId
                 });
               }
-              // this.userSelectionType = results.nodeExtAttr.userSelectionType;
               this.isLimitedTimeHandling =
                 data.nodeExtAttr.isLimitedTimeHandling;
               this.isCustomUser = data.nodeExtAttr.isCustomUser;
@@ -1568,13 +1571,6 @@ export default {
           this.nextNode.nextNodeId = this.nodeInfos[0].nodeId;
         }
       }
-      // else {
-      //   this.nextNodeList.map(item => {
-      //     if (item.nodeId === val) {
-      //       this.isMultiple(item.transRule.userSelectionType);
-      //     }
-      //   });
-      // }
 
       if (val === 9) {
         this.isReject = true;
@@ -1705,9 +1701,6 @@ export default {
                   if (item.taskNodeList != null) {
                     this.nodeInfos = item.taskNodeList;
                   }
-                  // if (item.taskNodeList) {
-                  //   this.nextNode.nextNodeId = item.taskNodeList[0].nodeId;
-                  // }
                 }
                 if (taskOperations.length == 1) {
                   this.nodeInfos = [];
@@ -1816,11 +1809,6 @@ export default {
                   this.moreList.push(item);
                 }
               });
-              //  else if (
-              //     item.fun === 'toSendMsg()' ||
-              //     item.fun === 'toStartDraf()'
-              //   ) {
-              //   }
             }
             this.isCustomPreset = isCustomPreset;
             this.isPreset = isPreset;
@@ -2123,8 +2111,7 @@ export default {
           params.processDefinitionId = taskExamineInfo.processDefinitionId;
           params.isSubFlow = taskExamineInfo.isSubFlow;
           params.nodeId = taskExamineInfo.nodeId;
-          return;
-          util
+          return util
             .ajax({ url: taskHandleHtml, method: 'post', data: params })
             .then((res) => {
               const { status, message } = res;

package/packages/form/src/main.vue

@@ -147,10 +147,11 @@
                 :tableAfter="tableAfter"
                 v-bind="items"
                 :thead="thead"
-                :model.sync="models"
                 :readonly="readonly"
                 :contents="items.contents"
                 :widths="widths"
+                :zoom="zoom"
+                :model.sync="models"
                 @click="handleClick"
                 @change="handleChange"
                 @dataChange="handleDataChange"
@@ -1000,6 +1001,7 @@
               :label-width="labelWidth"
               :span="span"
               :widths="widths"
+              :zoom="zoom"
               :model.sync="models"
               @click="handleClick"
               @change="handleChange"
@@ -1901,6 +1903,7 @@
               :model.sync="models"
               :readonly="readonly"
               :contents="items.contents"
+              :zoom="zoom"
               :widths="widths"
               @click="handleClick"
               @change="handleChange"
@@ -2700,12 +2703,13 @@
             :tableAfter="tableAfter"
             v-bind="tableAttrs"
             :thead="thead"
-            :model.sync="models"
             :contents="formContent"
             :readonly="readonly"
             :label-width="labelWidth"
             :span="span"
             :widths="widths"
+            :zoom="zoom"
+            :model.sync="models"
             @click="handleClick"
             @change="handleChange"
             @dataChange="handleDataChange"

package/packages/form/src/table.vue

@@ -1022,7 +1022,8 @@ export default {
     },
     caption: String,
     widths: Array,
-    thead: Array
+    thead: Array,
+    zoom: false
   },
   computed: {
     content() {
@@ -1103,6 +1104,13 @@ export default {
       }
     }
   },
+  watch: {
+    zoom: {
+      handler(val) {
+        this.getWidth();
+      }
+    }
+  },
   data() {
     return {
       col: this.span ? this.span : 2,

package/packages/icon/src/icon.json

@@ -0,0 +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","home","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"]

package/packages/icon/src/main.vue

@@ -17,11 +17,7 @@
     <es-dialog title="选择图标" :visible.sync="visible">
       <el-scrollbar class="es-scrollbar" ref="scrollbar">
         <ul class="es-icon-list">
-          <li
-            v-for="name in $icon"
-            :key="name"
-            @click.stop="handleSelect(name)"
-          >
+          <li v-for="name in list" :key="name" @click.stop="handleSelect(name)">
             <span>
               <i :class="'es-icon-' + name"></i>
               <span class="icon-name">{{ 'es-icon-' + name }}</span>
@@ -33,7 +29,7 @@
   </div>
 </template>
 <script>
-//import util from 'eoss-ui/src/utils/util';
+import icon from './icon.json';
 export default {
   name: 'EsIcon',
   inheritAttrs: false,
@@ -62,6 +58,7 @@ export default {
   },
   data() {
     return {
+      list: icon,
       icon: null,
       visible: false
     };

package/packages/main/src/main.vue

@@ -286,6 +286,7 @@ export default {
       type: String,
       default: ''
     },
+    param: Object,
     header: {
       type: Boolean,
       default: true
@@ -665,6 +666,20 @@ export default {
           }
         });
     },
+    // 将chalk写入到页面中
+    handleColorToPage(globalThalk) {
+      const thalk = document.getElementById('chalk-style');
+      if (!thalk) {
+        let ele = document.createElement('style');
+        ele.setAttribute('id', 'chalk-style');
+        ele.innerText = globalThalk;
+        document.head.appendChild(ele);
+      }
+      // 如果设置过主题的话
+      else {
+        thalk.innerText = globalThalk;
+      }
+    },
     renderMenu() {
       if (this.data !== undefined && this.data.length) {
         this.menus = JSON.parse(JSON.stringify(this.data));
@@ -903,7 +918,7 @@ export default {
     //获取应用导航菜单
     getMenu() {
       util
-        .ajax({ url: this.action })
+        .ajax({ url: this.action, params: this.param ? this.param : {} })
         .then((res) => {
           if (res.rCode === 0) {
             this.menus = JSON.parse(JSON.stringify(res.results));

package/packages/menu/src/main.vue

@@ -70,7 +70,7 @@ export default {
         } else {
           this.$nextTick(() => {
             let w = 0;
-            Array.from(this.$refs.menu.$el.children).forEach(item => {
+            Array.from(this.$refs.menu.$el.children).forEach((item) => {
               w += item.offsetWidth;
             });
             const styles = window.getComputedStyle(this.$refs.menu.$el);
@@ -114,7 +114,7 @@ export default {
         this.$refs.menu.close(this.menuId);
       } else {
         let openedMenus = item.rootMenu.openedMenus;
-        openedMenus.forEach(item => {
+        openedMenus.forEach((item) => {
           if (keyPath.indexOf(item) == -1) {
             this.$refs.menu.close(item);
           }
@@ -288,17 +288,20 @@ export default {
   },
   render(h) {
     let doms = [];
-    this.data.forEach(item => {
+    this.data.forEach((item) => {
       if (item.children && item.children.length) {
         doms = doms.concat(this.getSub(item, h, 'es-sub-menu'));
       } else {
         const title = [
           h('i', {
-            class: item.icons
-              ? this.unicode(item.icons)
-                ? item.icons
-                : 'es-icons iconfont'
-              : 'es-icon-application',
+            class: [
+              item.icons
+                ? this.unicode(item.icons)
+                  ? item.icons
+                  : 'es-icons iconfont'
+                : 'es-icon-application',
+              'es-menu-item-icon'
+            ],
             domProps:
               item.icons === '' || this.unicode(item.icons)
                 ? {}
@@ -343,6 +346,7 @@ export default {
           h(
             'el-menu-item',
             {
+              class: [`es-menu-item-${this.mode}`],
               props: {
                 paddingLeft: this.paddingLeft
               },