n20-common-lib 1.3.50 → 1.3.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.50",
+  "version": "1.3.53",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/assets/css/cl-form-item.scss

@@ -106,11 +106,15 @@ $--input-max: 304px;
 
 .el-input__inner {
   padding-left: 10px;
-
+  padding-right: 10px;
   &[oreadonly] {
     border-color: $--border-color-base;
   }
 }
+.el-input-number.is-without-controls .el-input__inner {
+  padding-left: 10px;
+  padding-right: 10px;
+}
 
 .w-224 {
   width: $--input-width !important;
@@ -679,6 +683,10 @@ $--input-max: 304px;
   .el-input__suffix {
     font-size: 14px;
   }
+  .el-icon-circle-close {
+    pointer-events: all;
+    cursor: pointer;
+  }
 }
 
 /* 多选搜索框 */
@@ -693,26 +701,19 @@ $--input-max: 304px;
     .el-select__input {
       margin-left: 10px;
     }
+    .el-input__suffix {
+      display: none;
+    }
   }
-  &[clearable] {
+  &.is-clearable {
     .el-select {
       .el-input__inner {
-        padding-right: 48px;
-      }
-      .el-input__suffix {
-        right: 26px;
-        .el-icon-arrow-up {
-          display: none;
-        }
+        padding-right: 50px;
       }
     }
   }
-  &:not([clearable]) {
-    .el-select {
-      .el-input__suffix {
-        display: none;
-      }
-    }
+  .el-input__suffix {
+    z-index: 1;
   }
 }
 

package/src/components/FileUploadTable/index.vue

@@ -22,7 +22,7 @@
         <template v-if="dataPorp.slotHeader">
           <el-table-column
             v-for="item in dataPorp.slotHeader"
-            :key="item"
+            :key="item.prop"
             :label="item.label"
             :prop="item.prop"
             :align="item.align || 'center'"
@@ -85,7 +85,7 @@
               <el-button
                 type="text"
                 icon="el-icon-download"
-                :disabled="!row[keys.url] || row.url"
+                :disabled="!row[keys.url]"
                 @click="downFile(row)"
               />
             </slot>
@@ -172,7 +172,7 @@
                 :ref="'upload' + $index"
                 class="n20-upload-table-up"
                 :file-name="row['_name'] || row[keys.name]"
-                :data="row['_fileData']"
+                :data="row['_fileData'] || fileData"
                 :msg-type="null"
                 :show-clear="false"
                 :action="action"
@@ -330,6 +330,7 @@
         :auto-upload="false"
         :multiple="true"
         :action="action"
+        :data="fileData"
         :headers="headers"
         :accept="fileAccept"
         :http-request="uploadHttpRequest"
@@ -339,9 +340,7 @@
         <template slot="trigger">
           <i class="drag-icon n20-icon-shangchuan"></i>
           <span class="drag-text">点击或将文件拖拽到这里上传</span>
-          <span class="drag-tip">
-            <slot>支持扩展名：.rar .zip .doc .docx .pdf .jpg...</slot>
-          </span>
+          <span class="drag-tip">{{ fileAcceptTip }}</span>
         </template>
       </clUpload>
       <div class="dialog-footer">
@@ -420,30 +419,6 @@ export default {
     return {
       imgType: /\.jpg|\.png|\.gif|\.svg$/i,
       selectionList: [],
-      fileAccept: this.dataPorp.fileAccept || undefined,
-      fileSize: this.dataPorp.fileSize || undefined,
-      typeOptions: this.dataPorp.typeOptions || [
-        {
-          type: '001',
-          label: '信贷合同'
-        },
-        {
-          type: '002',
-          label: '贴现合同'
-        },
-        {
-          type: '003',
-          label: '其他合同'
-        }
-      ],
-      keys: this.dataPorp.keys || {
-        rowKey: 'id',
-        type: 'type',
-        name: 'name',
-        url: 'url',
-        time: 'time',
-        user: 'user'
-      },
       currFileList: [],
       visibleP: false,
       visibleBatch: false,
@@ -452,6 +427,29 @@ export default {
       previewSameOrg: false
     }
   },
+  computed: {
+    fileAccept() {
+      return this.dataPorp.fileAccept || undefined
+    },
+    fileSize() {
+      return this.dataPorp.fileSize || undefined
+    },
+    fileAcceptTip() {
+      return (
+        this.dataPorp.fileAcceptTip ||
+        '支持扩展名：.rar .zip .doc .docx .pdf .jpg...'
+      )
+    },
+    fileData() {
+      return this.dataPorp.fileData || undefined
+    },
+    typeOptions() {
+      return this.dataPorp.typeOptions || typeOptionsD
+    },
+    keys() {
+      return this.dataPorp.keys || keysD
+    }
+  },
   methods: {
     batchUploadFn() {
       let $uploadwrap = this.$refs['upload-batch']
@@ -580,4 +578,18 @@ export default {
     }
   }
 }
+
+const keysD = {
+  rowKey: 'id',
+  type: 'type',
+  name: 'name',
+  url: 'url',
+  time: 'time',
+  user: 'user'
+}
+const typeOptionsD = [
+  { type: '001', label: '信贷合同' },
+  { type: '002', label: '贴现合同' },
+  { type: '003', label: '其他合同' }
+]
 </script>

package/src/components/Filters/index.vue

@@ -1,5 +1,6 @@
 <template>
   <el-popover
+    ref="popover"
     v-model="showPop"
     trigger="manual"
     :width="width"
@@ -39,7 +40,7 @@
             <el-button
               class="p-t-0 m-b-s color-primary"
               type="text"
-              @click="showMore = !showMore"
+              @click="moreFn"
               ><span>更多条件</span
               ><i
                 :class="showMore ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
@@ -197,6 +198,14 @@ export default {
         this.showPop = false
       }
     },
+    moreFn() {
+      if (this.showMore) {
+        this.showMore = false
+      } else {
+        this.showMore = true
+        setTimeout(() => this.$refs['popover'].updatePopper(), 360)
+      }
+    },
     setOptions(key, opts) {
       let item = this.filterList.find((f) => f.value === key)
       if (item) {
@@ -205,11 +214,20 @@ export default {
     },
     getRemote() {
       this.$refs['setRemote'].getColumns().then((list) => {
-        this.remoteList = list || this.filterList
+        if (list) {
+          this.remoteList = list
+        } else {
+          let defaultList = this.filterList.filter((col) => col.isDefault)
+          this.remoteList = defaultList.length
+            ? defaultList
+            : this.filterList.slice(0, this.defaultShow)
+        }
+        setTimeout(() => this.$refs['popover'].updatePopper(), 360)
       })
     },
     setRemoteChange(list) {
       this.remoteList = list
+      setTimeout(() => this.$refs['popover'].updatePopper(), 360)
     }
   }
 }

package/src/components/InputNumber/index.vue

@@ -1,9 +1,13 @@
 <template>
-  <div class="n20-num-w">
+  <div
+    class="n20-num-w"
+    @mouseenter="isHove = true"
+    @mouseleave="isHove = false"
+  >
     <el-input
       v-if="showStr"
       class="n20-stc"
-      :class="{ 'n20-num--rate': type === 'rate' }"
+      :class="{ 'n20-num--rate': type === 'rate' || isClearable }"
       :value="valueStr"
       :disabled="disabled"
       :placeholder="phd"
@@ -14,7 +18,7 @@
       v-else
       ref="input-number"
       class="n20-num"
-      :class="{ 'n20-num--rate': type === 'rate' }"
+      :class="{ 'n20-num--rate': type === 'rate' || isClearable }"
       :controls="false"
       v-bind="$attrs"
       :value="valueNum"
@@ -24,11 +28,14 @@
       @blur="blurFn"
       @change="changeFn"
     />
-    <span v-if="type === 'rate'" class="el-input__suffix">
-      <span class="el-input__icon" style="display: inline-block">{{
+    <span v-if="isClearable && isHove && value" class="el-input__suffix"
+      ><i class="el-input__icon el-icon-circle-close" @click="closeFn"></i
+    ></span>
+    <span v-else-if="type === 'rate'" class="el-input__suffix"
+      ><span class="el-input__icon" style="display: inline-block">{{
         suffix
-      }}</span>
-    </span>
+      }}</span></span
+    >
   </div>
 </template>
 
@@ -52,7 +59,7 @@ export default {
       type: Boolean,
       default: undefined
     },
-    clearable: {
+    isClearable: {
       type: Boolean,
       default: false
     },
@@ -78,7 +85,8 @@ export default {
     return {
       valueStr: '',
       valueNum: undefined,
-      showStr: true
+      showStr: true,
+      isHove: false
     }
   },
   computed: {
@@ -178,6 +186,10 @@ export default {
       } else {
         this.preValue = target.value
       }
+    },
+    closeFn() {
+      this.$emit('input', undefined)
+      this.$emit('change', undefined)
     }
   }
 }

package/src/components/InputSearch/index.vue

@@ -3,6 +3,7 @@
     v-if="!select"
     v-bind="$attrs"
     :value="value"
+    :clearable="clearable"
     v-on="$listeners"
     @change="searchFn"
   >
@@ -12,7 +13,13 @@
       @click.stop="searchFn"
     ></i>
   </el-input>
-  <div v-else class="n20-input-search">
+  <div
+    v-else
+    class="n20-input-search"
+    :class="{ 'is-clearable': clearable }"
+    @mouseenter="isHove = true"
+    @mouseleave="isHove = false"
+  >
     <el-select
       ref="input-search"
       v-bind="$attrs"
@@ -26,12 +33,17 @@
     >
       <slot></slot>
     </el-select>
-    <span class="el-input__suffix">
-      <span
+    <span class="el-input__suffix"
+      ><i
         class="is-search el-input__icon el-icon-zoom-in"
         @click.stop="searchFn"
-      ></span>
-    </span>
+      ></i
+      ><i
+        v-if="clearable && isHove && hasVal"
+        class="is-search el-input__icon el-icon-circle-close"
+        @click="closeFn"
+      ></i
+    ></span>
   </div>
 </template>
 
@@ -51,14 +63,36 @@ export default {
       type: Boolean,
       default: false
     },
+    clearable: {
+      type: Boolean,
+      default: false
+    },
     allowCreate: {
       type: Boolean,
       default: true
     }
   },
   data() {
-    this.listeners = Object.assign({}, this.$listeners, { input: () => {} })
-    return {}
+    return {
+      isHove: false
+    }
+  },
+  computed: {
+    hasVal() {
+      if (this.multiple) {
+        if (this.value && this.value.length) {
+          return true
+        } else {
+          return false
+        }
+      } else {
+        if (this.value || this.value === 0) {
+          return true
+        } else {
+          return false
+        }
+      }
+    }
   },
   methods: {
     visibleChangeFn(val) {
@@ -75,6 +109,10 @@ export default {
     },
     searchFn() {
       this.$emit('search', this.value)
+    },
+    closeFn() {
+      this.$emit('input', undefined)
+      this.$emit('change', undefined)
     }
   }
 }

package/src/components/ShowColumn/index.vue

@@ -1,11 +1,13 @@
 <template>
   <dialog-wrap
     ref="dialog"
+    v-drag
     class="p-t-0"
     v-bind="$attrs"
     :visible.sync="visible"
-    :width="width"
     :title="title"
+    :width="width"
+    :close-on-click-modal="false"
     @open="popOpen"
   >
     <div class="dialog-view">
@@ -172,6 +174,11 @@ export default {
       }
     },
     reset() {
+      if (this.isFilter) {
+        let dragList = this.columns.filter((col) => col.isDefault)
+        this.dragList = dragList.length ? dragList : this.checkColumns
+        return
+      }
       this.dragList = this.checkColumns.filter((col) => !col.static)
     },
     setChange() {