diff --git a/src/assets/options.js b/src/assets/options.js index 05a6108..9b31dcb 100644 --- a/src/assets/options.js +++ b/src/assets/options.js @@ -183,9 +183,9 @@ showOptions = () => { - - - + + + ` }; featureList += `
@@ -277,6 +277,8 @@ showCustomize = () => { + + ﹢动作

@@ -343,7 +345,7 @@ typeCheck = () => { $("#ruleWord").html("进 程"); $(".var.regex").hide() $(".var.window").show() - $("#rule").prop("placeholder", '窗口的进程名,支持正则,如explorer.exe'); + $("#rule").prop("placeholder", '窗口的进程名,多个用逗号隔开'); break; default: break; @@ -432,7 +434,7 @@ $("#options").on('click', '#addKey', function () { var m1 = $('#modifier1').val(); var m2 = $('#modifier2').val(); var k = $('#presskey').val(); - var code = 'utools.robot.keyTap'; + var code = '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`; @@ -495,9 +497,15 @@ $("#options").on('click', '#addAction', async function () { case 'copyTo': text = '要写入的内容' break; + case 'send': + text = '要发送的文本' + break; case 'alert': text = '要弹窗的消息' break; + case 'ubrowser': + text = '要访问的网站' + break; default: Swal.fire({ icon: 'warning', @@ -510,8 +518,12 @@ $("#options").on('click', '#addAction', async function () { input: 'text', showCancelButton: true, }) - if (content) { - window.editor.replaceSelection(`${a}("${content.replace(/\\/g, '\\\\')}");\n`) + if (content) { + if (a == 'ubrowser') { + window.editor.replaceSelection(`utools.ubrowser.goto("${content}")\n .run()\n`) + } else { + window.editor.replaceSelection(`${a}("${content.replace(/\\/g, '\\\\')}");\n`) + } } }) @@ -625,7 +637,7 @@ $("#options").on('click', '.saveBtn', function () { "label": desc, "type": "window", "match": { - "app": rule + "app": rule.split(',') } }]; }