Merge branch 'main' of github.com:pure-admin/vue-pure-admin into gitee

This commit is contained in:
xiaoxian521 2023-06-05 19:34:16 +08:00
commit f797d9531c
4 changed files with 848 additions and 924 deletions

View File

@ -96,8 +96,8 @@
"@types/qrcode": "^1.5.0", "@types/qrcode": "^1.5.0",
"@types/qs": "^6.9.7", "@types/qs": "^6.9.7",
"@types/sortablejs": "^1.15.1", "@types/sortablejs": "^1.15.1",
"@typescript-eslint/eslint-plugin": "^5.59.7", "@typescript-eslint/eslint-plugin": "^5.59.8",
"@typescript-eslint/parser": "^5.59.7", "@typescript-eslint/parser": "^5.59.8",
"@vitejs/plugin-vue": "^4.2.3", "@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.0.1", "@vitejs/plugin-vue-jsx": "^3.0.1",
"@vue/eslint-config-prettier": "^7.1.0", "@vue/eslint-config-prettier": "^7.1.0",
@ -105,9 +105,9 @@
"autoprefixer": "^10.4.14", "autoprefixer": "^10.4.14",
"cloc": "^2.11.0", "cloc": "^2.11.0",
"cssnano": "^6.0.1", "cssnano": "^6.0.1",
"eslint": "^8.41.0", "eslint": "^8.42.0",
"eslint-plugin-prettier": "^4.2.1", "eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-vue": "^9.14.0", "eslint-plugin-vue": "^9.14.1",
"husky": "^8.0.3", "husky": "^8.0.3",
"lint-staged": "^13.2.2", "lint-staged": "^13.2.2",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
@ -135,7 +135,7 @@
"svgo": "^3.0.2", "svgo": "^3.0.2",
"tailwindcss": "^3.3.2", "tailwindcss": "^3.3.2",
"terser": "^5.17.6", "terser": "^5.17.6",
"typescript": "^5.0.4", "typescript": "^5.1.3",
"vite": "^4.3.9", "vite": "^4.3.9",
"vite-plugin-cdn-import": "^0.3.5", "vite-plugin-cdn-import": "^0.3.5",
"vite-plugin-compression": "^0.5.1", "vite-plugin-compression": "^0.5.1",

1753
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
import { useNav } from "./useNav"; import { useNav } from "./useNav";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { useRoute } from "vue-router"; import { useRoute } from "vue-router";
import { watch, type Ref } from "vue"; import { watch, onBeforeMount, type Ref } from "vue";
export function useTranslationLang(ref?: Ref) { export function useTranslationLang(ref?: Ref) {
const { $storage, changeTitle, handleResize } = useNav(); const { $storage, changeTitle, handleResize } = useNav();
@ -27,6 +27,10 @@ export function useTranslationLang(ref?: Ref) {
} }
); );
onBeforeMount(() => {
locale.value = $storage.locale?.locale ?? "zh";
});
return { return {
t, t,
route, route,

View File

@ -28,8 +28,7 @@
"element-plus/global", "element-plus/global",
"@pureadmin/table/volar", "@pureadmin/table/volar",
"@pureadmin/descriptions/volar" "@pureadmin/descriptions/volar"
], ]
"typeRoots": ["./types", "./node_modules/@types/"]
}, },
"include": [ "include": [
"mock/*.ts", "mock/*.ts",