From 6a21e11817e1a831b4b257eac7f9719cf6069730 Mon Sep 17 00:00:00 2001 From: fofolee Date: Wed, 22 Apr 2020 01:20:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E6=8B=9F=E6=8C=89?= =?UTF-8?q?=E9=94=AE=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/index.js | 37 +++++++- src/assets/options.css | 30 +++++- src/assets/options.js | 208 ++++++++++++++++++++++++++++++----------- 3 files changed, 209 insertions(+), 66 deletions(-) diff --git a/src/assets/index.js b/src/assets/index.js index 18f596f..e1bd387 100755 --- a/src/assets/index.js +++ b/src/assets/index.js @@ -10,6 +10,13 @@ utools.onPluginEnter( async ({ code, type, payload }) => { $("#out").show().text(''); var db = utools.db.get('customFts').data[code], cmd = db.cmd; + if (db.robotjs) { + utools.setExpendHeight(0); + utools.hideMainWindow(); + eval(cmd); + utools.outPlugin(); + return; + } if (db.program == "custom") { option = db.customOptions; } else { @@ -68,9 +75,8 @@ utools.onPluginEnter( async ({ code, type, payload }) => { function runCmd(cmd, option, codec, output) { // 不需要输出的，提前关闭窗口 - if (['ignore', 'clip', 'send', 'notice', 'terminal'].indexOf(output) !== -1){ + if (['ignore', 'clip', 'send', 'notice', 'terminal'].indexOf(output) !== -1) { utools.hideMainWindow() - utools.outPlugin() } var terminal = false; if(output == 'terminal') terminal = true; @@ -78,8 +84,24 @@ function runCmd(cmd, option, codec, output) { window.run(cmd, option, codec, terminal, (stdout, stderr) => { if (stderr) { // 报错 - window.messageBox({ type: 'error', icon: window.logo, message: stderr, buttons: ['啊嘞?!'] }) - utools.outPlugin() + utools.showMainWindow() + Swal.fire({ + title: '啊嘞?!', + text: stderr, + icon: 'error', + showCancelButton: true, + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33', + confirmButtonText: '转至脚本目录', + cancelButtonText: '退出', + }).then((result) => { + if (result.value) { + open(resolve(tmpdir, `QuickCommandTempScript.${option.ext}`)); + } + copyTo(stderr); + utools.showNotification("已复制报错信息"); + utools.outPlugin(); + }) } else if (stdout) { // 有输出 switch (output) { @@ -91,6 +113,7 @@ function runCmd(cmd, option, codec, output) { break; case "clip": copyTo(stdout); + utools.outPlugin(); break; case "send": // 暂存用户剪贴板 @@ -100,12 +123,16 @@ function runCmd(cmd, option, codec, output) { setTimeout(() => { restoreClip(historyData); }, 500); + utools.outPlugin(); break; case "notice": // 发送系统通知 - utools.showNotification(stdout, null, true); + utools.showNotification(stdout); + utools.outPlugin(); break; case "ignore": + utools.outPlugin(); + break; default: break; } diff --git a/src/assets/options.css b/src/assets/options.css index 17d8b8e..c3b99a3 100755 --- a/src/assets/options.css +++ b/src/assets/options.css @@ -180,16 +180,37 @@ color: rgb(48, 21, 122); } +#options .keyword.key { + color: rgb(122, 115, 21); +} + #options .logo { width: 32px; } +#options #customize .robot{ + display: none; +} + +#options #customize .keys{ + width: 10%; +} + +#options #customize .robot.footBtn{ + background:#3085d6; + float: none; +} + +#options #customize .robot.footBtn:hover{ + background:#55aafa; +} + #options .footBtn { - float: right; /* right: 5px; bottom: 2px; */ - border-radius: 4px; + float: right; background: #00af2c; + border-radius: 4px; color: white; padding: 2px 5px; margin: 0px 5px; @@ -262,11 +283,10 @@ color: #bd3523; } -#options #customize input#custombin, -#options #customize input#customarg, -#options #customize input#customext { +#options #customize input.customscript { margin-left: 5px; width: 200px; + display: none; } #options #customize { diff --git a/src/assets/options.js b/src/assets/options.js index 1399e8a..9e38b4e 100755 --- a/src/assets/options.js +++ b/src/assets/options.js @@ -29,7 +29,11 @@ importCommand = () => { try { var pushData = JSON.parse(data); } catch (error) { - window.messageBox({ type: 'error', icon: window.logo, message: "格式错误！", buttons: ['朕知道了'] }) + Swal.fire({ + icon: 'error', + title: '啊嘞?!', + text: '格式错误!', + }) return } // 单个命令导入 @@ -45,7 +49,11 @@ importCommand = () => { } showOptions(); } else { - window.messageBox({ type: 'error', icon: window.logo, message: "格式错误！", buttons: ['朕知道了'] }) + Swal.fire({ + icon: 'error', + title: '啊嘞?!', + text: '格式错误!', + }) } } }) @@ -65,13 +73,21 @@ window.saveFile(options, JSON.stringify(json)); clearAll = () => { - window.messageBox({ type: 'question', icon: window.logo, message: "将会清空所有命令，请确认！", buttons: ['手抖...', '确定！'] }, index => { - if (index) { + Swal.fire({ + text: '将会清空所有命令，请确认！', + icon: 'warning', + showCancelButton: true, + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33', + confirmButtonText: '确定！', + cancelButtonText: '手抖...', + }).then((result) => { + if (result.value) { utools.db.remove('customFts'); clearAllFeatures(); showOptions(); - } - }) + } + }) } programs = { @@ -130,7 +146,7 @@ programs = { argv: '', ext: '' } - } +} showOptions = () => { var currentFts = utools.getFeatures(), @@ -146,7 +162,11 @@ showOptions = () => { } else if (features.cmds[0].type == 'window') { var app = features.cmds[0].match.app if (app.length > 15) app = app.slice(0, 15) + '...'; - cmds = `窗口: ${app}`; + if (customFts[fts].robotjs) { + cmds = `按键: ${app}`; + } else { + cmds = `窗口: ${app}`; + } } else { features.cmds.forEach(cmd => { cmds += `${cmd}`; @@ -178,6 +198,7 @@ showOptions = () => {
全部删除
全部禁用
全部启用
+
下载命令
` $("#options").html(featureList); } @@ -192,6 +213,7 @@ showCustomize = () => { + 关键字

说　明

@@ -232,9 +254,29 @@ showCustomize = () => {

脚　本 - - - + + + + 添加 + + 添加 + + + + +

@@ -249,7 +291,6 @@ showCustomize = () => { } else { var shell = 'shell', mode = 'shell'; - $("#codec").hide(); } $("#program").val(shell); $("#icon").attr('src', `logo/${shell}.png`); @@ -280,6 +321,8 @@ outputCheck = () => { // 检查模式选项 typeCheck = () => { var type = $("#type").val(); + $("#output, #program, #vars").prop("disabled", false); + $(".robot").hide() switch (type) { case 'key': $("#ruleWord").html("关键字"); @@ -293,6 +336,14 @@ typeCheck = () => { $(".var.window").hide() $("#rule").prop("placeholder", '匹配的正则规则，如/\\w+/i'); break; + case 'robotjs': + $("#ruleWord").html("进　程"); + $("#output, #program, #vars").prop("disabled", true).val(''); + $("#rule").prop("placeholder", '窗口的进程名，支持正则，如explorer.exe'); + $(".robot").show(); + $('.customscript').hide(); + window.editor.setOption("mode", 'javascript'); + break; case 'window': $("#ruleWord").html("进　程"); $(".var.regex").hide() @@ -322,6 +373,8 @@ $("#options").on('change', 'input[type=checkbox]', function () { // 底部功能按钮 $("#options").on('click', '.footBtn', function () { switch ($(this).attr('id')) { + case 'sample': visit('https://github.com/fofolee/uTools-QuickerCommand/tree/master/CommandCollections'); + break; case 'add': showCustomize(); break; case 'import': importCommand(); @@ -347,12 +400,13 @@ $("#options").on('click', '.editBtn', function () { var code = $(this).attr('code'); var data = utools.db.get("customFts").data[code]; showCustomize(); + var robotjs = data.robotjs; var cmds = data.features.cmds[0] if (cmds.type == 'regex') { $('#type').val('regex') $('#rule').val(cmds.match); } else if (cmds.type == 'window') { - $('#type').val('window') + robotjs ? $('#type').val('robotjs') : $('#type').val('window') $('#rule').val(cmds.match.app); } else { $('#type').val('key') @@ -362,7 +416,6 @@ $("#options").on('click', '.editBtn', function () { $('#program').val(data.program); $('#output').val(data.output); $('#desc').val(data.features.explain); - $('#codec').val(data.codec); $("#icon").attr('src', data.features.icon); let mode = data.program; if (mode == 'custom') { @@ -379,6 +432,51 @@ $("#options").on('click', '.editBtn', function () { outputCheck(); }) +// 添加模拟按键 +$("#options").on('click', '#addKey', function () { + var m1 = $('#modifier1').val(); + var m2 = $('#modifier2').val(); + var k = $('#presskey').val(); + var code = 'utools.robot.keyTap'; + if (/^(\S|f1[0-2]|f[1-9]|backspace|delete|enter|tab|escape|up|down|right|left|home|end|pageup|pagedown|command|alt|control|shift|right_shift|space|printscreen|insert')$/.test(k)) { + if (!m1 && !m2) { + code += `('${k}');\n`; + } else if(m1 && m2){ + code += `('${k}', ['${m1}', '${m2}']);\n` + } else { + code += `('${k}', '${m1}${m2}');\n` + } + window.editor.replaceSelection(code); + } else { + Swal.fire({ + text: '请输入正确的按键', + icon: 'warning', + showCancelButton: true, + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33', + confirmButtonText: '帮助', + cancelButtonText: '确定', + }).then((result) => { + if (result.value) { + visit('https://robotjs.io/docs/syntax#keys'); + } + }) + } +}) + +// 添加延时 +$("#options").on('click', '#addDelay', function () { + var t = $('#keydelay').val(); + if (/\d+/.test(t)) { + window.editor.replaceSelection(`utools.robot.setKeyboardDelay(${t});\n`) + } else { + Swal.fire({ + icon: 'warning', + text: '请输入正确的时间, 单位 ms', + }) + } +}) + // 导出 $("#options").on('click', '.exportBtn', function () { var code = $(this).attr('code'), @@ -431,40 +529,42 @@ $("#options").on('click', '.saveBtn', function () { // 合规性校验 if (type == 'key' && ['{{input}}', '{{SelectFile}}', '{{pwd}}', '{{WindowInfo}}'].map(x => cmd.includes(x)).includes(true)) { - window.messageBox({ - type: 'error', - icon: window.logo, - message: "关键字模式无法使用{{input}}、{{SelectFile}}、{{WindowInfo}}、{{pwd}}!", - buttons: ['朕知道了'] - }) + Swal.fire({ + icon: 'error', + title: '啊嘞?!', + text: '关键字模式无法使用{{input}}、{{SelectFile}}、{{WindowInfo}}、{{pwd}}!', + }) } else if (type == 'regex' - && ['{{SelectFile}}', '{{WindowInfo}}','{{pwd}}'].map(x => cmd.includes(x)).includes(true)) { - window.messageBox({ - type: 'error', - icon: window.logo, - message: "正则模式无法使用{{SelectFile}}、{{WindowInfo}}、{{pwd}}!", - buttons: ['朕知道了'] - }) + && ['{{SelectFile}}', '{{WindowInfo}}', '{{pwd}}'].map(x => cmd.includes(x)).includes(true)) { + Swal.fire({ + icon: 'error', + title: '啊嘞?!', + text: '正则模式无法使用{{SelectFile}}、{{WindowInfo}}、{{pwd}}!', + }) } else if (type == 'window' && cmd.includes('{{input}}')) { - window.messageBox({ - type: 'error', - icon: window.logo, - message: "窗口模式无法使用{{input}}!", - buttons: ['朕知道了'] - }) + Swal.fire({ + icon: 'error', + title: '啊嘞?!', + text: '窗口模式无法使用{{input}}!', + }) } else if (['text', 'html'].includes($('#output').val()) && cmd.includes('{{SelectText}}')) { - window.messageBox({ - type: 'error', - icon: window.logo, - message: "显示文本或html输出时无法使用{{SelectText}}!", - buttons: ['朕知道了'] - }) - } else { + Swal.fire({ + icon: 'error', + title: '啊嘞?!', + text: '显示文本或html输出时无法使用{{SelectText}}!', + }) + } else if (type == 'robotjs' && /\{\{.*?\}\}/.test(cmd)) { + Swal.fire({ + icon: 'error', + title: '啊嘞?!', + text: '模拟按键模式无法使用特殊变量!', + }) + }else { var program = $('#program').val(), desc = $('#desc').val(), - codec = $('#codec').val(), iconame = $("#iconame").val(), iconpath = $("#icon").attr('src'), + robotjs = false, icon, base64ico, hasSubInput; @@ -477,11 +577,9 @@ $("#options").on('click', '.saveBtn', function () { } else { icon = iconpath; } - var noKeyword; var rule = $('#rule').val(); if (type == 'key') { cmds = rule.split(',') - noKeyword = false; } if (type == 'regex') { cmds = [{ @@ -490,17 +588,15 @@ $("#options").on('click', '.saveBtn', function () { "match": rule, "minNum": 1 }]; - noKeyword = true; } - if (type == 'window') { + if (type == 'window' || type == 'robotjs') { cmds = [{ "label": desc, "type": "window", "match": { "app": rule - }, + } }]; - noKeyword = true; } // 需要子输入框 if (cmd.includes('{{subinput}}')) { @@ -509,6 +605,11 @@ $("#options").on('click', '.saveBtn', function () { hasSubInput = false; } $("#customize").animate({ top: '100%' }); + if (type == "robotjs") { + program = ""; + output = ""; + robotjs = true; + } // 添加特性 pushData = { features: { @@ -520,9 +621,8 @@ $("#options").on('click', '.saveBtn', function () { program: program, cmd: cmd, output: output, - codec: codec, - noKeyword: noKeyword, - hasSubInput: hasSubInput + hasSubInput: hasSubInput, + robotjs: robotjs } if (program == 'custom') { pushData.customOptions = { @@ -551,13 +651,9 @@ $("#options").on('change', '#program', function () { let mode = $(this).val(); if (!hasCustomIcon()) $("#icon").attr('src', `logo/${mode}.png`); if (mode == 'custom') { - $('#custombin').show(); - $('#customarg').show(); - $('#customext').show(); + $('.customscript').show(); } else { - $('#custombin').hide(); - $('#customarg').hide(); - $('#customext').hide(); + $('.customscript').hide(); } mode == 'applescript' && (mode = 'shell'); mode == 'cmd' && (mode = 'powershell');