✨ 增加徽标和菜单设置并调整设置页面 #573

Author: CodFrm

src/app/service/service_worker/index.ts

@@ -62,7 +62,7 @@ export default class ServiceWorkerManager {
       scriptDAO
     );
     runtime.init();
-    const popup = new PopupService(this.api.group("popup"), this.mq, runtime, scriptDAO);
+    const popup = new PopupService(this.api.group("popup"), this.mq, runtime, scriptDAO, systemConfig);
     popup.init();
     value.init(runtime, popup);
     const synchronize = new SynchronizeService(

src/app/service/service_worker/popup.ts

@@ -16,14 +16,16 @@ import {
   subscribeScriptRunStatus,
 } from "../queue";
 import { getStorageName } from "@App/pkg/utils/utils";
+import type { SystemConfig } from "@App/pkg/config/config";
 
 // 处理popup页面的数据
 export class PopupService {
   constructor(
     private group: Group,
     private mq: MessageQueue,
     private runtime: RuntimeService,
-    private scriptDAO: ScriptDAO
+    private scriptDAO: ScriptDAO,
+    private systemConfig: SystemConfig
   ) {}
 
   genScriptMenuByTabMap(menu: ScriptMenu[]) {
@@ -58,6 +60,11 @@ export class PopupService {
   async genScriptMenu(tabId: number) {
     // 移除之前所有的菜单
     chrome.contextMenus.removeAll();
+
+    if ((await this.systemConfig.getScriptMenuDisplayType()) !== "all") {
+      return;
+    }
+
     const [menu, backgroundMenu] = await Promise.all([this.getScriptMenu(tabId), this.getScriptMenu(-1)]);
     if (!menu.length && !backgroundMenu.length) {
       return;
@@ -83,6 +90,10 @@ export class PopupService {
   }
 
   async registerMenuCommand(message: ScriptMenuRegisterCallbackValue) {
+    if ((await this.systemConfig.getScriptMenuDisplayType()) === "none") {
+      // 如果不显示脚本菜单则不处理
+      return;
+    }
     // 给脚本添加菜单
     return this.txUpdateScriptMenu(message.tabId, async (data) => {
       const script = data.find((item) => item.uuid === message.uuid);
@@ -228,6 +239,20 @@ export class PopupService {
           data.push(item);
         }
       });
+      if ((await this.systemConfig.getBadgeNumberType()) === "script_count") {
+        chrome.action.setBadgeText({
+          text: data.length.toString(),
+          tabId: tabId,
+        });
+        chrome.action.setBadgeBackgroundColor({
+          color: await this.systemConfig.getBadgeBackgroundColor(),
+          tabId: tabId,
+        });
+        chrome.action.setBadgeTextColor({
+          color: await this.systemConfig.getBadgeTextColor(),
+          tabId: tabId,
+        });
+      }
       return data;
     });
   }
@@ -417,11 +442,14 @@ export class PopupService {
       }) => {
         this.addScriptRunNumber({ tabId, frameId, scripts });
         // 设置角标
+        if ((await this.systemConfig.getBadgeNumberType()) !== "run_count") {
+          return;
+        }
         chrome.action.getBadgeText(
           {
             tabId: tabId,
           },
-          (res: string) => {
+          async (res: string) => {
             const lastError = chrome.runtime.lastError;
             if (lastError) {
               console.error("chrome.runtime.lastError in chrome.action.getBadgeText:", lastError);
@@ -434,7 +462,11 @@ export class PopupService {
                 tabId: tabId,
               });
               chrome.action.setBadgeBackgroundColor({
-                color: "#4e5969",
+                color: await this.systemConfig.getBadgeBackgroundColor(),
+                tabId: tabId,
+              });
+              chrome.action.setBadgeTextColor({
+                color: await this.systemConfig.getBadgeTextColor(),
                 tabId: tabId,
               });
             }

src/locales/en-US/translation.json

@@ -421,5 +421,34 @@
   "ext_update_notification_desc": "Current version: {{version}}, please see the update log for details",
   "watch_file_description": "Monitor file changes and automatically update scripts. When using, please make sure the script file path remains unchanged and the page cannot be closed.",
   "watch_file": "Watch file",
-  "stop_watch_file": "Stop watch"
+  "stop_watch_file": "Stop watch",
+  "script_menu_display": "Script Registered Menu",
+  "badge_type_none": "None",
+  "badge_type_run_count": "Run Count",
+  "badge_type_script_count": "Script Count",
+  "menu_display_none": "None",
+  "menu_display_no_browser": "No Browser Display",
+  "menu_display_all": "Show All",
+  "interface_settings": "Interface",
+  "select_interface_language": "Select interface display language",
+  "extension_icon_badge": "Extension Icon Badge",
+  "display_type": "Display Type",
+  "extension_icon_badge_type": "Number type displayed on extension icon",
+  "background_color": "Background Color",
+  "badge_background_color_desc": "Badge background color",
+  "text_color": "Text Color",
+  "badge_text_color_desc": "Badge text color",
+  "script_menu": "Script Menu",
+  "menu_display": "Menu Display",
+  "control_menu_display_position": "Control menu display position",
+  "expand_count": "Expand Count",
+  "auto_collapse_when_exceeds": "Auto collapse when exceeds this number",
+  "check_frequency": "Check Frequency",
+  "script_auto_update_frequency": "Script automatic update check frequency",
+  "update_options": "Update Options",
+  "control_script_update_behavior": "Control script update behavior",
+  "blacklist_pages_desc": "Prevent scripts from running on specified pages, supports wildcards",
+  "development_tools": "Development Tools",
+  "check_script_code_quality": "Check script code quality and errors",
+  "custom_eslint_rules_config": "Custom ESLint rules configuration (JSON format)"
 }

src/locales/zh-CN/translation.json

@@ -421,5 +421,34 @@
   "ext_update_notification_desc": "当前版本：{{version}}，详情请查看更新日志",
   "watch_file_description": "监听文件变动，自动更新脚本，使用时请确保脚本文件路径不变且不能关闭页面",
   "watch_file": "监听文件",
-  "stop_watch_file": "停止监听"
+  "stop_watch_file": "停止监听",
+  "script_menu_display": "脚本注册的菜单",
+  "badge_type_none": "不显示",
+  "badge_type_run_count": "运行次数",
+  "badge_type_script_count": "脚本个数",
+  "menu_display_none": "不显示",
+  "menu_display_no_browser": "不在浏览器中显示",
+  "menu_display_all": "全部显示",
+  "interface_settings": "界面",
+  "select_interface_language": "选择界面显示语言",
+  "extension_icon_badge": "扩展图标徽标",
+  "display_type": "显示类型",
+  "extension_icon_badge_type": "扩展图标上显示的数字类型",
+  "background_color": "背景颜色",
+  "badge_background_color_desc": "徽标背景色",
+  "text_color": "文字颜色",
+  "badge_text_color_desc": "徽标文字色",
+  "script_menu": "脚本菜单",
+  "menu_display": "菜单显示",
+  "control_menu_display_position": "控制菜单显示位置",
+  "expand_count": "展开数量",
+  "auto_collapse_when_exceeds": "超过此数量时自动折叠",
+  "check_frequency": "检查频率",
+  "script_auto_update_frequency": "脚本自动检查更新的频率",
+  "update_options": "更新选项",
+  "control_script_update_behavior": "控制脚本更新的行为",
+  "blacklist_pages_desc": "禁止脚本在指定页面运行，支持通配符",
+  "development_tools": "开发工具",
+  "check_script_code_quality": "检查脚本代码质量和错误",
+  "custom_eslint_rules_config": "自定义 ESLint 规则配置（JSON 格式）"
 }