- 简单词
+ 已掌握
diff --git a/src/pages/mobile/my/SimplePage.vue b/src/pages/mobile/my/SimplePage.vue
index 235b6558..aab350b5 100644
--- a/src/pages/mobile/my/SimplePage.vue
+++ b/src/pages/mobile/my/SimplePage.vue
@@ -7,11 +7,11 @@ import SimpleList from "@/pages/mobile/components/SimpleList.vue";
>((result, dict) => {
dict.tags.forEach((tag) => {
- if (Object.prototype.hasOwnProperty.call(result, tag)) {
+ if (result[tag]) {
result[tag].push(dict)
} else {
result[tag] = [dict]
@@ -29,34 +32,64 @@ function groupByDictTags(dictList: DictResource[]) {
}, {})
}
-const groupByTranslateLanguage = $computed(() => {
- return groupBy(groupByLanguage[currentLanguage], 'translateLanguage')
-})
-
const groupedByCategoryAndTag = $computed(() => {
- const currentTranslateLanguageDictList = groupByTranslateLanguage[currentTranslateLanguage]
- const groupByCategory = groupBy(currentTranslateLanguageDictList, 'category')
-
+ const groupByCategory = groupBy(dictionaryResources, 'category')
let data = []
for (const [key, value] of Object.entries(groupByCategory)) {
data.push([key, groupByDictTags(value)])
}
- // console.log('groupedByCategoryAndTag', data)
return data
})
+let showSearchInput = $ref(false)
+let searchKey = $ref('')
+
+const searchList = computed(() => {
+ if (searchKey) {
+ let s = searchKey.toLowerCase()
+ return dictionaryResources.filter((item) => {
+ return item.name.toLowerCase().includes(s)
+ || item.category.toLowerCase().includes(s)
+ || item.tags.join('').replace('所有', '').toLowerCase().includes(s)
+ || item?.url?.toLowerCase?.().includes?.(s)
+ })
+ }
+ return []
+})
+
+defineExpose({startSearch: () => showSearchInput = true})
-
-
\ No newline at end of file
+
diff --git a/src/pages/mobile/practice/practice-word/TypingWord.vue b/src/pages/mobile/practice/practice-word/TypingWord.vue
index 83416d33..48e014d0 100644
--- a/src/pages/mobile/practice/practice-word/TypingWord.vue
+++ b/src/pages/mobile/practice/practice-word/TypingWord.vue
@@ -373,13 +373,13 @@ onMounted(() => {
v-if="!isWordSimple(item)"
class="easy"
@click="toggleWordSimple(item)"
- title="标记为简单词"
+ title="标记为已掌握"
icon="material-symbols:check-circle-outline-rounded"/>
-
+
+
+
+ 取消
+
+
+ 词典列表
+
+
+
+
+
+