Add data-id attribute to the buttons

fix #12518
siyuan-note · Feb 22, 2025 · 2626803 · 2626803
1 parent baef55f
commit 2626803
Show file tree

Hide file tree

Showing 13 changed files with 205 additions and 28 deletions.
diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts
@@ -342,6 +342,7 @@ export const bindCardEvent = async (options: {
                 }
                 const menu = new Menu();
                 menu.addItem({
+                    id: "setDueTime",
                     icon: "iconClock",
                     label: window.siyuan.languages.setDueTime,
                     click() {
@@ -392,6 +393,7 @@ export const bindCardEvent = async (options: {
                 });
                 if (currentCard.state !== 0) {
                     menu.addItem({
+                        id: "reset",
                         icon: "iconRefresh",
                         label: window.siyuan.languages.reset,
                         click() {
@@ -426,6 +428,7 @@ export const bindCardEvent = async (options: {
                     });
                 }
                 menu.addItem({
+                    id: "removeRiffCard",
                     icon: "iconTrashcan",
                     label: `${window.siyuan.languages.remove} <b>${window.siyuan.languages.riffCard}</b>`,
                     click() {
@@ -448,6 +451,7 @@ export const bindCardEvent = async (options: {
                 });
                 menu.addSeparator();
                 menu.addItem({
+                    id: "forgetCountAndRevisionCountAndCardStatusAndLastReviewTime",
                     iconHTML: "",
                     type: "readonly",
                     label: `<div class="fn__flex">
@@ -484,6 +488,7 @@ export const bindCardEvent = async (options: {
             if (sticktabElement) {
                 const stickMenu = new Menu();
                 stickMenu.addItem({
+                    id: "insertRight",
                     icon: "iconLayoutRight",
                     label: window.siyuan.languages.insertRight,
                     click() {
@@ -508,6 +513,7 @@ export const bindCardEvent = async (options: {
                 });
                 /// #if !BROWSER
                 stickMenu.addItem({
+                    id: "openByNewWindow",
                     icon: "iconOpenWindow",
                     label: window.siyuan.languages.openByNewWindow,
                     click() {
@@ -557,6 +563,7 @@ export const bindCardEvent = async (options: {
                 fetchPost("/api/riff/getRiffDecks", {}, (response) => {
                     window.siyuan.menus.menu.remove();
                     window.siyuan.menus.menu.append(new MenuItem({
+                        id: "all",
                         iconHTML: "",
                         label: window.siyuan.languages.all,
                         click() {
@@ -566,6 +573,7 @@ export const bindCardEvent = async (options: {
                         },
                     }).element);
                     window.siyuan.menus.menu.append(new MenuItem({
+                        id: "fileTree",
                         iconHTML: "",
                         label: window.siyuan.languages.fileTree,
                         click() {

diff --git a/app/src/menus/Menu.ts b/app/src/menus/Menu.ts
@@ -84,7 +84,10 @@ export class Menu {
         }
     }
 
-    public addSeparator(index?: number) {
+    public addSeparator(index?: number, id?: string) {
+        if (id) {
+            return this.addItem({id: "separator_" + id, type: "separator", index});
+        }
         return this.addItem({type: "separator", index});
     }
 

diff --git a/app/src/menus/bookmark.ts b/app/src/menus/bookmark.ts
@@ -19,6 +19,7 @@ export const openBookmarkMenu = (element: HTMLElement, event: MouseEvent, bookma
     const id = element.getAttribute("data-node-id");
     if (!id && !window.siyuan.config.readonly) {
         window.siyuan.menus.menu.append(new MenuItem({
+            id: "rename",
             icon: "iconEdit",
             label: window.siyuan.languages.rename,
             click: () => {
@@ -57,6 +58,7 @@ export const openBookmarkMenu = (element: HTMLElement, event: MouseEvent, bookma
     }
     if (id) {
         window.siyuan.menus.menu.append(new MenuItem({
+            id: "copy",
             label: window.siyuan.languages.copy,
             type: "submenu",
             icon: "iconCopy",
@@ -66,6 +68,7 @@ export const openBookmarkMenu = (element: HTMLElement, event: MouseEvent, bookma
 
     if (!window.siyuan.config.readonly) {
         window.siyuan.menus.menu.append(new MenuItem({
+            id: "remove",
             icon: "iconTrashcan",
             label: window.siyuan.languages.remove,
             click: () => {

diff --git a/app/src/menus/commonMenuItem.ts b/app/src/menus/commonMenuItem.ts
@@ -284,6 +284,7 @@ export const openFileAttr = (attrs: IObject, focusName = "bookmark", protyle?: I
                     window.siyuan.menus.menu.remove();
                     if (response.data.length === 0) {
                         window.siyuan.menus.menu.append(new MenuItem({
+                            id: "emptyContent",
                             iconHTML: "",
                             label: window.siyuan.languages.emptyContent,
                             type: "readonly",
@@ -711,6 +712,7 @@ export const openMenu = (app: App, src: string, onlyMenu: boolean, showAccelerat
     const submenu = [];
     /// #if MOBILE
     submenu.push({
+        id: isInAndroid() || isInHarmony() ? "useDefault" : "useBrowserView",
         label: isInAndroid() || isInHarmony() ? window.siyuan.languages.useDefault : window.siyuan.languages.useBrowserView,
         accelerator: showAccelerator ? window.siyuan.languages.click : "",
         click: () => {
@@ -724,6 +726,7 @@ export const openMenu = (app: App, src: string, onlyMenu: boolean, showAccelerat
                 (src.endsWith(".pdf") && !src.startsWith("file://")))
         ) {
             submenu.push({
+                id: "insertRight",
                 icon: "iconLayoutRight",
                 label: window.siyuan.languages.insertRight,
                 accelerator: showAccelerator ? window.siyuan.languages.click : "",
@@ -732,6 +735,7 @@ export const openMenu = (app: App, src: string, onlyMenu: boolean, showAccelerat
                 }
             });
             submenu.push({
+                id: "openBy",
                 label: window.siyuan.languages.openBy,
                 icon: "iconOpen",
                 accelerator: showAccelerator ? "⌥" + window.siyuan.languages.click : "",
@@ -741,13 +745,15 @@ export const openMenu = (app: App, src: string, onlyMenu: boolean, showAccelerat
             });
             /// #if !BROWSER
             submenu.push({
+                id: "openByNewWindow",
                 label: window.siyuan.languages.openByNewWindow,
                 icon: "iconOpenWindow",
                 click() {
                     openAssetNewWindow(src.trim());
                 }
             });
             submenu.push({
+                id: "showInFolder",
                 icon: "iconFolder",
                 label: window.siyuan.languages.showInFolder,
                 accelerator: showAccelerator ? "⌘" + window.siyuan.languages.click : "",
@@ -756,6 +762,7 @@ export const openMenu = (app: App, src: string, onlyMenu: boolean, showAccelerat
                 }
             });
             submenu.push({
+                id: "useDefault",
                 label: window.siyuan.languages.useDefault,
                 accelerator: showAccelerator ? "⇧" + window.siyuan.languages.click : "",
                 click() {
@@ -766,13 +773,15 @@ export const openMenu = (app: App, src: string, onlyMenu: boolean, showAccelerat
         } else {
             /// #if !BROWSER
             submenu.push({
+                id: "useDefault",
                 label: window.siyuan.languages.useDefault,
                 accelerator: showAccelerator ? window.siyuan.languages.click : "",
                 click() {
                     openBy(src, "app");
                 }
             });
             submenu.push({
+                id: "showInFolder",
                 icon: "iconFolder",
                 label: window.siyuan.languages.showInFolder,
                 accelerator: showAccelerator ? "⌘" + window.siyuan.languages.click : "",
@@ -782,6 +791,7 @@ export const openMenu = (app: App, src: string, onlyMenu: boolean, showAccelerat
             });
             /// #else
             submenu.push({
+                id: isInAndroid() || isInHarmony() ? "useDefault" : "useBrowserView",
                 label: isInAndroid() || isInHarmony() ? window.siyuan.languages.useDefault : window.siyuan.languages.useBrowserView,
                 accelerator: showAccelerator ? window.siyuan.languages.click : "",
                 click: () => {
@@ -798,6 +808,7 @@ export const openMenu = (app: App, src: string, onlyMenu: boolean, showAccelerat
         }
         /// #if !BROWSER
         submenu.push({
+            id: "useDefault",
             label: window.siyuan.languages.useDefault,
             accelerator: showAccelerator ? window.siyuan.languages.click : "",
             click: () => {
@@ -808,6 +819,7 @@ export const openMenu = (app: App, src: string, onlyMenu: boolean, showAccelerat
         });
         /// #else
         submenu.push({
+            id: isInAndroid() || isInHarmony() ? "useDefault" : "useBrowserView",
             label: isInAndroid() || isInHarmony() ? window.siyuan.languages.useDefault : window.siyuan.languages.useBrowserView,
             accelerator: showAccelerator ? window.siyuan.languages.click : "",
             click: () => {
@@ -821,6 +833,7 @@ export const openMenu = (app: App, src: string, onlyMenu: boolean, showAccelerat
         return submenu;
     }
     window.siyuan.menus.menu.append(new MenuItem({
+        id: "openBy",
         label: window.siyuan.languages.openBy,
         icon: "iconOpen",
         submenu