From ef4883ea37151209d879c5d2245dc2c03ba75f8e Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Sat, 2 Aug 2025 23:21:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=B0=86=E8=AF=8D=E5=85=B8=E7=9A=84words?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=AE=BE=E7=BD=AE=E4=B8=BA=E4=B8=8D=E5=93=8D?=
 =?UTF-8?q?=E5=BA=94=E5=BC=8F=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=A4=AA=E5=8D=A1?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pc/Setting.vue           | 19 +++++++------------
 src/pages/pc/word/DictDetail.vue   | 15 +++++++--------
 src/pages/pc/word/WordHomePage.vue |  1 -
 src/stores/base.ts                 | 25 ++++++++++++++++++-------
 src/types.ts                       |  9 +++++----
 src/utils/index.ts                 |  1 +
 6 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/src/pages/pc/Setting.vue b/src/pages/pc/Setting.vue
index e80e8090..8bb68a38 100644
--- a/src/pages/pc/Setting.vue
+++ b/src/pages/pc/Setting.vue
@@ -110,20 +110,15 @@ function importData(e) {
       }
       try {
         obj = JSON.parse(str)
+        let data = obj.val
+        let settingState = checkAndUpgradeSaveSetting(data.setting)
+        settingStore.setState(settingState)
+        let baseState = checkAndUpgradeSaveDict(data.dict)
+        store.setState(baseState)
+        ElMessage.success('导入成功！')
       } catch (err) {
-        ElMessage.error('导入失败！')
+        return ElMessage.error('导入失败！')
       }
-      if (obj.version === EXPORT_DATA_KEY.version) {
-
-      } else {
-        //TODO
-      }
-      let data = obj.val
-      let settingState = checkAndUpgradeSaveSetting(data.setting)
-      settingStore.setState(settingState)
-      let dictState = checkAndUpgradeSaveDict(data.dict)
-      store.init(dictState)
-      ElMessage.success('导入成功！')
     }
   }
   reader.readAsText(file);
diff --git a/src/pages/pc/word/DictDetail.vue b/src/pages/pc/word/DictDetail.vue
index b12295ff..a06efff0 100644
--- a/src/pages/pc/word/DictDetail.vue
+++ b/src/pages/pc/word/DictDetail.vue
@@ -1,9 +1,9 @@
 <script setup lang="tsx">
-import {DictId, getDefaultDict, getDefaultWord} from "@/types";
 import type {Word} from "@/types";
+import {DictId, getDefaultDict} from "@/types";
 
 import BasePage from "@/pages/pc/components/BasePage.vue";
-import {computed, nextTick, onMounted, reactive} from "vue";
+import {computed, onMounted, reactive} from "vue";
 import {useRuntimeStore} from "@/stores/runtime.ts";
 import {assign, cloneDeep} from "lodash-es";
 import {nanoid} from "nanoid";
@@ -18,7 +18,6 @@ import {useRoute, useRouter} from "vue-router";
 import {useBaseStore} from "@/stores/base.ts";
 import EditBook from "@/pages/pc/article/components/EditBook.vue";
 import {_getDictDataByUrl, _nextTick, convertToWord} from "@/utils";
-import {emitter, EventKey} from "@/utils/eventBus.ts";
 
 const runtimeStore = useRuntimeStore()
 const base = useBaseStore()
@@ -59,7 +58,7 @@ const wordRules = reactive<FormRules>({
     {max: 30, message: '名称不能超过30个字符', trigger: 'blur'},
   ],
 })
-
+let studyLoading = $ref(false)
 
 function syncDictInMyStudyList(study = false) {
   _nextTick(() => {
@@ -190,13 +189,13 @@ function formClose() {
 }
 
 async function addMyStudyList() {
+  studyLoading = true
+  await base.changeDict(runtimeStore.editDict)
+  studyLoading = false
   if (route.query?.from) {
     router.back()
   }
   router.back()
-  requestIdleCallback(()=>{
-    base.changeDict(runtimeStore.editDict)
-  })
 }
 
 defineRender(() => {
@@ -209,7 +208,7 @@ defineRender(() => {
                   <div class="absolute page-title text-align-center w-full">{runtimeStore.editDict.name}</div>
                   <div class="flex gap-2">
                     <BaseButton type="info" onClick={() => isEdit = true}>编辑</BaseButton>
-                    <BaseButton onClick={addMyStudyList}>学习</BaseButton>
+                    <BaseButton loading={studyLoading} onClick={addMyStudyList}>学习</BaseButton>
                   </div>
                 </div>
                 <div class="text-lg  ">介绍：{runtimeStore.editDict.description}</div>
diff --git a/src/pages/pc/word/WordHomePage.vue b/src/pages/pc/word/WordHomePage.vue
index 0f837687..f444e3eb 100644
--- a/src/pages/pc/word/WordHomePage.vue
+++ b/src/pages/pc/word/WordHomePage.vue
@@ -44,7 +44,6 @@ async function init() {
 }
 
 function startStudy() {
-  // getCurrentStudyWord()
   // return store.sdict.lastLearnIndex = store.sdict.length - 1
   // store.sdict.complete = true
   // store.sdict.lastLearnIndex = 20
diff --git a/src/stores/base.ts b/src/stores/base.ts
index 6fe976ed..702f8159 100644
--- a/src/stores/base.ts
+++ b/src/stores/base.ts
@@ -5,6 +5,7 @@ import * as localforage from "localforage";
 import {nanoid} from "nanoid";
 import {SAVE_DICT_KEY} from "@/utils/const.ts";
 import {_getStudyProgress, checkAndUpgradeSaveDict, getDictFile} from "@/utils";
+import {markRaw} from "vue";
 
 export interface BaseState {
   simpleWords: string[],
@@ -31,7 +32,7 @@ export const DefaultBaseState = (): BaseState => ({
   load: false,
   word: {
     bookList: [
-      getDefaultDict({id: DictId.wordCollect, name: '收藏', words: []}),
+      getDefaultDict({id: DictId.wordCollect, name: '收藏'}),
       getDefaultDict({id: DictId.wordWrong, name: '错词'}),
       getDefaultDict({id: DictId.wordKnown, name: '已掌握'}),
       // getDefaultDict({
@@ -103,9 +104,18 @@ export const useBaseStore = defineStore('base', {
     },
   },
   actions: {
-    setState(obj: any) {
-      //这样不会丢失watch的值的引用
-      merge(this, obj)
+    setState(obj: BaseState) {
+      obj.word.bookList.map(book => {
+        book.words = markRaw(book.words)
+        book.articles = markRaw(book.articles)
+        book.statistics = markRaw(book.statistics)
+      })
+      obj.article.bookList.map(book => {
+        book.words = markRaw(book.words)
+        book.articles = markRaw(book.articles)
+        book.statistics = markRaw(book.statistics)
+      })
+      this.$patch(obj)
     },
     async init(outData?: any) {
       return new Promise(async resolve => {
@@ -142,7 +152,7 @@ export const useBaseStore = defineStore('base', {
       //把其他的词典的单词数据都删掉，全保存在内存里太卡了
       this.word.bookList.slice(3).map(v => {
         if (!v.custom) {
-          v.words = []
+          v.words = markRaw([])
         }
       })
       let rIndex = this.word.bookList.findIndex((v: Dict) => v.id === val.id)
@@ -151,10 +161,11 @@ export const useBaseStore = defineStore('base', {
       }
       if (rIndex > -1) {
         this.word.studyIndex = rIndex
-        this.word.bookList[this.word.studyIndex].words = val.words
+        this.word.bookList[this.word.studyIndex].words = markRaw(val.words)
         this.word.bookList[this.word.studyIndex].perDayStudyNumber = val.perDayStudyNumber
       } else {
-        this.word.bookList.push(cloneDeep(val))
+        console.log(1)
+        this.word.bookList.push(getDefaultDict(val))
         this.word.studyIndex = this.word.bookList.length - 1
       }
     },
diff --git a/src/types.ts b/src/types.ts
index b3415be5..77563dcd 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -4,6 +4,7 @@ import jaFlag from "@/assets/img/flags/ja.png";
 import deFlag from "@/assets/img/flags/de.png";
 import codeFlag from "@/assets/img/flags/code.png";
 import myFlag from "@/assets/img/flags/my.png";
+import {markRaw} from "vue";
 
 export type Word = {
   id?: string,
@@ -262,12 +263,12 @@ export function getDefaultDict(val: Partial<Dict> = {}): Dict {
     language: 'en',
     lastLearnIndex: 0,
     perDayStudyNumber: 20,
-    words: [],
-    articles: [],
-    statistics: [],
     custom: false,
     complete: false,
-    ...val
+    ...val,
+    words: markRaw(val.words ?? []),
+    articles: markRaw(val.articles ?? []),
+    statistics: markRaw(val.statistics ?? [])
   }
 }
 
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 21fcad80..abf98e28 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -369,6 +369,7 @@ export function _getAccomplishDays(total: number, dayNumber: number) {
 
 //获取完成日期
 export function _getAccomplishDate(total: number, dayNumber: number) {
+  if (dayNumber <= 0) return '-'
   let d = _getAccomplishDays(total, dayNumber)
   return dayjs().add(d, 'day').format('YYYY-MM-DD')
 }