From e0741d6c30b99c0542035cc7f18a38211173f411 Mon Sep 17 00:00:00 2001
From: BTMuli <bt-muli@outlook.com>
Date: Wed, 3 Sep 2025 23:42:32 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E5=B1=9E=E6=80=A7=E7=AD=9B=E9=80=89=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/User/Characters.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/User/Characters.vue b/src/pages/User/Characters.vue
index 914a15bd..c671cd56 100644
--- a/src/pages/User/Characters.vue
+++ b/src/pages/User/Characters.vue
@@ -388,11 +388,14 @@ function selectRole(role: TGApp.Sqlite.Character.UserRole): void {
 function handleSelect(val: SelectedCValue) {
   showSelect.value = false;
   const filterC = AppCharacterData.filter((avatar) => {
-    if (!roleList.value.find((role) => role.avatar.id === avatar.id)) return false;
     if (!val.star.includes(avatar.star)) return false;
     if (!val.weapon.includes(avatar.weapon)) return false;
     if (!val.elements.includes(avatar.element)) return false;
-    return val.area.includes(avatar.area);
+    if (!val.area.includes(avatar.area)) return false;
+    return roleList.value.find(
+      (role) =>
+        role.avatar.id === avatar.id && getZhElement(role.avatar.element) === avatar.element,
+    );
   });
   if (filterC.length === 0) {
     showSnackbar.warn("未找到符合条件的角色");
@@ -535,7 +538,7 @@ function handleSwitch(next: boolean): void {
 
 .uc-grid {
   display: grid;
-  grid-gap: 8px;
+  gap: 8px;
   grid-template-columns: repeat(auto-fill, minmax(210px, 0.2fr));
 }