n20-common-lib 2.9.39 → 2.9.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.9.39",
+  "version": "2.9.41",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/DynamicField/DynamicField.vue

@@ -79,7 +79,7 @@
                       :max="formItem.max || 9999999999.99"
                       :min="formItem.min || formItem.min === 0 ? formItem.min : 0"
                       :d-num="formItem.dNum || formItem.dNum === 0 ? formItem.dNum : 2"
-                      :type="formItem.type || 'money'"
+                      :type="formItem.numberType || 'money'"
                       @change="(value) => $emit('valueChange', value, key)"
                     />
                   </template>

package/src/components/DynamicField/DynamicFieldOptions.vue

@@ -21,7 +21,7 @@
           @selection-change-method="handleSelectionChange"
         >
           <vxe-column slot="order" title="排序" width="60px" align="center">
-            <i class="n20-icon-tuodong"></i>
+            <i class="n20-icon-tuodong draggable-button"></i>
           </vxe-column>
           <vxe-column slot="input" slot-scope="{ column }" v-bind="column" :field="column.prop" :title="column.label">
             <el-input v-model="row[column.prop]" slot-scope="{ row }" placeholder="请输入" size="normal" clearable />
@@ -115,9 +115,11 @@ export default {
         ]
       }
     },
-    busKey: {
-      type: String,
-      default: ''
+    value: {
+      type: Array,
+      default: () => {
+        return []
+      }
     },
     options: {
       type: Object,
@@ -268,11 +270,19 @@ export default {
     }
   },
   computed: {},
-  watch: {},
+  watch: {
+    value: {
+      handler(val) {
+        this.tableData = val
+      },
+      immediate: true,
+      deep: true
+    }
+  },
   created() {},
   mounted() {
-    this.setFieldType()
     this.getData()
+    this.setFieldType()
     this.checkColumns = this.TableHeader.filter((item) => {
       return this.showItems.includes(item.label)
     })
@@ -302,24 +312,7 @@ export default {
       this.selectData = data
     },
     getData() {
-      if (!this.busKey) {
-        this.$message.warning('busKey缺失,请检查')
-        return false
-      }
-      /* this.$axios.get(`/test/dyfield/list/${this.busKey}`).then(res => {
-        const { code, data } = res
-        if (code !== 200) {
-          return false
-        }
-        this.tableData = data.map((item, index) => {
-          item.selectId = index
-          return item
-        })
-        this.initData()
-      }) */
-
-      this.tableData = customFormOptionsData.data
-      this.initData()
+      this.tableData = this.value
       this.$nextTick(() => {
         this.rowDrop()
       })
@@ -348,6 +341,7 @@ export default {
           } else {
             this.type = 2
           }
+          this.initData()
           break
         case '新增':
           this.tableData.push({ selectId: this.tableData.length })
@@ -363,23 +357,12 @@ export default {
           break
         case '保存':
           if (this.type === 1) {
-            /* this.$axios
-              .post(
-                '/test/dyfield/save',
-                this.tableData.map((item, index) => {
-                  item.busKey = this.busKey
-                  item.sort = index
-                  return item
-                })
-              )
-              .then(res => {
-                const { code } = res
-                if (code !== 200) {
-                  return false
-                }
-                this.$message.success('保存成功')
-              }) */
-            this.initData()
+            const tableData = this.tableData.map((item, index) => {
+              item.busKey = this.busKey
+              item.sort = index
+              return item
+            })
+            this.$emit('save', tableData)
           } else {
             this.$refs['DynamicField'].validate((valid) => {
               if (valid) {
@@ -402,6 +385,7 @@ export default {
       const tbody = document.querySelector('.Tabledrag tbody')
       const _this = this
       Sortable.create(tbody, {
+        handle: '.draggable-button',
         onEnd({ newIndex, oldIndex }) {
           // 页面重新渲染
           const tableData = deepClone(_this.tableData)

package/src/components/FileUploadTable/index.vue

@@ -560,7 +560,10 @@ export default {
           showClose: true
         })
       }
-      this.$emit('down-rows', this.selectionList)
+      this.$emit(
+        'down-rows',
+        this.selectionList.filter((item) => item[this.keys.url] || item._name)
+      )
     },
     deleteRows() {
       if (!this.selectionList.length) {

package/src/components/SelectDatePickerPro/customDatePicker.vue

@@ -0,0 +1,7 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+export default {}
+</script>

package/src/components/SelectDatePickerPro/index.vue

@@ -8,7 +8,7 @@
       v-if="type === '日' && selectList.includes(type)"
       key="day"
       v-model="day"
-      style="width: 220px"
+      style="width: 100%"
       format="yyyy-MM-dd"
       value-format="yyyy-MM-dd"
       type="daterange"
@@ -57,6 +57,15 @@
       :editable="false"
       :placeholder="'选择年' | $lc"
     />
+    <el-date-picker
+      v-if="type === '临时' && selectList.includes(type)"
+      v-model="custom"
+      type="daterange"
+      style="width: 100%"
+      value-format="yyyy-MM-dd"
+      :start-placeholder="$l('开始日期')"
+      :end-placeholder="$l('结束日期')"
+    />
   </div>
 </template>
 
@@ -95,7 +104,7 @@ export default {
     selectList: {
       type: Array,
       default: () => {
-        return ['日', '周', '月', '季', '半年', '年']
+        return ['日', '周', '月', '季', '半年', '年', '临时']
       }
     }
   },
@@ -243,6 +252,20 @@ export default {
           this.$emit('change', iYear)
         }
       }
+    },
+    custom: {
+      get() {
+        return [this.value.startDate, this.value.endDate]
+      },
+      set(value) {
+        if (value) {
+          this.$emit('input', { startDate: value[0], endDate: value[1], typeDate: this.type })
+          this.$emit('change', { startDate: value[0], endDate: value[1], typeDate: this.type })
+        } else {
+          this.$emit('input', { startDate: '', endDate: '', typeDate: this.type })
+          this.$emit('change', { startDate: '', endDate: '', typeDate: this.type })
+        }
+      }
     }
   },
   methods: {