From 93e30a1b18680be715648ab81c329f94ad62f25d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sat, 15 Apr 2023 09:25:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E6=AC=A1=E7=AC=AC=E4=B8=80=E6=AC=A1=E8=8E=B7=E5=8F=96=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload/index.vue | 10 ++---
 src/views/tool/file/index.vue       | 66 ++++++++++++++++++-----------
 2 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index fc4f86f..117b7e1 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -10,12 +10,12 @@
       :on-exceed="handleExceed"
       :on-success="handleUploadSuccess"
       :show-file-list="false"
-      :data="data"
+      :data="uploadData"
       :drag="drag"
       :headers="headers"
       :auto-upload="autoUpload"
       class="upload-file-uploader"
-      ref="upload">
+      ref="fileUpload">
       <!-- 拖拽上传 -->
       <template v-if="drag">
         <el-icon class="el-icon--upload">
@@ -104,6 +104,7 @@ const uploadFileUrl = ref(baseUrl + import.meta.env.VITE_APP_UPLOAD_URL) // 上
 const headers = ref({ Authorization: 'Bearer ' + getToken() })
 const fileList = ref([])
 const showTip = computed(() => props.isShowTip && (props.fileType || props.fileSize))
+const uploadData = computed(() => props.data)
 
 watch(
   () => props.modelValue,
@@ -121,7 +122,6 @@ watch(
         item.uid = item.uid || new Date().getTime() + temp++
         return item
       })
-      // uploadList.value = fileList
     } else {
       fileList.value = []
       return []
@@ -183,7 +183,7 @@ function handleUploadSuccess(response, uploadFile) {
   const { fileName, url, fileId } = response.data
   const tempFile = { name: fileName, url: url }
   uploadList.value.push(tempFile)
-  if (uploadList.value.length === number.value) {
+  if (number.value > 0 && uploadList.value.length === number.value) {
     fileList.value = fileList.value.filter((f) => f.url !== undefined).concat(uploadList.value)
     uploadList.value = []
     number.value = 0
@@ -219,7 +219,7 @@ function listToString(list, separator) {
 }
 // 手动提交上传
 function submitUpload() {
-  proxy.$refs.upload.submit()
+  proxy.$refs.fileUpload.submit()
 }
 defineExpose({
   submitUpload
diff --git a/src/views/tool/file/index.vue b/src/views/tool/file/index.vue
index 7a96367..2cd6eee 100644
--- a/src/views/tool/file/index.vue
+++ b/src/views/tool/file/index.vue
@@ -48,7 +48,7 @@
           <el-link type="primary" :href="scope.row.accessUrl" target="_blank">{{ scope.row.fileName }}</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="accessUrl" align="center" label="预览图" width="100">
+      <el-table-column prop="accessUrl" align="center" label="预览图" width="80">
         <template #default="{ row }">
           <el-image
             preview-teleported
@@ -59,30 +59,26 @@
             lazy
             class="el-avatar">
             <template #error>
-              <i class="document" />
+              <el-icon><document /></el-icon>
             </template>
           </el-image>
         </template>
       </el-table-column>
       <el-table-column prop="fileSize" label="文件大小" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="fileExt" label="扩展名" align="center" :show-overflow-tooltip="true" width="80px" />
-      <el-table-column prop="storeType" label="存储类型" align="center">
+      <!-- <el-table-column prop="storeType" label="存储类型" align="center">
         <template #default="scope">
-          {{ scope.row.storeType }}
-          <!-- <dict-tag :options="storeTypeOptions" :value="parseInt(scope.row.storeType)" /> -->
+          <dict-tag :options="storeTypeOptions" :value="parseInt(scope.row.storeType)" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
+      <el-table-column prop="storePath" label="存储目录"></el-table-column>
       <el-table-column prop="create_by" label="操作人" align="center" />
       <el-table-column prop="create_time" label="创建日期" align="center" width="150" />
-      <el-table-column label="操作" align="center" width="230">
+      <el-table-column label="操作" align="center" width="120">
         <template #default="scope">
-          <el-button text size="small" icon="view" @click="handleView(scope.row)">{{ $t('btn.view') }}</el-button>
-          <el-button class="copy-btn-main" icon="document-copy" text size="small" @click="copyText(scope.row.accessUrl)">
-            {{ $t('btn.copy') }}
-          </el-button>
-          <el-button v-hasPermi="['tool:file:delete']" text size="small" icon="delete" @click="handleDelete(scope.row)">
-            {{ $t('btn.delete') }}
-          </el-button>
+          <el-button text size="small" icon="view" title="查看" @click="handleView(scope.row)"></el-button>
+          <el-button class="copy-btn-main" icon="document-copy" title="复制" text size="small" @click="copyText(scope.row.accessUrl)"> </el-button>
+          <el-button v-hasPermi="['tool:file:delete']" title="删除" text size="small" icon="delete" @click="handleDelete(scope.row)"> </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -102,8 +98,18 @@
             </el-form-item>
           </el-col>
           <el-col :lg="24">
-            <el-form-item label="存储文件夹" prop="storePath">
-              <el-input v-model="form.storePath" placeholder="请输入存储文件夹" clearable="" auto-complete="" />
+            <el-form-item label="文件目录" prop="storePath">
+              <template #label>
+                <span>
+                  <el-tooltip content="文件目录不填则默认使用本地上次格式：uploads/yyyyMMdd" placement="top">
+                    <el-icon :size="15">
+                      <questionFilled />
+                    </el-icon>
+                  </el-tooltip>
+                  文件目录
+                </span>
+              </template>
+              <el-input v-model="form.storePath" placeholder="请输入文件目录" clearable="" auto-complete="" />
             </el-form-item>
           </el-col>
           <el-col :lg="24">
@@ -187,7 +193,11 @@
             </el-form-item>
           </el-col>
           <el-col :lg="24">
-            <el-form-item label="存储路径">{{ formView.fileUrl }}</el-form-item>
+            <el-form-item label="存储路径">
+              <div>
+                {{ formView.fileUrl }}
+              </div>
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -270,7 +280,7 @@ const state = reactive({
 })
 const { queryParams, form, rules } = toRefs(state)
 const { proxy } = getCurrentInstance()
-const uploadData = ref({})
+const uploadData = ref()
 // 查询数据
 function getList() {
   proxy.addDateRange(queryParams.value, dateRangeAddTime.value, 'Create_time')
@@ -362,13 +372,19 @@ function handleUploadSuccess(filelist) {
 function submitUpload() {
   proxy.$refs['formRef'].validate((valid) => {
     if (valid) {
-      uploadData.value = {
-        fileDir: form.value.storePath,
-        fileName: form.value.fileName,
-        storeType: form.value.storeType,
-        fileNameType: form.value.fileNameType
-      }
-      proxy.$refs.uploadRef.submitUpload()
+      var result = new Promise((resolve) => {
+        uploadData.value = {
+          fileDir: form.value.storePath,
+          fileName: form.value.fileName,
+          storeType: form.value.storeType,
+          fileNameType: form.value.fileNameType
+        }
+        resolve(true)
+      })
+      //使用异步解决第一次上次获取不到表单的值
+      result.then(() => {
+        proxy.$refs.uploadRef.submitUpload()
+      })
     }
   })
 }