diff --git a/src/views/Action/index.js b/src/views/Action/index.js index 65ca0a6..8610bbd 100644 --- a/src/views/Action/index.js +++ b/src/views/Action/index.js @@ -79,58 +79,54 @@ export default function Action({ translator, fab }) { }, [translator]); useEffect(() => { - // 注册菜单 - const menuCommandIds = []; - if (isGm) { - try { - menuCommandIds.push( - GM.registerMenuCommand( - "Toggle Translate (Alt+q)", - (event) => { - translator.toggle(); - setShowPopup(false); - }, - "Q" - ), - GM.registerMenuCommand( - "Toggle Style (Alt+c)", - (event) => { - translator.toggleStyle(); - setShowPopup(false); - }, - "C" - ), - GM.registerMenuCommand( - "Open Menu (Alt+k)", - (event) => { - setShowPopup((pre) => !pre); - }, - "K" - ), - GM.registerMenuCommand( - "Open Setting (Alt+o)", - (event) => { - window.open(process.env.REACT_APP_OPTIONSPAGE, "_blank"); - }, - "O" - ) - ); - } catch (err) { - console.log("[registerMenuCommand]", err); - } + if (!isGm) { + return; } - return () => { - if (isGm) { - try { - menuCommandIds.forEach((id) => { - GM.unregisterMenuCommand(id); - }); - } catch (err) { - // - } - } - }; + // 注册菜单 + try { + const menuCommandIds = []; + menuCommandIds.push( + GM.registerMenuCommand( + "Toggle Translate (Alt+q)", + (event) => { + translator.toggle(); + setShowPopup(false); + }, + "Q" + ), + GM.registerMenuCommand( + "Toggle Style (Alt+c)", + (event) => { + translator.toggleStyle(); + setShowPopup(false); + }, + "C" + ), + GM.registerMenuCommand( + "Open Menu (Alt+k)", + (event) => { + setShowPopup((pre) => !pre); + }, + "K" + ), + GM.registerMenuCommand( + "Open Setting (Alt+o)", + (event) => { + window.open(process.env.REACT_APP_OPTIONSPAGE, "_blank"); + }, + "O" + ) + ); + + return () => { + menuCommandIds.forEach((id) => { + GM.unregisterMenuCommand(id); + }); + }; + } catch (err) { + console.log("[registerMenuCommand]", err); + } }, [translator]); useEffect(() => { diff --git a/src/views/Popup/Header.js b/src/views/Popup/Header.js index 5888296..ed2af91 100644 --- a/src/views/Popup/Header.js +++ b/src/views/Popup/Header.js @@ -21,7 +21,12 @@ export default function Header({ setShowPopup }) { - + {`${process.env.REACT_APP_NAME} v${process.env.REACT_APP_VERSION}`} diff --git a/src/views/Popup/index.js b/src/views/Popup/index.js index 31e440e..004c2c7 100644 --- a/src/views/Popup/index.js +++ b/src/views/Popup/index.js @@ -80,13 +80,12 @@ export default function Popup({ setShowPopup, translator: tran }) { const handleSaveRule = async () => { try { - let host = window.location.host; + let href = window.location.href; if (isExt) { const tab = await getTabInfo(); - const url = new URL(tab.url); - host = url.host; + href = tab.url; } - saveRule({ ...rule, pattern: host }); + saveRule({ ...rule, pattern: href }); } catch (err) { console.log("[save rule]", err); }