From 08c9d78d2a5b875b0cddefea6389add7356be618 Mon Sep 17 00:00:00 2001 From: Gabe Yuan Date: Sun, 10 Sep 2023 13:44:34 +0800 Subject: [PATCH] add save rule button --- src/libs/rules.js | 2 +- src/views/Popup/index.js | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libs/rules.js b/src/libs/rules.js index 4c5567c..75048fa 100644 --- a/src/libs/rules.js +++ b/src/libs/rules.js @@ -144,7 +144,7 @@ export const checkRules = (rules) => { export const saveRule = async (newRule) => { const rules = await getRulesWithDefault(); const rule = rules.find((item) => isMatch(newRule.pattern, item.pattern)); - if (rule) { + if (rule && rule.pattern !== GLOBAL_KEY) { Object.assign(rule, { ...newRule, pattern: rule.pattern }); } else { rules.unshift(newRule); diff --git a/src/views/Popup/index.js b/src/views/Popup/index.js index 2bc1841..31e440e 100644 --- a/src/views/Popup/index.js +++ b/src/views/Popup/index.js @@ -80,14 +80,13 @@ export default function Popup({ setShowPopup, translator: tran }) { const handleSaveRule = async () => { try { - let pattern = window.location.host; + let host = window.location.host; if (isExt) { const tab = await getTabInfo(); const url = new URL(tab.url); - pattern = url.host; + host = url.host; } - - saveRule({ ...rule, pattern }); + saveRule({ ...rule, pattern: host }); } catch (err) { console.log("[save rule]", err); }