18069996051/mixly3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!7 feat(帮助): 修复帮助页面快捷键

Browse Source 
* Revert "feat(common): 主页面添加鼠标滚轮翻页功能"
* feat(帮助): 修复帮助页面快捷键
* Merge branch 'master' of https://gitee.com/dream-to-cloud-sail/mixly3
* feat(common): 主页面添加鼠标滚轮翻页功能
This commit is contained in:
梦归云帆
2025-05-09 17:23:53 +00:00
committed by 王立帮
parent f814587474
commit 1354d619d0
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
boards/default_src/arduino_avr/blocks/logic.js
View File

@@ -23,7 +23,7 @@ export const logic_compare = {
['>', 'GT'], ['>', 'GT'],
['\u2265', 'GTE'] ['\u2265', 'GTE']
]; ];
//this.setHelpUrl(Blockly.Msg.LOGIC_COMPARE_HELPURL); this.setHelpUrl("https://mixly.readthedocs.io/zh-cn/latest/Arduino/AVR/04Logic.html#id2");
this.setColour(LOGIC_HUE); this.setColour(LOGIC_HUE);
this.setOutput(true, Boolean); this.setOutput(true, Boolean);
this.appendValueInput('A'); this.appendValueInput('A');
@@ -58,7 +58,7 @@ export const logic_operation = {
[Blockly.Msg.LOGIC_OPERATION_AND, 'AND'], [Blockly.Msg.LOGIC_OPERATION_AND, 'AND'],
[Blockly.Msg.LOGIC_OPERATION_OR, 'OR'] [Blockly.Msg.LOGIC_OPERATION_OR, 'OR']
]; ];
//this.setHelpUrl(Blockly.Msg.LOGIC_OPERATION_HELPURL); this.setHelpUrl("https://mixly.readthedocs.io/zh-cn/latest/Arduino/AVR/04Logic.html#id12");
this.setColour(LOGIC_HUE); this.setColour(LOGIC_HUE);
this.setOutput(true, Boolean); this.setOutput(true, Boolean);
this.appendValueInput('A') this.appendValueInput('A')
@@ -144,5 +144,6 @@ export const logic_true_or_false = {
this.setOutput(true); this.setOutput(true);
this.setInputsInline(true); this.setInputsInline(true);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_LOGIT_TRUEORFALSE); this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_LOGIT_TRUEORFALSE);
this.setHelpUrl("https://mixly.readthedocs.io/zh-cn/latest/Arduino/AVR/04Logic.html#id17");
} }
}; };

10
main.js
View File

@@ -167,11 +167,11 @@ function createWindow(filePath = null, indexUrl = null) {
//打开帮助页面 //打开帮助页面
electronLocalshortcut.register(win, 'CmdOrCtrl+H', () => { electronLocalshortcut.register(win, 'CmdOrCtrl+H', () => {
var sendObj = {}; const winHelp = new BrowserWindow({ parent: win });
sendObj.type = "help"; //打开子窗口
var sendStr = JSON.stringify(sendObj); winHelp.loadURL("https://mixly.readthedocs.io/zh-cn/latest/contents.html");
win.webContents.send('ping', sendStr); //直接调用系统默认浏览器打开
//win.webContents.executeJavaScript('alert("this is a test!");'); //shell.openExternal("https://mixly.readthedocs.io/zh-cn/latest/contents.html")
}); });
//创建一个新页面 //创建一个新页面