Commit 62fee793af244dc3418b7872a5441b2ac67e899f
Merge branch 'fix/ApiUpload' into 'main_dev'
fix: 修复组态大屏上传组件无法预览缩略图 See merge request yunteng/thingskit-front!886
Showing
1 changed file
with
2 additions
and
2 deletions
| @@ -47,7 +47,7 @@ | @@ -47,7 +47,7 @@ | ||
| 47 | transformFile?: (file: File) => string | Blob | Promise<string | Blob | File>; | 47 | transformFile?: (file: File) => string | Blob | Promise<string | Blob | File>; |
| 48 | api: (file: string | Blob | Promise<string | Blob | File>) => Promise<FileItem>; | 48 | api: (file: string | Blob | Promise<string | Blob | File>) => Promise<FileItem>; |
| 49 | overFileLimitHiddenUploadEntry?: boolean; | 49 | overFileLimitHiddenUploadEntry?: boolean; |
| 50 | - beforeUpload: (file: File, fileList: File[]) => boolean; | 50 | + beforeUpload?: (file: File, fileList: File[]) => boolean; |
| 51 | }>(), | 51 | }>(), |
| 52 | { | 52 | { |
| 53 | fileList: () => [], | 53 | fileList: () => [], |
| @@ -146,7 +146,7 @@ | @@ -146,7 +146,7 @@ | ||
| 146 | :remove="handleRemove" | 146 | :remove="handleRemove" |
| 147 | > | 147 | > |
| 148 | <Spin | 148 | <Spin |
| 149 | - v-if="!(fileList.length >= getMaxFileLimit) || overFileLimitHiddenUploadEntry" | 149 | + v-if="!(fileList.length >= getMaxFileLimit && overFileLimitHiddenUploadEntry)" |
| 150 | :spinning="loading" | 150 | :spinning="loading" |
| 151 | > | 151 | > |
| 152 | <div class="w-full h-full flex flex-col justify-center content-center"> | 152 | <div class="w-full h-full flex flex-col justify-center content-center"> |