From a911002953f6a6ea22140e60a405be7f4a2ac69e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <i@haozi.net>
Date: Thu, 10 Oct 2024 00:17:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dnpm=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/build/config/proxy.ts                       |  1 -
 web/build/plugins/unplugin.ts                   | 12 +++++++++---
 web/src/components/common/AppProvider.vue       |  3 +--
 web/src/components/common/CodeEditor.vue        |  3 +--
 web/src/layout/IndexView.vue                    |  3 ++-
 web/src/layout/header/components/BreadCrumb.vue |  3 +--
 web/src/layout/sidebar/components/SideMenu.vue  |  5 ++---
 web/src/main.ts                                 | 11 +++++------
 web/src/router/guard/app-install-guard.ts       |  3 +--
 web/src/router/guard/index.ts                   |  1 -
 web/src/router/index.ts                         |  3 +--
 web/src/store/modules/permission/index.ts       |  3 +--
 web/src/store/modules/tab/index.ts              |  3 +--
 web/src/store/modules/theme/helpers.ts          |  7 +++----
 web/src/store/modules/theme/index.ts            |  5 ++---
 web/src/store/modules/user/index.ts             |  3 +--
 web/src/utils/common/naiveTools.ts              |  3 +--
 web/src/utils/http/index.ts                     |  1 -
 web/src/utils/http/interceptors.ts              |  1 -
 19 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/web/build/config/proxy.ts b/web/build/config/proxy.ts
index 560c53aa..3c89f9c0 100644
--- a/web/build/config/proxy.ts
+++ b/web/build/config/proxy.ts
@@ -1,5 +1,4 @@
 import type { ProxyOptions } from 'vite'
-
 import { getProxyConfig } from '../../settings/proxy-config'
 
 export function createViteProxy(isUseProxy = true, proxyType: ProxyType) {
diff --git a/web/build/plugins/unplugin.ts b/web/build/plugins/unplugin.ts
index 9a71e5ed..ebeaf1fa 100644
--- a/web/build/plugins/unplugin.ts
+++ b/web/build/plugins/unplugin.ts
@@ -1,8 +1,14 @@
 import AutoImport from 'unplugin-auto-import/vite'
-import IconsResolver from 'unplugin-icons/resolver'
-import Icons from 'unplugin-icons/vite'
-import { NaiveUiResolver } from 'unplugin-vue-components/resolvers'
 import Components from 'unplugin-vue-components/vite'
+import { NaiveUiResolver } from 'unplugin-vue-components/resolvers'
+
+/**
+ * * unplugin-icons应用，自动引入iconify图标
+ * usage: https://github.com/antfu/unplugin-icons
+ * 图标库: https://icones.js.org/
+ */
+import Icons from 'unplugin-icons/vite'
+import IconsResolver from 'unplugin-icons/resolver'
 
 export default [
   AutoImport({
diff --git a/web/src/components/common/AppProvider.vue b/web/src/components/common/AppProvider.vue
index fe1416b4..e4764f35 100644
--- a/web/src/components/common/AppProvider.vue
+++ b/web/src/components/common/AppProvider.vue
@@ -1,10 +1,9 @@
 <script lang="ts" setup>
+import { useThemeStore } from '@/store'
 import { useCssVar } from '@vueuse/core'
 import { kebabCase } from 'lodash-es'
 import type { GlobalThemeOverrides } from 'naive-ui'
 
-import { useThemeStore } from '@/store'
-
 type ThemeVars = Exclude<GlobalThemeOverrides['common'], undefined>
 type ThemeVarsKeys = keyof ThemeVars
 
diff --git a/web/src/components/common/CodeEditor.vue b/web/src/components/common/CodeEditor.vue
index 133d03f4..e01d7886 100644
--- a/web/src/components/common/CodeEditor.vue
+++ b/web/src/components/common/CodeEditor.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
-import Editor from '@guolao/vue-monaco-editor'
-
 import file from '@/api/panel/file'
 import { languageByPath } from '@/utils/file'
+import Editor from '@guolao/vue-monaco-editor'
 
 const props = defineProps({
   path: String,
diff --git a/web/src/layout/IndexView.vue b/web/src/layout/IndexView.vue
index b1deeff0..d150e70d 100644
--- a/web/src/layout/IndexView.vue
+++ b/web/src/layout/IndexView.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup>
-import { useThemeStore } from '@/store'
 import AppMain from './AppMain.vue'
 import AppHeader from './header/IndexView.vue'
 import SideBar from './sidebar/IndexView.vue'
 import AppTab from './tab/IndexView.vue'
 
+import { useThemeStore } from '@/store'
+
 const themeStore = useThemeStore()
 </script>
 
diff --git a/web/src/layout/header/components/BreadCrumb.vue b/web/src/layout/header/components/BreadCrumb.vue
index 91636ccf..35de774f 100644
--- a/web/src/layout/header/components/BreadCrumb.vue
+++ b/web/src/layout/header/components/BreadCrumb.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
-import { useI18n } from 'vue-i18n'
-
 import { renderIcon } from '@/utils'
+import { useI18n } from 'vue-i18n'
 import type { Meta } from '~/types/router'
 
 const { t } = useI18n()
diff --git a/web/src/layout/sidebar/components/SideMenu.vue b/web/src/layout/sidebar/components/SideMenu.vue
index 41c87c58..d7e5eff4 100644
--- a/web/src/layout/sidebar/components/SideMenu.vue
+++ b/web/src/layout/sidebar/components/SideMenu.vue
@@ -1,10 +1,9 @@
 <script lang="ts" setup>
+import { useAppStore, usePermissionStore, useThemeStore } from '@/store'
+import { isUrl, renderIcon } from '@/utils'
 import type { MenuInst, MenuOption } from 'naive-ui'
 import type { VNodeChild } from 'vue'
 import { useI18n } from 'vue-i18n'
-
-import { useAppStore, usePermissionStore, useThemeStore } from '@/store'
-import { isUrl, renderIcon } from '@/utils'
 import type { Meta, RouteType } from '~/types/router'
 
 const { t } = useI18n()
diff --git a/web/src/main.ts b/web/src/main.ts
index 9f64ed19..ca3db3fb 100644
--- a/web/src/main.ts
+++ b/web/src/main.ts
@@ -1,16 +1,15 @@
-import '@/styles/index.scss'
 import '@/styles/reset.css'
+import '@/styles/index.scss'
 import 'uno.css'
 
-import { install as VueMonacoEditorPlugin } from '@guolao/vue-monaco-editor'
 import { createApp } from 'vue'
-
-import info from '@/api/panel/info'
-import { setupI18n } from '@/i18n/i18n'
 import App from './App.vue'
-import { setupRouter } from './router'
 import { setupStore, useThemeStore } from './store'
+import { setupRouter } from './router'
+import { setupI18n } from '@/i18n/i18n'
 import { setupNaiveDiscreteApi } from './utils'
+import { install as VueMonacoEditorPlugin } from '@guolao/vue-monaco-editor'
+import info from '@/api/panel/info'
 
 async function setupApp() {
   const app = createApp(App)
diff --git a/web/src/router/guard/app-install-guard.ts b/web/src/router/guard/app-install-guard.ts
index 96c13c77..66b708e5 100644
--- a/web/src/router/guard/app-install-guard.ts
+++ b/web/src/router/guard/app-install-guard.ts
@@ -1,6 +1,5 @@
-import type { Router } from 'vue-router'
-
 import app from '@/api/panel/app'
+import type { Router } from 'vue-router'
 
 export function createAppInstallGuard(router: Router) {
   router.beforeEach(async (to) => {
diff --git a/web/src/router/guard/index.ts b/web/src/router/guard/index.ts
index df97996f..0a23b2d2 100644
--- a/web/src/router/guard/index.ts
+++ b/web/src/router/guard/index.ts
@@ -1,5 +1,4 @@
 import type { Router } from 'vue-router'
-
 import { createAppInstallGuard } from './app-install-guard'
 import { createPageLoadingGuard } from './page-loading-guard'
 import { createPageTitleGuard } from './page-title-guard'
diff --git a/web/src/router/index.ts b/web/src/router/index.ts
index 4dc6374e..1aaa3b1b 100644
--- a/web/src/router/index.ts
+++ b/web/src/router/index.ts
@@ -1,7 +1,6 @@
+import { usePermissionStore } from '@/store'
 import type { App } from 'vue'
 import { createRouter, createWebHashHistory, createWebHistory } from 'vue-router'
-
-import { usePermissionStore } from '@/store'
 import type { RoutesType, RouteType } from '~/types/router'
 import { setupRouterGuard } from './guard'
 import { basicRoutes, EMPTY_ROUTE, NOT_FOUND_ROUTE } from './routes'
diff --git a/web/src/store/modules/permission/index.ts b/web/src/store/modules/permission/index.ts
index 89332801..6ab95ad8 100644
--- a/web/src/store/modules/permission/index.ts
+++ b/web/src/store/modules/permission/index.ts
@@ -1,6 +1,5 @@
-import { defineStore } from 'pinia'
-
 import { asyncRoutes, basicRoutes } from '@/router/routes'
+import { defineStore } from 'pinia'
 import type { RoutesType } from '~/types/router'
 import { filterAsyncRoutes } from './helpers'
 
diff --git a/web/src/store/modules/tab/index.ts b/web/src/store/modules/tab/index.ts
index 4e7f9055..1dcf95a8 100644
--- a/web/src/store/modules/tab/index.ts
+++ b/web/src/store/modules/tab/index.ts
@@ -1,7 +1,6 @@
-import { defineStore } from 'pinia'
-
 import { router } from '@/router'
 import { setSession } from '@/utils'
+import { defineStore } from 'pinia'
 import { activeTab, tabs, WITHOUT_TAB_PATHS } from './helpers'
 
 export interface TabItem {
diff --git a/web/src/store/modules/theme/helpers.ts b/web/src/store/modules/theme/helpers.ts
index e28584aa..6ccbdf85 100644
--- a/web/src/store/modules/theme/helpers.ts
+++ b/web/src/store/modules/theme/helpers.ts
@@ -1,6 +1,5 @@
-import type { GlobalThemeOverrides } from 'naive-ui'
-
 import { addColorAlpha, getColorPalette } from '@/utils'
+import type { GlobalThemeOverrides } from 'naive-ui'
 import themeSetting from '~/settings/theme.json'
 
 type ColorType = 'primary' | 'info' | 'success' | 'warning' | 'error'
@@ -31,8 +30,8 @@ export function initThemeSettings(): Theme.Setting {
     warning: '#faad14',
     error: '#f5222d'
   }
-  const locale = themeSetting.locale || 'zh_CN'
-  return { isMobile, darkMode, sider, header, tab, primaryColor, otherColor, locale }
+  const language = themeSetting.language || 'zh_CN'
+  return { isMobile, darkMode, sider, header, tab, primaryColor, otherColor, language }
 }
 
 /** 获取naive的主题颜色 */
diff --git a/web/src/store/modules/theme/index.ts b/web/src/store/modules/theme/index.ts
index 466fcf88..61fc2248 100644
--- a/web/src/store/modules/theme/index.ts
+++ b/web/src/store/modules/theme/index.ts
@@ -10,7 +10,6 @@ import {
 } from 'naive-ui'
 import type { BuiltInGlobalTheme } from 'naive-ui/es/themes/interface'
 import { defineStore } from 'pinia'
-
 import { getNaiveThemeOverrides, initThemeSettings } from './helpers'
 
 type ThemeState = Theme.Setting
@@ -64,8 +63,8 @@ export const useThemeStore = defineStore('theme-store', {
       this.primaryColor = color
     },
     /** 设置语言 */
-    setLocale(language: string) {
-      this.locale = language
+    setLocale(locale: string) {
+      this.locale = locale
     }
   }
 })
diff --git a/web/src/store/modules/user/index.ts b/web/src/store/modules/user/index.ts
index c41c9ddb..ad3d9209 100644
--- a/web/src/store/modules/user/index.ts
+++ b/web/src/store/modules/user/index.ts
@@ -1,9 +1,8 @@
-import { defineStore } from 'pinia'
-
 import user from '@/api/panel/user'
 import { resetRouter } from '@/router'
 import { usePermissionStore, useTabStore } from '@/store'
 import { toLogin } from '@/utils'
+import { defineStore } from 'pinia'
 
 interface UserInfo {
   id?: string
diff --git a/web/src/utils/common/naiveTools.ts b/web/src/utils/common/naiveTools.ts
index 669a092c..1aa12dfc 100644
--- a/web/src/utils/common/naiveTools.ts
+++ b/web/src/utils/common/naiveTools.ts
@@ -1,6 +1,5 @@
-import * as NaiveUI from 'naive-ui'
-
 import { useThemeStore } from '@/store'
+import * as NaiveUI from 'naive-ui'
 
 export async function setupNaiveDiscreteApi() {
   const themeStore = useThemeStore()
diff --git a/web/src/utils/http/index.ts b/web/src/utils/http/index.ts
index 5af934ef..299994aa 100644
--- a/web/src/utils/http/index.ts
+++ b/web/src/utils/http/index.ts
@@ -1,5 +1,4 @@
 import axios from 'axios'
-
 import { reqReject, reqResolve, resReject, resResolve } from './interceptors'
 
 export function createAxios(options = {}) {
diff --git a/web/src/utils/http/interceptors.ts b/web/src/utils/http/interceptors.ts
index 16f711c1..0143c77e 100644
--- a/web/src/utils/http/interceptors.ts
+++ b/web/src/utils/http/interceptors.ts
@@ -1,5 +1,4 @@
 import type { AxiosError, AxiosResponse } from 'axios'
-
 import type { RequestConfig } from '~/types/axios'
 import { AxiosRejectError, resolveResError } from './helpers'