From 4e674fdd2744f59dd439e2d4bc40dd5d0dc37320 Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Tue, 5 Dec 2023 01:05:27 +0800
Subject: [PATCH] change audio file name

---
 ...�速打字的机械键盘声音.mp3 => 机械键盘1.mp3} | Bin
 .../{键盘快速打字的声音.mp3 => 机械键盘2.mp3} | Bin
 .../{电话打字的声音.mp3 => 笔记本键盘.mp3}    | Bin
 .../{老式机械.mp3 => 老式机械键盘.mp3}        | Bin
 src/components/DictListPanel.vue              |   5 +-
 src/components/dialog/DictDiglog.vue          |  36 +-
 src/components/dialog/WordListDialog.vue      |   3 +
 src/components/list/DictGroup.vue             |   5 +-
 src/components/list/DictItem.vue              |   2 +-
 src/components/list/DictList.vue              |   3 +-
 src/components/toolbar/VolumeSetting.vue      |   1 -
 src/hooks/sound.ts                            |   6 +-
 src/stores/base.ts                            | 526 +++++++++---------
 src/stores/setting.ts                         |   2 +-
 src/utils/const.ts                            |  10 +-
 15 files changed, 294 insertions(+), 305 deletions(-)
 rename public/sound/key-sounds/{快速打字的机械键盘声音.mp3 => 机械键盘1.mp3} (100%)
 rename public/sound/key-sounds/{键盘快速打字的声音.mp3 => 机械键盘2.mp3} (100%)
 rename public/sound/key-sounds/{电话打字的声音.mp3 => 笔记本键盘.mp3} (100%)
 rename public/sound/key-sounds/{老式机械.mp3 => 老式机械键盘.mp3} (100%)

diff --git a/public/sound/key-sounds/快速打字的机械键盘声音.mp3 b/public/sound/key-sounds/机械键盘1.mp3
similarity index 100%
rename from public/sound/key-sounds/快速打字的机械键盘声音.mp3
rename to public/sound/key-sounds/机械键盘1.mp3
diff --git a/public/sound/key-sounds/键盘快速打字的声音.mp3 b/public/sound/key-sounds/机械键盘2.mp3
similarity index 100%
rename from public/sound/key-sounds/键盘快速打字的声音.mp3
rename to public/sound/key-sounds/机械键盘2.mp3
diff --git a/public/sound/key-sounds/电话打字的声音.mp3 b/public/sound/key-sounds/笔记本键盘.mp3
similarity index 100%
rename from public/sound/key-sounds/电话打字的声音.mp3
rename to public/sound/key-sounds/笔记本键盘.mp3
diff --git a/public/sound/key-sounds/老式机械.mp3 b/public/sound/key-sounds/老式机械键盘.mp3
similarity index 100%
rename from public/sound/key-sounds/老式机械.mp3
rename to public/sound/key-sounds/老式机械键盘.mp3
diff --git a/src/components/DictListPanel.vue b/src/components/DictListPanel.vue
index 3de9da74..e38b86cd 100644
--- a/src/components/DictListPanel.vue
+++ b/src/components/DictListPanel.vue
@@ -43,7 +43,7 @@ const groupByTranslateLanguage = $computed(() => {
     data = groupBy(articleList, 'translateLanguage')
   } else if (currentLanguage === 'my') {
     data = {
-      common: store.myDictList.concat([{name: '',} as any])
+      common: store.myDictList.concat([{id: '',} as any])
     }
   } else {
     data = groupBy(groupByLanguage[currentLanguage], 'translateLanguage')
@@ -87,6 +87,7 @@ const groupedByCategoryAndTag = $computed(() => {
           <DictList
               @add="emit('add')"
               @selectDict="e => emit('selectDict',e)"
+              :select-id="store.currentDict.id"
               :list="groupByTranslateLanguage['common']"/>
         </template>
         <template v-else>
@@ -98,7 +99,7 @@ const groupedByCategoryAndTag = $computed(() => {
           </div>
           <DictGroup
               v-for="item in groupedByCategoryAndTag"
-              :select-dict-name="runtimeStore.editDict.resourceId"
+              :select-id="store.currentDict.id"
               @selectDict="e => emit('selectDict',e)"
               :groupByTag="item[1]"
               :category="item[0]"
diff --git a/src/components/dialog/DictDiglog.vue b/src/components/dialog/DictDiglog.vue
index 23ce97cf..62274a0e 100644
--- a/src/components/dialog/DictDiglog.vue
+++ b/src/components/dialog/DictDiglog.vue
@@ -35,6 +35,7 @@ let loading = $ref(false)
 let show = $ref(false)
 let chapterList2 = $ref([])
 let chapterWordNumber = $ref(0)
+let toggleLoading = $ref(false)
 
 const activeId = $computed(() => {
   if (dictIsArticle) {
@@ -104,18 +105,15 @@ function close() {
 }
 
 function changeDict() {
-  store.changeDict(runtimeStore.editDict)
   close()
+  store.changeDict(runtimeStore.editDict)
+  ElMessage.success('切换成功')
 }
 
 const dictIsArticle = $computed(() => {
   return isArticle(runtimeStore.editDict.type)
 })
 
-const chapterList = $computed(() => {
-  return dictIsArticle ? runtimeStore.editDict.articles.length : runtimeStore.editDict.chapterWords.length
-})
-
 function showAllWordModal() {
   emitter.emit(EventKey.openWordListModal, {
     title: runtimeStore.editDict.name,
@@ -124,7 +122,7 @@ function showAllWordModal() {
   })
 }
 
-function resetChapterList(v:number) {
+function resetChapterList(v: number) {
   const temp = () => {
     runtimeStore.editDict.chapterWordNumber = v
     runtimeStore.editDict.chapterWords = chunk(runtimeStore.editDict.words, runtimeStore.editDict.chapterWordNumber)
@@ -144,7 +142,7 @@ function resetChapterList(v:number) {
   }
 }
 
-function changeSort(v, notice: boolean = true) {
+function changeSort(v: Sort, notice: boolean = true) {
   const temp = () => {
     runtimeStore.editDict.sort = v
     if (v === Sort.normal) {
@@ -175,16 +173,6 @@ function option(type: string) {
   }, 500)
 }
 
-/**/
-/* 单词修改相关*/
-/**/
-
-watch(() => step, v => {
-  if (v === 0) {
-  }
-})
-
-
 onMounted(() => {
   emitter.on(EventKey.openDictModal, (type: 'detail' | 'list' | 'my') => {
     if (type === "detail") {
@@ -202,14 +190,6 @@ onMounted(() => {
   })
 })
 
-function addDict() {
-  show = false
-  setTimeout(() => {
-    router.push({path: '/dict', query: {type: 'addDict'}})
-  }, 500)
-}
-
-
 function showWordListModal(val: { item: Word, index: number }) {
   emitter.emit(EventKey.openWordListModal, {
     title: `第${val.index + 1}章`,
@@ -218,7 +198,7 @@ function showWordListModal(val: { item: Word, index: number }) {
   })
 }
 
-function handleChangeArticleChapterIndex(val) {
+function handleChangeArticleChapterIndex(val: any) {
   let rIndex = runtimeStore.editDict.articles.findIndex(v => v.id === val.item.id)
   if (rIndex > -1) {
     runtimeStore.editDict.chapterIndex = rIndex
@@ -235,7 +215,7 @@ function handleChangeArticleChapterIndex(val) {
     <div id="DictDialog">
       <Slide :slide-count="2" :step="step">
         <DictListPanel
-            @add="addDict"
+            @add="option('addDict')"
             @select-dict="selectDict"
         />
         <div class="dict-detail-page">
@@ -425,7 +405,7 @@ function handleChangeArticleChapterIndex(val) {
                 <div class="footer">
                   <!--            <BaseButton @click="step = 0">导出</BaseButton>-->
                   <BaseButton @click="close">关闭</BaseButton>
-                  <BaseButton @click="changeDict">切换</BaseButton>
+                  <BaseButton :loading="toggleLoading" @click="changeDict">切换</BaseButton>
                 </div>
               </div>
             </div>
diff --git a/src/components/dialog/WordListDialog.vue b/src/components/dialog/WordListDialog.vue
index 814071f3..8c72e80d 100644
--- a/src/components/dialog/WordListDialog.vue
+++ b/src/components/dialog/WordListDialog.vue
@@ -6,6 +6,7 @@ import {onMounted, onUnmounted, watch} from "vue";
 import {emitter, EventKey} from "@/utils/eventBus.ts";
 import {useRuntimeStore} from "@/stores/runtime.ts";
 import WordList from "@/components/list/WordList.vue";
+import Empty from "@/components/Empty.vue";
 
 let show = $ref(false)
 let loading = $ref(false)
@@ -78,9 +79,11 @@ onUnmounted(() => {
                      :show-text="false"/>
       </div>
       <WordList
+          v-if="list.length"
           class="word-list"
           :list="list">
       </WordList>
+      <Empty v-else/>
     </div>
   </Dialog>
 </template>
diff --git a/src/components/list/DictGroup.vue b/src/components/list/DictGroup.vue
index 905bcdf7..35d79b97 100644
--- a/src/components/list/DictGroup.vue
+++ b/src/components/list/DictGroup.vue
@@ -8,7 +8,7 @@ import DictList from "@/components/list/DictList.vue";
 const props = defineProps<{
   category: string,
   groupByTag: any,
-  selectDictName: string
+  selectId: string
 }>()
 const emit = defineEmits<{
   selectDict: [val: { dict: DictResource, index: number }]
@@ -37,7 +37,8 @@ watch(() => props.groupByTag, () => {
     </div>
     <DictList
         @selectDict="e => emit('selectDict',e)"
-        :list="list" :select-dict-name="selectDictName"/>
+        :list="list"
+        :select-id="selectId"/>
   </div>
 </template>
 
diff --git a/src/components/list/DictItem.vue b/src/components/list/DictItem.vue
index 4942a50a..84ced1a6 100644
--- a/src/components/list/DictItem.vue
+++ b/src/components/list/DictItem.vue
@@ -20,7 +20,7 @@ const emit = defineEmits<{
       class="dict-item anim"
       :class="active && 'active'"
   >
-    <template v-if="dict.name">
+    <template v-if="dict.id">
       <div class="top">
         <div class="name">{{ dict.name }}</div>
         <div class="desc">{{ dict.description }}</div>
diff --git a/src/components/list/DictList.vue b/src/components/list/DictList.vue
index 69982afd..d3dd614e 100644
--- a/src/components/list/DictList.vue
+++ b/src/components/list/DictList.vue
@@ -5,7 +5,7 @@ import DictItem from "@/components/list/DictItem.vue";
 
 defineProps<{
   list?: Dict[],
-  selectDictName?: string
+  selectId?: string
 }>()
 
 const emit = defineEmits<{
@@ -19,6 +19,7 @@ const emit = defineEmits<{
 <template>
   <div class="dict-list">
     <DictItem v-for="(dict,index) in list"
+              :active="selectId === dict.id"
               @click="emit('selectDict',{dict,index})"
               @add="emit('add')"
               :dict="dict"/>
diff --git a/src/components/toolbar/VolumeSetting.vue b/src/components/toolbar/VolumeSetting.vue
index 24060ed9..8130f60f 100644
--- a/src/components/toolbar/VolumeSetting.vue
+++ b/src/components/toolbar/VolumeSetting.vue
@@ -10,7 +10,6 @@ import {useSettingStore} from "@/stores/setting.ts";
 import VolumeIcon from "@/components/icon/VolumeIcon.vue";
 import {getAudioFileUrl, useChangeAllSound, usePlayAudio, useWatchAllSound} from "@/hooks/sound.ts";
 import {SoundFileOptions} from "@/utils/const.ts";
-import {throttle} from "lodash-es";
 
 const settingStore = useSettingStore()
 
diff --git a/src/hooks/sound.ts b/src/hooks/sound.ts
index ca76c76b..6a688269 100644
--- a/src/hooks/sound.ts
+++ b/src/hooks/sound.ts
@@ -4,6 +4,7 @@ import {PronunciationApi} from "@/types.ts";
 import beep from "@/assets/sound/beep.wav";
 import correct from "@/assets/sound/correct.wav";
 import {$ref} from "vue/macros";
+import {SoundFileOptions} from "@/utils/const.ts";
 
 export function useSound(audioSrcList?: string[], audioFileLength?: number) {
   let audioList: HTMLAudioElement[] = $ref([])
@@ -43,6 +44,9 @@ export function usePlayKeyboardAudio() {
   const {play, setAudio} = useSound()
 
   watchEffect(() => {
+    if (!SoundFileOptions.find(v => v.label === settingStore.keyboardSoundFile)) {
+      settingStore.keyboardSoundFile = '机械键盘2'
+    }
     let urlList = getAudioFileUrl(settingStore.keyboardSoundFile)
     setAudio(urlList, urlList.length === 1 ? 3 : 1)
   })
@@ -128,7 +132,7 @@ export function usePlayAudio(url: string) {
 }
 
 export function getAudioFileUrl(name: string) {
-  if (name === '机械') {
+  if (name === '机械键盘') {
     return [
       `./sound/key-sounds/jixie/机械0.mp3`,
       `./sound/key-sounds/jixie/机械1.mp3`,
diff --git a/src/stores/base.ts b/src/stores/base.ts
index a0c3615f..b1b4f2e9 100644
--- a/src/stores/base.ts
+++ b/src/stores/base.ts
@@ -8,13 +8,13 @@ import {nanoid} from "nanoid";
 import {state} from "vue-tsc/out/shared";
 
 export interface BaseState {
-    myDictList: Dict[],
-    current: {
-        index: number,
-        practiceType: DictType,//练习类型，目前仅词典为collect时判断是练单词还是文章使用
-    },
-    simpleWords: string[],
-    load: boolean
+  myDictList: Dict[],
+  current: {
+    index: number,
+    practiceType: DictType,//练习类型，目前仅词典为collect时判断是练单词还是文章使用
+  },
+  simpleWords: string[],
+  load: boolean
 }
 
 // words: [
@@ -63,267 +63,267 @@ export interface BaseState {
 // ],
 
 export const useBaseStore = defineStore('base', {
-    state: (): BaseState => {
-        return {
-            myDictList: [
-                {
-                    ...cloneDeep(DefaultDict),
-                    id: 'collect',
-                    name: '收藏',
-                    type: DictType.collect,
-                    category: '自带字典',
-                    tags: ['自带'],
-                },
-                {
-                    ...cloneDeep(DefaultDict),
-                    id: 'skip',
-                    name: '简单词',
-                    type: DictType.simple,
-                    category: '自带字典'
-                },
-                {
-                    ...cloneDeep(DefaultDict),
-                    id: 'wrong',
-                    name: '错词本',
-                    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',
-                    name: "新概念英语2-课文",
-                    description: '新概念英语2-课文',
-                    category: '英语学习',
-                    tags: ['新概念英语'],
-                    url: 'NCE_2.json',
-                    translateLanguage: 'common',
-                    language: 'en',
-                    type: DictType.article,
-                    resourceId: 'article_nce2',
-                    length: 10
-                },
-                {
-                    ...cloneDeep(DefaultDict),
-                    id: 'nce-new-2',
-                    name: '新概念英语(新版)-2',
-                    description: '新概念英语新版第二册',
-                    category: '青少年英语',
-                    tags: ['新概念英语'],
-                    url: 'nce-new-2.json',
-                    translateLanguage: 'common',
-                    language: 'en',
-                    type: DictType.word,
-                    resourceId: 'nce-new-2',
-                    length: 862
-                },
-            ],
-            current: {
-                index: 3,
-                // dictType: DictType.article,
-                // index: 0,
-                practiceType: DictType.word,
-            },
-            simpleWords: [
-                'a', 'an',
-                'i', 'my', 'you', 'your', 'me', 'it',
-                'am', 'is', 'do', 'are', 'did', 'were',
-                'what', 'who', 'where', 'how', 'no', 'yes',
-                'not', 'can', 'could',
-                'the', 'to', 'of', 'for', 'and', 'that', 'this', 'be'
-            ],
-            load: false
-        }
+  state: (): BaseState => {
+    return {
+      myDictList: [
+        {
+          ...cloneDeep(DefaultDict),
+          id: 'collect',
+          name: '收藏',
+          type: DictType.collect,
+          category: '自带字典',
+          tags: ['自带'],
+        },
+        {
+          ...cloneDeep(DefaultDict),
+          id: 'skip',
+          name: '简单词',
+          type: DictType.simple,
+          category: '自带字典'
+        },
+        {
+          ...cloneDeep(DefaultDict),
+          id: 'wrong',
+          name: '错词本',
+          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',
+          name: "新概念英语2-课文",
+          description: '新概念英语2-课文',
+          category: '英语学习',
+          tags: ['新概念英语'],
+          url: 'NCE_2.json',
+          translateLanguage: 'common',
+          language: 'en',
+          type: DictType.article,
+          resourceId: 'article_nce2',
+          length: 10
+        },
+        {
+          ...cloneDeep(DefaultDict),
+          id: 'nce-new-2',
+          name: '新概念英语(新版)-2',
+          description: '新概念英语新版第二册',
+          category: '青少年英语',
+          tags: ['新概念英语'],
+          url: 'nce-new-2.json',
+          translateLanguage: 'common',
+          language: 'en',
+          type: DictType.word,
+          resourceId: 'nce-new-2',
+          length: 862
+        },
+      ],
+      current: {
+        index: 3,
+        // dictType: DictType.article,
+        // index: 0,
+        practiceType: DictType.word,
+      },
+      simpleWords: [
+        'a', 'an',
+        'i', 'my', 'you', 'your', 'me', 'it',
+        'am', 'is', 'do', 'are', 'did', 'were',
+        'what', 'who', 'where', 'how', 'no', 'yes',
+        'not', 'can', 'could',
+        'the', 'to', 'of', 'for', 'and', 'that', 'this', 'be'
+      ],
+      load: false
+    }
+  },
+  getters: {
+    collect() {
+      return this.myDictList[0] ?? {}
     },
-    getters: {
-        collect() {
-            return this.myDictList[0] ?? {}
-        },
-        simple(): Dict {
-            return this.myDictList[1]
-        },
-        wrong() {
-            return this.myDictList[2]
-        },
-        skipWordNames() {
-            return this.simple.originWords.map(v => v.name.toLowerCase())
-        },
-        skipWordNamesWithSimpleWords() {
-            return this.simple.originWords.map(v => v.name.toLowerCase()).concat(this.simpleWords)
-        },
-        isArticle(state: BaseState): boolean {
-            //如果是收藏时，特殊判断
-            if (this.currentDict.type === DictType.collect) {
-                return state.current.practiceType === DictType.article
-            }
-            return [
-                DictType.article,
-            ].includes(this.currentDict.type)
-        },
-        currentDict(): Dict {
-            return this.myDictList[this.current.index]
-        },
-        chapter(state: BaseState): Word[] {
-            return this.currentDict.chapterWords[this.currentDict.chapterIndex] ?? []
-        },
-        chapterName(state: BaseState) {
-            let title = ''
-            switch (this.currentDict.type) {
-                case DictType.collect:
-                    if (state.current.practiceType === DictType.article) {
-                        return `第${this.currentDict.chapterIndex + 1}章`
-                    }
-                case DictType.wrong:
-                case DictType.simple:
-                    return this.currentDict.name
-                case DictType.word:
-                    return `第${this.currentDict.chapterIndex + 1}章`
-            }
-            return title
-        }
+    simple(): Dict {
+      return this.myDictList[1]
     },
-    actions: {
-        setState(obj: any) {
-            //这样不会丢失watch的值的引用
-            merge(this, obj)
-        },
-        async init() {
-            return new Promise(async resolve => {
-                try {
-                    let configStr: string = await localforage.getItem(SaveDict.key)
-                    // console.log(configStr)
-                    // console.log('s', new Blob([configStr]).size)
-                    configStr = ''
-                    if (configStr) {
-                        let data = JSON.parse(configStr)
-                        let state: BaseState = data.val
-                        let version = Number(data.version)
-                        // console.log('state', state)
-                        state.load = false
+    wrong() {
+      return this.myDictList[2]
+    },
+    skipWordNames() {
+      return this.simple.originWords.map(v => v.name.toLowerCase())
+    },
+    skipWordNamesWithSimpleWords() {
+      return this.simple.originWords.map(v => v.name.toLowerCase()).concat(this.simpleWords)
+    },
+    isArticle(state: BaseState): boolean {
+      //如果是收藏时，特殊判断
+      if (this.currentDict.type === DictType.collect) {
+        return state.current.practiceType === DictType.article
+      }
+      return [
+        DictType.article,
+      ].includes(this.currentDict.type)
+    },
+    currentDict(): Dict {
+      return this.myDictList[this.current.index]
+    },
+    chapter(state: BaseState): Word[] {
+      return this.currentDict.chapterWords[this.currentDict.chapterIndex] ?? []
+    },
+    chapterName(state: BaseState) {
+      let title = ''
+      switch (this.currentDict.type) {
+        case DictType.collect:
+          if (state.current.practiceType === DictType.article) {
+            return `第${this.currentDict.chapterIndex + 1}章`
+          }
+        case DictType.wrong:
+        case DictType.simple:
+          return this.currentDict.name
+        case DictType.word:
+          return `第${this.currentDict.chapterIndex + 1}章`
+      }
+      return title
+    }
+  },
+  actions: {
+    setState(obj: any) {
+      //这样不会丢失watch的值的引用
+      merge(this, obj)
+    },
+    async init() {
+      return new Promise(async resolve => {
+        try {
+          let configStr: string = await localforage.getItem(SaveDict.key)
+          // console.log(configStr)
+          // console.log('s', new Blob([configStr]).size)
+          configStr = ''
+          if (configStr) {
+            let data = JSON.parse(configStr)
+            let state: BaseState = data.val
+            let version = Number(data.version)
+            // console.log('state', state)
+            state.load = false
 
-                        if (version === SaveDict.version) {
-                            this.setState(state)
-                        } else {
-                            if (version === 2) {
-
-                            }
-                            // this.setState(state)
-                        }
-                    }
-                } catch (e) {
-                    console.error('读取本地dict数据失败', e)
-                }
-                const runtimeStore = useRuntimeStore()
-
-                if (this.current.index < 3) {
-
-                } else {
-                    let dictResourceUrl = `./dicts/${this.currentDict.language}/${this.currentDict.type}/${this.currentDict.translateLanguage}/${this.currentDict.url}`;
-                    if ([DictType.word].includes(this.currentDict.type)) {
-                        if (!this.currentDict.originWords.length) {
-                            let r = await fetch(dictResourceUrl)
-                            // let r = await fetch(`.${this.currentDict.url}`)
-                            let v = await r.json()
-                            v.map(s => {
-                                s.id = nanoid(6)
-                            })
-                            if (this.currentDict.translateLanguage === 'common') {
-                                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
-                                }
-                            }
-                            this.currentDict.originWords = cloneDeep(v)
-                            this.currentDict.words = cloneDeep(v)
-                            this.currentDict.chapterWords = chunk(this.currentDict.words, this.currentDict.chapterWordNumber)
-                        }
-                    }
-
-                    if ([DictType.article].includes(this.currentDict.type)) {
-                        if (!this.currentDict.articles.length) {
-                            let r = await fetch(dictResourceUrl)
-                            let s: any[] = await r.json()
-                            this.currentDict.articles = cloneDeep(s.map(v => {
-                                v.id = nanoid(6)
-                                return v
-                            }))
-                        }
-                    }
-                }
-
-                //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)
-            })
-        },
-        saveStatistics(statistics: DisplayStatistics) {
-            if (statistics.spend > 1000 * 10) {
-                delete statistics.wrongWords
-                this.currentDict.statistics.push(statistics)
-            }
-        },
-        async changeDict(dict: Dict, practiceType?: DictType, chapterIndex?: number, wordIndex?: number) {
-            //TODO 保存统计
-            // this.saveStatistics()
-            console.log('changeDict', cloneDeep(dict), chapterIndex, wordIndex)
-            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)) {
-                dict.chapterIndex = 0
-                dict.wordIndex = wordIndex
-                dict.chapterWordNumber = dict.words.length
-                dict.chapterWords = [dict.words]
+            if (version === SaveDict.version) {
+              this.setState(state)
             } else {
-                if (dict.type === DictType.article) {
-                    if (chapterIndex > dict.articles.length) {
-                        dict.chapterIndex = 0
-                        dict.wordIndex = 0
-                    }
-                } else {
-                    if (chapterIndex > dict.chapterWords.length) {
-                        dict.chapterIndex = 0
-                        dict.wordIndex = 0
-                    }
-                }
-            }
-            // await checkDictHasTranslate(dict)
-            let rIndex = this.myDictList.findIndex((v: Dict) => v.id === dict.id)
-            if (rIndex > -1) {
-                this.myDictList[rIndex] = dict
-                this.current.index = rIndex
-            } else {
-                this.myDictList.push(cloneDeep(dict))
-                this.current.index = this.myDictList.length - 1
-            }
+              if (version === 2) {
 
-            emitter.emit(EventKey.changeDict)
+              }
+              // this.setState(state)
+            }
+          }
+        } catch (e) {
+          console.error('读取本地dict数据失败', e)
         }
+        const runtimeStore = useRuntimeStore()
+
+        if (this.current.index < 3) {
+
+        } else {
+          let dictResourceUrl = `./dicts/${this.currentDict.language}/${this.currentDict.type}/${this.currentDict.translateLanguage}/${this.currentDict.url}`;
+          if ([DictType.word].includes(this.currentDict.type)) {
+            if (!this.currentDict.originWords.length) {
+              let r = await fetch(dictResourceUrl)
+              // let r = await fetch(`.${this.currentDict.url}`)
+              let v = await r.json()
+              v.map(s => {
+                s.id = nanoid(6)
+              })
+              if (this.currentDict.translateLanguage === 'common') {
+                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
+                }
+              }
+              this.currentDict.originWords = cloneDeep(v)
+              this.currentDict.words = cloneDeep(v)
+              this.currentDict.chapterWords = chunk(this.currentDict.words, this.currentDict.chapterWordNumber)
+            }
+          }
+
+          if ([DictType.article].includes(this.currentDict.type)) {
+            if (!this.currentDict.articles.length) {
+              let r = await fetch(dictResourceUrl)
+              let s: any[] = await r.json()
+              this.currentDict.articles = cloneDeep(s.map(v => {
+                v.id = nanoid(6)
+                return v
+              }))
+            }
+          }
+        }
+
+        //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)
+      })
     },
+    saveStatistics(statistics: DisplayStatistics) {
+      if (statistics.spend > 1000 * 10) {
+        delete statistics.wrongWords
+        this.currentDict.statistics.push(statistics)
+      }
+    },
+    async changeDict(dict: Dict, practiceType?: DictType, chapterIndex?: number, wordIndex?: number) {
+      //TODO 保存统计
+      // this.saveStatistics()
+      console.log('changeDict', cloneDeep(dict), chapterIndex, wordIndex)
+      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)) {
+        dict.chapterIndex = 0
+        dict.wordIndex = wordIndex
+        dict.chapterWordNumber = dict.words.length
+        dict.chapterWords = [dict.words]
+      } else {
+        if (dict.type === DictType.article) {
+          if (chapterIndex > dict.articles.length) {
+            dict.chapterIndex = 0
+            dict.wordIndex = 0
+          }
+        } else {
+          if (chapterIndex > dict.chapterWords.length) {
+            dict.chapterIndex = 0
+            dict.wordIndex = 0
+          }
+        }
+      }
+      // await checkDictHasTranslate(dict)
+      let rIndex = this.myDictList.findIndex((v: Dict) => v.id === dict.id)
+      if (rIndex > -1) {
+        this.myDictList[rIndex] = dict
+        this.current.index = rIndex
+      } else {
+        this.myDictList.push(cloneDeep(dict))
+        this.current.index = this.myDictList.length - 1
+      }
+
+      emitter.emit(EventKey.changeDict)
+    }
+  },
 })
\ No newline at end of file
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/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