@lambo-design/upload-file 1.0.0-beta.20 → 1.0.0-beta.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/upload-file",
-  "version": "1.0.0-beta.20",
+  "version": "1.0.0-beta.22",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -12,11 +12,11 @@
   "devDependencies": {
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
-    "@lambo-design/core": "^4.7.1-beta.139",
-    "@lambo-design/shared": "^1.0.0-beta.201"
+    "@lambo-design/core": "^4.7.1-beta.144",
+    "@lambo-design/shared": "^1.0.0-beta.214"
   },
   "scripts": {
-    "release": "pnpm release-beta && git push --follow-tags && pnpm re-publish",
+    "release-upload-file": "pnpm release-beta && git push --follow-tags && pnpm re-publish",
     "release-major": "standard-version --release-as major",
     "release-minor": "standard-version --release-as minor",
     "release-patch": "standard-version --release-as patch",

package/src/index.vue

@@ -1,32 +1,34 @@
 <template>
   <div class="upload-file-box">
     <div class="upload-btn-box">
-      <Button :size="buttonSize" icon="md-add" type="primary" :loading="loading"
-              @click="UploadFile()" ghost v-if="uploadBtn">
-        <span v-if="!loading">上传附件</span>
-        <span v-else>正在上传...</span>
-      </Button>
-      <a v-if="!uploadBtn" @click="UploadFile()">
-        <Icon type="md-add"></Icon>
-        上传附件
-      </a>
+      <slot>
+        <Button :size="buttonSize" icon="md-add" type="primary" :loading="loading"
+                @click="UploadFile()" ghost v-if="uploadBtn">
+          <span v-if="!loading">上传附件</span>
+          <span v-else>正在上传...</span>
+        </Button>
+        <a v-if="!uploadBtn" @click="UploadFile()">
+          <Icon type="md-add"></Icon>
+          上传附件
+        </a>
+      </slot>
     </div>
-    <input type="file" :disabled="false" ref="uploadInput" style="position:absolute; clip:rect(0 0 0 0);"
+    <input type="file" :disabled="false" ref="uploadInput" style="position:absolute; clip:rect(0 0 0 0);display: none"
            :multiple="multiple"
            :accept="accept"
            @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>
@@ -144,7 +146,7 @@ export default {
       loading: false,
       attachmentFile: {
         // fileUrl:"",
-        fileCode: "",
+        fileId: "",
         fileType: "",
         fileName: "",
         size: ""
@@ -211,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,
@@ -252,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)
@@ -285,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),