From adce501901391b23239ee3d9669b0660d2aa6d90 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 12 Aug 2024 18:37:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=87=8D=E6=9E=84=E4=B8=8A=E4=BC=A0=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=B9=B6=E8=B0=83=E6=95=B4=E8=B5=84=E6=BA=90=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E7=9B=AE=E5=BD=95=20=E4=B8=8A=E4=BC=A0=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E8=BF=9B=E8=A1=8C=E9=87=8D=E6=9E=84=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8=E7=9A=84=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=E6=A1=86=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B5=84=E6=BA=90=E7=9A=84=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E9=85=8D=E7=BD=AE=E3=80=82=E6=AD=A4=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=8C=85=E5=90=AB=E5=AF=B9=E4=B8=8A=E4=BC=A0=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=87=8D=E5=91=BD=E5=90=8D=E5=92=8C=E5=AF=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9E=84=E5=BB=BA=E9=85=8D=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BB=A5=E9=80=82=E5=BA=94=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84=E3=80=82=20sws=20?=
 =?UTF-8?q?2024-08-12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/upload/form-upload-category.vue          | 13 +++++++++++++
 src/components/common/upload/form.vue               |  0
 src/components/common/upload/index.vue              |  7 -------
 src/types/components.d.ts                           |  2 +-
 vite.config.ts                                      |  8 ++++----
 5 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 src/components/common/upload/form-upload-category.vue
 delete mode 100644 src/components/common/upload/form.vue

diff --git a/src/components/common/upload/form-upload-category.vue b/src/components/common/upload/form-upload-category.vue
new file mode 100644
index 00000000..1a31b66f
--- /dev/null
+++ b/src/components/common/upload/form-upload-category.vue
@@ -0,0 +1,13 @@
+<template>
+    <el-dialog v-model="dialog_visible_category_oprate" class="radius-lg" width="1168" append-to-body>
+        <template #header>
+            <div class="title center re">
+                <div class="tc size-16 fw">添加分类</div>
+            </div>
+        </template>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+const dialog_visible_category_oprate = ref(false);
+</script>
+<style lang="scss"></style>
diff --git a/src/components/common/upload/form.vue b/src/components/common/upload/form.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/components/common/upload/index.vue b/src/components/common/upload/index.vue
index c93c1f9d..815f702a 100644
--- a/src/components/common/upload/index.vue
+++ b/src/components/common/upload/index.vue
@@ -159,13 +159,6 @@
     <!-- 图片预览 -->
     <el-image-viewer v-if="preview_switch_img && upload_type == 'img'" :z-index="999999" :url-list="[preview_url]" :hide-on-click-modal="true" @close="preview_close"></el-image-viewer>
     <upload-model v-model="upload_model_visible" :type="upload_type" :exts="props.type == 'img' ? ext_img_name_list : props.type == 'video' ? ext_video_name_list : ext_file_name_list" @close="close_upload_model"></upload-model>
-    <el-dialog v-model="dialog_visible_type_oprate" class="radius-lg" width="1168" append-to-body>
-        <template #header>
-            <div class="title center re">
-                <div class="tc size-16 fw">添加分类</div>
-            </div>
-        </template>
-    </el-dialog>
 </template>
 <script lang="ts" setup>
 const app = getCurrentInstance();
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 969596ed..ff24f7ac 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -57,7 +57,7 @@ declare module 'vue' {
     FooterNavContent: typeof import('./../components/footer-nav/footer-nav-content.vue')['default']
     FooterNavSetting: typeof import('./../components/footer-nav/footer-nav-setting.vue')['default']
     FooterNavStyles: typeof import('./../components/footer-nav/footer-nav-styles.vue')['default']
-    Form: typeof import('./../components/common/upload/form.vue')['default']
+    FormUploadCategory: typeof import('./../components/common/upload/form-upload-category.vue')['default']
     GdMap: typeof import('./../components/base/maps/gd-map.vue')['default']
     Hot: typeof import('./../components/common/hot/index.vue')['default']
     Icon: typeof import('./../components/base/icon/index.vue')['default']
diff --git a/vite.config.ts b/vite.config.ts
index b22f0ecf..25359437 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -88,7 +88,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
             // 指定输出路径（相对于项目根目录)，默认dist
             outDir: 'dist',
             // 指定生成静态资源的存放路径，默认assets
-            assetsDir: 'assets',
+            assetsDir: 'diy',
             // chunk大小警告限制，默认500kbs
             chunkSizeWarningLimit: 1500,
             // 是否禁用css拆分(默认true)，设置false时所有CSS将被提取到一个CSS文件中
@@ -112,11 +112,11 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
             rollupOptions: {
                 output: {
                     // 自定义 chunk 文件的输出路径和文件名格式
-                    chunkFileNames: 'assets/js/chunk/[name]-[hash].js',
+                    chunkFileNames: 'static/admin/default/diy/js/chunk/[name]-[hash].js',
                     // 自定义 entry chunk 的输出路径和文件名格式
-                    entryFileNames: 'assets/js/entry/[name]-[hash].js',
+                    entryFileNames: 'static/admin/default/diy/js/entry/[name]-[hash].js',
                     //非js文件夹，按照文件类型分类css,png,jpg
-                    assetFileNames: 'assets/[ext]/[name]-[hash].[ext]',
+                    assetFileNames: 'static/admin/default/diy/[ext]/[name]-[hash].[ext]',
                 },
             },
         },