From 613972f4a13e81af4fb498bfbc6d5eddf2f2e171 Mon Sep 17 00:00:00 2001
From: hooray <304327508@qq.com>
Date: Sun, 23 Oct 2022 14:18:17 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B0=86=20element=20plus=20?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E7=BB=84=E4=BB=B6=E6=94=B9=E4=B8=BA=E6=89=8B?=
 =?UTF-8?q?=E5=8A=A8=E5=BC=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts                            |  1 +
 src/auto-imports.d.ts                       |  1 -
 src/components/FileUpload/index.vue         |  2 +-
 src/components/ImageUpload/index.vue        |  1 +
 src/components/ImagesUpload/index.vue       |  1 +
 src/layouts/components/AppSetting/index.vue |  1 +
 src/views/login.vue                         |  1 +
 src/views/personal/edit.password.vue        |  1 +
 src/views/personal/setting.vue              |  1 +
 vite.config.ts                              | 13 +------------
 vite/plugins/auto-import.ts                 |  4 ----
 11 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index 808350a4..e3f4446c 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,5 +1,6 @@
 import axios from 'axios'
 // import qs from 'qs'
+import { ElMessage } from 'element-plus'
 import router from '@/router/index'
 import useUserStore from '@/store/modules/user'
 
diff --git a/src/auto-imports.d.ts b/src/auto-imports.d.ts
index 83cabc8f..566dd2f7 100644
--- a/src/auto-imports.d.ts
+++ b/src/auto-imports.d.ts
@@ -2,7 +2,6 @@
 export {}
 declare global {
   const EffectScope: typeof import('vue')['EffectScope']
-  const ElMessage: typeof import('element-plus/es')['ElMessage']
   const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
   const computed: typeof import('vue')['computed']
   const createApp: typeof import('vue')['createApp']
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index d61fbe06..9302b14a 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="FileUpload">
-import { UploadUserFile } from 'element-plus'
+import { ElMessage, UploadUserFile } from 'element-plus'
 import type { UploadProps } from 'element-plus'
 
 const props = defineProps({
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index b0249211..dc65d62e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="ImageUpload">
 import type { UploadProps } from 'element-plus'
+import { ElMessage } from 'element-plus'
 
 const props = defineProps({
   action: {
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index f94ffe04..9d01e3aa 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="ImagesUpload">
 import type { UploadProps } from 'element-plus'
+import { ElMessage } from 'element-plus'
 
 const props = defineProps({
   action: {
diff --git a/src/layouts/components/AppSetting/index.vue b/src/layouts/components/AppSetting/index.vue
index ea475c43..1c91078a 100644
--- a/src/layouts/components/AppSetting/index.vue
+++ b/src/layouts/components/AppSetting/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="AppSetting">
 import { useClipboard } from '@vueuse/core'
+import { ElMessage } from 'element-plus'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
diff --git a/src/views/login.vue b/src/views/login.vue
index 1fbc0fd1..c006e994 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -7,6 +7,7 @@ meta:
 
 <script lang="ts" setup name="Login">
 import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
 
 const route = useRoute()
diff --git a/src/views/personal/edit.password.vue b/src/views/personal/edit.password.vue
index 7445e202..7246b42c 100644
--- a/src/views/personal/edit.password.vue
+++ b/src/views/personal/edit.password.vue
@@ -6,6 +6,7 @@ meta:
 
 <script lang="ts" setup name="PersonalEditPassword">
 import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
 
 const route = useRoute()
diff --git a/src/views/personal/setting.vue b/src/views/personal/setting.vue
index 286dc83c..22305a97 100644
--- a/src/views/personal/setting.vue
+++ b/src/views/personal/setting.vue
@@ -7,6 +7,7 @@ meta:
 
 <script lang="ts" setup name="PersonalSetting">
 import type { UploadProps } from 'element-plus'
+import { ElMessage } from 'element-plus'
 
 const router = useRouter()
 
diff --git a/vite.config.ts b/vite.config.ts
index 3219f3b6..8589a2e0 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -11,8 +11,7 @@ export default ({ mode, command }) => {
   // 全局 scss 资源
   const scssResources = []
   fs.readdirSync('src/assets/styles/resources').forEach((dirname) => {
-    if (fs.statSync(`src/assets/styles/resources/${dirname}`).isFile())
-      scssResources.push(`@use "src/assets/styles/resources/${dirname}" as *;`)
+    if (fs.statSync(`src/assets/styles/resources/${dirname}`).isFile()) { scssResources.push(`@use "src/assets/styles/resources/${dirname}" as *;`) }
   })
   // css 精灵图相关
   fs.readdirSync('src/assets/sprites').forEach((dirname) => {
@@ -50,16 +49,6 @@ export default ({ mode, command }) => {
         lastBuildTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
       }),
     },
-    optimizeDeps: {
-      include: [
-        'element-plus',
-        'element-plus/es',
-        'element-plus/es/components/message/style/css',
-        'element-plus/es/components/notification/style/css',
-        'element-plus/es/components/message-box/style/css',
-        'element-plus/es/components/loading/style/css',
-      ],
-    },
     plugins: createVitePlugins(env, command === 'build'),
     resolve: {
       alias: {
diff --git a/vite/plugins/auto-import.ts b/vite/plugins/auto-import.ts
index 3e60cfab..b50e784f 100644
--- a/vite/plugins/auto-import.ts
+++ b/vite/plugins/auto-import.ts
@@ -1,5 +1,4 @@
 import autoImport from 'unplugin-auto-import/vite'
-import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
 
 export default function createAutoImport() {
   return autoImport({
@@ -12,8 +11,5 @@ export default function createAutoImport() {
     dirs: [
       './src/utils/composables/**',
     ],
-    resolvers: [
-      ElementPlusResolver(),
-    ],
   })
 }