From dcc66ff4ff756472d86ecee4785348a7292cfb2c Mon Sep 17 00:00:00 2001 From: jiangx Date: Mon, 28 Feb 2022 11:10:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=AF=AD=E8=A8=80hooks=20=E6=B7=BB=E5=8A=A0=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Written/Written.vue | 11 +++++++--- src/composables/useLanguage.ts | 33 ------------------------------ 2 files changed, 8 insertions(+), 36 deletions(-) delete mode 100644 src/composables/useLanguage.ts diff --git a/src/components/Written/Written.vue b/src/components/Written/Written.vue index 9c26e6d..7979f52 100644 --- a/src/components/Written/Written.vue +++ b/src/components/Written/Written.vue @@ -71,10 +71,10 @@ const state = reactive({ oldX: 0, oldY: 0, timer: 0, - list: [] //返回汉子 + list: [] //返回汉字列表 }) -const inkCanvas = ref() +const inkCanvas = ref(null) const ctx = computed(() => (inkCanvas.value as HTMLCanvasElement).getContext('2d')) function updateBound() { @@ -151,7 +151,7 @@ function _getHandWriting() { getHandWriting(params) .then(res => { const { data } = res - state.list = data + state.list = data as string[] }) .catch(err => { console.log(err) @@ -177,4 +177,9 @@ onBeforeUnmount(() => { ;(inkCanvas.value as HTMLElement).removeEventListener('touchmove', move) ;(inkCanvas.value as HTMLElement).removeEventListener('touchend', mouseUp) }) + +defineExpose({ + updateBound, + reload +}) diff --git a/src/composables/useLanguage.ts b/src/composables/useLanguage.ts deleted file mode 100644 index 603900d..0000000 --- a/src/composables/useLanguage.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { useStore, Language } from '@/store' -import { chineseLanguageLoader } from '@/i18n/util' - -export const useSetLanguage = () => { - return { - setLanguage(language: Language) { - const store = useStore() - store.setLanguage(language) - } - } -} - -export const useSwitchLanguage = () => { - return { - switchLanguage(map: Record, key: string) { - const store = useStore() - const language = store.language - if (language === 'zh') { - return map[key] - } - - if (language === 'en' && map[key + 'En']) { - return map[key + 'En'] - } else if (language === 'en' && !map[key + 'En']) { - return map[key] - } - - if (language === 'tw') { - return chineseLanguageLoader(map[key]) - } - } - } -}