diff --git a/src/components/ShikigamiSelect.vue b/src/components/ShikigamiSelect.vue index 0a1a581..dd78c9f 100644 --- a/src/components/ShikigamiSelect.vue +++ b/src/components/ShikigamiSelect.vue @@ -6,11 +6,19 @@ :before-close="cancel" > 当前选择式神:{{ current.name }} +
+ +
-
+
{ const confirm = (shikigami: Shikigami) => { emit('updateShikigami', shikigami) + searchText.value='' + activeName.value='ALL' // cancel() } -const filterShikigamiByRarity = (rarity: string) => { - if (rarity.toLowerCase() === 'all') return shikigamiData - return shikigamiData.filter(item => - item.rarity.toLowerCase() === rarity.toLowerCase() - ) + +// 修改后的过滤函数 +const filterShikigamiByRarityAndSearch = (rarity: string, search: string) => { + let filteredList = shikigamiData; + if (rarity.toLowerCase() !== 'all') { + filteredList = filteredList.filter(item => + item.rarity.toLowerCase() === rarity.toLowerCase() + ); + } + if (search.trim() !== '') { + return filteredList.filter(item => + item.name.toLowerCase().includes(search.toLowerCase()) + ); + } + return filteredList; } \ No newline at end of file diff --git a/src/components/Toolbar.vue b/src/components/Toolbar.vue index 93e191b..0d62f38 100644 --- a/src/components/Toolbar.vue +++ b/src/components/Toolbar.vue @@ -4,13 +4,10 @@ {{ t('import') }} {{ t('export') }} {{ t('prepareCapture') }} - {{ - t('setWatermark') - }} - - - 更新日志 - 问题反馈 + {{ t('setWatermark') }} + {{ t('loadExample') }} + {{ t('updateLog') }} + {{ t('feedback') }}
@@ -25,7 +22,7 @@ - + 备注阴阳师
@@ -79,13 +76,17 @@