n20-common-lib 2.7.52 → 2.7.54

package/package.json

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

package/src/components/FileUploadTable/index.vue

@@ -9,7 +9,7 @@
           <el-button type="primary" size="mini" @click="addRow">{{ '新增' | $lc }}</el-button>
         </slot>
         <slot v-if="!readonly && showBatchUpload" name="batch-btn">
-          <el-button size="mini" plain @click="visibleBatch = true">{{ '批量上传' | $lc }}</el-button>
+          <el-button size="mini" plain @click="handleBathUpload">{{ '批量上传' | $lc }}</el-button>
         </slot>
         <slot v-if="!readonly && showBatchPrint" name="batch-btn">
           <el-button size="mini" plain @click="batchPrint">{{ '批量打印' | $lc }}</el-button>
@@ -222,7 +222,17 @@
       :close-on-click-modal="false"
       :destroy-on-open="true"
     >
+      <el-select class="m-b-s" v-model="bathType" clearable @change="handleBathChange">
+        <el-option
+          v-for="item in typeOptions"
+          :key="item.type"
+          :disabled="item.disabled"
+          :value="item.type"
+          :label="item.label"
+        />
+      </el-select>
       <Upload
+        v-if="bathType"
         ref="upload-batch"
         class="n20-upload-drag"
         :msg-type="null"
@@ -236,7 +246,7 @@
         :headers="headers"
         :accept="fileAccept"
         :size="fileSize"
-        :http-request="uploadHttpRequest"
+        :http-request="uploadHttpRequestBath"
         :before-upload="(file) => batchBeforeUploadFn(file)"
         :on-remove="batchRemove"
         :on-success="batchSuccess"
@@ -265,6 +275,8 @@ import { $lc } from '../../utils/i18n/index'
 import importG from '../../utils/importGlobal.js'
 import Dialog from '../Dialog/index.vue'
 import Upload from '../Upload/index.vue'
+import auth from '../../utils/auth'
+import _axios from 'axios'
 
 const ViewerImg = async function () {
   let { component } = await importG('v-viewer', () => import(/*webpackChunkName: "v-viewer"*/ 'v-viewer'))
@@ -398,6 +410,7 @@ export default {
     }
 
     return {
+      bathType:'',
       indexK: '$index',
       imgType: /\.(jpg|png|gif|svg)$/i,
       selectionList: [],
@@ -441,6 +454,9 @@ export default {
           ? `${this.apiPrefix}/neams/eamsBaseFile/getOfficeIsEnable`:`/neams/eamsBaseFile/getOfficeIsEnable`)
       this.officeStatus = data
     },
+    handleBathUpload() {
+      this.visibleBatch = true
+    },
     async batchPrint() {
       if (!this.selectionList.length) {
         return this.$message({
@@ -477,6 +493,11 @@ export default {
       let bu = this.$listeners['before-upload'] || this.$listeners['beforeUpload']
       if (bu) return bu(file)
     },
+    handleBathChange(){
+      let dto = JSON.parse(this.dataPorp.fileData.data)
+      dto[this.keys.type] = this.bathType
+      this.fileData.data = JSON.stringify(dto)
+    },
     batchUploadFn() {
       let $uploadwrap = this.$refs['upload-batch']
       let fileList = $uploadwrap.fileList
@@ -623,6 +644,50 @@ export default {
         this.visiblePv = false
       }, 300)
     },
+    uploadHttpRequestBath(opt) {
+      console.log(opt.data)
+      if (this.uploadHttpRequest) {
+        return this.uploadHttpRequest(opt)
+      } else {
+        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
+        }
+
+        if (data) {
+          let dto = JSON.parse(data.data)
+          dto[this.keys.type] = this.bathType
+          data.data = JSON.stringify(dto)
+          for (let k in data) {
+            FD.append(k, data[k])
+          }
+        }
+
+        let abort
+        let Pro = axios.post(opt.action + '?r=' + Math.random(), FD, {
+          headers: Object.assign(auth.setHeaders(this.headers), { 'Content-Type': 'multipart/form-data' }),
+          loading: false,
+          onUploadProgress: (arg) => {
+            if (opt.onProgress) {
+              arg.percent = arg.progress * 100
+              opt.onProgress(arg)
+            }
+          },
+          cancelToken: new _axios.CancelToken((cancel) => {
+            abort = cancel
+          })
+        })
+        Pro.abort = abort
+        return Pro
+      }
+      console.log(opt)
+    },
     beforeUploadFn(file, row) {
       this.$set(row, '_percent', 0)
       this.$set(row, '_status', undefined)
@@ -637,6 +702,7 @@ export default {
       this.$set(row, '_typeDisabled', true)
       this.$set(row, '_name', file.name)
       this.$set(row, '_percent', 100)
+      this.$set(row,[this.keys.type],row[this.keys.type]||this.bathType)
       row[this.keys.time] = dayjs().format('YYYY-MM-DD HH:mm:ss')
 
       row[this.keys.url] = response.data