From 1c0214c1f823de2084494c9c85c1cec304f5c133 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 6 Dec 2023 15:29:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadFile/src/UploadFile.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 4067be5..a12b07b 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -8,10 +8,11 @@
       v-model:file-list="fileList"
       :show-file-list="true"
       :auto-upload="autoUpload"
-      :action="updateUrl+'?tableId='+upData?.tableId+'&tableName='+ upData?.tableName"
+      :action="updateUrl + '?tableId=' + upData?.tableId + '&tableName=' + upData?.tableName"
       :headers="uploadHeaders"
       :limit="props.limit"
       :drag="drag"
+      :accept="fileType.join(',')"
       :before-upload="beforeUpload"
       :on-exceed="handleExceed"
       :on-success="handleFileSuccess"
@@ -26,8 +27,9 @@
           大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
         </div>
         <div style="font-size: 8px;line-height: initial;">
-          格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
+          格式为 <b style="color: #f56c6c">{{ fileType.join(',') }}</b> 的文件
         </div>
+        <Preview/>
       </template>
       <template  v-if="!isShowFile" #file >
           <div>
@@ -38,6 +40,7 @@
 </template>
 <script lang="ts" setup>
 import { PropType } from 'vue'
+import  Preview  from '@/components/UploadFile/src/Preview'
 
 import { propTypes } from '@/utils/propTypes'
 import { getAccessToken, getTenantId } from '@/utils/auth'
@@ -60,15 +63,16 @@ const props = defineProps({
   fileSize: propTypes.number.def(5), // 大小限制(MB)
   limit: propTypes.number.def(5), // 数量限制
   autoUpload: propTypes.bool.def(true), // 自动上传
-  drag: propTypes.bool.def(false), // 拖拽上传
   isShowTip: propTypes.bool.def(true), // 是否显示提示
   isShowFile: propTypes.bool.def(true), // 是否显示上传的文件
   
 })
+console.log('props.upData',props.upData)
 // ========== 上传相关 ==========
 const valueRef = ref(props.modelValue)
 const uploadRef = ref<UploadInstance>()
 const uploadList = ref<UploadUserFile[]>([])
+console.log('props.modelValue',props.modelValue)
 const fileList = props.modelValue && props.modelValue.length > 0 ? ref<UploadUserFile[]>(props.modelValue) : ref<UploadUserFile[]>([])
 const uploadNumber = ref<number>(0)
 const uploadHeaders = ref({
@@ -91,7 +95,7 @@ const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
   })
   const isLimit = file.size < props.fileSize * 1024 * 1024
   if (!isImg) {
-    message.error(`文件格式不正确, 请上传${props.fileType.join('/')}格式!`)
+    message.error(`文件格式不正确, 请上传${props.fileType.join(',')}格式!`)
     return false
   }
   if (!isLimit) {
@@ -136,7 +140,9 @@ const handleRemove = (file) => {
   }
 }
 const handlePreview: UploadProps['onPreview'] = (uploadFile) => {
-  console.log(uploadFile)
+  console.log('uploadFile',uploadFile)
+  window.open(uploadFile.url)
+
 }
 // 对象转成指定字符串分隔
 const listToString = (list: UploadUserFile[], separator?: string) => {