diff --git a/package.json b/package.json index 525ff8f..4b16bcc 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "pinia": "^2.1.7", "pinia-plugin-persist": "^1.0.0", "vue": "^3.4.21", - "vue-i18n": "10.0.0-alpha.2", + "vue-i18n": "10.0.0-alpha.3", "vue-router": "^4.3.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d6cbe80..869959f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,9 +1,5 @@ lockfileVersion: '6.0' -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - dependencies: dc-admin: specifier: 'link:' @@ -21,8 +17,8 @@ dependencies: specifier: ^3.4.21 version: 3.4.21(typescript@5.4.3) vue-i18n: - specifier: 10.0.0-alpha.2 - version: 10.0.0-alpha.2(vue@3.4.21) + specifier: 10.0.0-alpha.3 + version: 10.0.0-alpha.3(vue@3.4.21) vue-router: specifier: ^4.3.0 version: 4.3.0(vue@3.4.21) @@ -1126,24 +1122,24 @@ packages: resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==} dev: true - /@intlify/core-base@10.0.0-alpha.2: - resolution: {integrity: sha512-bT+RwQtJ2BOwpt/lLlDtJM8+lfNG9TdWWGRYphDsV8123SiGb4Qm6iEjBN3/RKC/9hX+EHl2ENslURfioov3dQ==} + /@intlify/core-base@10.0.0-alpha.3: + resolution: {integrity: sha512-geqr/gY+g/PeAIMeFpi3hypeG7p+gGsHftc9K+jagW8775j6x4pvpeWa5CeHKm6b3lSKfGYZ9BPg74TOKt8B4Q==} engines: {node: '>= 16'} dependencies: - '@intlify/message-compiler': 10.0.0-alpha.2 - '@intlify/shared': 10.0.0-alpha.2 + '@intlify/message-compiler': 10.0.0-alpha.3 + '@intlify/shared': 10.0.0-alpha.3 dev: false - /@intlify/message-compiler@10.0.0-alpha.2: - resolution: {integrity: sha512-OGwttsMwB2BUzhZLraoAfAqcza5UyLMEU013ort3LbmdE6ke/pFONFyxjNQdmFWzW2K868AIVgwx4zo8lbmhjg==} + /@intlify/message-compiler@10.0.0-alpha.3: + resolution: {integrity: sha512-WjM1KAl5enpOfprfVAJ3FzwACmizZFPgyV0sn+QXoWH8BG2ahVkf7uVEqQH0mvUr2rKKaScwpzhH3wZ5F7ZdPw==} engines: {node: '>= 16'} dependencies: - '@intlify/shared': 10.0.0-alpha.2 + '@intlify/shared': 10.0.0-alpha.3 source-map-js: 1.2.0 dev: false - /@intlify/shared@10.0.0-alpha.2: - resolution: {integrity: sha512-pWlpsC3IqkDuIH/5bNlyyiUbAXYymeNXkznORzPWT3qpAe8MazPOm14wMHGn/wESCdB5b9txQson4+CH0ym1hQ==} + /@intlify/shared@10.0.0-alpha.3: + resolution: {integrity: sha512-fi2q48i+C6sSCAt3vOj/9LD3tkr1wcvLt+ifZEHrpPiwHCyKLDYGp5qBNUHUBBA/iqFTeWdtHUbHE9z9OeTXkw==} engines: {node: '>= 16'} dev: false @@ -5189,14 +5185,14 @@ packages: - supports-color dev: true - /vue-i18n@10.0.0-alpha.2(vue@3.4.21): - resolution: {integrity: sha512-wP3+3k0TbdqvYDUn5lS5v7dtAsX0lP9J+CRcoP7mTQXsmkGurfruyd0rvw+DBnW+mULsoP/oygtj75HZFPp6YQ==} + /vue-i18n@10.0.0-alpha.3(vue@3.4.21): + resolution: {integrity: sha512-4+NpYfOUmeG7RKwaqJ2HglqQNbql7hmcy9w/1QZeVwCT0pDG/j93PZlqmsiGSEx7Fz2Ok+dWbd/vEUrOohVwYQ==} engines: {node: '>= 16'} peerDependencies: vue: ^3.0.0 dependencies: - '@intlify/core-base': 10.0.0-alpha.2 - '@intlify/shared': 10.0.0-alpha.2 + '@intlify/core-base': 10.0.0-alpha.3 + '@intlify/shared': 10.0.0-alpha.3 '@vue/devtools-api': 6.6.1 vue: 3.4.21(typescript@5.4.3) dev: false @@ -5329,3 +5325,7 @@ packages: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} engines: {node: '>=12.20'} dev: true + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false diff --git a/src/assets/icons/about.svg b/src/assets/svgs/about.svg similarity index 100% rename from src/assets/icons/about.svg rename to src/assets/svgs/about.svg diff --git a/src/assets/icons/classify.svg b/src/assets/svgs/classify.svg similarity index 100% rename from src/assets/icons/classify.svg rename to src/assets/svgs/classify.svg diff --git a/src/assets/icons/common.svg b/src/assets/svgs/common.svg similarity index 100% rename from src/assets/icons/common.svg rename to src/assets/svgs/common.svg diff --git a/src/assets/icons/earth.svg b/src/assets/svgs/earth.svg similarity index 100% rename from src/assets/icons/earth.svg rename to src/assets/svgs/earth.svg diff --git a/src/assets/icons/exit.svg b/src/assets/svgs/exit.svg similarity index 100% rename from src/assets/icons/exit.svg rename to src/assets/svgs/exit.svg diff --git a/src/assets/icons/form.svg b/src/assets/svgs/form.svg similarity index 100% rename from src/assets/icons/form.svg rename to src/assets/svgs/form.svg diff --git a/src/assets/icons/gitee.svg b/src/assets/svgs/gitee.svg similarity index 100% rename from src/assets/icons/gitee.svg rename to src/assets/svgs/gitee.svg diff --git a/src/assets/icons/github.svg b/src/assets/svgs/github.svg similarity index 100% rename from src/assets/icons/github.svg rename to src/assets/svgs/github.svg diff --git a/src/assets/icons/home.svg b/src/assets/svgs/home.svg similarity index 100% rename from src/assets/icons/home.svg rename to src/assets/svgs/home.svg diff --git a/src/assets/icons/lock-pwd.svg b/src/assets/svgs/lock-pwd.svg similarity index 100% rename from src/assets/icons/lock-pwd.svg rename to src/assets/svgs/lock-pwd.svg diff --git a/src/assets/icons/set.svg b/src/assets/svgs/set.svg similarity index 100% rename from src/assets/icons/set.svg rename to src/assets/svgs/set.svg diff --git a/src/assets/icons/snow.svg b/src/assets/svgs/snow.svg similarity index 100% rename from src/assets/icons/snow.svg rename to src/assets/svgs/snow.svg diff --git a/src/assets/icons/switch.svg b/src/assets/svgs/switch.svg similarity index 100% rename from src/assets/icons/switch.svg rename to src/assets/svgs/switch.svg diff --git a/src/assets/icons/user.svg b/src/assets/svgs/user.svg similarity index 100% rename from src/assets/icons/user.svg rename to src/assets/svgs/user.svg diff --git a/src/assets/icons/wechat.svg b/src/assets/svgs/wechat.svg similarity index 100% rename from src/assets/icons/wechat.svg rename to src/assets/svgs/wechat.svg diff --git a/src/components/lang-provider/index.vue b/src/components/lang-provider/index.vue index 6fca0fc..79e128e 100644 --- a/src/components/lang-provider/index.vue +++ b/src/components/lang-provider/index.vue @@ -10,7 +10,7 @@ import zhCN from "@arco-design/web-vue/es/locale/lang/zh-cn"; import enUS from "@arco-design/web-vue/es/locale/lang/en-us"; import { storeToRefs } from "pinia"; -import { useThemeConfig } from "@/store/theme-config"; +import { useThemeConfig } from "@/store/modules/theme-config"; const themeStore = useThemeConfig(); const { language } = storeToRefs(themeStore); interface Lang { diff --git a/src/hooks/useRoutingMethod.ts b/src/hooks/useRoutingMethod.ts index 9fe001a..ad4063b 100644 --- a/src/hooks/useRoutingMethod.ts +++ b/src/hooks/useRoutingMethod.ts @@ -1,6 +1,6 @@ import pinia from "@/store/index"; import { storeToRefs } from "pinia"; -import { useRoutesListStore } from "@/store/route-list"; +import { useRoutesListStore } from "@/store/modules/route-list"; /** * 路由处理hooks,内置多种路由处理场景 * @returns 路由方法 diff --git a/src/lang/index.ts b/src/lang/index.ts index e031316..fb2f358 100644 --- a/src/lang/index.ts +++ b/src/lang/index.ts @@ -3,7 +3,7 @@ import zhCN from "@/lang/modules/zhCN"; import enUS from "@/lang/modules/enUS"; import pinia from "@/store/index"; import { storeToRefs } from "pinia"; -import { useThemeConfig } from "@/store/theme-config"; +import { useThemeConfig } from "@/store/modules/theme-config"; const themeStore = useThemeConfig(pinia); const { language } = storeToRefs(themeStore); /* 这里必须是messages名称 */ diff --git a/src/layout/components/Aside/index.vue b/src/layout/components/Aside/index.vue index 247221d..3877aa5 100644 --- a/src/layout/components/Aside/index.vue +++ b/src/layout/components/Aside/index.vue @@ -14,7 +14,7 @@ import Logo from "@/assets/img/logo.jpg"; import Menu from "@/layout/components/Menu/index.vue"; import { storeToRefs } from "pinia"; -import { useThemeConfig } from "@/store/theme-config"; +import { useThemeConfig } from "@/store/modules/theme-config"; const themeStore = useThemeConfig(); const { collapsed } = storeToRefs(themeStore); diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue index 029aa08..e47f91c 100644 --- a/src/layout/components/Header/index.vue +++ b/src/layout/components/Header/index.vue @@ -110,8 +110,8 @@ import { useI18n } from "vue-i18n"; import { Modal } from "@arco-design/web-vue"; import { useRouter } from "vue-router"; import { storeToRefs } from "pinia"; -import { useUserInfoStore } from "@/store/user-info"; -import { useThemeConfig } from "@/store/theme-config"; +import { useUserInfoStore } from "@/store/modules/user-info"; +import { useThemeConfig } from "@/store/modules/theme-config"; const i18n = useI18n(); const router = useRouter(); const themeStore = useThemeConfig(pinia); diff --git a/src/layout/components/Main/index.vue b/src/layout/components/Main/index.vue index 3a33221..9aa6bd1 100644 --- a/src/layout/components/Main/index.vue +++ b/src/layout/components/Main/index.vue @@ -18,8 +18,8 @@