diff --git a/src/config/i18n.js b/src/config/i18n.js index 07ae872..deb5a31 100644 --- a/src/config/i18n.js +++ b/src/config/i18n.js @@ -375,11 +375,11 @@ export const I18N = { zh: `选择器`, en: `Selector`, }, - rootSelector: { + root_selector: { zh: `根选择器`, en: `Root Selector`, }, - fixerFunction: { + fixer_function: { zh: `修复函数`, en: `Fixer Function`, }, diff --git a/src/libs/webfix.js b/src/libs/webfix.js index c9a7c85..d555813 100644 --- a/src/libs/webfix.js +++ b/src/libs/webfix.js @@ -1,5 +1,5 @@ import { isMatch } from "./utils"; -import { getWebfix, setWebfix } from "./storage"; +import { getWebfix, setWebfix, getWebfixRulesWithDefault } from "./storage"; import { apiFetch } from "../apis"; /** @@ -202,12 +202,12 @@ export const loadOrFetchWebfix = async (url) => { */ export async function runWebfix({ injectWebfix }) { try { - if (!injectWebfix) { - return; - } - const href = document.location.href; - const sites = await loadOrFetchWebfix(process.env.REACT_APP_WEBFIXURL); + let sites = await getWebfixRulesWithDefault(); + if (injectWebfix) { + const subSites = await loadOrFetchWebfix(process.env.REACT_APP_WEBFIXURL); + sites = [...sites, ...subSites]; + } for (var i = 0; i < sites.length; i++) { var site = sites[i]; if (isMatch(href, site.pattern)) { diff --git a/src/views/Options/Webfix.js b/src/views/Options/Webfix.js index a6ca014..2f5a925 100644 --- a/src/views/Options/Webfix.js +++ b/src/views/Options/Webfix.js @@ -119,7 +119,7 @@ function WebfixFields({ rule, webfix, setShow }) { />