From 09c7a2d74872703404dbadfc599b4929cb310be5 Mon Sep 17 00:00:00 2001 From: terwer Date: Thu, 25 May 2023 01:09:53 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=A4=9A=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- src/{app-instance.ts => appInstance.ts} | 0 src/components/publish/PublishIndex.vue | 6 +- src/components/set/GeneralSetting.vue | 36 +++++++++ src/components/set/SetIndex.vue | 41 ++++++++++ src/components/set/preference/ChangeLocal.vue | 71 +++++++++++++++++ src/composables/useVueI18n.ts | 5 +- src/layouts/default/DefaultFooter.vue | 8 +- src/layouts/default/DefaultHeader.vue | 2 +- src/loader.ts | 4 +- src/main.ts | 11 ++- src/stores/configKeys.ts | 34 ++++++++ src/stores/configUtil.ts | 77 +++++++++++++++++++ src/stores/localStorageAdaptor.ts | 34 ++++++++ src/tools.ts | 4 +- src/utils/{inject-keys.ts => injectKeys.ts} | 0 .../{simple-logger.ts => simpleLogger.ts} | 0 src/utils/utils.ts | 4 +- src/vue-shim.d.ts | 5 +- vite.config.ts | 33 ++++---- 20 files changed, 339 insertions(+), 38 deletions(-) rename src/{app-instance.ts => appInstance.ts} (100%) create mode 100644 src/components/set/GeneralSetting.vue create mode 100644 src/components/set/SetIndex.vue create mode 100644 src/components/set/preference/ChangeLocal.vue create mode 100644 src/stores/configKeys.ts create mode 100644 src/stores/configUtil.ts create mode 100644 src/stores/localStorageAdaptor.ts rename src/utils/{inject-keys.ts => injectKeys.ts} (100%) rename src/utils/{simple-logger.ts => simpleLogger.ts} (100%) diff --git a/src/App.vue b/src/App.vue index 924f688..b5e9817 100644 --- a/src/App.vue +++ b/src/App.vue @@ -30,7 +30,7 @@ import AppLayout from "~/src/layouts/AppLayout.vue" import "~/src/assets/style.css" import "~/src/assets/style.dark.css" import { inject } from "vue" -import { InjectKeys } from "~/src/utils/inject-keys.ts" +import { InjectKeys } from "~/src/utils/injectKeys.ts" // Vue 实例 // const vueInstance = inject(InjectKeys.VUE_INSTANCE) diff --git a/src/app-instance.ts b/src/appInstance.ts similarity index 100% rename from src/app-instance.ts rename to src/appInstance.ts diff --git a/src/components/publish/PublishIndex.vue b/src/components/publish/PublishIndex.vue index b6d4324..efb1082 100644 --- a/src/components/publish/PublishIndex.vue +++ b/src/components/publish/PublishIndex.vue @@ -24,10 +24,10 @@ --> + + + + diff --git a/src/components/set/SetIndex.vue b/src/components/set/SetIndex.vue new file mode 100644 index 0000000..68cd9be --- /dev/null +++ b/src/components/set/SetIndex.vue @@ -0,0 +1,41 @@ + + + + + + + diff --git a/src/components/set/preference/ChangeLocal.vue b/src/components/set/preference/ChangeLocal.vue new file mode 100644 index 0000000..5fc4fc2 --- /dev/null +++ b/src/components/set/preference/ChangeLocal.vue @@ -0,0 +1,71 @@ + + + + + + + diff --git a/src/composables/useVueI18n.ts b/src/composables/useVueI18n.ts index 04abce6..075a387 100644 --- a/src/composables/useVueI18n.ts +++ b/src/composables/useVueI18n.ts @@ -30,11 +30,12 @@ import { useI18n } from "vue-i18n" * https://github.com/intlify/vue-i18n-next/issues/543 */ export const useVueI18n = () => { + const { messages, locale } = useI18n() + const translate = (key) => { - const { messages, locale } = useI18n() const localeMessages = messages.value?.[locale.value] return localeMessages[key] || key } - return { t: translate } + return { t: translate, locale } } diff --git a/src/layouts/default/DefaultFooter.vue b/src/layouts/default/DefaultFooter.vue index 6eda0b6..e34df8b 100644 --- a/src/layouts/default/DefaultFooter.vue +++ b/src/layouts/default/DefaultFooter.vue @@ -59,11 +59,6 @@ --> - - - - - @@ -77,9 +72,10 @@ import { useDark, useToggle } from "@vueuse/core" import { ref } from "vue" import { version } from "../../../package.json" -import { createLogger } from "~/src/utils/simple-logger.ts" +import { createLogger } from "~/src/utils/simpleLogger.ts" import { useVueI18n } from "~/src/composables/useVueI18n.ts" import { Utils } from "~/src/utils/utils.ts" +import SetIndex from "~/src/components/set/SetIndex.vue" const logger = createLogger("layouts/default/DefaultFooter") const common = Utils.zhiCommon() diff --git a/src/layouts/default/DefaultHeader.vue b/src/layouts/default/DefaultHeader.vue index 1c6bc88..48f6460 100644 --- a/src/layouts/default/DefaultHeader.vue +++ b/src/layouts/default/DefaultHeader.vue @@ -28,7 +28,7 @@ ` : "", + injectScript: isDev && !isChromeBuild ? `` : "", }, }, }), @@ -101,8 +107,7 @@ export default defineConfig({ // 或是用来指定是应用哪种混淆器 // boolean | 'terser' | 'esbuild' // 不压缩,用于调试 - // minify: !isWatch, - minify: false, + minify: !isDev, rollupOptions: { plugins: [