save

src/components/Add/AddDict.vue

@@ -64,12 +64,12 @@ onMounted(() => {
     // if (!languageCategoryList.find(w => w === v.languageCategory)) {
     //   languageCategoryList.push(v.languageCategory)
     // }
-    if (categoryList[v.languageCategory]) {
-      if (!categoryList[v.languageCategory].find(w => w === v.category)) {
-        categoryList[v.languageCategory].push(v.category)
+    if (categoryList[v.language]) {
+      if (!categoryList[v.language].find(w => w === v.category)) {
+        categoryList[v.language].push(v.category)
       }
     } else {
-      categoryList[v.languageCategory] = [v.category]
+      categoryList[v.language] = [v.category]
     }
     if (tagList[v.category]) {
       tagList[v.category] = Array.from(new Set(tagList[v.category].concat(v.tags)))

src/components/Toolbar/DictModal.vue

@@ -71,7 +71,7 @@ async function selectDict(item: DictionaryResource) {
       ...item,
     }
 
-    if (item.languageCategory === 'article') {
+    if (item.language === 'article') {
       data.type = DictType.publicArticle
       let r = await fetch(`${item.url}`)
       r.json().then(v => {
@@ -134,7 +134,7 @@ function groupByDictTags(dicts: DictionaryResource[]) {
 }
 
 const groupedByCategoryAndTag = $computed(() => {
-  const currentLanguageCategoryDicts = dictionaryResources.filter((dict) => dict.languageCategory === currentLanguage)
+  const currentLanguageCategoryDicts = dictionaryResources.filter((dict) => dict.language === currentLanguage)
   const groupedByCategory = Object.entries(groupBy(currentLanguageCategoryDicts, (dict) => dict.category))
   const groupedByCategoryAndTag = groupedByCategory.map(
       ([category, dicts]) => [category, groupByDictTags(dicts)] as [string, Record<string, DictionaryResource[]>],

src/types.ts

@@ -23,9 +23,9 @@ export const SaveConfigKey = 'typing-word-config'
 
 export const PronunciationApi = 'https://dict.youdao.com/dictvoice?audio='
 
-export type LanguageType = 'en' | 'zh-CN' | 'ja' | 'de'
-export type LanguageCategoryType = 'en' | 'ja' | 'de' | 'code' | 'article'
-
+export type TranslateLanguageType = 'en' | 'zh-CN' | 'ja' | 'de' | ''
+export type LanguageType = 'en' | 'ja' | 'de' | 'code'
+export type ResourceType = 'word' | 'article'
 
 export type DictionaryResource = {
   id: string
@@ -35,8 +35,9 @@ export type DictionaryResource = {
   tags: string[]
   url: string
   length: number
+  translateLanguage: TranslateLanguageType
+  type: ResourceType
   language: LanguageType
-  languageCategory: LanguageCategoryType
 }
 
 export interface Dict {