From e90bbf34c547aca7d1f0e8c6402f3b6867dcd586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= <mapaler@163.com>
Date: Thu, 10 Dec 2020 19:52:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=A0=87=E7=AD=BE=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E8=AE=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 languages/en.css    |  2 +-
 languages/ja.css    |  2 +-
 languages/ko.css    |  2 +-
 languages/zh-TW.css |  2 +-
 languages/zh.css    |  2 +-
 script.js           | 38 +++++++++++++++++++++-----------------
 6 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/languages/en.css b/languages/en.css
index 3cb9e230..680b8021 100644
--- a/languages/en.css
+++ b/languages/en.css
@@ -86,7 +86,7 @@
 	content: "Collab ID：";
 }
 .monsterinfo-box .monster-altName::before{
-	content: "Alternative Name：";
+	content: "Tags";
 }
 .m-level-exp::before{
 	content: "Need Exp:";
diff --git a/languages/ja.css b/languages/ja.css
index cb85cff0..bd2097e2 100644
--- a/languages/ja.css
+++ b/languages/ja.css
@@ -84,7 +84,7 @@
 	content: "コラボ ID:";
 }
 .monsterinfo-box .monster-altName::before{
-	content: "別名：";
+	content: "タグで";
 }
 .m-level-exp::before{
 	content: "必要な経験値:";
diff --git a/languages/ko.css b/languages/ko.css
index 7187f9e6..a2ff89dd 100644
--- a/languages/ko.css
+++ b/languages/ko.css
@@ -85,7 +85,7 @@
 	content: "콜라보 ID:";
 }
 .monsterinfo-box .monster-altName::before{
-	content: "대체 이름：";
+	content: "태그로";
 }
 .m-level-exp::before{
 	content: "필요한 Exp:";
diff --git a/languages/zh-TW.css b/languages/zh-TW.css
index 84371a85..631a01f2 100644
--- a/languages/zh-TW.css
+++ b/languages/zh-TW.css
@@ -88,7 +88,7 @@
 	content: "合作ID：";
 }
 .monsterinfo-box .monster-altName::before{
-	content: "替代名稱：";
+	content: "標簽";
 }
 .m-level-exp::before{
 	content: "需要經驗值：";
diff --git a/languages/zh.css b/languages/zh.css
index 9e53a512..77a769ef 100644
--- a/languages/zh.css
+++ b/languages/zh.css
@@ -88,7 +88,7 @@
 	content: "合作ID：";
 }
 .monsterinfo-box .monster-altName::before{
-	content: "替代名称：";
+	content: "标签";
 }
 .m-level-exp::before{
 	content: "需要经验值：";
diff --git a/script.js b/script.js
index e4f2daee..4d4775ad 100644
--- a/script.js
+++ b/script.js
@@ -972,21 +972,25 @@ function initialize() {
 	const stringSearchDialog = settingBox.querySelector(".dialog-search-string");
 	function searchByString(str)
 	{
-		showSearch(Cards.filter(card =>
-			{
-				const names = [card.name];
-				if (card.otLangName)
-				{
-					names.push(...Object.values(card.otLangName));
-				}
-				const altNames = card.altName;
-				if (card.otTags)
+		str = str.trim();
+		if (str.length>0)
+		{
+			showSearch(Cards.filter(card =>
 				{
-					altNames.push(...card.otTags);
+					const names = [card.name];
+					if (card.otLangName)
+					{
+						names.push(...Object.values(card.otLangName));
+					}
+					const altNames = card.altName.concat();
+					if (card.otTags)
+					{
+						altNames.push(...card.otTags);
+					}
+					return altNames.some(astr=>astr.toLowerCase().includes(str.toLowerCase())) || names.some(astr=>astr.toLowerCase().includes(str.toLowerCase()));
 				}
-				return altNames.some(astr=>astr.includes(str)) || names.some(astr=>astr.includes(str));
-			}
-		));
+			));
+		}
 	}
 	function copyString(input)
 	{
@@ -2346,14 +2350,14 @@ function editBoxChangeMonId(id) {
 		mCollabId.classList.remove(className_displayNone);
 	}
 	const mAltName = monInfoBox.querySelector(".monster-altName");
-	mAltName.textContent = card.altName.join("|");
+	//mAltName.textContent = card.altName.join("|");
 	
 	//mAltName.setAttribute("data-monId", card.id);
 
-	if (card.altName.length == 0) { //当没有合作名
-		mAltName.classList.add(className_displayNone);
-	} else {
+	if (card.altName.length >= 0 || card.otTags && card.otTags.length >= 0) { //当没有合作名
 		mAltName.classList.remove(className_displayNone);
+	} else {
+		mAltName.classList.add(className_displayNone);
 	}
 
 	const evoCardUl = settingBox.querySelector(".row-mon-id .evo-card-list");