From f4984998d56ee145675c1c5e12f83b0589d80196 Mon Sep 17 00:00:00 2001
From: pany <939630029@qq.com>
Date: Thu, 5 May 2022 17:18:58 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20element-plus=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=8C=89=E9=9C=80=E5=BC=95=E5=85=A5=E6=9B=B4=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=AE=8C=E6=95=B4=E5=BC=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                        |   6 +-
 package.json                        |   2 -
 pnpm-lock.yaml                      | 127 ----------------------------
 src/components/Screenfull/index.vue |   1 +
 src/main.ts                         |  10 ++-
 src/router/permission.ts            |   1 +
 src/utils/service.ts                |   3 +-
 types/auto-imports.d.ts             |   6 --
 types/components.d.ts               |  40 ---------
 vite.config.ts                      |  29 ++++---
 10 files changed, 30 insertions(+), 195 deletions(-)
 delete mode 100644 types/auto-imports.d.ts
 delete mode 100644 types/components.d.ts

diff --git a/.eslintrc.js b/.eslintrc.js
index 347c8d75..3f994341 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -10,9 +10,7 @@ module.exports = {
     defineProps: "readonly",
     defineEmits: "readonly",
     defineExpose: "readonly",
-    withDefaults: "readonly",
-    // element-plus
-    ElMessage: "readonly"
+    withDefaults: "readonly"
   },
   extends: [
     "plugin:vue/vue3-essential",
@@ -20,6 +18,8 @@ module.exports = {
     "@vue/typescript/recommended",
     "@vue/prettier",
     "@vue/eslint-config-typescript"
+    // unplugin-auto-import 自动生成的文件
+    // "./types/.eslintrc-auto-import.json"
   ],
   parser: "vue-eslint-parser",
   parserOptions: {
diff --git a/package.json b/package.json
index 4125f1fa..f208d97d 100644
--- a/package.json
+++ b/package.json
@@ -57,8 +57,6 @@
     "prettier": "^2.6.2",
     "sass": "^1.51.0",
     "typescript": "^4.6.3",
-    "unplugin-auto-import": "^0.7.1",
-    "unplugin-vue-components": "^0.19.3",
     "vite": "^2.9.5",
     "vite-plugin-svg-icons": "^2.0.1",
     "vue-eslint-parser": "^8.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fa33259f..a4c846e3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -31,8 +31,6 @@ specifiers:
   sass: ^1.51.0
   screenfull: ^6.0.1
   typescript: ^4.6.3
-  unplugin-auto-import: ^0.7.1
-  unplugin-vue-components: ^0.19.3
   vite: ^2.9.5
   vite-plugin-svg-icons: ^2.0.1
   vue: ^3.2.33
@@ -75,8 +73,6 @@ devDependencies:
   prettier: 2.6.2
   sass: 1.51.0
   typescript: 4.6.3
-  unplugin-auto-import: 0.7.1_vite@2.9.5
-  unplugin-vue-components: 0.19.3_vite@2.9.5+vue@3.2.33
   vite: 2.9.5_sass@1.51.0
   vite-plugin-svg-icons: 2.0.1_vite@2.9.5
   vue-eslint-parser: 8.3.0_eslint@8.14.0
@@ -84,10 +80,6 @@ devDependencies:
 
 packages:
 
-  /@antfu/utils/0.5.1:
-    resolution: {integrity: sha512-8Afo0+xvYe1K8Wm4xHTymfTkpzy36aaqDvhXIayUwl+mecMG9Xzl3XjXa6swG6Bk8FBeQ646RyvmsYt6+2Be9g==}
-    dev: true
-
   /@babel/parser/7.17.9:
     resolution: {integrity: sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==}
     engines: {node: '>=6.0.0'}
@@ -169,14 +161,6 @@ packages:
       fastq: 1.13.0
     dev: true
 
-  /@rollup/pluginutils/4.2.1:
-    resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==}
-    engines: {node: '>= 8.0.0'}
-    dependencies:
-      estree-walker: 2.0.2
-      picomatch: 2.3.1
-    dev: true
-
   /@sxzz/popperjs-es/2.11.6:
     resolution: {integrity: sha512-V8W+eJiInGq8roHR8xYR+lxojL022LyUI9E4FRav4+1Ih+875ONcLNK3XIs809fyxk1lNzrZO5OAy6xpvEafNw==}
     dev: false
@@ -713,12 +697,6 @@ packages:
       concat-map: 0.0.1
     dev: true
 
-  /brace-expansion/2.0.1:
-    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
-    dependencies:
-      balanced-match: 1.0.2
-    dev: true
-
   /braces/2.3.2:
     resolution: {integrity: sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==}
     engines: {node: '>=0.10.0'}
@@ -2190,11 +2168,6 @@ packages:
       json5: 1.0.1
     dev: true
 
-  /local-pkg/0.4.1:
-    resolution: {integrity: sha512-lL87ytIGP2FU5PWwNDo0w3WhIo2gopIAxPg9RxDYF7m4rr5ahuZxP22xnJHIvaLTe4Z9P6uKKY2UHiwyB4pcrw==}
-    engines: {node: '>=14'}
-    dev: true
-
   /lodash-es/4.17.21:
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
@@ -2240,13 +2213,6 @@ packages:
     dependencies:
       sourcemap-codec: 1.4.8
 
-  /magic-string/0.26.1:
-    resolution: {integrity: sha512-ndThHmvgtieXe8J/VGPjG+Apu7v7ItcD5mhEIvOscWjPF/ccOiLxHaSuCAS2G+3x4GKsAbT8u7zdyamupui8Tg==}
-    engines: {node: '>=12'}
-    dependencies:
-      sourcemap-codec: 1.4.8
-    dev: true
-
   /map-cache/0.2.2:
     resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
     engines: {node: '>=0.10.0'}
@@ -2333,13 +2299,6 @@ packages:
       brace-expansion: 1.1.11
     dev: true
 
-  /minimatch/5.0.1:
-    resolution: {integrity: sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==}
-    engines: {node: '>=10'}
-    dependencies:
-      brace-expansion: 2.0.1
-    dev: true
-
   /minimist/1.2.6:
     resolution: {integrity: sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==}
     dev: true
@@ -3168,83 +3127,6 @@ packages:
     engines: {node: '>= 10.0.0'}
     dev: true
 
-  /unplugin-auto-import/0.7.1_vite@2.9.5:
-    resolution: {integrity: sha512-9865OV9eP99PNxHR2mtTDExeN01m4M9boT5U2BtIwsU1wDRsaFIYWLwcCBEjvXzXfTTC2NNMskhHGVAMfL2WgA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@vueuse/core': '*'
-    peerDependenciesMeta:
-      '@vueuse/core':
-        optional: true
-    dependencies:
-      '@antfu/utils': 0.5.1
-      '@rollup/pluginutils': 4.2.1
-      local-pkg: 0.4.1
-      magic-string: 0.26.1
-      resolve: 1.22.0
-      unplugin: 0.6.2_vite@2.9.5
-    transitivePeerDependencies:
-      - esbuild
-      - rollup
-      - vite
-      - webpack
-    dev: true
-
-  /unplugin-vue-components/0.19.3_vite@2.9.5+vue@3.2.33:
-    resolution: {integrity: sha512-z/kpYJnqrJuWglDNs7fy0YRHr41oLc07y2TkP3by6DqPb1GG9xGC9SFigeFwd4J7GVTqyFVsnjoeup7uK7I2dA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@babel/parser': ^7.15.8
-      '@babel/traverse': ^7.15.4
-      vue: 2 || 3
-    peerDependenciesMeta:
-      '@babel/parser':
-        optional: true
-      '@babel/traverse':
-        optional: true
-    dependencies:
-      '@antfu/utils': 0.5.1
-      '@rollup/pluginutils': 4.2.1
-      chokidar: 3.5.3
-      debug: 4.3.4
-      fast-glob: 3.2.11
-      local-pkg: 0.4.1
-      magic-string: 0.26.1
-      minimatch: 5.0.1
-      resolve: 1.22.0
-      unplugin: 0.6.2_vite@2.9.5
-      vue: 3.2.33
-    transitivePeerDependencies:
-      - esbuild
-      - rollup
-      - supports-color
-      - vite
-      - webpack
-    dev: true
-
-  /unplugin/0.6.2_vite@2.9.5:
-    resolution: {integrity: sha512-+QONc2uBFQbeo4x5mlJHjTKjR6pmuchMpGVrWhwdGFFMb4ttFZ4E9KqhOOrNcm3Q8NNyB1vJ4s5e36IZC7UWYw==}
-    peerDependencies:
-      esbuild: '>=0.13'
-      rollup: ^2.50.0
-      vite: ^2.3.0
-      webpack: 4 || 5
-    peerDependenciesMeta:
-      esbuild:
-        optional: true
-      rollup:
-        optional: true
-      vite:
-        optional: true
-      webpack:
-        optional: true
-    dependencies:
-      chokidar: 3.5.3
-      vite: 2.9.5_sass@1.51.0
-      webpack-sources: 3.2.3
-      webpack-virtual-modules: 0.4.3
-    dev: true
-
   /unset-value/1.0.0:
     resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
     engines: {node: '>=0.10.0'}
@@ -3387,15 +3269,6 @@ packages:
       '@vue/shared': 3.2.33
     dev: false
 
-  /webpack-sources/3.2.3:
-    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
-    engines: {node: '>=10.13.0'}
-    dev: true
-
-  /webpack-virtual-modules/0.4.3:
-    resolution: {integrity: sha512-5NUqC2JquIL2pBAAo/VfBP6KuGkHIZQXW/lNKupLPfhViwh8wNsu0BObtl09yuKZszeEUfbXz8xhrHvSG16Nqw==}
-    dev: true
-
   /which/2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
     engines: {node: '>= 8'}
diff --git a/src/components/Screenfull/index.vue b/src/components/Screenfull/index.vue
index c43f6691..aa06539f 100644
--- a/src/components/Screenfull/index.vue
+++ b/src/components/Screenfull/index.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import { ElMessage } from "element-plus"
 import { FullScreen } from "@element-plus/icons-vue"
 import screenfull from "screenfull"
 
diff --git a/src/main.ts b/src/main.ts
index 65cc2742..69505946 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,15 +3,19 @@ import router from "./router"
 import "@/router/permission"
 import store from "./store"
 import App from "./App.vue"
-import * as directives from "@/directives"
+import ElementPlus from "element-plus"
+import "element-plus/dist/index.css"
 import loadSvg from "@/icons"
+import * as directives from "@/directives"
 import "@/styles/index.scss"
 import "normalize.css"
 
 const app = createApp(App)
-// 加载全局 svg
+/** element-plus 组件完整引入 */
+app.use(ElementPlus)
+/** 加载全局 svg */
 loadSvg(app)
-// 自定义指令
+/** 自定义指令 */
 Object.keys(directives).forEach((key) => {
   app.directive(key, (directives as { [key: string]: Directive })[key])
 })
diff --git a/src/router/permission.ts b/src/router/permission.ts
index a452601a..21d69c8c 100644
--- a/src/router/permission.ts
+++ b/src/router/permission.ts
@@ -2,6 +2,7 @@ import router from "@/router"
 import { RouteLocationNormalized } from "vue-router"
 import { useUserStoreHook } from "@/store/modules/user"
 import { usePermissionStoreHook } from "@/store/modules/permission"
+import { ElMessage } from "element-plus"
 import { whiteList } from "@/config/white-list"
 import { getToken } from "@/utils/cookies"
 import asyncRouteSettings from "@/config/async-route"
diff --git a/src/utils/service.ts b/src/utils/service.ts
index 983016ca..cc9315df 100644
--- a/src/utils/service.ts
+++ b/src/utils/service.ts
@@ -1,7 +1,8 @@
 import axios, { AxiosInstance, AxiosRequestConfig } from "axios"
+import { useUserStoreHook } from "@/store/modules/user"
+import { ElMessage } from "element-plus"
 import { get } from "lodash-es"
 import { getToken } from "@/utils/cookies"
-import { useUserStoreHook } from "@/store/modules/user"
 
 /** 创建请求实例 */
 function createService() {
diff --git a/types/auto-imports.d.ts b/types/auto-imports.d.ts
deleted file mode 100644
index bf57e698..00000000
--- a/types/auto-imports.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// Generated by 'unplugin-auto-import'
-// We suggest you to commit this file into source control
-declare global {
-  const ElMessage: typeof import('element-plus/es')['ElMessage']
-}
-export {}
diff --git a/types/components.d.ts b/types/components.d.ts
deleted file mode 100644
index 73bae363..00000000
--- a/types/components.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// generated by unplugin-vue-components
-// We suggest you to commit this file into source control
-// Read more: https://github.com/vuejs/vue-next/pull/3399
-import '@vue/runtime-core'
-
-declare module '@vue/runtime-core' {
-  export interface GlobalComponents {
-    ElAvatar: typeof import('element-plus/es')['ElAvatar']
-    ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
-    ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
-    ElButton: typeof import('element-plus/es')['ElButton']
-    ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
-    ElDrawer: typeof import('element-plus/es')['ElDrawer']
-    ElDropdown: typeof import('element-plus/es')['ElDropdown']
-    ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
-    ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
-    ElForm: typeof import('element-plus/es')['ElForm']
-    ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElInput: typeof import('element-plus/es')['ElInput']
-    ElMenu: typeof import('element-plus/es')['ElMenu']
-    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
-    ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
-    ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
-    ElSwitch: typeof import('element-plus/es')['ElSwitch']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
-    ElTag: typeof import('element-plus/es')['ElTag']
-    ElTooltip: typeof import('element-plus/es')['ElTooltip']
-    RouterLink: typeof import('vue-router')['RouterLink']
-    RouterView: typeof import('vue-router')['RouterView']
-    Screenfull: typeof import('./../src/components/Screenfull/index.vue')['default']
-    SvgIcon: typeof import('./../src/components/SvgIcon/index.vue')['default']
-    ThemeSwitch: typeof import('./../src/components/ThemeSwitch/index.vue')['default']
-  }
-}
-
-export {}
diff --git a/vite.config.ts b/vite.config.ts
index b5ac2733..743238ad 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,9 +1,6 @@
 import { UserConfigExport } from "vite"
 import path, { resolve } from "path"
 import vue from "@vitejs/plugin-vue"
-import AutoImport from "unplugin-auto-import/vite"
-import Components from "unplugin-vue-components/vite"
-import { ElementPlusResolver } from "unplugin-vue-components/resolvers"
 import { createSvgIconsPlugin } from "vite-plugin-svg-icons"
 
 /** 配置项文档：https://vitejs.dev/config */
@@ -72,21 +69,27 @@ export default (): UserConfigExport => {
     /** vite 插件 */
     plugins: [
       vue(),
-      /** 自动按需导入 */
-      AutoImport({
-        dts: "./types/auto-imports.d.ts",
-        resolvers: [ElementPlusResolver()]
-      }),
-      /** 自动按需导入 */
-      Components({
-        dts: "./types/components.d.ts",
-        resolvers: [ElementPlusResolver()]
-      }),
       /** svg */
       createSvgIconsPlugin({
         iconDirs: [path.resolve(process.cwd(), "src/icons/svg")],
         symbolId: "icon-[dir]-[name]"
       })
+      // AutoImport({
+      //   dts: "./types/auto-imports.d.ts",
+      //   /** 自动按需导入 element-plus 相关函数，比如 ElMessage */
+      //   resolvers: [ElementPlusResolver()],
+      //   /** 根据自动按需导入的相关 api，生成 .eslintrc-auto-import.json 文件供 eslint 识别 */
+      //   eslintrc: {
+      //     enabled: true, // 默认 false
+      //     filepath: "./types/.eslintrc-auto-import.json", // 默认 "./.eslintrc-auto-import.json"
+      //     globalsPropValue: true // 默认 true (true | false | "readonly" | "readable" | "writable" | "writeable")
+      //   }
+      // }),
+      // Components({
+      //   dts: "./types/components.d.ts",
+      //   /** 自动按需导入 element-plus 组件 */
+      //   resolvers: [ElementPlusResolver()]
+      // })
     ]
   }
 }