diff --git a/package.json b/package.json index c95b539f..db31c4d0 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "pinia": "^2.0.13", "screenfull": "^6.0.1", "vue": "^3.2.31", - "vue-i18n": "^9.2.0-beta.34", + "vue-i18n": "~9.1.9", "vue-router": "4.0.12", "vue3-lazyload": "^0.2.5-beta", "vue3-sketch-ruler": "^1.3.3", @@ -30,7 +30,7 @@ "@types/node": "^16.11.26", "@typescript-eslint/eslint-plugin": "^5.18.0", "@typescript-eslint/parser": "^5.18.0", - "@vicons/carbon": "~0.11.0", + "@vicons/carbon": "^0.11.0", "@vicons/ionicons5": "~0.11.0", "@vitejs/plugin-vue": "^1.10.2", "@vitejs/plugin-vue-jsx": "^1.3.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cd796099..7f004c7e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,7 +5,7 @@ specifiers: '@types/node': ^16.11.26 '@typescript-eslint/eslint-plugin': ^5.18.0 '@typescript-eslint/parser': ^5.18.0 - '@vicons/carbon': ~0.11.0 + '@vicons/carbon': ^0.11.0 '@vicons/ionicons5': ~0.11.0 '@vitejs/plugin-vue': ^1.10.2 '@vitejs/plugin-vue-jsx': ^1.3.9 @@ -42,7 +42,7 @@ specifiers: vite-plugin-style-import: ^1.4.1 vue: ^3.2.31 vue-echarts: ^6.0.2 - vue-i18n: ^9.2.0-beta.34 + vue-i18n: ~9.1.9 vue-router: 4.0.12 vue-tsc: ^0.28.10 vue3-lazyload: ^0.2.5-beta @@ -62,7 +62,7 @@ dependencies: pinia: 2.0.13_typescript@4.6.3+vue@3.2.31 screenfull: 6.0.1 vue: 3.2.31 - vue-i18n: 9.2.0-beta.34_vue@3.2.31 + vue-i18n: 9.1.9_vue@3.2.31 vue-router: 4.0.12_vue@3.2.31 vue3-lazyload: 0.2.5-beta_4f726de02e89ff745196f225ebb1bbcf vue3-sketch-ruler: 1.3.3_vue@3.2.31 @@ -478,42 +478,60 @@ packages: resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} dev: true - /@intlify/core-base/9.2.0-beta.34: - resolution: {integrity: sha512-MwWvL7GMpFeYBfFOU2fDj8V+kodtoGv3ZjK0qxnQtJ6oWtmv2ldqRuIu1NxPSmykYYg4iljrG174EzZnQkIcqA==} - engines: {node: '>= 12'} + /@intlify/core-base/9.1.9: + resolution: {integrity: sha512-x5T0p/Ja0S8hs5xs+ImKyYckVkL4CzcEXykVYYV6rcbXxJTe2o58IquSqX9bdncVKbRZP7GlBU1EcRaQEEJ+vw==} + engines: {node: '>= 10'} dependencies: - '@intlify/devtools-if': 9.2.0-beta.34 - '@intlify/message-compiler': 9.2.0-beta.34 - '@intlify/shared': 9.2.0-beta.34 - '@intlify/vue-devtools': 9.2.0-beta.34 + '@intlify/devtools-if': 9.1.9 + '@intlify/message-compiler': 9.1.9 + '@intlify/message-resolver': 9.1.9 + '@intlify/runtime': 9.1.9 + '@intlify/shared': 9.1.9 + '@intlify/vue-devtools': 9.1.9 dev: false - /@intlify/devtools-if/9.2.0-beta.34: - resolution: {integrity: sha512-Q/MNzslMLKpVygLJDE2poOwzQFed3KTpAn6hPsN10pgBPNHwJGVi6LgBYsO/6TVszN0w4GA1cv+6nT3iIyW7+A==} - engines: {node: '>= 12'} + /@intlify/devtools-if/9.1.9: + resolution: {integrity: sha512-oKSMKjttG3Ut/1UGEZjSdghuP3fwA15zpDPcjkf/1FjlOIm6uIBGMNS5jXzsZy593u+P/YcnrZD6cD3IVFz9vQ==} + engines: {node: '>= 10'} dependencies: - '@intlify/shared': 9.2.0-beta.34 + '@intlify/shared': 9.1.9 dev: false - /@intlify/message-compiler/9.2.0-beta.34: - resolution: {integrity: sha512-l7JjkXJBW2l6cFZqPvI6oWU6QZn/i70agU6QB02W1O+6quFCFNpsiPswgYyQrmfHt4F4qYhLJUMZltIW/cqcbw==} - engines: {node: '>= 12'} + /@intlify/message-compiler/9.1.9: + resolution: {integrity: sha512-6YgCMF46Xd0IH2hMRLCssZI3gFG4aywidoWQ3QP4RGYQXQYYfFC54DxhSgfIPpVoPLQ+4AD29eoYmhiHZ+qLFQ==} + engines: {node: '>= 10'} dependencies: - '@intlify/shared': 9.2.0-beta.34 + '@intlify/message-resolver': 9.1.9 + '@intlify/shared': 9.1.9 source-map: 0.6.1 dev: false - /@intlify/shared/9.2.0-beta.34: - resolution: {integrity: sha512-hbUKcVbTOkLVpnlSeZE1OPgEI7FpvhuZF/gb84xECTjXEImIa3u0fIcJKUUffv3dlAx8fMOE5xKgDzngidm0tw==} - engines: {node: '>= 12'} + /@intlify/message-resolver/9.1.9: + resolution: {integrity: sha512-Lx/DBpigeK0sz2BBbzv5mu9/dAlt98HxwbG7xLawC3O2xMF9MNWU5FtOziwYG6TDIjNq0O/3ZbOJAxwITIWXEA==} + engines: {node: '>= 10'} dev: false - /@intlify/vue-devtools/9.2.0-beta.34: - resolution: {integrity: sha512-0fEUqxZ2XibWNpWr1OTQrz0hBgqiWdXOvg5D6NjYBYIrSlJ13cPFfkfPBlnKUkrfBdw7RG6l+SlcUwIPj0ViGA==} - engines: {node: '>= 12'} + /@intlify/runtime/9.1.9: + resolution: {integrity: sha512-XgPw8+UlHCiie3fI41HPVa/VDJb3/aSH7bLhY1hJvlvNV713PFtb4p4Jo+rlE0gAoMsMCGcsiT982fImolSltg==} + engines: {node: '>= 10'} dependencies: - '@intlify/core-base': 9.2.0-beta.34 - '@intlify/shared': 9.2.0-beta.34 + '@intlify/message-compiler': 9.1.9 + '@intlify/message-resolver': 9.1.9 + '@intlify/shared': 9.1.9 + dev: false + + /@intlify/shared/9.1.9: + resolution: {integrity: sha512-xKGM1d0EAxdDFCWedcYXOm6V5Pfw/TMudd6/qCdEb4tv0hk9EKeg7lwQF1azE0dP2phvx0yXxrt7UQK+IZjNdw==} + engines: {node: '>= 10'} + dev: false + + /@intlify/vue-devtools/9.1.9: + resolution: {integrity: sha512-YPehH9uL4vZcGXky4Ev5qQIITnHKIvsD2GKGXgqf+05osMUI6WSEQHaN9USRa318Rs8RyyPCiDfmA0hRu3k7og==} + engines: {node: '>= 10'} + dependencies: + '@intlify/message-resolver': 9.1.9 + '@intlify/runtime': 9.1.9 + '@intlify/shared': 9.1.9 dev: false /@jridgewell/resolve-uri/3.0.5: @@ -4389,15 +4407,15 @@ packages: - supports-color dev: true - /vue-i18n/9.2.0-beta.34_vue@3.2.31: - resolution: {integrity: sha512-AKzOMn91OKBKHTPVWrDF+kBSbYYNGfBeeBhuihkxW2ZTXd1l8vp7WBqA6weV9kb9EDv7HO61Qhctqcr79TmHVw==} - engines: {node: '>= 12'} + /vue-i18n/9.1.9_vue@3.2.31: + resolution: {integrity: sha512-JeRdNVxS2OGp1E+pye5XB6+M6BBkHwAv9C80Q7+kzoMdUDGRna06tjC0vCB/jDX9aWrl5swxOMFcyAr7or8XTA==} + engines: {node: '>= 10'} peerDependencies: vue: ^3.0.0 dependencies: - '@intlify/core-base': 9.2.0-beta.34 - '@intlify/shared': 9.2.0-beta.34 - '@intlify/vue-devtools': 9.2.0-beta.34 + '@intlify/core-base': 9.1.9 + '@intlify/shared': 9.1.9 + '@intlify/vue-devtools': 9.1.9 '@vue/devtools-api': 6.1.4 vue: 3.2.31 dev: false diff --git a/src/i18n/index.ts b/src/i18n/index.ts index 2670a585..ed78d551 100644 --- a/src/i18n/index.ts +++ b/src/i18n/index.ts @@ -10,7 +10,6 @@ import en from './en/index' const langStorage: LangStateType = getLocalStorage(StorageEnum.GO_LANG_STORE) - // 语言数组 export const langList = [ { @@ -26,7 +25,6 @@ export const langList = [ const i18n = createI18n({ locale: langStorage?.lang || lang, globalInjection: true, - legacy:false, messages: { [LangEnum.zh]: zh, [LangEnum.en]: en