@@ -338,7 +368,7 @@ watch(() => article.useTranslateType, () => {
diff --git a/src/components/Practice/TypeArticle.vue b/src/components/Practice/TypeArticle.vue
index 2c81e089..3c413f9e 100644
--- a/src/components/Practice/TypeArticle.vue
+++ b/src/components/Practice/TypeArticle.vue
@@ -202,7 +202,7 @@ function onKeyDown(e: KeyboardEvent) {
let letter = e.key
let key = currentWord.name[stringIndex]
- console.log('key', key,)
+ // console.log('key', key,)
let isWrong = false
if (settingStore.ignoreCase) {
diff --git a/src/components/Toolbar/Add.vue b/src/components/Toolbar/Add.vue
index 0e050b36..76f3499d 100644
--- a/src/components/Toolbar/Add.vue
+++ b/src/components/Toolbar/Add.vue
@@ -28,8 +28,7 @@ function toggle() {
/>
-
diff --git a/src/hooks/event.ts b/src/hooks/event.ts
index 0a3dcdf6..482d41bc 100644
--- a/src/hooks/event.ts
+++ b/src/hooks/event.ts
@@ -4,84 +4,95 @@ import {useRuntimeStore} from "@/stores/runtime.ts";
import {$ref} from "vue/macros";
export function useWindowClick(cb: () => void) {
- onMounted(() => {
- emitter.on(EventKey.closeOther, cb)
- window.addEventListener('click', cb)
- })
- onUnmounted(() => {
- window.removeEventListener('click', cb)
- })
+ onMounted(() => {
+ emitter.on(EventKey.closeOther, cb)
+ window.addEventListener('click', cb)
+ })
+ onUnmounted(() => {
+ window.removeEventListener('click', cb)
+ })
}
export function useEventListener(type: string, listener: EventListenerOrEventListenerObject) {
- onMounted(() => window.addEventListener(type, listener))
- onUnmounted(() => window.removeEventListener(type, listener))
+ onMounted(() => window.addEventListener(type, listener))
+ onUnmounted(() => window.removeEventListener(type, listener))
}
export function useStartKeyboardEventListener() {
- const runtimeStore = useRuntimeStore()
+ const runtimeStore = useRuntimeStore()
- useEventListener('keydown', (e: KeyboardEvent) => {
- if (!runtimeStore.disableEventListener) {
- emitter.emit(EventKey.keydown, e)
- }
- })
- useEventListener('keyup', (e: KeyboardEvent) => {
- if (!runtimeStore.disableEventListener) {
- emitter.emit(EventKey.keyup, e)
- }
- })
+ useEventListener('keydown', (e: KeyboardEvent) => {
+ if (!runtimeStore.disableEventListener) {
+ emitter.emit(EventKey.keydown, e)
+ }
+ })
+ useEventListener('keyup', (e: KeyboardEvent) => {
+ if (!runtimeStore.disableEventListener) {
+ emitter.emit(EventKey.keyup, e)
+ }
+ })
}
export function useOnKeyboardEventListener(onKeyDown: (e: KeyboardEvent) => void, onKeyUp: (e: KeyboardEvent) => void) {
- onMounted(() => {
- emitter.on(EventKey.keydown, onKeyDown)
- emitter.on(EventKey.keyup, onKeyUp)
- })
- onUnmounted(() => {
- emitter.off(EventKey.keydown, onKeyDown)
- emitter.off(EventKey.keyup, onKeyUp)
- })
+ onMounted(() => {
+ emitter.on(EventKey.keydown, onKeyDown)
+ emitter.on(EventKey.keyup, onKeyUp)
+ })
+ onUnmounted(() => {
+ emitter.off(EventKey.keydown, onKeyDown)
+ emitter.off(EventKey.keyup, onKeyUp)
+ })
}
-export function useDisableEventListener() {
- const runtimeStore = useRuntimeStore()
- onMounted(() => {
- runtimeStore.disableEventListener = true
- })
- onUnmounted(() => {
- runtimeStore.disableEventListener = false
- })
+export function useDisableEventListener(watchVal?: any) {
+ const runtimeStore = useRuntimeStore()
+ watch(watchVal, n => {
+ if (n) {
+ runtimeStore.disableEventListener = true
+ } else {
+ runtimeStore.disableEventListener = false
+ }
+ })
+ onMounted(() => {
+ if (!watchVal) {
+ runtimeStore.disableEventListener = true
+ }
+ })
+ onUnmounted(() => {
+ if (!watchVal) {
+ runtimeStore.disableEventListener = false
+ }
+ })
}
export function useEsc(close: () => void, watchVal?: any) {
- const runtimeStore = useRuntimeStore()
- const id = $ref(Date.now())
+ const runtimeStore = useRuntimeStore()
+ const id = $ref(Date.now())
- watch(watchVal, n => {
- if (n) {
- runtimeStore.modalList.push({id, close})
- } else {
- let rIndex = runtimeStore.modalList.findIndex(item => item.id === id)
- if (rIndex > 0) {
- runtimeStore.modalList.splice(rIndex, 1)
- }
- }
- })
+ watch(watchVal, n => {
+ if (n) {
+ runtimeStore.modalList.push({id, close})
+ } else {
+ let rIndex = runtimeStore.modalList.findIndex(item => item.id === id)
+ if (rIndex > 0) {
+ runtimeStore.modalList.splice(rIndex, 1)
+ }
+ }
+ })
- onMounted(() => {
- if (watchVal() === undefined) {
- runtimeStore.modalList.push({id, close})
- }
- })
+ onMounted(() => {
+ if (watchVal() === undefined) {
+ runtimeStore.modalList.push({id, close})
+ }
+ })
- onUnmounted(() => {
- if (watchVal() === undefined) {
- let rIndex = runtimeStore.modalList.findIndex(item => item.id === id)
- if (rIndex > 0) {
- runtimeStore.modalList.splice(rIndex, 1)
- }
- }
- })
+ onUnmounted(() => {
+ if (watchVal() === undefined) {
+ let rIndex = runtimeStore.modalList.findIndex(item => item.id === id)
+ if (rIndex > 0) {
+ runtimeStore.modalList.splice(rIndex, 1)
+ }
+ }
+ })
}
diff --git a/src/utils/MessageBox.tsx b/src/utils/MessageBox.tsx
new file mode 100644
index 00000000..1badd4b1
--- /dev/null
+++ b/src/utils/MessageBox.tsx
@@ -0,0 +1,68 @@
+import {createApp} from 'vue'
+import Modal from "@/components/Modal/Modal.vue";
+
+export class MessageBox {
+ static confirm(
+ content: string,
+ title: string,
+ onOk: () => any = () => void 0,
+ onCancel: () => any = () => void 0,
+ ) {
+ let remove = () => {
+ let parent = document.querySelector('.dialog-ctn')
+ parent.remove()
+ }
+ let tempOnCancel = () => {
+ remove()
+ onCancel()
+ }
+
+ const app = createApp({
+ render() {
+ return
+
+ },
+ })
+ let parent = document.createElement('div')
+ parent.classList.add(...['dialog-ctn'])
+ document.body.append(parent)
+ app.mount(parent)
+ }
+
+ static notice(
+ content: string,
+ title: string,
+ ) {
+ let remove = () => {
+ let parent = document.querySelector('.dialog-ctn')
+ parent.remove()
+ }
+ let tempOnCancel = () => {
+ remove()
+ }
+
+ const app = createApp({
+ render() {
+ return
+
+ },
+ })
+ let parent = document.createElement('div')
+ parent.classList.add(...['dialog-ctn'])
+ document.body.append(parent)
+ app.mount(parent)
+ }
+}
\ No newline at end of file
{content}
+ {content}
+