@lambo-design/upload-file 1.0.0-beta.21 → 1.0.0-beta.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/upload-file",
-  "version": "1.0.0-beta.21",
+  "version": "1.0.0-beta.23",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -12,8 +12,8 @@
   "devDependencies": {
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
-    "@lambo-design/shared": "^1.0.0-beta.206",
-    "@lambo-design/core": "^4.7.1-beta.139"
+    "@lambo-design/core": "^4.7.1-beta.144",
+    "@lambo-design/shared": "^1.0.0-beta.214"
   },
   "scripts": {
     "release-upload-file": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

package/src/index.vue

@@ -19,16 +19,16 @@
            @change="readFile($event, 1)"/>
     <div class="upload-file-list" v-if="showFileList && resultList.length > 0">
       <List border size="small">
-        <ListItem v-for="item in resultList" :key="item.fileCode">
+        <ListItem v-for="item in resultList" :key="item.fileId ? item.fileId : item.fileCode">
           <div span="21">
-            <a :href="item.fileUrl ? item.fileUrl : downloadUrl + item.fileCode">
+            <a :href="item.fileUrl ? item.fileUrl : downloadUrl + item.fileId ? item.fileId : item.fileCode">
               {{ item.fileName }}
               <span class="size" style="margin-left: 5px" v-if="item.showSize">({{ item.showSize }})</span>
             </a>
           </div>
           <div span="3" style="text-align: right">
             <Button v-if="showPreview" @click="previewFile(item)" type="text">预览</Button>
-            <Button @click="deleteFile(item.fileCode)" type="text">删除</Button>
+            <Button @click="deleteFile(item.fileId ? item.fileId : item.fileCode)" type="text">删除</Button>
           </div>
         </ListItem>
       </List>
@@ -48,7 +48,7 @@ export default {
     accept: {//txt,word,excel
       type: String,
       required: false,
-      default: "text/plain,application/msword,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+      default: ".pdf,text/plain,application/msword,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
     },
     fileSuffix: {
       type: String,
@@ -146,7 +146,7 @@ export default {
       loading: false,
       attachmentFile: {
         // fileUrl:"",
-        fileCode: "",
+        fileId: "",
         fileType: "",
         fileName: "",
         size: ""
@@ -174,7 +174,7 @@ export default {
       for (let file of e.target.files) {
         const reg = new RegExp("\.(" + this.fileSuffix + ")$", "i");
         if (!reg.test(file.name)) {
-          alert('文件类型必须是doc，docx，txt，xls，xlsx，jpg，jpeg，png中的一种');
+          alert('文件类型必须是doc，docx，txt，pdf，xls，xlsx，jpg，jpeg，png中的一种');
           self.loading = false;
           return false;
         } else {
@@ -213,7 +213,7 @@ export default {
             result.forEach(item => {
               const tmp = {
                 fileUrl: downloadUrl + item.fileId,
-                fileCode: item.fileId,
+                fileId: item.fileId,
                 fileName: item.fileName,
                 fileType: item.fileName.substring(item.fileName.lastIndexOf(".") + 1),
                 size: item.length,
@@ -254,17 +254,20 @@ export default {
       }
     },
     previewFile: function (item) {
-      if (item.fileCode) {
-        const url = this.fileOnlinePreviewHost + this.ossServerContext + this.ossFilePreviewUrl + item.fileCode + "?fullfilename=" + item.fileName + "." + item.fileType;
+      if (item.fileId || item.fileCode) {
+        const url = this.fileOnlinePreviewHost + this.ossServerContext + this.ossFilePreviewUrl + item.fileId ? item.fileId : item.fileCode + "?fullfilename=" + item.fileName + "." + item.fileType;
         window.open(config.fileOnlinePreviewContext + '/onlinePreview?url=' + encodeURIComponent(this.encode64(url)));
       }
     },
-    deleteFile: function (fileCode) {
-      if (fileCode) {
+    deleteFile: function (fileId) {
+      if (fileId) {
         let result = [];
         let deletes = []
         this.resultList.forEach(item => {
-          if (item.fileCode !== fileCode) {
+          if (!item.fileId) {
+            item.fileId = item.fileCode;
+          }
+          if (item.fileId !== fileId) {
             result.push(item);
           } else {
             deletes.push(item)
@@ -287,7 +290,7 @@ export default {
         Promise.all(requests).then((response) => {
           response.forEach(item => {
             this.resultList.push({
-              fileCode: item.data.data.fileId,
+              fileId: item.data.data.fileId,
               fileUrl: this.ossServerContext + this.ossFileGetUrl + item.data.data.fileId,
               fileName: item.data.data.fileName,
               fileType: item.data.data.fileName.substring(item.data.data.fileName.lastIndexOf(".") + 1),