eoss-ui 0.4.15 → 0.4.18

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">
@@ -370,18 +373,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 +404,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 +417,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 +434,7 @@ export default {
                 }
               }
             })
-            .catch(err => {
+            .catch((err) => {
               this.loading = false;
               if (err.message && err.message !== 'canceled') {
                 this.$message.error(err.message);
@@ -512,7 +515,7 @@ export default {
             }
           }
         } else if (Array.isArray(this.changeData)) {
-          this.changeData.forEach(item => {
+          this.changeData.forEach((item) => {
             changeData[item] = data[item];
           });
         } else {
@@ -532,13 +535,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 +612,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/upload/src/main.vue

@@ -640,7 +640,7 @@ export default {
             data: { code: this.code },
             params: { code: this.code }
           })
-          .then(res => {
+          .then((res) => {
             if (res.rCode === 0) {
               if (res.results) {
                 this.excludeNames = res.results.excludeName;
@@ -655,7 +655,7 @@ export default {
               }
             }
           })
-          .catch(err => {
+          .catch((err) => {
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
             }
@@ -663,6 +663,7 @@ export default {
       }
     },
     getFiles(params) {
+      console.log(111, params);
       if (
         !this.show ||
         (this.isRequiredOwnId &&
@@ -678,7 +679,7 @@ export default {
           params: params,
           format: false
         })
-        .then(res => {
+        .then((res) => {
           if (res.rCode === 0) {
             if (this.portrait === true) {
               this.image = JSON.parse(JSON.stringify(res.results))[0];
@@ -691,7 +692,7 @@ export default {
             this.$message.error(msg);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -858,7 +859,7 @@ export default {
                       id: file.adjunctId || file.response.adjunctId
                     }
                   })
-                  .then(res => {
+                  .then((res) => {
                     if (res.rCode === 0) {
                       this.$message.success(res.msg);
                       resolve();
@@ -868,7 +869,7 @@ export default {
                       reject();
                     }
                   })
-                  .catch(err => {
+                  .catch((err) => {
                     if (err.message && err.message !== 'canceled') {
                       this.$message.error(err.message);
                     }
@@ -930,7 +931,7 @@ export default {
         if (this.onSort) {
           this.onSort(files);
         } else {
-          let ids = files.map(item => {
+          let ids = files.map((item) => {
             if (item.status === 'success') {
               return item.adjunctId || item.response.adjunctId;
             }
@@ -947,7 +948,7 @@ export default {
                 ids: ids
               }
             })
-            .then(res => {
+            .then((res) => {
               if (res.rCode === 0) {
                 this.$message.success(res.msg);
               } else {
@@ -955,7 +956,7 @@ export default {
                 this.$message.error(msg);
               }
             })
-            .catch(err => {
+            .catch((err) => {
               if (err.message && err.message !== 'canceled') {
                 this.$message.error(err.message);
               }

package/src/index.js

@@ -115,7 +115,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.15',
+  version: '0.4.18',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -37,9 +37,9 @@ import { MessageBox, Loading } from 'eoss-element';
  * @param {String} [host] - host
  * @param {Object} [data] - 请求参数
  * @param {Object} [params] - 请求参数
- * @param {Boolean} [format] - post请求是否使用表单类型
- * @param {Boolean} [mix] - 是否混合传参
- * @param {Boolean} [defaults] - 是否传入默认参数userId
+ * @param {Boolean} [format = true] - post请求是否使用表单类型
+ * @param {Boolean} [mix = false] - 是否混合传参
+ * @param {Boolean} [defaults = false] - 是否传入默认参数userId
  * @param {Object} [loading] - loading加载对象
  **/
 // 请求