From 4d90ba5f207252c5e29f1132df00bc175f816c41 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Fri, 16 Aug 2024 10:12:34 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83=20sws=202024-08-15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/upload/index.ts         | 54 +++++++++++++++++++
 src/components/common/upload/index.vue        | 53 +-----------------
 src/components/common/upload/upload-model.vue | 35 +++++++++---
 3 files changed, 83 insertions(+), 59 deletions(-)
 create mode 100644 src/components/common/upload/index.ts

diff --git a/src/components/common/upload/index.ts b/src/components/common/upload/index.ts
new file mode 100644
index 00000000..7c819e06
--- /dev/null
+++ b/src/components/common/upload/index.ts
@@ -0,0 +1,54 @@
+// 文件后缀分类
+const ext_img_name_list = ref(['.png', '.jpg', '.jpeg', '.bmp', '.webp', '.gif']);
+const ext_video_name_list = ref(['.flv', '.swf', '.mkv', '.avi', '.rm', '.rmvb', '.mpeg', '.mpg', '.ogg', '.ogv', '.mov', '.wmv', '.mp4', '.webm']);
+const ext_file_name_list = ref(['.png', '.jpg', '.jpeg', '.bmp', '.webp', '.gif', '.flv', '.swf', '.mkv', '.avi', '.rm', '.rmvb', '.mpeg', '.mpg', '.ogg', '.ogv', '.mov', '.wmv', '.mp4', '.webm', '.mp3', '.csv', '.wav', '.mid', '.cab', '.iso', '.ofd', '.xml', '.rar', '.zip', '.tar', '.gz', '.7z', '.bz2', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx', '.pdf', '.txt', '.md', '.vsd', '.sql']);
+const ext_file_name_list_map = ref([
+    { type: '.png', icon: 'error-img' },
+    { type: '.jpg', icon: 'error-img' },
+    { type: '.jpeg', icon: 'error-img' },
+    { type: '.bmp', icon: 'error-img' },
+    { type: '.webp', icon: 'error-img' },
+    { type: '.gif', icon: 'error-img' },
+    { type: '.flv', icon: 'video' },
+    { type: '.swf', icon: 'video' },
+    { type: '.mkv', icon: 'video' },
+    { type: '.avi', icon: 'video' },
+    { type: '.rm', icon: 'video' },
+    { type: '.rmvb', icon: 'video' },
+    { type: '.mpeg', icon: 'video' },
+    { type: '.mpg', icon: 'video' },
+    { type: '.ogg', icon: 'video' },
+    { type: '.ogv', icon: 'video' },
+    { type: '.mov', icon: 'video' },
+    { type: '.wmv', icon: 'video' },
+    { type: '.mp4', icon: 'video' },
+    { type: '.webm', icon: 'video' },
+    { type: '.mp3', icon: 'vf' },
+    { type: '.csv', icon: 'file' },
+    { type: '.wav', icon: 'file' },
+    { type: '.mid', icon: 'file' },
+    { type: '.cab', icon: 'file' },
+    { type: '.iso', icon: 'file' },
+    { type: '.ofd', icon: 'file' },
+    { type: '.xml', icon: 'file' },
+    { type: '.sql', icon: 'file' },
+    { type: '.rar', icon: 'zip' },
+    { type: '.zip', icon: 'zip' },
+    { type: '.tar', icon: 'zip' },
+    { type: '.gz', icon: 'zip' },
+    { type: '.7z', icon: 'zip' },
+    { type: '.bz2', icon: 'bz2' },
+    { type: '.doc', icon: 'word' },
+    { type: '.docx', icon: 'word' },
+    { type: '.xls', icon: 'excel' },
+    { type: '.xlsx', icon: 'excel' },
+    { type: '.ppt', icon: 'ppt' },
+    { type: '.pptx', icon: 'ppt' },
+    { type: '.pdf', icon: 'pdf' },
+    { type: '.txt', icon: 'txt' },
+    { type: '.md', icon: 'txt' },
+    { type: '.vsd', icon: 'vsd' },
+]);
+
+// 导出变量
+export { ext_img_name_list, ext_video_name_list, ext_file_name_list, ext_file_name_list_map };
diff --git a/src/components/common/upload/index.vue b/src/components/common/upload/index.vue
index 1898da15..b1c89797 100644
--- a/src/components/common/upload/index.vue
+++ b/src/components/common/upload/index.vue
@@ -185,6 +185,7 @@
     <form-upload-category v-model="upload_category_model_visible" :value="upload_category_model" :type="upload_category_type" :category-id="upload_category_id" :category-pid="upload_category_pid" @confirm="upload_category_confirm"></form-upload-category>
 </template>
 <script lang="ts" setup>
+import { ext_img_name_list, ext_video_name_list, ext_file_name_list, ext_file_name_list_map } from './index';
 import UploadAPI, { Tree } from '@/api/upload';
 import { uploadrStore } from '@/store';
 const upload_store = uploadrStore();
@@ -254,58 +255,6 @@ watch(
         }
     }
 );
-
-// 文件后缀分类
-const ext_img_name_list = ref(['.png', '.jpg', '.jpeg', '.bmp', '.webp', '.gif']);
-const ext_video_name_list = ref(['.flv', '.swf', '.mkv', '.avi', '.rm', '.rmvb', '.mpeg', '.mpg', '.ogg', '.ogv', '.mov', '.wmv', '.mp4', '.webm']);
-const ext_file_name_list = ref(['.png', '.jpg', '.jpeg', '.bmp', '.webp', '.gif', '.flv', '.swf', '.mkv', '.avi', '.rm', '.rmvb', '.mpeg', '.mpg', '.ogg', '.ogv', '.mov', '.wmv', '.mp4', '.webm', '.mp3', '.csv', '.wav', '.mid', '.cab', '.iso', '.ofd', '.xml', '.rar', '.zip', '.tar', '.gz', '.7z', '.bz2', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx', '.pdf', '.txt', '.md', '.vsd','.sql']);
-const ext_file_name_list_map = ref([
-    { type: '.png', icon: 'error-img' },
-    { type: '.jpg', icon: 'error-img' },
-    { type: '.jpeg', icon: 'error-img' },
-    { type: '.bmp', icon: 'error-img' },
-    { type: '.webp', icon: 'error-img' },
-    { type: '.gif', icon: 'error-img' },
-    { type: '.flv', icon: 'video' },
-    { type: '.swf', icon: 'video' },
-    { type: '.mkv', icon: 'video' },
-    { type: '.avi', icon: 'video' },
-    { type: '.rm', icon: 'video' },
-    { type: '.rmvb', icon: 'video' },
-    { type: '.mpeg', icon: 'video' },
-    { type: '.mpg', icon: 'video' },
-    { type: '.ogg', icon: 'video' },
-    { type: '.ogv', icon: 'video' },
-    { type: '.mov', icon: 'video' },
-    { type: '.wmv', icon: 'video' },
-    { type: '.mp4', icon: 'video' },
-    { type: '.webm', icon: 'video' },
-    { type: '.mp3', icon: 'vf' },
-    { type: '.csv', icon: 'file' },
-    { type: '.wav', icon: 'file' },
-    { type: '.mid', icon: 'file' },
-    { type: '.cab', icon: 'file' },
-    { type: '.iso', icon: 'file' },
-    { type: '.ofd', icon: 'file' },
-    { type: '.xml', icon: 'file' },
-    { type: '.sql', icon: 'file' },
-    { type: '.rar', icon: 'zip' },
-    { type: '.zip', icon: 'zip' },
-    { type: '.tar', icon: 'zip' },
-    { type: '.gz', icon: 'zip' },
-    { type: '.7z', icon: 'zip' },
-    { type: '.bz2', icon: 'bz2' },
-    { type: '.doc', icon: 'word' },
-    { type: '.docx', icon: 'word' },
-    { type: '.xls', icon: 'excel' },
-    { type: '.xlsx', icon: 'excel' },
-    { type: '.ppt', icon: 'ppt' },
-    { type: '.pptx', icon: 'ppt' },
-    { type: '.pdf', icon: 'pdf' },
-    { type: '.txt', icon: 'txt' },
-    { type: '.md', icon: 'txt' },
-    { type: '.vsd', icon: 'vsd' },
-]);
 // 弹窗上传显示
 const upload_model_visible = ref(false);
 // 上传类型
diff --git a/src/components/common/upload/upload-model.vue b/src/components/common/upload/upload-model.vue
index 7e1a563e..d206655a 100644
--- a/src/components/common/upload/upload-model.vue
+++ b/src/components/common/upload/upload-model.vue
@@ -7,7 +7,6 @@
             </div>
         </template>
         <div class="upload-content pa-20" @paste="handle_paste">
-            {{ exts }}
             <el-form ref="ruleFormRef" :model="form" :rules="rules" label-width="85" status-icon>
                 <el-form-item label="上传方式">
                     <el-radio-group v-model="form.type" @change="upload_type_change">
@@ -49,13 +48,27 @@
                                         <div class="progress" :style="'width:' + item.progress + '%'"></div>
                                         <div class="table-row">
                                             <div class="table-cell">
-                                                <el-image :src="file_to_base64(item.file)" class="preview-img radius-sm" fit="contain">
-                                                    <template #error>
+                                                <template v-if="type == 'video'">
+                                                    <div class="preview-img radius-sm">
+                                                        <icon name="video" size="12" color="9"></icon>
+                                                    </div>
+                                                </template>
+                                                <template v-else-if="type == 'file'">
+                                                    <div class="preview-img radius-sm">
                                                         <div class="bg-f5 img flex-row jc-c align-c radius h w">
-                                                            <icon name="error-img" size="12"></icon>
+                                                            <icon :name="ext_file_name_list_map.filter((ext) => ext.type == get_after_string(item.file.name)).length > 0 && ext_file_name_list_map.filter((ext) => ext.type == get_after_string(item.file.name))[0].type == get_after_string(item.file.name) ? ext_file_name_list_map.filter((ext) => ext.type == get_after_string(item.file.name))[0].icon : 'file'" size="12" color="9"></icon>
                                                         </div>
-                                                    </template>
-                                                </el-image>
+                                                    </div>
+                                                </template>
+                                                <template v-else>
+                                                    <el-image :src="file_to_base64(item.file)" class="preview-img radius-sm" fit="contain">
+                                                        <template #error>
+                                                            <div class="bg-f5 img flex-row jc-c align-c radius h w">
+                                                                <icon name="error-img" size="12"></icon>
+                                                            </div>
+                                                        </template>
+                                                    </el-image>
+                                                </template>
                                                 <div class="desc">{{ item.file.name }}</div>
                                             </div>
                                             <div class="table-cell">{{ annex_size_to_unit(item.file.size) }}</div>
@@ -134,6 +147,7 @@ import { uploadrStore } from '@/store';
 const upload_store = uploadrStore();
 import type { UploadFile, UploadFiles, UploadUserFile, FormRules, FormInstance } from 'element-plus';
 import { annex_size_to_unit, ext_name } from '@/utils';
+import { ext_img_name_list, ext_video_name_list, ext_file_name_list, ext_file_name_list_map } from './index';
 /**
  * @description: 图片执行上传弹窗
  * @param close{String} 默认值
@@ -229,6 +243,13 @@ const cascader_data = computed(() => {
     }));
 });
 
+// 获取字符串中‘，’后所有字符
+const get_after_string = (str: string) => {
+    let index = str.lastIndexOf('.');
+    str = str.substring(index, str.length);
+    return str;
+};
+
 //#region 本地上传 -----------------------------------------------start
 
 // 选择文件夹
@@ -247,7 +268,7 @@ const folder_mode = (type: boolean) => {
 };
 // 文件状态改变时的钩子，添加文件、上传成功和上传失败时都会被调用
 const upload_change = async (uploadFile: UploadFile, uploadFiles: UploadFiles) => {
-    // console.log('文件状态改变时的钩子', uploadFile, uploadFiles);
+    console.log('文件状态改变时的钩子', uploadFile, uploadFiles);
     // // 过滤已上传的文件和重复的文件
     const results = uploadFiles.flat(Infinity).filter((f: any) => validExt(f.name) && validSize(f.size));
     const new_upload_files = results.filter((item: UploadFile) => {