diff --git a/assets/options.js b/assets/options.js index 4f05a40..680127c 100644 --- a/assets/options.js +++ b/assets/options.js @@ -206,9 +206,9 @@ showCustomize = () => { - + - + aa 输 出 @@ -359,20 +359,33 @@ $("#options").on('click', '#icon, #iconame', function () { // 保存 $("#options").on('click', '.saveBtn', function () { var code = $('#kw').val().split(',')[0].trim() - var customFts = getCustomFts(); + var customFts = getCustomFts(), + output = $('#output').val(), + cmd = window.editor.getValue(); // 如果 code 重复, 编辑状态下不检测 if (code in customFts && !$('#kw').attr('edit')) { $('#kw').css({ 'border-bottom-color': '#ec1212' }) - window.messageBox({ type: 'error', icon: window.logo, message: "命令名称重复!", buttons: ['朕知道了'] }) + window.messageBox({ + type: 'error', + icon: window.logo, + message: "命令名称重复!", + buttons: ['朕知道了'] + }) + } else if (['text', 'html'].includes($('#output').val()) + && ['{{SelectText}}', '{{SelectFile}}', '{{pwd}}'].map(x => cmd.includes(x)).includes(true)) { + window.messageBox({ + type: 'error', + icon: window.logo, + message: "显示文本或html输出时无法使用{{SelectText}}、{{SelectFile}}或{{pwd}}!", + buttons: ['朕知道了'] + }) } else { var kw = $('#kw').val().split(','), program = $('#program').val(), desc = $('#desc').val(), - output = $('#output').val(), codec = $('#codec').val(), iconame = $("#iconame").val(), iconpath = $("#icon").attr('src'), - cmd = window.editor.getValue(), icon, base64ico, hasSubInput;