From 4171fe05971b4a80a09eae9bd6e236be011bd857 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 9 Feb 2023 20:22:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=EF=BC=9Aarco-design-pro-vue?= =?UTF-8?q?=20=3D>=202.6.1=EF=BC=88=E4=BC=98=E5=8C=96=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=8F=8A=E4=BF=AE=E5=A4=8D=E8=8B=A5=E5=B9=B2?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- continew-admin-ui/package.json | 6 +- .../src/components/navbar/index.vue | 5 +- continew-admin-ui/src/hooks/locale.ts | 3 + .../src/layout/default-layout.vue | 7 +- .../src/views/system/dept/index.vue | 2 +- continew-admin-ui/yarn.lock | 214 ++++++++++++++---- 6 files changed, 191 insertions(+), 46 deletions(-) diff --git a/continew-admin-ui/package.json b/continew-admin-ui/package.json index 771c2654..d571a0ed 100644 --- a/continew-admin-ui/package.json +++ b/continew-admin-ui/package.json @@ -31,7 +31,7 @@ "dependencies": { "@arco-design/web-vue": "^2.40.1", "@vueuse/core": "^9.9.0", - "arco-design-pro-vue": "^2.6.0", + "arco-design-pro-vue": "^2.6.1", "axios": "^0.24.0", "crypto-js": "^4.1.1", "dayjs": "^1.11.7", @@ -59,8 +59,8 @@ "@types/sortablejs": "^1.15.0", "@typescript-eslint/eslint-plugin": "^5.47.1", "@typescript-eslint/parser": "^5.47.1", - "@vitejs/plugin-vue": "^4.0.0", - "@vitejs/plugin-vue-jsx": "^3.0.0", + "@vitejs/plugin-vue": "^3.1.2", + "@vitejs/plugin-vue-jsx": "^2.0.1", "@vue/babel-plugin-jsx": "^1.1.1", "consola": "^2.15.3", "cross-env": "^7.0.3", diff --git a/continew-admin-ui/src/components/navbar/index.vue b/continew-admin-ui/src/components/navbar/index.vue index 120385fb..2f8d79d7 100644 --- a/continew-admin-ui/src/components/navbar/index.vue +++ b/continew-admin-ui/src/components/navbar/index.vue @@ -53,6 +53,9 @@ :key="item.value" :value="item.value" > + {{ item.label }} @@ -196,7 +199,7 @@ const appStore = useAppStore(); const loginStore = useLoginStore(); const { logout } = useUser(); - const { changeLocale } = useLocale(); + const { changeLocale, currentLocale } = useLocale(); const { isFullscreen, toggle: toggleFullScreen } = useFullscreen(); const locales = [...LOCALE_OPTIONS]; const theme = computed(() => { diff --git a/continew-admin-ui/src/hooks/locale.ts b/continew-admin-ui/src/hooks/locale.ts index 67db3000..afe4bf76 100644 --- a/continew-admin-ui/src/hooks/locale.ts +++ b/continew-admin-ui/src/hooks/locale.ts @@ -8,6 +8,9 @@ export default function useLocale() { return i18.locale.value; }); const changeLocale = (value: string) => { + if (i18.locale.value === value) { + return; + } i18.locale.value = value; localStorage.setItem('arco-locale', value); Message.success(i18.t('navbar.action.locale')); diff --git a/continew-admin-ui/src/layout/default-layout.vue b/continew-admin-ui/src/layout/default-layout.vue index 178a2101..75756f4a 100644 --- a/continew-admin-ui/src/layout/default-layout.vue +++ b/continew-admin-ui/src/layout/default-layout.vue @@ -45,7 +45,7 @@