编辑器全屏功能,窗口模式调整

This commit is contained in:
fofolee 2020-06-28 17:46:12 +08:00
parent 3252ad3909
commit 85a923c438

View File

@ -1,10 +1,11 @@
let getDB = id => {
!function () {
getDB = id => {
var db = utools.db.get(id),
dbData = db ? db.data : {};
return dbData;
}
}
let putDB = (code, pushData, id) => {
putDB = (code, pushData, id) => {
var db = utools.db.get(id);
if (db) {
var rev = db._rev
@ -16,10 +17,10 @@ let putDB = (code, pushData, id) => {
data[code] = pushData;
utools.db.put({ _id: id, data: data });
}
}
}
// 导入
let importCommand = file => {
// 导入
let importCommand = file => {
var options = file ? { type: 'file', argvs: file } : { type: 'dialog', argvs: { filters: [{ name: 'json', extensions: ['json'] }] } }
options.readfile = true
var fileinfo = getFileInfo(options)
@ -46,9 +47,9 @@ let importCommand = file => {
Swal.fire({ icon: 'error', title: '啊嘞?!', text: '格式错误!', })
}
}
}
}
let exportAll = () => {
let exportAll = () => {
json = utools.db.get('customFts').data,
options = {
title: '选择保存位置',
@ -58,10 +59,9 @@ let exportAll = () => {
]
};
window.saveFile(options, JSON.stringify(json));
}
}
let clearAll = () => {
let clearAll = () => {
Swal.fire({
text: '将会清空所有命令,请确认!',
icon: 'warning',
@ -77,9 +77,9 @@ let clearAll = () => {
showOptions();
}
})
}
}
let programs = {
programs = {
shell: {
bin: 'bash',
argv: '',
@ -164,9 +164,9 @@ let programs = {
codec: '',
color: '#438eff'
}
}
}
let showOptions = (tag = "默认") => {
showOptions = (tag = "默认") => {
$("#options").empty().fadeIn();
var currentFts = utools.getFeatures(),
customFts = getDB('customFts');
@ -185,21 +185,25 @@ let showOptions = (tag = "默认") => {
if (!fts.tags) return false
if (!fts.tags.includes(tag)) return false
}
var cmds = '', rules;
var cmds = '', rules = features.cmds[0].match;
if (features.cmds[0].type == 'regex') {
rules = features.cmds[0].match;
if (rules.length > 15) rules = rules.slice(0, 15) + '...';
cmds = `<div class="topchild">正则</div><div><span class="keyword re">${rules}</span></div>`;
} else if (features.cmds[0].type == 'window') {
rules = features.cmds[0].match.app.join(",")
if(rules.length > 15) rules = rules.slice(0, 15) + '...';
cmds += `<div class="topchild">窗口</div><div>`
if (!rules) {
cmds += `<span class="keyword win">所有窗口</span>`
} else if (rules.title || rules.class) {
cmds += `<span class="keyword win">${JSON.stringify(rules).slice(0, 15) + '...'}</span>`;
} else if (rules.app) {
rules = rules.app.join(",")
if(rules.length > 15) rules = rules.slice(0, 15) + '...';
rules.split(',').forEach(r => {
cmds += `<span class="keyword win">${r}</span>`;
});
}
cmds += `</div>`
} else if (features.cmds[0].type == 'files') {
rules = features.cmds[0].match
if (rules.length > 15) rules = rules.slice(0, 15) + '...';
cmds = `<div class="topchild">文件</div><div><span class="keyword fil">${rules}</span></div>`;
} else {
@ -227,7 +231,7 @@ let showOptions = (tag = "默认") => {
<div class="topchild">${features.explain}</div>
<div>
<span class="info">
<span style="margin: 0; color: ${fts.program == 'quickcommand' ? "#00af2c;" : programs[fts.program].color}"></span>
<span style="margin: 0; font-size: smaller; color: ${fts.program == 'quickcommand' ? "#00af2c;" : programs[fts.program].color}"></span>
${fts.program} | ${platformIcons.join('')}
</div>
</td>
@ -262,9 +266,9 @@ let showOptions = (tag = "默认") => {
<div id="sample" class="footBtn">下载命令</div>
</div>`
$("#options").append(sidebar + featureList + footer)
}
}
let showCustomize = (readonly = false) => {
let showCustomize = (readonly = false) => {
$("#customize").remove();
let options = `<option>${Object.keys(programs).join('</option><option>')}</option>`
let allTags = []
@ -345,7 +349,7 @@ let showCustomize = (readonly = false) => {
<img id="win32" class="platform" src="./img/win32.svg">
<img id="darwin" class="platform" src="./img/darwin.svg">
<img id="linux" class="platform" src="./img/linux.svg">
${readonly ? '' : '<button class="button cmdBtn save">保存</button>'}
${(readonly && !fofoCommon.isDev()) ? '' : '<button class="button cmdBtn save">保存</button>'}
<button class="button cmdBtn run">运行</button>
<button class="button cmdBtn cancel">取消</button>
</p>`
@ -373,13 +377,13 @@ let showCustomize = (readonly = false) => {
maximumSelectionLength: 3,
dropdownParent: $("#customize")
}).on("select2:unselecting", e => {
(e.params.args.data.text == "默认") && e.preventDefault();
(e.params.args.data.text == "默认") && !fofoCommon.isDev() && e.preventDefault();
}).on("select2:selecting", e => {
(e.params.args.data.text == "默认" || e.params.args.data.text == "未分类") && e.preventDefault();
(e.params.args.data.text == "默认" || e.params.args.data.text == "未分类") && !fofoCommon.isDev() && e.preventDefault();
})
}
}
createEditor = () => {
let createEditor = () => {
window.editor = CodeMirror.fromTextArea(document.getElementById("cmd"), {
lineNumbers: true,
matchBrackets: true,
@ -389,8 +393,10 @@ createEditor = () => {
keyMap: "sublime",
theme: "mdn-like",
extraKeys: {
"Alt-Enter": cm => {
cm.setOption("fullScreen", !cm.getOption("fullScreen"));
"Alt-Enter": () => {
$('.CodeMirror').hasClass('CodeMirror-fullscreen') &&
$('.CodeMirror').removeClass('CodeMirror-fullscreen') ||
$('.CodeMirror').addClass('CodeMirror-fullscreen')
},
"Ctrl-B": () => {
runCurrentCommand()
@ -412,13 +418,13 @@ createEditor = () => {
window.editor.on("change", showHint);
window.editor.setOption("mode", 'javascript');
}
}
let showHint = () => {
showHint = () => {
editor.showHint({ completeSingle: false });
}
}
let beautifyCode = () => {
let beautifyCode = () => {
if ($("#customize").is(":parent")) {
var cmd = window.editor.getValue()
switch ($("#program").val()) {
@ -436,20 +442,20 @@ let beautifyCode = () => {
break;
}
}
}
}
// 获取特殊变量
let getSpecialVars = () => {
// 获取特殊变量
let getSpecialVars = () => {
var specialVars = []
$("#vars option").each(i => {
var selector = $("#vars option").eq(i)
if (selector.css('display') != 'none') specialVars.push(selector.val())
})
localStorage['specialVars'] = specialVars
}
}
let typeCheck = () => {
let typeCheck = () => {
var type = $("#type").val();
switch (type) {
case 'key':
@ -473,27 +479,27 @@ let typeCheck = () => {
$("#ruleWord").html("进&#12288;程");
$(".var.regex, .var.files").prop("disabled", true)
$(".var.window").prop("disabled", false)
$("#rule").prop("placeholder", '窗口进程名,多个用逗号隔开');
$("#rule").prop("placeholder", '多个窗口进程逗号隔开,留空匹配所有窗口');
break;
default:
break;
}
getSpecialVars()
}
}
let clearAllFeatures = () => {
let clearAllFeatures = () => {
for (var fts of utools.getFeatures()) {
utools.removeFeature(fts.code)
}
}
}
let hasCustomIcon = () => {
let hasCustomIcon = () => {
var src = $("#icon").attr('src');
var iconame = $("#iconame").val();
return /data:image\/png;base64,/.test(src) || iconame
}
}
let programCheck = () => {
let programCheck = () => {
let mode = $('#program').val();
$('.customscript').hide();
$('.quickactions').hide();
@ -529,10 +535,10 @@ let programCheck = () => {
break;
}
window.editor.setOption("mode", mode);
}
}
// 合规性校验
let cmdCheck = (type, cmd) => {
// 合规性校验
let cmdCheck = (type, cmd) => {
var blacklist
switch (type) {
case 'key':
@ -557,19 +563,19 @@ let cmdCheck = (type, cmd) => {
} else {
return true
}
}
}
// 开关
$("#options").on('change', 'input[type=checkbox]', function () {
// 开关
$("#options").on('change', 'input[type=checkbox]', function () {
var customFts = getDB('customFts'),
code = $(this).attr('id');
if (!utools.removeFeature(code)) {
utools.setFeature(customFts[code].features);
}
});
});
// 底部功能按钮
$("#options").on('click', '.footBtn', function () {
// 底部功能按钮
$("#options").on('click', '.footBtn', function () {
switch ($(this).attr('id')) {
case 'sample': visit('https://github.com/fofolee/uTools-QuickerCommand/tree/master/CommandCollections');
break;
@ -587,10 +593,10 @@ $("#options").on('click', '.footBtn', function () {
case 'clear': clearAll();
break;
}
})
})
// 编辑
$("#options").on('click', '.editBtn', function () {
// 编辑
$("#options").on('click', '.editBtn', function () {
var readonly = false,
code = $(this).attr('code'),
data = utools.db.get("customFts").data[code],
@ -604,7 +610,9 @@ $("#options").on('click', '.editBtn', function () {
if (cmds.type == 'regex' || cmds.type == 'files') {
$('#rule').val(cmds.match);
} else if (cmds.type == 'window') {
$('#rule').val(cmds.match.app);
if (!cmds.match) $('#rule').val('');
else if (cmds.match.title || cmds.match.class) $('#rule').val(JSON.stringify(cmds.match));
else $('#rule').val(cmds.match.app);
} else {
$('#type').val('key').trigger("change")
$('#rule').val(data.features.cmds.toString());
@ -629,10 +637,10 @@ $("#options").on('click', '.editBtn', function () {
$("#customize").animate({ top: '0px' }, () => {
window.editor.replaceRange(data.cmd.slice(2000), {line: Infinity});
});
})
})
// 添加模拟按键
$("#options").on('click', '#addKey', function () {
// 添加模拟按键
$("#options").on('click', '#addKey', function () {
$("#addKey").text("▶ 录制中").addClass('record')
message('开始录制按键,可连续录制')
Mousetrap.record(sequence => {
@ -643,17 +651,17 @@ $("#options").on('click', '#addKey', function () {
})
$("#addKey").text("﹢按键").removeClass('record')
});
})
})
// quickCommand的帮助
$("#options").on('click', '#showHelp', function () {
// quickCommand的帮助
$("#options").on('click', '#showHelp', function () {
$.get('./HELP.md', r => {
utools.ubrowser.goto(r).run()
})
})
})
// 添加动作
$("#options").on('click', '#addAction', function () {
// 添加动作
$("#options").on('click', '#addAction', function () {
var html = `
<select id="actionType" class="swal2-select" style="width: 80%; height: 3rem;">
<option value="open" args="文件、文件夹或软件的绝对路径">打开文件/文件夹/软件</option>
@ -689,10 +697,10 @@ $("#options").on('click', '#addAction', function () {
window.editor.replaceSelection(`${action}\n`)
}
})
})
})
// 导出
$("#options").on('click', '.exportBtn', function () {
// 导出
$("#options").on('click', '.exportBtn', function () {
var code = $(this).attr('code'),
json = getDB('customFts')[code],
options = {
@ -702,10 +710,10 @@ $("#options").on('click', '.exportBtn', function () {
]
};
window.saveFile(options, JSON.stringify(json));
})
})
// 删除
$("#options").on('click', '.delBtn', function () {
// 删除
$("#options").on('click', '.delBtn', function () {
Swal.fire({
text: '删除这个快捷命令',
icon: 'warning',
@ -727,10 +735,10 @@ $("#options").on('click', '.delBtn', function () {
showOptions(currentTag);
}
})
})
})
// 选择图标
$("#options").on('click', '#icon, #iconame', function () {
// 选择图标
$("#options").on('click', '#icon, #iconame', function () {
var options = {
buttonLabel: '选择',
filters: [{
@ -743,17 +751,17 @@ $("#options").on('click', '#icon, #iconame', function () {
$("#iconame").val(file.name);
$("#icon").attr('src', file.path);
}
})
})
let SaveCurrentCommand = async (debug = false) => {
let SaveCurrentCommand = async () => {
if ($('#tags').is(":parent")) {
var type = $('#type').val(),
code = $("#code").val(),
tags = $('#tags').val(),
rule = $('#rule').val(),
cmd = window.editor.getValue();
if (tags && tags.includes("默认") && !debug) return
if (!rule) return swal.fire(`${$('#ruleWord').text().replace(" ", "")} 不能留空!`)
if (tags && tags.includes("默认") && !fofoCommon.isDev()) return
if (type != "window" && !rule) return swal.fire(`${$('#ruleWord').text().replace(" ", "")} 不能留空!`)
if (!cmdCheck(type, cmd)) return
if (!code) {
// 生成唯一code
@ -870,10 +878,10 @@ let SaveCurrentCommand = async (debug = false) => {
}
});
}
}
}
// 显示运行结果
let showRunResult = (content, raw, success) => {
// 显示运行结果
let showRunResult = (content, raw, success) => {
var options, position, showClass, hideClass, maxlength = 100000
if ($("#vars").is(":parent")) {
position = 'top'
@ -910,9 +918,9 @@ let showRunResult = (content, raw, success) => {
}
success ? swalOneByOne(options) : Swal.fire(options)
}
}
}
let runCurrentCommand = async () => {
let runCurrentCommand = async () => {
if ($("#customize").is(":parent")) {
var cmd = window.editor.getValue()
cmd = special(cmd)
@ -969,31 +977,31 @@ let runCurrentCommand = async () => {
})
}
}
}
}
let killCurrentCommand = () => {
let killCurrentCommand = () => {
}
}
let quitCurrentCommand = () => {
let quitCurrentCommand = () => {
if ($("#customize").is(":parent") && $("#featureList").is(":parent")) {
$("#customize").animate({ top: '100%' });
$("#customize").empty()
}
}
}
let highlightIfKnown = ext => {
let highlightIfKnown = ext => {
var lang = Object.keys(programs).filter(p => programs[p].ext == ext)
if (lang.length) {
if (lang[0] == 'python') getPythonMods()
window.editor.setOption("mode", lang[0])
return lang[0]
}
}
}
showCodeEditor = file => {
showCodeEditor = file => {
let options = `<option>${Object.keys(programs).join('</option><option>')}</option>`
var customWindow = `
<div id="customize">
<select id="program">
<option value="quickcommand">quickcommand</option>
@ -1013,12 +1021,12 @@ showCodeEditor = file => {
<span id="addKey" class="footBtn robot">按键</span>
<span id="showHelp" class="footBtn robot">帮助</span>
</span>
<textarea id="cmd" placeholder="可以直接拖放脚本文件至此处, 支持VSCode快捷键\nCtrl+B 运行\nCtrl+F 搜索\nShift+Alt+F 格式化仅JS/PY"></textarea>
<textarea id="cmd" placeholder="可以直接拖放脚本文件至此处, 支持VSCode快捷键\nCtrl+B 运行\nCtrl+F 搜索\nAlt+Enter 全屏\nShift+Alt+F 格式化仅JS/PY"></textarea>
</div>
`
$("#options").html(customWindow)
createEditor()
$(".CodeMirror").css({ bottom: "0", top: "33px", left: "0", right: "0" })
$(".CodeMirror").addClass('CodeMirror-coderunner')
$("#customize").css({ top: '0px', padding: '0px' });
$("span.customscript > input").css({"height": "30px"})
var db = getDB('codeHistory')
@ -1044,81 +1052,82 @@ showCodeEditor = file => {
}
programCheck()
$('#program').select2({
width: 130,
width: 140,
minimumResultsForSearch: Infinity,
dropdownParent: $("#customize"),
dropdownAutoWidth: true
});
$("#options").show()
}
}
// 切换TAGS
$("#options").on('click', '.sidebar li', function () {
// 切换TAGS
$("#options").on('click', '.sidebar li', function () {
showOptions($(this).text());
})
})
// 运行
$("#options").on('click', '.cmdBtn.run, #runCode', function () {
// 运行
$("#options").on('click', '.cmdBtn.run, #runCode', function () {
runCurrentCommand()
})
})
// 格式化
$("#options").on('click', '#beautifyCode', function () {
// 格式化
$("#options").on('click', '#beautifyCode', function () {
beautifyCode()
})
})
// 取消
$("#options").on('click', '.cmdBtn.cancel', function () {
// 取消
$("#options").on('click', '.cmdBtn.cancel', function () {
quitCurrentCommand()
})
})
// 保存
$("#options").on('click', '.cmdBtn.save', function () {
// 保存
$("#options").on('click', '.cmdBtn.save', function () {
SaveCurrentCommand()
})
})
// 语言选项改变时
$("#options").on('change', '#program', function () {
// 语言选项改变时
$("#options").on('change', '#program', function () {
programCheck()
})
})
// 变量选项改变时
$("#options").on('change', '#vars', function () {
// 变量选项改变时
$("#options").on('change', '#vars', function () {
$("#vars").css({'color':'black'})
window.editor.replaceSelection($("#vars").val());
})
})
$("#options").on('change', '#action', function () {
$("#options").on('change', '#action', function () {
$("#action").css({ 'color': 'black' })
})
})
// 方式选项改变时
$("#options").on('change', '#type', function () {
// 方式选项改变时
$("#options").on('change', '#type', function () {
// resetVars();
typeCheck();
})
})
// 平台按钮
$("#options").on('click', '.platform', function () {
// 平台按钮
$("#options").on('click', '.platform', function () {
if ($(this).hasClass('disabled')){
$(this).removeClass('disabled')
} else {
if ($('.disabled').length == 2) message('至少保留一个平台')
else $(this).addClass('disabled')
}
})
})
Mousetrap.bind('ctrl+s', () => {
Mousetrap.bind('ctrl+s', () => {
SaveCurrentCommand()
return false
});
});
Mousetrap.bind('ctrl+q', () => {
Mousetrap.bind('ctrl+q', () => {
quitCurrentCommand()
return false
});
});
Mousetrap.bind('ctrl+b', () => {
Mousetrap.bind('ctrl+b', () => {
runCurrentCommand()
return false
});
});
}()