From 56077eceb86824afb9117d54386b106a3032419a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= <BT-Muli@outlook.com>
Date: Fri, 9 Feb 2024 20:01:04 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/wiki/two-select-c.vue | 12 +++++-------
 src/pages/WIKI/Character.vue         | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/components/wiki/two-select-c.vue b/src/components/wiki/two-select-c.vue
index ca6cc62e..fef9ce91 100644
--- a/src/components/wiki/two-select-c.vue
+++ b/src/components/wiki/two-select-c.vue
@@ -20,7 +20,7 @@
           <div v-for="(item, index) in selectWeaponList" :key="index">
             <v-item v-slot="{ isSelected, toggle }" :value="item">
               <v-btn @click="toggle" :color="isSelected ? 'primary' : ''">
-                <img :alt="`${item}元素`" :src="`/icon/weapon/${item}.webp`" class="two-sci-icon" />
+                <img :alt="`${item}`" :src="`/icon/weapon/${item}.webp`" class="two-sci-icon" />
                 <span>{{ item }}</span>
               </v-btn>
             </v-item>
@@ -88,12 +88,12 @@ export interface SelectedCValue {
   area: string[];
 }
 
-interface TwoSelectProps {
+interface TwoSelectCProps {
   modelValue: boolean;
   reset: boolean;
 }
 
-interface TwoSelectEmits {
+interface TwoSelectCEmits {
   (e: "update:modelValue", value: boolean): void;
 
   (e: "update:reset", value: boolean): void;
@@ -101,8 +101,8 @@ interface TwoSelectEmits {
   (e: "select-c", value: SelectedCValue): void;
 }
 
-const props = defineProps<TwoSelectProps>();
-const emits = defineEmits<TwoSelectEmits>();
+const props = defineProps<TwoSelectCProps>();
+const emits = defineEmits<TwoSelectCEmits>();
 
 const visible = computed({
   get() {
@@ -130,13 +130,11 @@ watch(
       selectedElements.value = selectElementList;
       selectedArea.value = selectAreaList;
       reset.value = false;
-      confirmSelect();
     }
   },
 );
 
 function onCancel() {
-  console.log(selectedElements.value);
   visible.value = false;
 }
 
diff --git a/src/pages/WIKI/Character.vue b/src/pages/WIKI/Character.vue
index 64150fc9..2ecf2c6a 100644
--- a/src/pages/WIKI/Character.vue
+++ b/src/pages/WIKI/Character.vue
@@ -9,9 +9,9 @@
       </div>
       <div class="wc-list">
         <TwcListItem
-          v-for="item in cardsInfo"
+          v-for="(item, index) in cardsInfo"
           v-model:cur-item="curItem"
-          :key="item.id"
+          :key="index"
           :data="item"
           @click="switchC(item)"
           mode="character"
@@ -25,7 +25,7 @@
   <TwoSelectC v-model="showSelect" @select-c="handleSelect" v-model:reset="resetSelect" />
 </template>
 <script lang="ts" setup>
-import { onBeforeMount, ref } from "vue";
+import { onBeforeMount, ref, watch } from "vue";
 import { useRoute } from "vue-router";
 
 import showConfirm from "../../components/func/confirm";
@@ -60,6 +60,10 @@ onBeforeMount(() => {
   }
 });
 
+watch(resetSelect, (val) => {
+  if (val) cardsInfo.value = AppCharacterData;
+});
+
 function handleSelect(val: SelectedCValue) {
   showSelect.value = false;
   const filterC = AppCharacterData.filter((item) => {
@@ -70,16 +74,15 @@ function handleSelect(val: SelectedCValue) {
   });
   if (filterC.length === 0) {
     showSnackbar({
-      text: "未找到符合条件的角色，已重置筛选条件",
+      text: "未找到符合条件的角色",
       color: "warn",
     });
-    resetSelect.value = true;
     return;
   }
+  showSnackbar({
+    text: `筛选出符合条件的角色 ${filterC.length} 个`,
+  });
   cardsInfo.value = filterC;
-  if (!filterC.find((item) => item.id === curItem.value?.id)) {
-    curItem.value = filterC[0];
-  }
 }
 
 async function switchC(item: TGApp.App.Character.WikiBriefInfo): Promise<void> {