-
-
-
-
@import "@/assets/css/style";
-$article-width: 50vw;
-
.swiper-wrapper {
height: 100%;
overflow: hidden;
@@ -353,7 +434,7 @@ $article-width: 50vw;
.practice-article {
flex: 1;
overflow: hidden;
- width: $article-width;
+ width: var(--article-width);
}
.typing-word-wrapper {
@@ -365,7 +446,7 @@ $article-width: 50vw;
left: 0;
top: 10rem;
z-index: 1;
- margin-left: calc(50% + ($article-width / 2) + var(--space));
+ margin-left: var(--article-panel-margin-left);
height: calc(100% - 20rem);
}
diff --git a/src/pages/practice/practice-word/TypingWord.vue b/src/pages/practice/practice-word/TypingWord.vue
index c3de70f5..c11aacdf 100644
--- a/src/pages/practice/practice-word/TypingWord.vue
+++ b/src/pages/practice/practice-word/TypingWord.vue
@@ -140,17 +140,13 @@ function next(isTyping: boolean = true) {
data.index++
isTyping && practiceStore.inputWordNumber++
console.log('这个词完了')
- if ([DictType.customWord, DictType.word].includes(store.currentDict.type)
+ if ([DictType.word].includes(store.currentDict.type)
&& store.skipWordNames.includes(word.name.toLowerCase())) {
next()
}
}
}
-function onKeyUp(e: KeyboardEvent) {
- typingRef.hideWord()
-}
-
function wordWrong() {
if (!store.wrong.originWords.find((v: Word) => v.name.toLowerCase() === word.name.toLowerCase())) {
store.wrong.originWords.push(word)
@@ -161,6 +157,10 @@ function wordWrong() {
}
}
+function onKeyUp(e: KeyboardEvent) {
+ typingRef.hideWord()
+}
+
async function onKeyDown(e: KeyboardEvent) {
// console.log('e', e)
switch (e.key) {
@@ -433,14 +433,11 @@ onUnmounted(() => {
}
}
-$article-width: 50vw;
-
.word-panel-wrapper {
position: fixed;
left: 0;
top: 10rem;
z-index: 1;
- //margin-left: calc(50% + (var(--toolbar-width) / 2) + var(--space));
margin-left: var(--panel-margin-left);
height: calc(100% - 20rem);
}
diff --git a/src/pages/practice/practice-word/index.vue b/src/pages/practice/practice-word/index.vue
index 4947e231..4f9f23c3 100644
--- a/src/pages/practice/practice-word/index.vue
+++ b/src/pages/practice/practice-word/index.vue
@@ -6,7 +6,7 @@ import {chunk, cloneDeep} from "lodash-es";
import {useBaseStore} from "@/stores/base.ts";
import {onMounted, onUnmounted, watch} from "vue";
import {useRuntimeStore} from "@/stores/runtime.ts";
-import {Word} from "@/types.ts";
+import {ShortcutKey, Word} from "@/types.ts";
import {emitter, EventKey} from "@/utils/eventBus.ts";
import {useSettingStore} from "@/stores/setting.ts";
import {syncMyDictList} from "@/hooks/dict.ts";
@@ -20,12 +20,6 @@ let wordData = $ref({
index: -1
})
-watch([
- () => store.currentDict.words,
-], n => {
- getCurrentPractice()
-})
-
function getCurrentPractice() {
if (store.chapter.length) {
wordData.words = store.chapter
@@ -37,6 +31,9 @@ function getCurrentPractice() {
if (res) w = Object.assign(w, res)
}
})
+
+ wordData.words = cloneDeep(store.chapter)
+ emitter.emit(EventKey.resetWord)
}
}
@@ -46,7 +43,26 @@ function sort(list: Word[]) {
syncMyDictList(store.currentDict)
}
-onMounted(getCurrentPractice)
+function next() {
+ if (store.currentDict.chapterIndex >= store.currentDict.chapterWords.length - 1) {
+ store.currentDict.chapterIndex = 0
+ } else store.currentDict.chapterIndex++
+
+ getCurrentPractice()
+}
+
+onMounted(() => {
+ getCurrentPractice()
+ emitter.on(EventKey.changeDict, getCurrentPractice)
+ emitter.on(EventKey.next, next)
+ emitter.on(ShortcutKey.NextChapter, next)
+})
+
+onUnmounted(() => {
+ emitter.off(EventKey.changeDict, getCurrentPractice)
+ emitter.off(EventKey.next, next)
+ emitter.off(ShortcutKey.NextChapter, next)
+})
defineExpose({getCurrentPractice})
diff --git a/src/stores/base.ts b/src/stores/base.ts
index f4f5f5dc..b1b4f2e9 100644
--- a/src/stores/base.ts
+++ b/src/stores/base.ts
@@ -88,6 +88,19 @@ export const useBaseStore = defineStore('base', {
type: DictType.wrong,
category: '自带字典'
},
+ {
+ ...cloneDeep(DefaultDict),
+ id: 'cet4',
+ name: 'CET-4',
+ description: '大学英语四级词库',
+ category: '中国考试',
+ tags: ['大学英语'],
+ url: 'CET4_T.json',
+ length: 2607,
+ translateLanguage: 'common',
+ language: 'en',
+ type: DictType.word
+ },
{
...cloneDeep(DefaultDict),
id: 'article_nce2',
@@ -100,6 +113,7 @@ export const useBaseStore = defineStore('base', {
language: 'en',
type: DictType.article,
resourceId: 'article_nce2',
+ length: 10
},
{
...cloneDeep(DefaultDict),
@@ -113,10 +127,11 @@ export const useBaseStore = defineStore('base', {
language: 'en',
type: DictType.word,
resourceId: 'nce-new-2',
+ length: 862
},
],
current: {
- index: 4,
+ index: 3,
// dictType: DictType.article,
// index: 0,
practiceType: DictType.word,
@@ -163,20 +178,17 @@ export const useBaseStore = defineStore('base', {
chapter(state: BaseState): Word[] {
return this.currentDict.chapterWords[this.currentDict.chapterIndex] ?? []
},
- dictTitle(state: BaseState) {
- let title = this.currentDict.name
- return title + this.chapterName
- },
chapterName(state: BaseState) {
let title = ''
switch (this.currentDict.type) {
case DictType.collect:
- if (state.current.practiceType === DictType.article || state.current.practiceType === DictType.customArticle) {
+ if (state.current.practiceType === DictType.article) {
return `第${this.currentDict.chapterIndex + 1}章`
}
- return ''
+ case DictType.wrong:
+ case DictType.simple:
+ return this.currentDict.name
case DictType.word:
- case DictType.customWord:
return `第${this.currentDict.chapterIndex + 1}章`
}
return title
@@ -213,6 +225,7 @@ export const useBaseStore = defineStore('base', {
} catch (e) {
console.error('读取本地dict数据失败', e)
}
+ const runtimeStore = useRuntimeStore()
if (this.current.index < 3) {
@@ -227,7 +240,6 @@ export const useBaseStore = defineStore('base', {
s.id = nanoid(6)
})
if (this.currentDict.translateLanguage === 'common') {
- const runtimeStore = useRuntimeStore()
let r2 = await fetch('./translate/en2zh_CN-min.json')
// fetch('http://sc.ttentau.top/en2zh_CN-min.json').then(r2 => {
let list: Word[] = await r2.json()
@@ -252,6 +264,19 @@ export const useBaseStore = defineStore('base', {
}
}
}
+
+ //TODO 先这样，默认加载
+ if (!runtimeStore.translateWordList.length) {
+ setTimeout(async () => {
+ let r2 = await fetch('./translate/en2zh_CN-min.json')
+ // fetch('http://sc.ttentau.top/en2zh_CN-min.json').then(r2 => {
+ let list: Word[] = await r2.json()
+ if (list && list.length) {
+ runtimeStore.translateWordList = list
+ }
+ })
+ }
+ emitter.emit(EventKey.changeDict)
resolve(true)
})
},
@@ -261,11 +286,13 @@ export const useBaseStore = defineStore('base', {
this.currentDict.statistics.push(statistics)
}
},
- async changeDict(dict: Dict, chapterIndex: number = dict.chapterIndex, wordIndex: number = dict.wordIndex, practiceType: DictType) {
+ async changeDict(dict: Dict, practiceType?: DictType, chapterIndex?: number, wordIndex?: number) {
//TODO 保存统计
// this.saveStatistics()
console.log('changeDict', cloneDeep(dict), chapterIndex, wordIndex)
- this.current.practiceType = practiceType
+ if (chapterIndex === undefined) chapterIndex = dict.chapterIndex
+ if (wordIndex === undefined) wordIndex = dict.wordIndex
+ if (practiceType === undefined) this.current.practiceType = practiceType
if ([DictType.collect,
DictType.simple,
DictType.wrong].includes(dict.type)) {
@@ -296,7 +323,6 @@ export const useBaseStore = defineStore('base', {
this.current.index = this.myDictList.length - 1
}
- emitter.emit(EventKey.resetWord)
emitter.emit(EventKey.changeDict)
}
},
diff --git a/src/stores/setting.ts b/src/stores/setting.ts
index f16ee8c4..4c5c249d 100644
--- a/src/stores/setting.ts
+++ b/src/stores/setting.ts
@@ -54,7 +54,7 @@ export const useSettingStore = defineStore('setting', {
wordSoundType: 'us',
keyboardSound: true,
keyboardSoundVolume: 100,
- keyboardSoundFile: '老式机械',
+ keyboardSoundFile: '机械键盘2',
translateSound: true,
translateSoundVolume: 100,
effectSound: true,
diff --git a/src/types.ts b/src/types.ts
index 4a13707d..410c4fde 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -46,9 +46,7 @@ export enum DictType {
simple = 'simple',
wrong = 'wrong',
word = 'word',
- customWord = 'customWord',
article = 'article',
- customArticle = 'customArticle'
}
export const DefaultArticleWord: ArticleWord = {
@@ -235,7 +233,7 @@ export const DefaultDict: Dict = {
category: '',
tags: [],
translateLanguage: 'common',
- type: DictType.customWord,
+ type: DictType.word,
language: 'en',
}
diff --git a/src/utils/const.ts b/src/utils/const.ts
index af1b62da..bb640bc8 100644
--- a/src/utils/const.ts
+++ b/src/utils/const.ts
@@ -1,7 +1,7 @@
export const SoundFileOptions = [
- {value: '快速打字的机械键盘声音', label: '快速打字的机械键盘声音'},
- {value: '键盘快速打字的声音', label: '键盘快速打字的声音'},
- {value: '电话打字的声音', label: '电话打字的声音'},
- {value: '老式机械', label: '老式机械'},
- {value: '机械', label: '机械'},
+ {value: '机械键盘', label: '机械键盘'},
+ {value: '机械键盘1', label: '机械键盘1'},
+ {value: '机械键盘2', label: '机械键盘2'},
+ {value: '老式机械键盘', label: '老式机械键盘'},
+ {value: '笔记本键盘', label: '笔记本键盘'},
]
\ No newline at end of file
-
+
-
+
+
+
+
+
+
- {{ store.dictTitle }}
+
+
+
+
+
+
-
-
-
-
-
-
+
-
+
-
-
-
-
+
+
+
+
+
+
+ {{ store.currentDict.name }}
+
+
+ {{ articleData.articles.length }}篇文章
-
- {{ store.currentDict.articles.length }}篇文章
-
-