From 1d10d70f2383eb38abd89a4549aefd5a76631cf3 Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Wed, 15 Nov 2023 17:36:08 +0800
Subject: [PATCH] save

---
 src/App.vue                               |  20 +-
 src/components/Modal/DictDialog/index.vue |   2 +-
 src/stores/base.ts                        | 520 +++++++++++-----------
 3 files changed, 284 insertions(+), 258 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 0a32c900..39bb7a93 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,23 +1,32 @@
 <script setup lang="ts">
 
 import {onMounted, watch} from "vue";
-import {useBaseStore} from "@/stores/base.ts";
-import {SaveConfig, SaveDict} from "@/types.ts"
+import {BaseState, useBaseStore} from "@/stores/base.ts";
+import {DictType, SaveConfig, SaveDict} from "@/types.ts"
 import Practice from "@/components/Practice/Practice.vue"
-import {useEventListener, useStartKeyboardEventListener} from "@/hooks/event.ts";
 import {useRuntimeStore} from "@/stores/runtime.ts";
 import {useSettingStore} from "@/stores/setting.ts";
 import {cloneDeep} from "lodash-es";
 import Backgorund from "@/components/Backgorund.vue";
 import useTheme from "@/hooks/useTheme.ts";
+import * as localforage from "localforage";
 
 const store = useBaseStore()
 const runtimeStore = useRuntimeStore()
 const settingStore = useSettingStore()
 const {setTheme} = useTheme()
 
-watch(store.$state, (n) => {
-  localStorage.setItem(SaveDict.key, JSON.stringify({val: n, version: SaveDict.version}))
+watch(store.$state, (n: BaseState) => {
+  let data: BaseState = cloneDeep(n)
+  data.myDicts.map((v: any) => {
+    if (v.type === DictType.word && v.translateLanguage === 'common') {
+      v.originWordsSimple = v.originWords.map(s => s.name)
+      v.originWords = []
+    }
+    v.words = []
+    v.chapterWords = []
+  })
+  localforage.setItem(SaveDict.key, JSON.stringify({val: data, version: SaveDict.version}))
 })
 
 watch(settingStore.$state, (n) => {
@@ -38,7 +47,6 @@ watch(store.wrong.originWords, (n) => {
   store.wrong.chapterWords = [store.wrong.words]
 })
 
-
 async function init() {
   console.time()
   store.init().then(() => {
diff --git a/src/components/Modal/DictDialog/index.vue b/src/components/Modal/DictDialog/index.vue
index 8a6560c3..a9807dc4 100644
--- a/src/components/Modal/DictDialog/index.vue
+++ b/src/components/Modal/DictDialog/index.vue
@@ -58,7 +58,7 @@ async function selectDict(val: { dict: DictResource, index: number }) {
     })
   }
 
-  if ([DictType.collect, DictType.simple, DictType.simple].includes(runtimeStore.editDict.type)) {
+  if ([DictType.collect, DictType.simple, DictType.wrong].includes(runtimeStore.editDict.type)) {
     wordList = cloneDeep(runtimeStore.editDict.originWords)
   } else {
     let url = `./dicts/${runtimeStore.editDict.language}/${runtimeStore.editDict.type}/${runtimeStore.editDict.translateLanguage}/${runtimeStore.editDict.url}`;
diff --git a/src/stores/base.ts b/src/stores/base.ts
index 95b1f826..935f8949 100644
--- a/src/stores/base.ts
+++ b/src/stores/base.ts
@@ -1,20 +1,21 @@
 import {defineStore} from 'pinia'
-import {DefaultDict, Dict, DictType, DisplayStatistics, SaveDict, Word} from "../types.ts"
+import {DefaultDict, DefaultWord, Dict, DictType, DisplayStatistics, SaveDict, Word} from "../types.ts"
 import {chunk, cloneDeep} from "lodash-es";
 import {emitter, EventKey} from "@/utils/eventBus.ts"
 import {v4 as uuidv4} from 'uuid';
 import {useRuntimeStore} from "@/stores/runtime.ts";
+import * as localforage from "localforage";
 
-export interface State {
-  myDicts: Dict[],
-  current: {
-    dictType: DictType,
-    index: number,
-    editIndex: number,
-    practiceType: DictType,//练习类型，目前仅词典为collect时判断是练单词还是文章使用
-  },
-  simpleWords: string[],
-  load: boolean
+export interface BaseState {
+    myDicts: Dict[],
+    current: {
+        dictType: DictType,
+        index: number,
+        editIndex: number,
+        practiceType: DictType,//练习类型，目前仅词典为collect时判断是练单词还是文章使用
+    },
+    simpleWords: string[],
+    load: boolean
 }
 
 // words: [
@@ -63,253 +64,270 @@ export interface State {
 // ],
 
 export const useBaseStore = defineStore('base', {
-  state: (): State => {
-    return {
-      myDicts: [
-        {
-          ...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: 'article_nce2',
-          name: "新概念英语2-课文",
-          description: '新概念英语2-课文',
-          category: '英语学习',
-          tags: ['新概念英语'],
-          url: 'NCE_2.json',
-          translateLanguage: 'common',
-          language: 'en',
-          type: DictType.article
-        },
-        {
-          ...cloneDeep(DefaultDict),
-          name: '新概念英语(新版)-2',
-          description: '新概念英语新版第二册',
-          category: '青少年英语',
-          tags: ['新概念英语'],
-          url: 'nce-new-2.json',
-          translateLanguage: 'common',
-          language: 'en',
-          type: DictType.word
-        },
-      ],
-      current: {
-        dictType: DictType.word,
-        index: 4,
-        editIndex: 0,
-        // 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.myDicts[0]
-    },
-    simple(): Dict {
-      return this.myDicts[1]
-    },
-    wrong() {
-      return this.myDicts[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: State): boolean {
-      //如果是收藏时，特殊判断
-      if (this.currentDict.type === DictType.collect) {
-        return state.current.practiceType === DictType.article
-      }
-      return [
-        DictType.article,
-        DictType.customArticle
-      ].includes(this.currentDict.type)
-    },
-    editDict(state: State) {
-      if (state.current.editIndex === -1) {
-        return cloneDeep(DefaultDict)
-      }
-      return state.myDicts.filter(v => [DictType.customWord, DictType.customArticle].includes(v.type))[state.current.editIndex - 3]
-    },
-    currentDict(): Dict {
-      return this.myDicts[this.current.index]
-    },
-    currentEditDict(): Dict {
-      return this.myDicts[this.current.editIndex]
-    },
-    wordIndex(state: State): number {
-      return this.currentDict.wordIndex
-    },
-    chapter(state: State): Word[] {
-      return this.currentDict.chapterWords[this.currentDict.chapterIndex] ?? []
-    },
-    dictTitle(state: State) {
-      let title = this.currentDict.name
-      return title + this.chapterName
-    },
-    chapterName(state: State) {
-      let title = ''
-      switch (this.currentDict.type) {
-        case DictType.collect:
-          if (state.current.practiceType === DictType.word) {
-            return `第${this.currentDict.chapterIndex + 1}章`
-          }
-        case DictType.word:
-        case DictType.customWord:
-          return `第${this.currentDict.chapterIndex + 1}章`
-      }
-      return title
-    }
-  },
-  actions: {
-    setState(obj: any) {
-      for (const [key, value] of Object.entries(obj)) {
-        this[key] = value
-      }
-      // console.log('this/', this)
-    },
-    async init() {
-      return new Promise(async resolve => {
-
-        let configStr = localStorage.getItem(SaveDict.key)
-        if (configStr) {
-          let obj: State = JSON.parse(configStr)
-          // this.setState(obj)
+    state: (): BaseState => {
+        return {
+            myDicts: [
+                {
+                    ...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: 'article_nce2',
+                    name: "新概念英语2-课文",
+                    description: '新概念英语2-课文',
+                    category: '英语学习',
+                    tags: ['新概念英语'],
+                    url: 'NCE_2.json',
+                    translateLanguage: 'common',
+                    language: 'en',
+                    type: DictType.article
+                },
+                {
+                    ...cloneDeep(DefaultDict),
+                    name: '新概念英语(新版)-2',
+                    description: '新概念英语新版第二册',
+                    category: '青少年英语',
+                    tags: ['新概念英语'],
+                    url: 'nce-new-2.json',
+                    translateLanguage: 'common',
+                    language: 'en',
+                    type: DictType.word
+                },
+            ],
+            current: {
+                dictType: DictType.word,
+                index: 4,
+                editIndex: 0,
+                // 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.myDicts[0]
+        },
+        simple(): Dict {
+            return this.myDicts[1]
+        },
+        wrong() {
+            return this.myDicts[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,
+                DictType.customArticle
+            ].includes(this.currentDict.type)
+        },
+        editDict(state: BaseState) {
+            if (state.current.editIndex === -1) {
+                return cloneDeep(DefaultDict)
+            }
+            return state.myDicts.filter(v => [DictType.customWord, DictType.customArticle].includes(v.type))[state.current.editIndex - 3]
+        },
+        currentDict(): Dict {
+            return this.myDicts[this.current.index]
+        },
+        currentEditDict(): Dict {
+            return this.myDicts[this.current.editIndex]
+        },
+        wordIndex(state: BaseState): number {
+            return this.currentDict.wordIndex
+        },
+        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.word) {
+                        return `第${this.currentDict.chapterIndex + 1}章`
+                    }
+                case DictType.word:
+                case DictType.customWord:
+                    return `第${this.currentDict.chapterIndex + 1}章`
+            }
+            return title
+        }
+    },
+    actions: {
+        setState(obj: any) {
+            for (const [key, value] of Object.entries(obj)) {
+                this[key] = value
+            }
+            // console.log('this/', this)
+        },
+        async init() {
+            return new Promise(async resolve => {
+                try {
+                    let configStr: string = await localforage.getItem(SaveDict.key)
+                    if (configStr) {
+                        let data = JSON.parse(configStr)
 
-        if (this.current.index < 3) {
+                        let state: BaseState = data.val
+                        state.myDicts.map((v: any) => {
+                            if (v.type === DictType.word && v.translateLanguage === 'common') {
+                                v.originWords = v.originWordsSimple.map((name: string) => ({...DefaultWord, name}))
+                                delete v.originWordsSimple
+                            }
+                        })
+                        this.setState(state)
 
-        } else {
-          if ([
-            DictType.word,
-            DictType.customWord,
-          ].includes(this.currentDict.type)) {
-            if (!this.currentDict.originWords.length) {
-              let r = await fetch(`./dicts/${this.currentDict.language}/${this.currentDict.type}/${this.currentDict.translateLanguage}/${this.currentDict.url}`)
-              // let r = await fetch(`.${this.currentDict.url}`)
-              r.json().then(v => {
-                if (this.currentDict.translateLanguage === 'common') {
-                  const runtimeStore = useRuntimeStore()
-                  fetch('./translate/en2zh_CN-min.json').then(r2 => {
-                    // fetch('http://sc.ttentau.top/en2zh_CN-min.json').then(r2 => {
-                    r2.json().then((list: Word[]) => {
-                      runtimeStore.translateWordList = list
+                        // if (data.version === SaveDict.version) {
+                        //
+                        // } else {
+                        //
+                        // }
+                    }
+                } catch (e) {
 
-                      this.currentDict.originWords = cloneDeep(v)
-                      this.currentDict.words = cloneDeep(v)
-                      this.currentDict.chapterWords = chunk(this.currentDict.words, this.currentDict.chapterWordNumber)
-                      this.currentDict.chapterWords[this.currentDict.chapterIndex].map((w: Word) => {
-                        let res = list.find(a => a.name === w.name)
-                        if (res) w = Object.assign(w, res)
-                      })
-
-                      resolve(true)
-                    })
-                  })
-                } else {
-                  this.currentDict.originWords = cloneDeep(v)
-                  this.currentDict.words = cloneDeep(v)
-                  this.currentDict.chapterWords = chunk(this.currentDict.words, this.currentDict.chapterWordNumber)
-                  resolve(true)
                 }
-              })
-            } else {
-              resolve(true)
-            }
-          }
 
-          if ([
-            DictType.article,
-            DictType.customArticle,
-          ].includes(this.currentDict.type)) {
-            if (!this.currentDict.articles.length) {
-              console.log(2)
-              let r = await fetch(`./dicts/${this.currentDict.language}/${this.currentDict.type}/${this.currentDict.translateLanguage}/${this.currentDict.url}`)
-              r.json().then((v: any[]) => {
-                console.log(3)
-                this.currentDict.articles = cloneDeep(v.map(v => {
-                  v.id = uuidv4()
-                  return v
-                }))
-                resolve(true)
-              })
-            } else {
-              resolve(true)
+                if (this.current.index < 3) {
+
+                } else {
+                    if ([
+                        DictType.word,
+                        DictType.customWord,
+                    ].includes(this.currentDict.type)) {
+                        if (!this.currentDict.originWords.length) {
+                            let r = await fetch(`./dicts/${this.currentDict.language}/${this.currentDict.type}/${this.currentDict.translateLanguage}/${this.currentDict.url}`)
+                            // let r = await fetch(`.${this.currentDict.url}`)
+                            r.json().then(v => {
+                                if (this.currentDict.translateLanguage === 'common') {
+                                    const runtimeStore = useRuntimeStore()
+                                    fetch('./translate/en2zh_CN-min.json').then(r2 => {
+                                        // fetch('http://sc.ttentau.top/en2zh_CN-min.json').then(r2 => {
+                                        r2.json().then((list: Word[]) => {
+                                            runtimeStore.translateWordList = list
+
+                                            this.currentDict.originWords = cloneDeep(v)
+                                            this.currentDict.words = cloneDeep(v)
+                                            this.currentDict.chapterWords = chunk(this.currentDict.words, this.currentDict.chapterWordNumber)
+                                            this.currentDict.chapterWords[this.currentDict.chapterIndex].map((w: Word) => {
+                                                let res = list.find(a => a.name === w.name)
+                                                if (res) w = Object.assign(w, res)
+                                            })
+
+                                            resolve(true)
+                                        })
+                                    })
+                                } else {
+                                    this.currentDict.originWords = cloneDeep(v)
+                                    this.currentDict.words = cloneDeep(v)
+                                    this.currentDict.chapterWords = chunk(this.currentDict.words, this.currentDict.chapterWordNumber)
+                                    resolve(true)
+                                }
+                            })
+                        } else {
+                            resolve(true)
+                        }
+                    }
+
+                    if ([
+                        DictType.article,
+                        DictType.customArticle,
+                    ].includes(this.currentDict.type)) {
+                        if (!this.currentDict.articles.length) {
+                            console.log(2)
+                            let r = await fetch(`./dicts/${this.currentDict.language}/${this.currentDict.type}/${this.currentDict.translateLanguage}/${this.currentDict.url}`)
+                            r.json().then((v: any[]) => {
+                                console.log(3)
+                                this.currentDict.articles = cloneDeep(v.map(v => {
+                                    v.id = uuidv4()
+                                    return v
+                                }))
+                                resolve(true)
+                            })
+                        } else {
+                            resolve(true)
+                        }
+                    }
+                }
+            })
+        },
+        saveStatistics(statistics: DisplayStatistics) {
+            if (statistics.spend > 1000 * 10) {
+                delete statistics.wrongWords
+                this.currentDict.statistics.push(statistics)
             }
-          }
+        },
+        async changeDict(dict: Dict, chapterIndex: number = dict.chapterIndex, chapterWordIndex: number = dict.chapterWordNumber, practiceType: DictType) {
+            //TODO 保存统计
+            // this.saveStatistics()
+            console.log('changeDict', cloneDeep(dict), chapterIndex, chapterWordIndex)
+            this.currentDict.type = dict.type
+            this.current.practiceType = practiceType
+            if ([DictType.collect,
+                DictType.simple,
+                DictType.wrong].includes(dict.type)) {
+                this[dict.type].chapterIndex = 0
+                this[dict.type].chapterWordIndex = chapterWordIndex
+                this[dict.type].chapterWords = [this[dict.type].words]
+            } else {
+                if (dict.type === DictType.article || dict.type === DictType.customArticle) {
+                    if (chapterIndex > dict.articles.length) {
+                        dict.chapterIndex = 0
+                    }
+                } else {
+                    if (chapterIndex > dict.chapterWords.length) {
+                        dict.chapterIndex = 0
+                    }
+                }
+                let rIndex = this.myDicts.findIndex((v: Dict) => v.name === dict.name)
+                if (rIndex > -1) {
+                    this.myDicts[rIndex] = dict
+                    this.current.index = rIndex
+                } else {
+                    this.myDicts.push(cloneDeep(dict))
+                    this.current.index = this.myDicts.length - 1
+                }
+            }
+            emitter.emit(EventKey.resetWord)
         }
-      })
     },
-    saveStatistics(statistics: DisplayStatistics) {
-      if (statistics.spend > 1000 * 10) {
-        delete statistics.wrongWords
-        this.currentDict.statistics.push(statistics)
-      }
-    },
-    async changeDict(dict: Dict, chapterIndex: number = dict.chapterIndex, chapterWordIndex: number = dict.chapterWordNumber, practiceType: DictType) {
-      //TODO 保存统计
-      // this.saveStatistics()
-      console.log('changeDict', cloneDeep(dict), chapterIndex, chapterWordIndex)
-      this.currentDict.type = dict.type
-      this.current.practiceType = practiceType
-      if ([DictType.collect,
-        DictType.simple,
-        DictType.wrong].includes(dict.type)) {
-        this[dict.type].chapterIndex = 0
-        this[dict.type].chapterWordIndex = chapterWordIndex
-        this[dict.type].chapterWords = [this[dict.type].words]
-      } else {
-        if (dict.type === DictType.article || dict.type === DictType.customArticle) {
-          if (chapterIndex > dict.articles.length) {
-            dict.chapterIndex = 0
-          }
-        } else {
-          if (chapterIndex > dict.chapterWords.length) {
-            dict.chapterIndex = 0
-          }
-        }
-        let rIndex = this.myDicts.findIndex((v: Dict) => v.name === dict.name)
-        if (rIndex > -1) {
-          this.myDicts[rIndex] = dict
-          this.current.index = rIndex
-        } else {
-          this.myDicts.push(cloneDeep(dict))
-          this.current.index = this.myDicts.length - 1
-        }
-      }
-      emitter.emit(EventKey.resetWord)
-    }
-  },
 })
\ No newline at end of file