From 8c6db7b4a773a55913f2ec1a1ec05a5ec5145152 Mon Sep 17 00:00:00 2001 From: purocean Date: Wed, 14 Aug 2019 14:02:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E6=96=87=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/app.ts | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/app/src/app.ts b/app/src/app.ts index f49c2f8e..b5aa047d 100644 --- a/app/src/app.ts +++ b/app/src/app.ts @@ -51,6 +51,30 @@ const createWindow = () => { win.on('closed', () => { win = null }) + + const selectionMenu = Menu.buildFromTemplate([ + { role: 'copy', label: '复制' }, + ]) + + const inputMenu = Menu.buildFromTemplate([ + { role: 'copy', label: '复制' }, + { role: 'paste', label: '粘贴' }, + { role: 'cut', label: '剪切' }, + { type: 'separator' }, + { role: 'undo' , label: '撤销' }, + { role: 'redo', label: '重做'}, + { type: 'separator' }, + { role: 'selectall', label: '全选' }, + ]) + + win.webContents.on('context-menu', (e, props) => { + const { selectionText, isEditable } = props + if (isEditable) { + inputMenu.popup({ window: win }) + } else if (selectionText && selectionText.trim() !== '') { + selectionMenu.popup({ window: win }) + } + }) } const showWindow = () => { From ba9d04fe81b1077366d54e1253ab18d3d0c74600 Mon Sep 17 00:00:00 2001 From: purocean Date: Wed, 14 Aug 2019 14:04:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- app/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d2d82951..9b9ef6b5 100644 --- a/README.md +++ b/README.md @@ -159,7 +159,7 @@ yarn run start ## 更新日志 [最新发布](https://github.com/purocean/yn/releases) -### [v2.0.0-beta5.1](https://github.com/purocean/yn/releases/tag/v2.0.0-beta5.1) 2019-08-14 +### [v2.0.0-beta5.2](https://github.com/purocean/yn/releases/tag/v2.0.0-beta5.2) 2019-08-14 1. 增加 2.0 计划 1. Electron 打包 1. 增加 HTML 小工具渲染 diff --git a/app/package.json b/app/package.json index 6b3b3d2c..72c3d99d 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "yank.note.yang", - "version": "2.0.0-beta5.1", + "version": "2.0.0-beta5.2", "description": "Yank-Note", "main": "dist/app.js", "author": {