eoss-ui 0.4.17 → 0.4.19

package/packages/theme-chalk/src/flow.scss

@@ -62,14 +62,14 @@
   }
 }
 // .commonOpinion{
-  .commonOpinion-set{
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    .el-table__body-wrapper{
-      flex:1
-    }
+.commonOpinion-set {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  .el-table__body-wrapper {
+    flex: 1;
   }
+}
 // }
 .es-flow-index-shrink {
   width: 24px;
@@ -227,19 +227,9 @@
 .select-users .el-input-group__append {
   background-color: $--color-primary;
 }
-.select-users .el-input-group__append .el-button::after {
-  content: '';
-  display: inline-block;
-  width: 25px;
-  height: 25px;
-  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAx5JREFUaEPtWO1RFUEQnI4AiUCJQIhAjECNQI1AiECNQIhAiUCIQIlAjECMQIigrX41Y21d+W4/D+pRb6v4wbvbven56OlZ2IYvbLj9tgVw3xHcRuDBRYDkazN7aWb7ZvbEAV6b2ZWZnQM4Gwl6WAqRlNGfEqPX2SkwxwDORwAZAoDkZzN74wZdmtkX9/aNfiP5yKOid575eycAjntBdANIjL8ViJxnSQrEiZntmNkpgKMeEF0APG2+mpmMPwSgPM8ukqqP7w7iVQ703IG9AH55zr8FoLQpXiTledXMNYC94o2TF5sBeCoo9y8BHLYYQFJRUE00R6EHgDwuyqz2foBNnHAGIEigyhc9AH441+8BEDVWL5LqE0rDKwAH1QeYtYs5ktQHATQ7wSm265zmj5MUx+8MAnALQL2ievUAiAIckULNRNADQFLghcsCNabqlVDpvRSxqPNbD4+TjD7yHIAiWr2aI+AFKPZ53BKFxPu/AYRqvXMAEQV9+KBCSqT7mr2/YsFqyJMNiSf15AjA6dyZJN+5mNNrktVN9RPf6AbgqfTBzN77oUorGaXmJGktOS25IAEn/RPp0m38kAiEJxJlWhLUZu0zPbw7AiSVz0oLTWQ1SzT8sbRu1h3cDMB1jNImFWEXmsRErZ5C6UQWM7KAqn/EkigUkCY91QTA00VSWu1fw4xyXiPiyuDc8hFT9aA/TWbap7Sq7gXVACYsIo9rjCwyfArMgSgCEZEsi3XVwIQyh7CIs1RMZ/q3ar4ojoAXq6RD9UdyKeUgVEtKS63i5lYEwAtWA4xyfpjn/5NSEQmlpDp7trBLAcT4eAGgli5LAvDvHZKhcosUahZAMvaJbfZLvFJl8eTl5Ht6kp01SgCER8TVkgyLL5IhTbJRKAHwx3N/t5UuaxEnUbgBsDu3fxZAom9+AlAnvbNFUrd8T3N3RjkA6rDSOYsxzzqPJD1n9v40ByAG92JeHhWipO/MDvwPHsCqgHvvflqj4pdns4Wci4AoVACaLm9bDY99fvkrAGubZ5ZGe41Yev8WwNIezp2/jUDOQ0s/3/gI/AUY12NA2FztQAAAAABJRU5ErkJggg==)
-    no-repeat;
-  background-size: 100% 100%;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 10;
+.select-users .el-input-group__append .el-button i {
+  font-size: 18px;
+  color: #fff;
 }
 .es-flow-form .input-with-select .el-input-group__prepend {
   background-color: #fff;

package/packages/theme-chalk/src/index.scss

@@ -2,7 +2,6 @@
 @import "./button.scss";
 @import "./button-group.scss";
 @import "./checkbox-group.scss";
-@import "./ca-login.scss";
 @import "./card.scss";
 @import "./cascader.scss";
 @import "./clients.scss";

package/packages/theme-chalk/src/tree.scss

@@ -12,7 +12,7 @@
     background-color: #f5f7fa;
     border-bottom: $--border-base;
     .es-tree-filtrate {
-      & + .es-tree-search-item {
+      &.es-tree-hasfiltrate + .es-tree-search-item {
         margin-top: 4px;
       }
     }

package/packages/theme-chalk/src/upload.scss

@@ -46,7 +46,7 @@
   }
 }
 .es-upload-text {
-  & > .el-upload-list,
+  & > .el-upload-list:not(.is-disabled),
   & > .el-scrollbar {
     margin-top: 8px;
   }
@@ -75,8 +75,10 @@
     }
   }
   &.es-upload-text:not(.es-avatar-uploader) {
-    .el-upload-list__item:first-child {
-      margin-top: 5px;
+    .el-upload-list--text:not(.is-disabled) {
+      .el-upload-list__item:first-child {
+        margin-top: 5px;
+      }
     }
   }
   &.es-avatar-uploader {
@@ -129,3 +131,8 @@
     }
   }
 }
+.el-upload-list--picture.is-disabled {
+  .el-upload-list__item:first-child {
+    margin-top: 0;
+  }
+}

package/packages/tree/src/main.vue

@@ -10,7 +10,10 @@
   >
     <div v-if="title" class="es-tree-title">{{ title }}</div>
     <div class="es-tree-search" v-if="showSearch || $slots.filtrate">
-      <div class="es-tree-filtrate">
+      <div
+        class="es-tree-filtrate"
+        :class="{ 'es-tree-hasfiltrate': $slots.filtrate }"
+      >
         <slot name="filtrate"></slot>
       </div>
       <template v-if="showSearch">
@@ -166,6 +169,10 @@ export default {
       type: String,
       default: getOrgMainTree
     },
+    currentFirstNode: {
+      type: Boolean,
+      default: false
+    },
     system: {
       type: Boolean,
       default: false
@@ -370,18 +377,18 @@ export default {
           data: params,
           params: params
         })
-        .then(res => {
+        .then((res) => {
           this.loading = false;
           if (res.rCode === 0) {
             this.treeList = JSON.parse(JSON.stringify(res.results));
-            this.expandedKeys = this.treeList.filter(item => {
+            this.expandedKeys = this.treeList.filter((item) => {
               if (item.open) {
                 return item.id;
               }
             });
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -401,11 +408,11 @@ export default {
         }
         if (this.onLoadsub) {
           this.onLoadsub({ data, params, node })
-            .then(res => {
+            .then((res) => {
               this.loading = false;
               this.$set(data, 'children', JSON.parse(JSON.stringify(res)));
             })
-            .catch(e => {});
+            .catch((e) => {});
         } else {
           util
             .ajax({
@@ -414,7 +421,7 @@ export default {
               data: params,
               params: params
             })
-            .then(res => {
+            .then((res) => {
               if (res.rCode === 0) {
                 this.loading = false;
                 let results = JSON.parse(JSON.stringify(res.results));
@@ -431,7 +438,7 @@ export default {
                 }
               }
             })
-            .catch(err => {
+            .catch((err) => {
               this.loading = false;
               if (err.message && err.message !== 'canceled') {
                 this.$message.error(err.message);
@@ -512,7 +519,7 @@ export default {
             }
           }
         } else if (Array.isArray(this.changeData)) {
-          this.changeData.forEach(item => {
+          this.changeData.forEach((item) => {
             changeData[item] = data[item];
           });
         } else {
@@ -532,13 +539,13 @@ export default {
         let changeData = {};
         if (util.isObject(this.changeData)) {
           for (let i in this.changeData) {
-            changeData[i] = checkeds.map(item => {
+            changeData[i] = checkeds.map((item) => {
               return item[this.changeData[i]];
             });
           }
         } else if (Array.isArray(this.changeData)) {
-          this.changeData.forEach(item => {
-            changeData[item] = checkeds.map(ele => {
+          this.changeData.forEach((item) => {
+            changeData[item] = checkeds.map((ele) => {
               return ele[this.changeData[i]];
             });
           });
@@ -609,7 +616,7 @@ export default {
       return this.$refs.oaTree.insertAfter(data, refNode);
     },
     getKeys(data, result) {
-      data.forEach(item => {
+      data.forEach((item) => {
         result.push(item.id);
         if (
           Object.prototype.hasOwnProperty.call(item, 'children') &&

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

@@ -65,6 +65,7 @@
         <es-form
           v-if="form"
           v-bind="form"
+          :zoom="zoom"
           :ref="form.ref ? form.ref : 'esForm'"
           v-on="{ ...$listeners, ...form.events }"
         >
@@ -81,6 +82,7 @@
           size="mini"
           v-bind="{ close: true, ...table }"
           :param="param"
+          :zoom="zoom"
           :ref="table.ref ? table.ref : 'esDataTable'"
           v-on="{ ...$listeners, ...table.events }"
         >
@@ -188,7 +190,8 @@ export default {
     empty: {
       type: String,
       default: '#/empty'
-    }
+    },
+    zoom: false
   },
   computed: {
     wujieName() {
@@ -311,7 +314,7 @@ export default {
         if (this.checkeds) {
           if (Array.isArray(this.checkeds)) {
             let creditCodes = [];
-            this.checkeds.forEach(item => {
+            this.checkeds.forEach((item) => {
               if (item.creditCode && item.creditCode !== 'undefined') {
                 creditCodes.push(item.creditCode);
               } else {
@@ -334,7 +337,7 @@ export default {
             if (this.syncKeys && util.isObject(this.syncKeys)) {
               for (let i in this.syncKeys) {
                 params[i] = this.checkeds
-                  .map(item => {
+                  .map((item) => {
                     if (
                       Object.prototype.hasOwnProperty.call(
                         item,
@@ -351,7 +354,7 @@ export default {
               }
             } else {
               params.id = this.checkeds
-                .map(item => {
+                .map((item) => {
                   return item.id;
                 })
                 .join(',');

package/packages/upload/src/main.vue

@@ -263,6 +263,7 @@ export default {
     },
     // 单文件大小
     size: Number,
+    totalSize: Number,
     // 是否头像模式上传
     portrait: {
       type: Boolean,
@@ -394,6 +395,7 @@ export default {
       fileAccept: '',
       fileSize: 0,
       fileTotalSize: 0,
+      filesTotalSize: 0,
       showImg: false,
       imgChange: false,
       title: '',
@@ -447,9 +449,6 @@ export default {
       if ((this.photo && typeof this.photo === 'string') || this.value) {
         return false;
       }
-      if (this.photo && typeof this.photo === 'string') {
-        return false;
-      }
       return this.showFileList;
     },
     url() {
@@ -472,16 +471,23 @@ export default {
         ? 'image/*'
         : undefined;
     },
-    sizes() {
+    _size() {
       return this.size ? this.size : this.fileSize ? this.fileSize : 0;
     },
+    _totalSize() {
+      return this.totalSize
+        ? this.totalSize
+        : this.fileTotalSize
+        ? this.fileTotalSize
+        : 0;
+    },
     getAdjunctFileInfos() {
       return typeof this.fileList === 'string'
         ? this.fileList
         : getAdjunctFileInfos;
     },
     showList() {
-      return this.portrait || !this.multiple ? false : this.showFileList;
+      return this.portrait ? false : this.showFileList;
     },
     isDownloads() {
       return this.downloads;
@@ -542,10 +548,12 @@ export default {
       if (this.value) {
         if (typeof this.value === 'string') {
           if (this.value.indexOf('data:image/') === -1) {
-            let val = util.jointUrl({
-              url: this.value,
-              reg: this.host + '/main2'
-            });
+            let val =
+              this.host +
+              util.jointUrl({
+                url: this.value,
+                reg: '/main2'
+              });
             return val;
           }
           if (
@@ -572,10 +580,12 @@ export default {
         typeof this.photo === 'string' &&
         this.photo.indexOf('data:image/') === -1
       ) {
-        let val = util.jointUrl({
-          url: this.photo,
-          reg: this.host + '/main2'
-        });
+        let val =
+          this.host +
+          util.jointUrl({
+            url: this.photo,
+            reg: '/main2'
+          });
         return val;
       }
       return this.photo;
@@ -588,11 +598,29 @@ export default {
       handler(val) {
         if (Array.isArray(val) && val.length > 0) {
           this.lists = val;
+          let filesTotalSize = 0;
+          val.forEach((item) => {
+            filesTotalSize += item.size ? item.size : 0;
+          });
+          this.filesTotalSize = filesTotalSize;
         } else {
           this.getFiles(this.params);
         }
       }
     },
+    value: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        if (val && typeof val === 'object' && this.showFileList) {
+          if (Array.isArray(val)) {
+            this.lists = val;
+          } else {
+            this.lists = [val];
+          }
+        }
+      }
+    },
     params: {
       deep: true,
       handler(val) {
@@ -649,7 +677,7 @@ export default {
                   ','
                 );
                 this.fileSize = res.results.limitFileSize
-                  ? res.results.limitFileSize / 1024 / 1024
+                  ? res.results.limitFileSize
                   : 0;
                 this.fileTotalSize = res.results.limitTotalSize;
               }
@@ -663,7 +691,6 @@ export default {
       }
     },
     getFiles(params) {
-      console.log(111, params);
       if (
         !this.show ||
         (this.isRequiredOwnId &&
@@ -685,6 +712,11 @@ export default {
               this.image = JSON.parse(JSON.stringify(res.results))[0];
             } else {
               this.lists = JSON.parse(JSON.stringify(res.results));
+              let filesTotalSize = 0;
+              this.lists.forEach((item) => {
+                filesTotalSize += item.size ? item.size : 0;
+              });
+              this.filesTotalSize = filesTotalSize;
               this.$emit('input', this.lists);
             }
           } else {
@@ -803,10 +835,35 @@ export default {
       };
     },
     isLt(file) {
-      const flag =
-        this.sizes === 0 ? true : file.size / 1024 / 1024 < this.sizes;
-      if (!flag) {
-        this.$message.error('上传头像图片大小不能超过 ' + this.sizes + 'MB!');
+      let flag = false;
+      let size = this._size;
+      let text = '单个附件';
+      if (this._size === 0 && this._totalSize === 0) {
+        flag = true;
+      } else if (this._size > 0 && this._totalSize === 0) {
+        flag = file.size < this._size;
+        size = this._size;
+        text = '单个附件';
+      } else if (this._size === 0 && this._totalSize > 0) {
+        flag = this.filesTotalSize + file.size < this._totalSize;
+        size = this._totalSize;
+        text = '附件总';
+      } else {
+        flag =
+          file.size < this._size &&
+          this.filesTotalSize + file.size < this._totalSize;
+        if (file.size < this._size) {
+          size = this._size;
+          text = '单个附件';
+        } else {
+          size = this._totalSize;
+          text = '附件总';
+        }
+      }
+      if (flag) {
+        this.filesTotalSize += file.size;
+      } else {
+        this.$message.error(`上传${text}大小不能超过${size}KB!`);
       }
       return flag;
     },
@@ -821,7 +878,7 @@ export default {
       if (this.beforeUpload) {
         return this.beforeUpload(file);
       }
-      return true;
+      return this.isLt(file);
     },
     handleBeforeRemove(file, fileList) {
       if (file && file.status === 'success') {

package/src/index.js

@@ -3,7 +3,6 @@
 import Button from '../packages/button/index.js';
 import ButtonGroup from '../packages/button-group/index.js';
 import CheckboxGroup from '../packages/checkbox-group/index.js';
-import CaLogin from '../packages/ca-login/index.js';
 import Card from '../packages/card/index.js';
 import Cascader from '../packages/cascader/index.js';
 import Clients from '../packages/clients/index.js';
@@ -55,7 +54,6 @@ const components = [
   Button,
   ButtonGroup,
   CheckboxGroup,
-  CaLogin,
   Card,
   Cascader,
   Clients,
@@ -115,12 +113,11 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.17',
+  version: '0.4.19',
   install,
   Button,
   ButtonGroup,
   CheckboxGroup,
-  CaLogin,
   Card,
   Cascader,
   Clients,