eoss-ui 0.5.79 → 0.5.81-beta

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

@@ -562,7 +562,13 @@ export default {
         if (this.list && this.list.length) {
           return this.list;
         }
-        if (this.config.totalCount == 0 && this.data.length) {
+        if (
+          this.page &&
+          ((typeof this.page === 'object' &&
+            (!Object.prototype.hasOwnProperty.call(this.page, 'totalCount') ||
+              this.page.totalCount == 0)) ||
+            this.page === true)
+        ) {
           this.config.totalCount = this.data.length - this.lose;
         }
         if (this.page && this.data.length > this.config.pageSize) {
@@ -641,10 +647,15 @@ export default {
       this.doLayout();
     },
     // data: {
-    //   immediate: true,
     //   deep: true,
     //   handler(val) {
-    //     this.config.totalCount = val.length - this.lose;
+    //     if (
+    //       this.page &&
+    //       typeof this.page === 'object' &&
+    //       !Object.prototype.hasOwnProperty.call(this.page, 'totalCount')
+    //     ) {
+    //       this.config.totalCount = val.length - this.lose;
+    //     }
     //   }
     // },
     page() {
@@ -1013,7 +1024,7 @@ export default {
       if (where) {
         reqData = util.extend({}, reqData, where);
       }
-      if (this.retainSearh) {
+      if (this.retainSearh || first === false) {
         reqData = util.extend({}, reqData, this.wheres);
       }
       if (this.isJoin) {
@@ -1258,7 +1269,7 @@ export default {
       }
       let thead = this.theads;
       if (this.$refs.oaTable) {
-        thead = this.$refs.oaTable.getThead();
+        thead = this.$refs.oaTable.getThead().thead;
       }
       if (handle.action) {
         let isConfirm = handle.confirm || true;
@@ -1449,6 +1460,7 @@ export default {
               data: JSON.parse(JSON.stringify(data))
             })
           : data;
+
       if (this.url && this.executeFilter) {
         this.getTableData({ where: this.wheres });
       }

package/packages/form/src/main.vue

@@ -54,10 +54,12 @@
                 class="es-collapse-item"
                 v-if="!items.hide"
                 v-show="items.show !== false"
+                v-bind="items.config"
                 :class="{
                   'es-collapse-readonly': accordion ? false : !collapse,
                   'es-collapse-caption': items.caption
                 }"
+                :show-title="items.showTitle"
                 :name="items.name || String(indexs)"
                 :key="indexs"
                 :readonly="accordion ? false : !collapse"
@@ -591,7 +593,10 @@
                         v-else-if="item.type === 'component'"
                         v-model="models[item.name]"
                         v-bind="
-                          handleExclAttribute({ data: item, attrs: ['value'] })
+                          handleExclAttribute({
+                            data: item,
+                            attrs: ['value', 'type']
+                          })
                         "
                         v-on="item.events"
                       ></component>
@@ -657,6 +662,7 @@
                               </div>
                               <el-form-item
                                 label-width="0"
+                                :class="{ 'fixed-width': inline.width }"
                                 :prop="inline.name"
                                 :rules="getRules(inline)"
                               >
@@ -845,7 +851,7 @@
                                   v-bind="
                                     handleExclAttribute({
                                       data: inline,
-                                      attrs: ['value']
+                                      attrs: ['value', 'type']
                                     })
                                   "
                                   v-on="inline.events"
@@ -900,6 +906,7 @@
                           </div>
                           <el-form-item
                             label-width="0"
+                            :class="{ 'fixed-width': item.inline.width }"
                             :prop="item.inline.name"
                             :rules="getRules(item.inline)"
                           >
@@ -1093,7 +1100,7 @@
                               v-bind="
                                 handleExclAttribute({
                                   data: inline,
-                                  attrs: ['value']
+                                  attrs: ['value', 'type']
                                 })
                               "
                               v-on="inline.events"
@@ -1549,7 +1556,7 @@
                     v-bind="
                       handleExclAttribute({
                         data: item,
-                        attrs: ['value']
+                        attrs: ['value', 'type']
                       })
                     "
                     v-on="item.events"
@@ -1609,6 +1616,7 @@
                           </div>
                           <el-form-item
                             label-width="0"
+                            :class="{ 'fixed-width': inline.width }"
                             :prop="inline.name"
                             :rules="getRules(inline)"
                           >
@@ -1776,7 +1784,7 @@
                               v-bind="
                                 handleExclAttribute({
                                   data: inline,
-                                  attrs: ['value']
+                                  attrs: ['value', 'type']
                                 })
                               "
                               v-on="inline.events"
@@ -1824,6 +1832,7 @@
                       </div>
                       <el-form-item
                         label-width="0"
+                        :class="{ 'fixed-width': item.inline.width }"
                         :prop="item.inline.name"
                         :rules="getRules(item.inline)"
                       >
@@ -1983,7 +1992,7 @@
                           v-bind="
                             handleExclAttribute({
                               data: item.inline,
-                              attrs: ['value']
+                              attrs: ['value', 'type']
                             })
                           "
                           v-on="item.inline.events"
@@ -2554,7 +2563,7 @@
                       v-bind="
                         handleExclAttribute({
                           data: item,
-                          attrs: ['value']
+                          attrs: ['value', 'type']
                         })
                       "
                       v-on="item.events"
@@ -2618,6 +2627,7 @@
                             </div>
                             <el-form-item
                               label-width="0"
+                              :class="{ 'fixed-width': inline.width }"
                               :prop="inline.name"
                               :rules="getRules(inline)"
                             >
@@ -2805,7 +2815,7 @@
                                 v-bind="
                                   handleExclAttribute({
                                     data: inline,
-                                    attrs: ['value']
+                                    attrs: ['value', 'type']
                                   })
                                 "
                                 v-on="inline.events"
@@ -2860,6 +2870,7 @@
                         </div>
                         <el-form-item
                           label-width="0"
+                          :class="{ 'fixed-width': item.inline.width }"
                           :prop="item.inline.name"
                           :rules="getRules(item.inline)"
                         >
@@ -3034,7 +3045,7 @@
                             v-bind="
                               handleExclAttribute({
                                 data: item.inline,
-                                attrs: ['value']
+                                attrs: ['value', 'type']
                               })
                             "
                             v-on="item.inline.events"
@@ -3468,7 +3479,7 @@
                   v-bind="
                     handleExclAttribute({
                       data: item,
-                      attrs: ['value']
+                      attrs: ['value', 'type']
                     })
                   "
                   v-on="item.events"
@@ -3544,6 +3555,7 @@
                         >
                         <el-form-item
                           label-width="0"
+                          :class="{ 'fixed-width': inline.width }"
                           :prop="inline.name"
                           :rules="getRules(inline)"
                         >
@@ -3711,7 +3723,7 @@
                             v-bind="
                               handleExclAttribute({
                                 data: inline,
-                                attrs: ['value']
+                                attrs: ['value', 'type']
                               })
                             "
                             v-on="inline.events"
@@ -3759,6 +3771,7 @@
                     </div>
                     <el-form-item
                       label-width="0"
+                      :class="{ 'fixed-width': item.inline.width }"
                       :prop="item.inline.name"
                       :rules="getRules(item.inline)"
                     >
@@ -3918,7 +3931,7 @@
                         v-bind="
                           handleExclAttribute({
                             data: item.inline,
-                            attrs: ['value']
+                            attrs: ['value', 'type']
                           })
                         "
                         v-on="item.inline.events"
@@ -4524,7 +4537,8 @@ export default {
   mounted() {
     this.$nextTick(() => {
       !this.height && this.getHeight();
-      this.$refs.esForm.$el.addEventListener('keyup', this.handleEnter);
+      this.$refs.esForm &&
+        this.$refs.esForm.$el.addEventListener('keyup', this.handleEnter);
     });
   },
   methods: {

package/packages/handler/src/main.vue

@@ -191,7 +191,9 @@ export default {
       return true;
     },
     onlineList() {
-      return this.useCaseCodes.includes('sys_user_onlineList');
+      return (
+        this.useCaseCodes && this.useCaseCodes.includes('sys_user_onlineList')
+      );
     }
   },
   data() {

package/packages/icon/src/main.vue

@@ -1,12 +1,17 @@
 <template>
-  <i
-    :class="[className, { 'es-pointer': Object.keys(event).length }]"
+  <component
+    :is="tag"
+    :class="[
+      className,
+      { 'es-pointer': Object.keys(event).length, 'es-icon_image': tag == 'img' }
+    ]"
+    :src="tag == 'img' ? contents : ''"
     v-on="event"
     v-html="code"
-  >
-  </i>
+  />
 </template>
 <script>
+import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'EsIcon',
   inheritAttrs: false,
@@ -19,13 +24,28 @@ export default {
       deep: true,
       handler(val) {
         if (val) {
-          if (typeof val == 'string') {
-            if (!this.unicode(val)) {
-              this.code = val;
-              this.className = 'es-icon';
+          if (typeof val == 'string' && val) {
+            if (
+              val.indexOf('.jpge') > 1 ||
+              val.indexOf('.jpg') > 1 ||
+              val.indexOf('.gif') > 1 ||
+              val.indexOf('.png') > 1 ||
+              val.indexOf('data:image/jpge;base64') > -1 ||
+              val.indexOf('data:image/jpg;base64') > -1 ||
+              val.indexOf('data:image/gif;base64') > -1 ||
+              val.indexOf('data:image/png;base64') > -1 ||
+              util.startWith(val, ['http', 'https', '/'])
+            ) {
+              this.tag = 'img';
             } else {
-              this.code = '';
-              this.className = val;
+              this.tag = 'i';
+              if (!this.unicode(val)) {
+                this.code = val;
+                this.className = 'es-icon';
+              } else {
+                this.code = '';
+                this.className = val;
+              }
             }
           } else {
             this.code = val.code;
@@ -38,6 +58,7 @@ export default {
   },
   data() {
     return {
+      tag: 'i',
       code: '',
       className: '',
       event: {}

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","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","wenjianjiadakai","yingyonglan"]
+["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"]

package/packages/input/src/main.vue

@@ -30,10 +30,6 @@ export default {
         return {};
       }
     },
-    autocomplete: {
-      type: [String, Boolean],
-      default: ''
-    },
     fetchSuggestions: Function,
     focusShow: {
       type: Boolean,

package/packages/login/src/main.vue

@@ -2,6 +2,11 @@
   <div
     v-if="!code"
     class="es-login-screen"
+    :class="{
+      'es-login-medium': size == 'medium',
+      'es-login-small': size == 'small',
+      'es-login-mini': size == 'mini'
+    }"
     :style="getBackground(loginBackgroundImg)"
   >
     <img v-if="loginLogoImg" class="es-login-logo" :src="loginLogoImg" />
@@ -79,7 +84,6 @@
                   :focusShow="focusShow"
                   :data="users"
                   @select="handleBlur"
-                  :autocomplete="true"
                 >
                   <template slot="prefix">
                     <i class="es-icon-zhanghao es-label-user"></i>
@@ -394,6 +398,7 @@ export default {
       type: String,
       default: initLogin
     },
+    size: String,
     mode: {
       type: String,
       default: 'default'
@@ -988,12 +993,12 @@ export default {
     isShow(res) {
       return this.loginModel.indexOf(res) > -1;
     },
-    getLogin() {
+    async getLogin() {
       const config = util.getStorage('initLogin');
       if (config) {
         this.setConfig(config);
       }
-      util
+      await util
         .ajax({ url: this.initLogin })
         .then((res) => {
           if (res && res.rCode === 0) {
@@ -1144,12 +1149,13 @@ export default {
       }
       let data = {};
       let flag = false;
+      let ref = 'login' + this.active;
       if (this.active == 12) {
         if (!this.formData.username) {
-          this.$refs.login.validateField('username');
+          this.$refs[ref].validateField('username');
           return false;
         }
-        this.$refs.login.validateField('username', (res) => {
+        this.$refs[ref].validateField('username', (res) => {
           flag = res != '';
         });
         if (flag) {
@@ -1162,10 +1168,10 @@ export default {
         };
       } else {
         if (!this.formData.target) {
-          this.$refs.login.validateField('target');
+          this.$refs[ref].validateField('target');
           return false;
         }
-        this.$refs.login.validateField('target', (res) => {
+        this.$refs[ref].validateField('target', (res) => {
           flag = res != '';
         });
         if (flag) {