From 5bb50f4dbb5b6ec460a40ae947e5ecbeb011e056 Mon Sep 17 00:00:00 2001
From: rookie4show <rookie4show@gmail.com>
Date: Mon, 31 Mar 2025 14:50:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BE=A1=E9=AD=82=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2,=20=E6=98=BE=E7=A4=BA=E5=BC=8F=E7=A5=9E=E5=92=8C?=
 =?UTF-8?q?=E5=BE=A1=E9=AD=82=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ShikigamiSelect.vue |  3 ++-
 src/components/YuhunSelect.vue     | 36 +++++++++++++++++++++++++-----
 src/data/updateLog.json            |  8 +++++++
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/components/ShikigamiSelect.vue b/src/components/ShikigamiSelect.vue
index dd78c9f..6f249d2 100644
--- a/src/components/ShikigamiSelect.vue
+++ b/src/components/ShikigamiSelect.vue
@@ -28,13 +28,14 @@
       >
         <div style="max-height: 600px; overflow-y: auto;">
           <el-space wrap size="large">
-            <div v-for="i in filterShikigamiByRarityAndSearch(rarity.name,searchText)" :key="i.name">
+            <div style="display: flex;flex-direction: column;justify-content: center" v-for="i in filterShikigamiByRarityAndSearch(rarity.name,searchText)" :key="i.name">
               <el-button
                   style="width: 100px; height: 100px;"
                   @click.stop="confirm(i)"
               >
                 <img :src="i.avatar" style="width: 99px; height: 99px;">
               </el-button>
+              <span style="text-align: center; display: block;">{{i.name}}</span>
             </div>
           </el-space>
         </div>
diff --git a/src/components/YuhunSelect.vue b/src/components/YuhunSelect.vue
index 96970cf..ec54e76 100644
--- a/src/components/YuhunSelect.vue
+++ b/src/components/YuhunSelect.vue
@@ -4,14 +4,22 @@
       <span>当前选择：{{ current.name }}</span>
       <el-button type="danger" icon="Delete" round @click="remove()"></el-button>
     </div>
+    <div style="display: flex; align-items: center;">
+      <el-input
+          placeholder="请输入内容"
+          v-model="searchText"
+          style="width: 200px; margin-right: 10px;"
+      />
+    </div>
     <el-tabs v-model="activeName" type="card" class="demo-tabs" @tab-click="handleTabClick">
       <el-tab-pane v-for="type in yuhunTypes" :key="type.name" :label="type.label" :name="type.name">
         <div style="max-height: 500px; overflow-y: auto;">
         <el-space wrap size="large" style="">
-          <div v-for="yuhun in filterYuhunByType(activeName)" :key="yuhun.name">
+          <div v-for="yuhun in filterYuhunByTypeAndSearch(activeName,searchText)" :key="yuhun.name">
             <el-button style="width: 100px; height: 100px;" @click="confirm(yuhun)">
               <img :src="yuhun.avatar" style="width: 99px; height: 99px;">
             </el-button>
+            <span style="text-align: center; display: block;">{{yuhun.name}}</span>
           </div>
         </el-space>
         </div>
@@ -20,7 +28,7 @@
   </el-dialog>
 </template>
 
-<script setup>
+<script setup lang="ts">
 import {ref, watch, computed} from 'vue';
 import shikigamiData from '../data/Shikigami.json';
 import yuhunData from '../data/Yuhun.json';
@@ -39,6 +47,7 @@ const props = defineProps({
 
 const emit = defineEmits(['updateYuhunSelect', 'closeYuhunSelect']);
 
+const searchText = ref('') // 新增搜索文本
 const show = ref(false);
 const activeName = ref('ALL');
 const current = ref(props.currentShikigami);
@@ -66,9 +75,24 @@ const handleTabClick = (tab) => {
   console.log(tab.paneName);
 };
 
-const filterYuhunByType = (type) => {
-  if (type.toLowerCase() === 'all') return yuhunData;
-  return yuhunData.filter(yuhun => yuhun.type.toLowerCase() === type.toLowerCase());
+const filterYuhunByTypeAndSearch = (type: string, search: string) => {
+  let filteredList = yuhunData;
+
+  // 按类型过滤
+  if (type.toLowerCase() !== 'all') {
+    filteredList = filteredList.filter(item =>
+        item.type.toLowerCase() === type.toLowerCase()
+    );
+  }
+
+  // 按搜索关键字过滤
+  if (search.trim() !== '') {
+    filteredList = filteredList.filter(item =>
+        item.name.toLowerCase().includes(search.toLowerCase())
+    );
+  }
+
+  return filteredList;
 };
 
 const cancel = () => {
@@ -77,6 +101,8 @@ const cancel = () => {
 
 const confirm = (item) => {
   emit('updateYuhunSelect', JSON.parse(JSON.stringify(item)), 'Update');
+  searchText.value=''
+  activeName.value = 'ALL'
 };
 
 const remove = () => {
diff --git a/src/data/updateLog.json b/src/data/updateLog.json
index c2e9451..b9682b4 100644
--- a/src/data/updateLog.json
+++ b/src/data/updateLog.json
@@ -1,4 +1,12 @@
 [
+  {
+    "version": "2.3.0",
+    "date": "2025-03-31",
+    "changes": [
+      "支持御魂搜索",
+      "显示式神和御魂名称"
+    ]
+  },
   {
     "version": "2.2.0",
     "date": "2025-03-21",