doctor-admin-components 1.0.14-beta.11 → 1.0.14-beta.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "doctor-admin-components",
   "version1": "1.0.11",
-  "version": "1.0.14-beta.11",
+  "version": "1.0.14-beta.13",
   "private": false,
   "main1": "lib/index.umd.min.js",
   "main": "packages/index.js",

package/packages/src/utils/zip.js

@@ -32,18 +32,35 @@ export function batchAsZip(fileList, zipName) {
     background: "rgba(0, 0, 0, 0.7)",
   });
   const zip = new JSZip();
-  const promises = [];
-  const cache = {};
+  // const promises = [];
+  // const cache = {};
   console.log(fileList);
-  fileList.forEach((item) => {
-    const promise = getFile(item.url).then((data) => {
-      // 下载文件, 并存成ArrayBuffer对象
-      // const file_name = item.realName // 获取文件名
-      zip.file(item.fileName, data, { binary: true });
-      cache[item.fileName] = data;
-    });
-    promises.push(promise);
-  });
+  const usedFileNames = {} // 用于跟踪已使用的文件名
+  // fileList.forEach((item) => {
+  //   const promise = getFile(item.url).then((data) => {
+  //     // 下载文件, 并存成ArrayBuffer对象
+  //     // const file_name = item.realName // 获取文件名
+  //     zip.file(item.fileName, data, { binary: true });
+  //     cache[item.fileName] = data;
+  //   });
+  //   promises.push(promise);
+  // });
+  const promises = fileList.map((item) => {
+    return getFile(item.url).then((data) => {
+      let fileName = item.fileName
+      let count = 1
+
+      // 如果文件名已存在，则添加递增的数字后缀
+      while (usedFileNames[fileName]) {
+        fileName = `${count}_${item.fileName}`
+        count++
+      }
+
+      usedFileNames[fileName] = true
+
+      zip.file(fileName, data, { binary: true })
+    })
+  })
   Promise.all(promises)
     .then(() => {
       zip.generateAsync({ type: "blob" }).then((f) => {
@@ -57,6 +74,7 @@ export function batchAsZip(fileList, zipName) {
     })
     .catch((res) => {
       Message.error("下载文件出现错误，请联系管理员！");
+      console.log(res)
       downloadLoadingInstance.close();
     });
 }

package/packages/src/views/biz/bizFileInfo/contract.vue

@@ -1591,6 +1591,7 @@ export default {
           const ids = this.selectFileList.map((item) => item.fileId)
           delBizFileInfo(ids).then(() => {
             this.$message.success('删除成功')
+            this.selectFileList = []
             this.handleRefresh()
           })
         })

package/packages/src/views/biz/contractTracing/contractTracingDetail.vue

@@ -12,14 +12,14 @@
       <div class="app-container-left">
         <div class="contract-number">
           <div>{{ $t('contractDetail.Contract_No') }}</div>
-          <div>{{ contract.contractNo }}</div>
+          <div style="word-wrap: break-word;">{{ contract.contractNo }}</div>
         </div>
         <div class="contract-number">
           <div>
             <span>{{$t('contractDetail.Reference_No')}}</span>
             <el-button size="mini" type="text" icon="el-icon-edit" @click="clickEditReference"></el-button>
           </div>
-          <div>{{ contract.reference  || '--' }}</div>
+          <div style="word-wrap: break-word;">{{ contract.reference  || '--' }}</div>
         </div>
         <div class="tab-root">
           <div :class="['tab', activeName == tabsItem.name ? 'active' : '']" v-for="tabsItem in saleTabsArr" :key="tabsItem.id" @click="changeTabs(tabsItem)">