fix: 修复筛选和搜索时没有互斥

hardstylewyl · Jul 2, 2024 · 51a8126 · 51a8126
1 parent 24c0f27
commit 51a8126
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...ponents/business/Global/Control/components/K-Optional/components/SelectHeroSkin/index.vue b/...ponents/business/Global/Control/components/K-Optional/components/SelectHeroSkin/index.vue
@@ -114,6 +114,7 @@ useUserConfigFinish.readPromise.then(async () => {
 
 /* 搜索英雄/皮肤 */
 const handleSearch = () => {
+  tab_index.value = 0;
   const search_keys = ["hero_name"];
 
   //如果为领取皮肤，则支持皮肤搜索
@@ -133,6 +134,7 @@ const handleSearch = () => {
 
 /* 点击tab栏 */
 const onTab = (index: number) => {
+  search_value.value = "";
   tab_index.value = index;
   heroListRef.value!.scrollTop = 0;
   sortAll();
@@ -223,7 +225,7 @@ onMounted(() => {
         @input="handleSearch"
       />
     </div>
-    <KCategory line :options="options" @tab="onTab" />
+    <KCategory v-model="tab_index" line :options="options" @update:model-value="onTab" />
   </div>
   <div ref="heroListRef" v-scroll-virtualization class="hero-list">
     <HeroSkinCard

diff --git a/src/components/business/Global/Control/components/K-Upgrade/components/SelectHero/index.vue b/src/components/business/Global/Control/components/K-Upgrade/components/SelectHero/index.vue
@@ -58,6 +58,7 @@ useUserConfigFinish.readPromise.then(async () => {
 
 /* 搜索英雄 */
 const handleSearch = () => {
+  tab_index.value = 0;
   show_list.value = _search<HeroUpgradeInfo>(
     _cloneDeep(hero_list.value),
     search_value.value,
@@ -74,6 +75,7 @@ const onSelectAttr = (index: number) => {
 
 /* 点击tab栏 */
 const onTab = (index: number) => {
+  search_value.value = "";
   tab_index.value = index;
   sortAll();
 };
@@ -123,7 +125,13 @@ const handleSelect = (hero: HeroUpgradeInfo) => {
         @input="handleSearch"
       />
     </div>
-    <KCategory v-if="hero_list.length" line :options="options" @tab="onTab" />
+    <KCategory
+      v-if="hero_list.length"
+      v-model="tab_index"
+      line
+      :options="options"
+      @update:model-value="onTab"
+    />
   </div>
   <div v-scroll-virtualization class="hero-list">
     <HeroCard