diff --git a/src/config/setting.js b/src/config/setting.js index a29c747..1f4bafb 100644 --- a/src/config/setting.js +++ b/src/config/setting.js @@ -135,7 +135,7 @@ export const DEFAULT_SETTING = { // transOnly: false, // 是否仅显示译文(移至rule,作废) // transTitle: false, // 是否同时翻译页面标题(移至rule,作废) subrulesList: DEFAULT_SUBRULES_LIST, // 订阅列表 - owSubrule: DEFAULT_OW_RULE, // 覆写订阅规则 + // owSubrule: DEFAULT_OW_RULE, // 覆写订阅规则 (作废) transApis: DEFAULT_API_LIST, // 翻译接口 (v2.0 对象改为数组) // mouseKey: OPT_TIMING_PAGESCROLL, // 翻译时机/鼠标悬停翻译(移至rule,作废) shortcuts: DEFAULT_SHORTCUTS, // 快捷键 diff --git a/src/libs/rules.js b/src/libs/rules.js index b95264d..e3cc7d6 100644 --- a/src/libs/rules.js +++ b/src/libs/rules.js @@ -22,32 +22,13 @@ import { kissLog } from "./log"; * @param {string} href * @returns */ -export const matchRule = async ( - href, - { injectRules, subrulesList, owSubrule } -) => { +export const matchRule = async (href, { injectRules, subrulesList }) => { const rules = await getRulesWithDefault(); if (injectRules) { try { const selectedSub = subrulesList.find((item) => item.selected); if (selectedSub?.url) { - const mixRule = {}; - Object.entries(owSubrule) - .filter(([key, val]) => { - if ( - owSubrule.textStyle === REMAIN_KEY && - (key === "bgColor" || key === "textDiyStyle") - ) { - return false; - } - return val !== REMAIN_KEY; - }) - .forEach(([key, val]) => { - mixRule[key] = val; - }); - - let subRules = await loadOrFetchSubRules(selectedSub.url); - subRules = subRules.map((item) => ({ ...item, ...mixRule })); + const subRules = await loadOrFetchSubRules(selectedSub.url); rules.splice(-1, 0, ...subRules); } } catch (err) { diff --git a/src/views/Options/Rules.js b/src/views/Options/Rules.js index 23cd482..ffbadee 100644 --- a/src/views/Options/Rules.js +++ b/src/views/Options/Rules.js @@ -49,7 +49,7 @@ import { getSyncWithDefault, getRulesOld, } from "../../libs/storage"; -import OwSubRule from "./OwSubRule"; +// import OwSubRule from "./OwSubRule"; import ClearAllIcon from "@mui/icons-material/ClearAll"; import HelpButton from "./HelpButton"; import { useSyncCaches } from "../../hooks/Sync"; @@ -1255,7 +1255,7 @@ export default function Rules() { - + {/* */}