n20-common-lib 2.22.44 → 2.22.45

package/package.json

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

package/src/components/DatePicker/index.vue

@@ -1,16 +1,29 @@
 <template>
-  <el-date-picker
-    ref="date-picker"
-    class="n20-date-editor"
-    :class="{ 'has-value': clearable && value }"
-    v-bind="$attrs"
-    :value="value"
-    :clearable="clearable"
-    v-on="$listeners"
-  />
+  <div class="n20-date-picker" :class="{ 'has-long-term': showLongTerm }">
+    <el-date-picker
+      ref="date-picker"
+      class="n20-date-editor"
+      :class="{ 'has-value': clearable && value }"
+      v-bind="$attrs"
+      :value="value"
+      :clearable="clearable"
+      :disabled="datePickerDisabled"
+      v-on="listeners"
+    />
+    <el-checkbox
+      v-if="showLongTerm"
+      v-model="longTermC"
+      class="n20-date-picker__long-term"
+      :disabled="checkboxDisabled"
+    >
+      {{ longTermLabel | $lc }}
+    </el-checkbox>
+  </div>
 </template>
 
 <script>
+const LONG_TERM_DATE = new Date(9999, 11, 31, 23, 59, 59)
+
 export default {
   name: 'DatePicker',
   props: {
@@ -21,7 +34,139 @@ export default {
     clearable: {
       type: Boolean,
       default: true
+    },
+    showLongTerm: {
+      type: Boolean,
+      default: false
+    },
+    longTerm: {
+      type: Boolean,
+      default: false
+    },
+    longTermLabel: {
+      type: String,
+      default: '长期'
+    }
+  },
+  computed: {
+    listeners() {
+      return Object.assign({}, this.$listeners, {
+        input: (val) => {
+          this.$emit('input', val)
+          if (this.longTerm) {
+            this.$emit('update:long-term', false)
+            this.$emit('changeLongTerm', {
+              longTerm: false,
+              value: val
+            })
+          }
+        }
+      })
+    },
+    longTermC: {
+      get() {
+        return this.longTerm
+      },
+      set(val) {
+        this.handleLongTermChange(val)
+      }
+    },
+    datePickerDisabled() {
+      return this.longTerm || this.isDisabled
+    },
+    checkboxDisabled() {
+      return this.isDisabled
+    },
+    isDisabled() {
+      return this.$attrs.disabled === '' || this.$attrs.disabled === true || this.$attrs.disabled === 'disabled'
+    }
+  },
+  methods: {
+    handleLongTermChange(val) {
+      this.$emit('update:long-term', val)
+
+      if (val) {
+        const longTermValue = this.getLongTermValue()
+        this.$emit('input', longTermValue)
+        this.$emit('change', longTermValue)
+        this.$emit('changeLongTerm', {
+          longTerm: true,
+          value: longTermValue
+        })
+      } else {
+        const currentValue = this.getCurrentValue()
+        this.$emit('input', currentValue)
+        this.$emit('change', currentValue)
+        this.$emit('changeLongTerm', {
+          longTerm: false,
+          value: currentValue
+        })
+      }
+    },
+    getLongTermValue() {
+      return this.getDateValue(LONG_TERM_DATE)
+    },
+    getCurrentValue() {
+      return this.getDateValue(new Date())
+    },
+    getDateValue(date) {
+      const valueFormat = this.$attrs['value-format']
+
+      if (valueFormat === 'timestamp') {
+        return date.getTime()
+      }
+
+      if (!valueFormat) {
+        return new Date(date.getTime())
+      }
+
+      const year = date.getFullYear() + ''
+      const month = this.padDateValue(date.getMonth() + 1)
+      const day = this.padDateValue(date.getDate())
+      const hours = this.padDateValue(date.getHours())
+      const minutes = this.padDateValue(date.getMinutes())
+      const seconds = this.padDateValue(date.getSeconds())
+
+      return valueFormat
+        .replace(/yyyy/g, year)
+        .replace(/YYYY/g, year)
+        .replace(/MM/g, month)
+        .replace(/dd/g, day)
+        .replace(/DD/g, day)
+        .replace(/HH/g, hours)
+        .replace(/hh/g, hours)
+        .replace(/mm/g, minutes)
+        .replace(/ss/g, seconds)
+    },
+    padDateValue(value) {
+      return value > 9 ? value + '' : '0' + value
     }
   }
 }
 </script>
+
+<style scoped>
+.n20-date-picker {
+  display: inline-block;
+}
+
+.n20-date-picker > .n20-date-editor {
+  width: 100%;
+}
+
+.n20-date-picker.has-long-term {
+  display: inline-flex;
+  align-items: center;
+}
+
+.n20-date-picker.has-long-term > .n20-date-editor {
+  flex: 1;
+  width: auto;
+  min-width: 0;
+}
+
+.n20-date-picker__long-term {
+  margin-left: 8px;
+  white-space: nowrap;
+}
+</style>

package/src/components/DatePicker/por.vue

@@ -1,43 +1,32 @@
 <template>
-  <div class="n20-date-picker-por" :class="{ 'has-long-term': showLongTermCheckbox }">
-    <el-date-picker
-      ref="date-picker"
-      v-model="valueC"
-      class="n20-date-editor"
-      :class="{
-        'has-value': clearable && valueC,
-        [this.$attrs && this.$attrs['rule-form']]: !valueC
-      }"
-      :popper-class="
-        !clearable && pickerType === 'datetimerange'
-          ? 'clearable-datetimerange' + ' ' + $attrs['popper-class']
-          : $attrs['popper-class']
-      "
-      :type="pickerType"
-      :value-format="valueFormat"
-      :placeholder="'选择日期' | $lc"
-      :start-placeholder="'开始日期' | $lc"
-      :end-placeholder="'结束日期' | $lc"
-      :picker-options="pickerOptionsAs"
-      :clearable="clearable"
-      v-bind="$attrs"
-      v-on="listeners"
-    />
-    <el-checkbox
-      v-if="showLongTermCheckbox"
-      v-model="longTermC"
-      class="n20-date-picker-por__long-term"
-      :disabled="longTermDisabled"
-    >
-      {{ '长期' | $lc }}
-    </el-checkbox>
-  </div>
+  <el-date-picker
+    ref="date-picker"
+    v-model="valueC"
+    class="n20-date-editor"
+    :class="{
+      'has-value': clearable && valueC,
+      [this.$attrs && this.$attrs['rule-form']]: !valueC
+    }"
+    :popper-class="
+      !clearable && type === 'datetimerange'
+        ? 'clearable-datetimerange' + ' ' + $attrs['popper-class']
+        : $attrs['popper-class']
+    "
+    :type="type"
+    :value-format="valueFormat"
+    :placeholder="'选择日期' | $lc"
+    :start-placeholder="'开始日期' | $lc"
+    :end-placeholder="'结束日期' | $lc"
+    :picker-options="pickerOptionsAs"
+    :clearable="clearable"
+    v-bind="$attrs"
+    v-on="listeners"
+  />
 </template>
 
 <script>
-import dayjs from 'dayjs'
-
 import { $lc } from '../../utils/i18n/index'
+import dayjs from 'dayjs'
 
 let startDate = ''
 
@@ -263,20 +252,25 @@ export default {
       type: Boolean,
       default: true
     },
-    showLongTerm: {
-      type: Boolean,
-      default: false
-    },
-    longTerm: {
-      type: Boolean,
-      default: false
-    },
     pickerOptions: {
       type: Object,
       default: () => ({})
     }
   },
   data() {
+    let shortcuts = undefined
+    if (this.shortcuts && ['daterange', 'datetimerange'].includes(this.type))
+      shortcuts = this.startStop ? shortcuts_2 : shortcuts_1
+
+    this.pickerOptionsAs = Object.assign(
+      {
+        disabledDate: this.minNow ? disabledDate_1 : this.maxNow ? disabledDate_2 : undefined,
+        shortcuts
+        // onPick
+      },
+      this.pickerOptions
+    )
+
     this.listeners = Object.assign({}, this.$listeners, {
       input: () => {},
       change: () => {}
@@ -285,56 +279,9 @@ export default {
     return {}
   },
   computed: {
-    isRangeType() {
-      return ['daterange', 'monthrange', 'datetimerange'].includes(this.type)
-    },
-    showLongTermCheckbox() {
-      return this.showLongTerm && this.isRangeType
-    },
-    isLongTerm() {
-      return this.showLongTermCheckbox && this.longTerm
-    },
-    pickerType() {
-      if (!this.isLongTerm) return this.type
-      const typeMap = {
-        daterange: 'date',
-        datetimerange: 'datetime',
-        monthrange: 'month'
-      }
-      return typeMap[this.type] || this.type
-    },
-    pickerOptionsAs() {
-      let shortcuts = undefined
-      if (!this.isLongTerm && this.shortcuts && ['daterange', 'datetimerange'].includes(this.type)) {
-        shortcuts = this.startStop ? shortcuts_2 : shortcuts_1
-      }
-
-      return Object.assign(
-        {
-          disabledDate: this.minNow ? disabledDate_1 : this.maxNow ? disabledDate_2 : undefined,
-          shortcuts
-          // onPick
-        },
-        this.pickerOptions
-      )
-    },
-    longTermC: {
-      get() {
-        return this.longTerm
-      },
-      set(val) {
-        this.handleLongTermChange(val)
-      }
-    },
-    longTermDisabled() {
-      return this.$attrs.disabled === '' || this.$attrs.disabled === true || this.$attrs.disabled === 'disabled'
-    },
     valueC: {
       get() {
-        if (this.isRangeType) {
-          if (this.isLongTerm) {
-            return this.startDate || null
-          }
+        if (['daterange', 'monthrange', 'datetimerange'].includes(this.type)) {
           if (this.startDate && this.endDate) {
             return [this.startDate, this.endDate]
           } else {
@@ -345,11 +292,7 @@ export default {
         }
       },
       set(val) {
-        if (this.isRangeType) {
-          if (this.isLongTerm) {
-            this.handleLongTermDateChange(val)
-            return
-          }
+        if (['daterange', 'monthrange', 'datetimerange'].includes(this.type)) {
           if (val && val[0]) {
             if (this.type === 'monthrange' && ['yyyy-MM-dd', 'yyyy-MM-dd HH:mm:ss'].includes(this.valueFormat)) {
               let end = new Date(val[1])
@@ -387,51 +330,6 @@ export default {
     }
   },
   methods: {
-    handleLongTermChange(val) {
-      this.$emit('update:long-term', val)
-
-      if (val) {
-        this.$emit('update:end-date', undefined)
-        this.$emit('end', undefined)
-        this.$emit('changeLongTerm', {
-          longTerm: true,
-          startTime: this.startDate || null
-        })
-      } else {
-        this.$emit('update:start-date', null)
-        this.$emit('update:end-date', null)
-        this.$emit('start', null)
-        this.$emit('end', null)
-        this.$emit('changeLongTerm', {
-          longTerm: false,
-          startTime: null
-        })
-        this.$emit('change', null)
-      }
-    },
-    handleLongTermDateChange(val) {
-      if (val) {
-        this.$emit('update:start-date', val)
-        this.$emit('update:end-date', undefined)
-        this.$emit('start', val)
-        this.$emit('end', undefined)
-        this.$emit('change', [val, undefined])
-        this.$emit('changeLongTerm', {
-          longTerm: true,
-          startTime: val
-        })
-      } else {
-        this.$emit('update:start-date', null)
-        this.$emit('update:end-date', undefined)
-        this.$emit('start', null)
-        this.$emit('end', undefined)
-        this.$emit('change', val)
-        this.$emit('changeLongTerm', {
-          longTerm: true,
-          startTime: null
-        })
-      }
-    },
     HandleBlur() {
       let startSh = shortcuts_2.find((s) => s.text.includes($lc('开始')))
       let endSh = shortcuts_2.find((s) => s.text.includes($lc('截止')))
@@ -451,29 +349,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-.n20-date-picker-por {
-  display: inline-block;
-}
-
-.n20-date-picker-por > .n20-date-editor {
-  width: 100%;
-}
-
-.n20-date-picker-por.has-long-term {
-  display: inline-flex;
-  align-items: center;
-}
-
-.n20-date-picker-por.has-long-term > .n20-date-editor {
-  flex: 1;
-  width: auto;
-  min-width: 0;
-}
-
-.n20-date-picker-por__long-term {
-  margin-left: 8px;
-  white-space: nowrap;
-}
-</style>

package/src/components/FileUploadTable/index.vue

@@ -268,7 +268,7 @@
       :close-on-click-modal="false"
       :destroy-on-open="true"
     >
-      <el-select v-model="bathType" class="m-b-s" clearable @change="handleBathChange">
+      <el-select v-model="bathType" class="m-b-s w-100p" clearable @change="handleBathChange">
         <el-option
           v-for="item in typeOptions"
           :key="item.type"
@@ -288,7 +288,7 @@
         :multiple="true"
         :show-file-list="true"
         :action="apiPrefix ? apiPrefix + action : action"
-        :data="fileData"
+        :data="_batchFileData || fileData"
         :headers="headers"
         :accept="fileAccept"
         :size="fileSize"
@@ -501,7 +501,9 @@ export default {
       previewName: undefined,
       previewSameOrg: false,
       seeRow: {},
-      officeStatus: false
+      officeStatus: false,
+      // 批量上传使用的文件数据（避免直接修改计算属性）
+      _batchFileData: null
     }
   },
   computed: {
@@ -745,20 +747,32 @@ export default {
       if (bu) return bu(file)
     },
     handleBathChange() {
-      let dto = JSON.parse(this.dataPorp.fileData.data)
+      // 创建新的文件数据对象，避免直接修改计算属性
+      let fileData = this.fileData || {}
+      let dto = JSON.parse(fileData.data || '{}')
       dto[this.keys.type] = this.bathType
-      this.fileData.data = JSON.stringify(dto)
+      this._batchFileData = {
+        ...fileData,
+        data: JSON.stringify(dto)
+      }
     },
     batchUploadFn() {
       let $uploadwrap = this.$refs['upload-batch']
-      let fileList = $uploadwrap.fileList
-      if (fileList.length !== 0 && fileList.every((f) => f.status === 'success')) {
-        this.visibleBatch = false
-      }
+      // 直接提交上传，关闭对话框的逻辑在 batchSuccess 回调中处理
       $uploadwrap.submit()
     },
     batchSuccess(response, file, fileList) {
-      let row = { ...this.dataPorp.keys }
+      // 创建完整的行对象，初始化状态字段
+      let row = {
+        id: 'n' + Math.random(),
+        [this.keys.name]: '',
+        [this.keys.type]: this.bathType,
+        [this.keys.time]: '',
+        [this.keys.user]: JSON.parse(sessionStorage.getItem('userInfo')).uname,
+        _percent: 0,
+        _status: undefined,
+        _typeDisabled: false
+      }
       this.tableData.splice(0, 0, row)
       this.$nextTick(() => {
         this.onSuccessFn(response, file, fileList, row)
@@ -916,13 +930,8 @@ export default {
         let FD = new FormData()
         FD.append(opt.filename, opt.file)
 
-        let data
-        if (window._fileData) {
-          data = window._fileData
-          delete window._fileData
-        } else {
-          data = opt.data
-        }
+        // 优先使用 opt.data，其次使用 this.fileData，移除全局变量 window._fileData 的使用
+        let data = opt.data || this.fileData
 
         if (data) {
           let dto = JSON.parse(data.data)
@@ -996,7 +1005,7 @@ export default {
           _percent = 99
           _status = 'error'
         } else {
-          _percent = 99
+          _percent = 100
           _status = 'success'
         }
         setTimeout(() => {