From 7a483d4a5137b44f2ad1cff00a9e26ad40de2d61 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: Tue, 12 Jul 2022 21:14:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload/index.vue |  2 +-
 src/views/tool/file/index.vue       | 60 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index f5a69b1..01eaccc 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -33,7 +33,7 @@
           <template v-if="fileSize">
             大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
           </template>
-          <template v-if="fileType">
+          <template v-if="fileType && fileType.length > 0">
             格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b>
           </template>
           的文件
diff --git a/src/views/tool/file/index.vue b/src/views/tool/file/index.vue
index e78952d..00e43ff 100644
--- a/src/views/tool/file/index.vue
+++ b/src/views/tool/file/index.vue
@@ -107,6 +107,15 @@
             </el-form-item>
           </el-col>
           <el-col :lg="24">
+            <el-form-item label="文件名规则" prop="fileNameType">
+              <el-radio-group v-model="form.fileNameType" placeholder="请选择文件名存储类型">
+                <el-radio v-for="item in fileNameTypeOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">
+                  {{ item.dictLabel }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="24" v-if="form.fileNameType == 2">
             <el-form-item label="自定文件名" prop="fileName">
               <el-input v-model="form.fileName" placeholder="请输入文件名" clearable="" />
             </el-form-item>
@@ -116,8 +125,7 @@
               ref="uploadRef"
               v-model="form.accessUrl"
               :fileType="[]"
-              :limit="1"
-              :fileSize="15"
+              :fileSize="100"
               :drag="true"
               :data="uploadData"
               :autoUpload="false"
@@ -213,9 +221,14 @@ const dateRangeAddTime = ref([])
 // 存储类型选项列表
 const storeTypeOptions = ref([
   { dictLabel: '本地存储', dictValue: 1 },
-  { dictLabel: '阿里云存储', dictValue: 2 },
+  { dictLabel: '阿里云存储', dictValue: 2 }
+])
+//文件名产生选项列表
+const fileNameTypeOptions = ref([
+  { dictLabel: '原文件名', dictValue: 1 },
+  { dictLabel: '自定义', dictValue: 2 },
+  { dictLabel: '自动生成', dictValue: 3 }
 ])
-
 // 数据列表
 const dataList = ref([])
 // 总记录数
@@ -223,30 +236,37 @@ const total = ref(0)
 
 const state = reactive({
   form: {
-    storeType: 1,
+    storeType: 1
   },
   rules: {
     accessUrl: [
       {
         required: true,
         message: '上传文件不能为空',
-        trigger: 'blur',
-      },
+        trigger: 'blur'
+      }
     ],
     storeType: [
       {
         required: true,
         message: '存储类型不能为空',
-        trigger: 'blur',
-      },
+        trigger: 'blur'
+      }
     ],
+    fileName: [
+      {
+        required: true,
+        message: '文件名不能为空',
+        trigger: 'blur'
+      }
+    ]
   },
   queryParams: {
     pageNum: 1,
     pageSize: 20,
     storeType: 1, // 存储类型 1、本地 2、阿里云
-    fileId: undefined,
-  },
+    fileId: undefined
+  }
 })
 const { queryParams, form, rules } = toRefs(state)
 const { proxy } = getCurrentInstance()
@@ -278,6 +298,7 @@ function reset() {
     fileExt: '',
     storeType: 1,
     accessUrl: '',
+    fileNameType: 3
   }
   proxy.resetForm('formRef')
 }
@@ -339,12 +360,17 @@ function handleUploadSuccess(filelist) {
 }
 // 手动上传
 function submitUpload() {
-  uploadData.value = {
-    fileDir: form.value.storePath,
-    fileName: form.value.fileName,
-    storeType: form.value.storeType,
-  }
-  proxy.$refs.uploadRef.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()
+    }
+  })
 }
 
 const { copy, isSupported } = useClipboard()