diff --git a/src/config/rules.js b/src/config/rules.js index ef08c89..cade31e 100644 --- a/src/config/rules.js +++ b/src/config/rules.js @@ -271,29 +271,8 @@ const RULES_MAP = { export const BUILTIN_RULES = Object.entries(RULES_MAP) .sort((a, b) => a[0].localeCompare(b[0])) - .map( - ([ - pattern, - { - selector, - keepSelector = "", - terms = "", - selectStyle = "", - parentStyle = "", - injectCss = "", - fixerSelector = "", - fixerFunc = GLOBAL_KEY, - }, - ]) => ({ - ...DEFAULT_RULE, - pattern, - selector, - keepSelector, - terms, - selectStyle, - parentStyle, - injectCss, - fixerSelector, - fixerFunc, - }) - ); + .map(([pattern, rule]) => ({ + ...DEFAULT_RULE, + ...rule, + pattern, + })); diff --git a/src/views/Options/Rules.js b/src/views/Options/Rules.js index 6edf61e..a93bba9 100644 --- a/src/views/Options/Rules.js +++ b/src/views/Options/Rules.js @@ -7,6 +7,7 @@ import Alert from "@mui/material/Alert"; import { GLOBAL_KEY, DEFAULT_RULE, + GLOBLA_RULE, OPT_LANGS_FROM, OPT_LANGS_TO, OPT_TRANS_ALL, @@ -56,7 +57,10 @@ import UploadButton from "./UploadButton"; import { FIXER_ALL } from "../../libs/webfix"; function RuleFields({ rule, rules, setShow, setKeyword }) { - const initFormValues = { ...DEFAULT_RULE, ...(rule || {}) }; + const initFormValues = { + ...(rule?.pattern === "*" ? GLOBLA_RULE : DEFAULT_RULE), + ...(rule || {}), + }; const editMode = !!rule; const i18n = useI18n();