From bee1fbcf885e55144f73c7bbf5c4335049d530c2 Mon Sep 17 00:00:00 2001
From: Gabe Yuan <yugang2002@gmail.com>
Date: Fri, 8 Sep 2023 23:38:36 +0800
Subject: [PATCH] follow global style bug

---
 src/libs/rules.js | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/libs/rules.js b/src/libs/rules.js
index 5f39e02..0bf58b2 100644
--- a/src/libs/rules.js
+++ b/src/libs/rules.js
@@ -60,32 +60,25 @@ export const matchRule = async (
   const rule = rules.find((r) =>
     r.pattern.split(",").some((p) => isMatch(href, p.trim()))
   );
-
-  const globalRule =
-    rules.find((r) =>
-      r.pattern.split(",").some((p) => p.trim() === GLOBAL_KEY)
-    ) || GLOBLA_RULE;
-
+  const globalRule = rules.find((r) => r.pattern === GLOBAL_KEY) || GLOBLA_RULE;
   if (!rule) {
     return globalRule;
   }
 
-  rule.selector =
-    rule?.selector?.trim() ||
-    globalRule?.selector?.trim() ||
-    GLOBLA_RULE.selector;
-
-  rule.bgColor = rule?.bgColor?.trim() || globalRule?.bgColor?.trim();
-  rule.textDiyStyle =
-    rule?.textDiyStyle?.trim() || globalRule?.textDiyStyle?.trim();
-
-  ["translator", "fromLang", "toLang", "textStyle", "transOpen"].forEach(
-    (key) => {
-      if (rule[key] === GLOBAL_KEY) {
-        rule[key] = globalRule[key];
-      }
+  rule.selector = rule.selector?.trim() || globalRule.selector;
+  if (rule.textStyle === GLOBAL_KEY) {
+    rule.textStyle = globalRule.textStyle;
+    rule.bgColor = globalRule.bgColor;
+    rule.textDiyStyle = globalRule.textDiyStyle;
+  } else {
+    rule.bgColor = rule.bgColor?.trim() || globalRule.bgColor;
+    rule.textDiyStyle = rule.textDiyStyle?.trim() || globalRule.textDiyStyle;
+  }
+  ["translator", "fromLang", "toLang", "transOpen"].forEach((key) => {
+    if (rule[key] === GLOBAL_KEY) {
+      rule[key] = globalRule[key];
     }
-  );
+  });
 
   return rule;
 };