n20-common-lib 3.2.40 → 3.2.42

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "n20-common-lib",
-  "version": "3.2.40",
+  "version": "3.2.42",
   "private": false,
   "scripts": {
-    "serve": "vue-cli-service serve",
+    "serve": "pnpm --dir ../packages/docs run serve",
     "prepublishOnly": "npm run build:css",
     "build": "node versionInfo.js && npm run build:css && vue-cli-service build --testTheme",
     "test:unit": "vue-cli-service test:unit",

package/src/components/DatePicker/index.vue

@@ -22,6 +22,8 @@
 </template>
 
 <script>
+import { $lc } from '../../utils/i18n/index'
+
 const LONG_TERM_DATE = new Date(9999, 11, 31, 23, 59, 59)
 
 export default {
@@ -45,7 +47,7 @@ export default {
     },
     longTermLabel: {
       type: String,
-      default: $lc("长期")
+      default: $lc('长期')
     }
   },
   computed: {

package/src/components/FileUploadTable/index.vue

@@ -268,7 +268,13 @@
       :close-on-click-modal="false"
       :destroy-on-open="true"
     >
-      <el-select v-model="bathType" class="m-b-s w-100p" clearable @change="handleBathChange">
+      <el-select
+        v-if="!autoMatchBatchFileType"
+        v-model="bathType"
+        class="m-b-s w-100p"
+        clearable
+        @change="handleBathChange"
+      >
         <el-option
           v-for="item in typeOptions"
           :key="item.type"
@@ -278,7 +284,7 @@
         />
       </el-select>
       <Upload
-        v-if="bathType"
+        v-if="autoMatchBatchFileType || bathType"
         ref="upload-batch"
         class="n20-upload-drag"
         :msg-type="null"
@@ -305,7 +311,7 @@
         </template>
       </Upload>
       <div class="dialog-footer">
-        <el-button type="primary" @click="batchUploadFn">{{ '确认' | $lc }}</el-button>
+        <el-button type="primary" :loading="batchUploading" @click="batchUploadFn">{{ '确认' | $lc }}</el-button>
         <el-button plain @click="visibleBatch = false">{{ '取消' | $lc }}</el-button>
       </div>
     </Dialog>
@@ -434,6 +440,10 @@ export default {
       type: Boolean,
       default: false
     },
+    autoMatchBatchFileType: {
+      type: Boolean,
+      default: false
+    },
     showBatchPrint: {
       type: Boolean,
       default: false
@@ -498,6 +508,7 @@ export default {
       previewSameOrg: false,
       seeRow: {},
       officeStatus: false,
+      batchUploading: false,
       // 批量上传使用的文件数据（避免直接修改计算属性）
       _batchFileData: null
     }
@@ -752,11 +763,91 @@ export default {
         data: JSON.stringify(dto)
       }
     },
-    batchUploadFn() {
+    async batchUploadFn() {
+      if (this.autoMatchBatchFileType) {
+        await this.autoMatchBatchUpload()
+        return
+      }
       let $uploadwrap = this.$refs['upload-batch']
       // 直接提交上传，关闭对话框的逻辑在 batchSuccess 回调中处理
       $uploadwrap.submit()
     },
+    async autoMatchBatchUpload() {
+      let $uploadwrap = this.$refs['upload-batch']
+      let uploadFiles = $uploadwrap?.$refs?.upload?.uploadFiles || []
+      let files = uploadFiles.filter((item) => item.status === 'ready' && item.raw)
+      if (!files.length) {
+        this.$message.warning($lc('请先选择上传文件'))
+        return
+      }
+
+      try {
+        for (let item of files) {
+          let result = await $uploadwrap.beforeUploadFn(item.raw)
+          if (result === false) {
+            return
+          }
+        }
+
+        let FD = new FormData()
+        files.forEach((item) => {
+          FD.append('file', item.raw)
+        })
+
+        let remoteFileUpload = JSON.parse(this.fileData?.data || '{}')
+        remoteFileUpload.bussValues = this.typeOptions.map((item) => item.type)
+        FD.append('remoteFileUpload', JSON.stringify(remoteFileUpload))
+
+        this.batchUploading = true
+        let { data } = await axios.post(
+          this.apiPrefix
+            ? `${this.apiPrefix}/neams/eamsbaserecord/batchSaveFile`
+            : '/neams/eamsbaserecord/batchSaveFile',
+          FD,
+          {
+            headers: Object.assign(auth.setHeaders(this.headers), { 'Content-Type': 'multipart/form-data' }),
+            loading: false,
+            noMsg: true,
+            timeout: 900000
+          }
+        )
+
+        let responseList = Array.isArray(data) ? data : []
+        let rows = responseList.map((item) => this.buildAutoMatchBatchRow(item))
+        this.tableData.splice(0, 0, ...rows)
+        let pendingFiles = [...files]
+        rows.forEach((row) => {
+          let fileIndex = pendingFiles.findIndex((item) => item.raw.name === row[this.keys.name])
+          let sourceFile = pendingFiles.splice(fileIndex > -1 ? fileIndex : 0, 1)[0]
+          this.$emit('on-success', sourceFile?.raw, row)
+        })
+
+        $uploadwrap.clearFiles()
+        $uploadwrap.fileList = []
+        this.visibleBatch = false
+      } catch (err) {
+        this.$message.error(err?.msg || $lc('上传失败'))
+      } finally {
+        this.batchUploading = false
+      }
+    },
+    buildAutoMatchBatchRow(item) {
+      let userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}')
+      let row = {
+        ...item,
+        _name: item.fileName,
+        _percent: 100,
+        _status: 'success',
+        _typeDisabled: false
+      }
+      row[this.keys.rowKey] = item.beid
+      row[this.keys.type] = item.attno
+      row[this.keys.name] = item.fileName
+      row[this.keys.url] = this.keys.url === this.keys.rowKey ? item.beid : item.filePath || item.beid
+      row[this.keys.time] = row[this.keys.time] || dayjs().format('YYYY-MM-DD HH:mm:ss')
+      row[this.keys.user] = row[this.keys.user] || userInfo.uname
+      return row
+    },
     batchSuccess(response, file, fileList) {
       // 创建完整的行对象，初始化状态字段
       let row = {

package/src/utils/auth.js

@@ -52,7 +52,7 @@ const auth = {
     }
   },
   setReqLang() {
-    let langMap = { 'zh-cn': 'zh_CN', en: 'en_US', 'zh-hk': 'zh_TW', th: 'th_TH', vi: 'vi_VI' }
+    let langMap = { 'zh-cn': 'zh_CN', en: 'en_US', 'zh-hk': 'zh_TW', th: 'th_TH', vi: 'vi_VI', ja: 'ja_JP' }
     let langKey = window.localStorage.getItem('pageLang') || 'zh-cn'
     reqLang = langMap[langKey]
   },