Skip to content

避免 menuCommand 更新在 Tab 移除后触发 #828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CodFrm merged 2 commits into from
Oct 10, 2025
Merged

避免 menuCommand 更新在 Tab 移除后触发 #828

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59b1bb7
避免 menuCommand 更新在 Tab 移除后触发
cyfung1031 Oct 10, 2025
5872c7b
改一改
cyfung1031 Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/app/service/service_worker/popup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ export class PopupService {

// 防止并发导致频繁更新菜单，将注册菜单的请求集中在一个队列中处理
updateMenuCommands = new Map<number, ((TScriptMenuRegister | TScriptMenuUnregister) & { registerType: number })[]>();
isUpdateMenuDirty = false;

// 此函数必须是同步执行的，避免updateMenuCommands并发问题
updateMenuCommand(tabId: number, data: ScriptMenu[]): string[] {
Expand All @@ -194,10 +193,10 @@ export class PopupService {
const { uuid, key, name } = message;
const script = scripts.get(uuid);
if (!script) continue;
const menus = script.menus;

if (listEntry.registerType === ScriptMenuRegisterType.REGISTER) {
const menus = script.menus;
retUpdated.add(script.uuid);
retUpdated.add(uuid);
// 以 options+name 生成稳定 groupKey：相同语义项目在 UI 只呈现一次，但可同时触发多个来源（frame）。
// groupKey 用来表示「相同性质的项目」，允许重叠。
// 例如 subframe 和 mainframe 创建了相同的 menu item，显示时只会出现一个。
Expand Down Expand Up @@ -228,7 +227,6 @@ export class PopupService {
menu.groupKey = groupKey;
}
} else if (listEntry.registerType === ScriptMenuRegisterType.UNREGISTER) {
const menus = script.menus;
// 删除菜单
const index = menus.findIndex((item) => item.key === key);
if (index >= 0) {
Expand Down Expand Up @@ -579,6 +577,12 @@ export class PopupService {
}
runCountMap.delete(tabId);
scriptCountMap.delete(tabId);
const list = this.updateMenuCommands.get(tabId);
if (list) {
// 避免 menuCommand 更新在 Tab 移除后触发
list.length = 0;
Comment thread
CodFrm marked this conversation as resolved.
this.updateMenuCommands.delete(tabId);
}
Copy link
Copy Markdown
Member

@CodFrm CodFrm Oct 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我理解 this.updateMenuCommand 在 updateMenuCommand 最后面肯定会删除的，且updateMenuCommand是一个同步函数，这实际是一个无效操作

Copy link
Copy Markdown
Collaborator Author

@cyfung1031 cyfung1031 Oct 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

呀。原来现在是 ScriptMenu 没删 （${CACHE_KEY_TAB_SCRIPT}${tabId}）
对。会跑。所以如果推了10个registerMenu, onRemoved 后才执行，那么就会变成在 script.menus 里残留

// 清理数据tab关闭需要释放的数据
this.txUpdateScriptMenu(tabId, async (scripts) => {
for (const { uuid } of scripts) {
Expand Down
Loading