From 75c42f68b881a2ddd2d0d0204d43185e49858ae1 Mon Sep 17 00:00:00 2001 From: "zhoulibin@xiaoxin" <125377187@qq.com> Date: Sun, 11 Aug 2024 11:35:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A2=84=E8=A7=88=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/AnnotationsToNote.tsx | 6 +- src/modules/menu.tsx | 153 +++++++++++++++--------------- 2 files changed, 80 insertions(+), 79 deletions(-) diff --git a/src/modules/AnnotationsToNote.tsx b/src/modules/AnnotationsToNote.tsx index 13184d9..45f5150 100644 --- a/src/modules/AnnotationsToNote.tsx +++ b/src/modules/AnnotationsToNote.tsx @@ -489,14 +489,14 @@ export function createSearchAnnContent(dialogWindow: Window | undefined, popupDi tag: "div", styles: { padding: "5px", - marginRight: "20px", + // marginRight: "20px", display: "flex", alignItems: "stretch", flexDirection: "column", - width: docWidth / columnSize - 10 - 60 / columnSize + "px", + width: docWidth / columnSize - 15 - 15 / columnSize + "px", background: "#fff", borderRadius: "5px", - margin: "4px", + margin: "0 0 4px 4px", }, properties: { textContent: "" }, children: [ diff --git a/src/modules/menu.tsx b/src/modules/menu.tsx index d817548..5ae4261 100644 --- a/src/modules/menu.tsx +++ b/src/modules/menu.tsx @@ -35,7 +35,7 @@ function buildMenu(collectionOrItem: "collection" | "item") { label: "笔记管理 - in " + collectionOrItem, icon: iconBaseUrl + "favicon.png", children: [ - { + { //自定义命令 tag: "menu", label: "自定义命令", icon: iconBaseUrl + "favicon.png", @@ -210,83 +210,11 @@ function buildMenu(collectionOrItem: "collection" | "item") { }, ], }, - { - tag: "menu", - label: "备份还原pdf注释（慎用）", - icon: iconBaseUrl + "favicon.png", - children: [ - { - //复制pdf注释 - tag: "menuitem", - label: "备份pdf注释到剪切板", - icon: iconBaseUrl + "favicon.png", - commandListener: async (ev: Event) => { - const items = await getSelectedItems(collectionOrItem); - await copyAnnotations(items); - }, - }, - { - tag: "menuseparator", - }, - { - //粘贴pdf注释 - tag: "menuitem", - label: "还原pdf注释-用作者年份标题匹配", - icon: iconBaseUrl + "favicon.png", - commandListener: async (ev: Event) => { - const items = await getSelectedItems(collectionOrItem); - await pasteAnnotations(items); - }, - }, - { - //粘贴pdf注释 - tag: "menuitem", - label: "还原pdf注释-用作者年份标题+文件大小匹配", - icon: iconBaseUrl + "favicon.png", - commandListener: async (ev: Event) => { - const items = await getSelectedItems(collectionOrItem); - await pasteAnnotations(items, false, true); - }, - }, - { - //粘贴pdf注释 - tag: "menuitem", - label: "还原pdf注释-仅文件md5匹配（严格）", - icon: iconBaseUrl + "favicon.png", - commandListener: async (ev: Event) => { - const items = await getSelectedItems(collectionOrItem); - await pasteAnnotations(items, true, false, false); - }, - }, - { - tag: "menuseparator", - }, - { - //相同PDF合并，注释合并 - tag: "menuitem", - label: "仅保留1个PDF，注释合并(条目下其它PDF删除，慎用，可能会产生位置偏移)", - icon: iconBaseUrl + "favicon.png", - commandListener: async (ev: Event) => { - const items = await getSelectedItems(collectionOrItem); - await mergePdfs(items); - }, - }, - { - //相同PDF合并，注释合并 - tag: "menuitem", - label: "仅保留1个PDF，注释合并(条目下与这个PDF大小一样的PDF删除)", - icon: iconBaseUrl + "favicon.png", - commandListener: async (ev: Event) => { - const items = await getSelectedItems(collectionOrItem); - await mergePdfs(items); - }, - }, - ], - }, - { + + { //---- tag: "menuseparator", }, - { + { //预览批注导出 tag: "menuitem", label: "预览批注导出", icon: iconBaseUrl + "favicon.png", @@ -393,6 +321,79 @@ function buildMenu(collectionOrItem: "collection" | "item") { alert("测试中。。。") }, }, + { //备份还原pdf注释（慎用） + tag: "menu", + label: "备份还原pdf注释（慎用）", + icon: iconBaseUrl + "favicon.png", + children: [ + { + //复制pdf注释 + tag: "menuitem", + label: "备份pdf注释到剪切板", + icon: iconBaseUrl + "favicon.png", + commandListener: async (ev: Event) => { + const items = await getSelectedItems(collectionOrItem); + await copyAnnotations(items); + }, + }, + { + tag: "menuseparator", + }, + { + //粘贴pdf注释 + tag: "menuitem", + label: "还原pdf注释-用作者年份标题匹配", + icon: iconBaseUrl + "favicon.png", + commandListener: async (ev: Event) => { + const items = await getSelectedItems(collectionOrItem); + await pasteAnnotations(items); + }, + }, + { + //粘贴pdf注释 + tag: "menuitem", + label: "还原pdf注释-用作者年份标题+文件大小匹配", + icon: iconBaseUrl + "favicon.png", + commandListener: async (ev: Event) => { + const items = await getSelectedItems(collectionOrItem); + await pasteAnnotations(items, false, true); + }, + }, + { + //粘贴pdf注释 + tag: "menuitem", + label: "还原pdf注释-仅文件md5匹配（严格）", + icon: iconBaseUrl + "favicon.png", + commandListener: async (ev: Event) => { + const items = await getSelectedItems(collectionOrItem); + await pasteAnnotations(items, true, false, false); + }, + }, + { + tag: "menuseparator", + }, + { + //相同PDF合并，注释合并 + tag: "menuitem", + label: "仅保留1个PDF，注释合并(条目下其它PDF删除，慎用，可能会产生位置偏移)", + icon: iconBaseUrl + "favicon.png", + commandListener: async (ev: Event) => { + const items = await getSelectedItems(collectionOrItem); + await mergePdfs(items); + }, + }, + { + //相同PDF合并，注释合并 + tag: "menuitem", + label: "仅保留1个PDF，注释合并(条目下与这个PDF大小一样的PDF删除)", + icon: iconBaseUrl + "favicon.png", + commandListener: async (ev: Event) => { + const items = await getSelectedItems(collectionOrItem); + await mergePdfs(items); + }, + }, + ], + }, ], }; return menu;