-
-
+ >
- ![]()
+ ![]()
- ![]()
+ ![]()
import MonocaEditor from "components/MonocaEditor";
-import commandTypes from "../js/options/commandTypes.js";
-import outputTypes from "../js/options/outputTypes.js";
-
-let commandTypesOptions = Object.values(commandTypes);
+import CommandMenu from "components/CommandMenu";
export default {
- components: { MonocaEditor },
+ components: { MonocaEditor, CommandMenu },
data() {
return {
programLanguages: Object.keys(this.$programmings),
- currentMatchType: "关键字",
- sideBarWidth: "240px",
+ sideBarWidth: "290px",
languageBarHeight: "40px",
- commandTypes: commandTypes,
- commandTypesOptions: commandTypesOptions,
- cmdType: commandTypesOptions[0],
- cmdMatch: "",
- outputTypes: outputTypes,
- outputTypesOptions: Object.keys(outputTypes),
- specilaVar: "{{input}}",
+ canCommandSave: this.action.type === "edit" ? true : false,
quickcommandInfo: {
features: {
explain: "",
- platform: [],
+ platform: ["win32", "linux", "darwin"],
},
program: "quickcommand",
cmd: "",
@@ -346,8 +189,8 @@ export default {
resultMaxLength: 10000,
showSidebar: this.action.type !== "run",
isRunCodePage: this.action.type === "run",
+ parent: this.$parent.$parent.$parent.$parent,
commandString: this.$q.platform.is.mac ? "⌘" : "ctrl",
- configurationPage: this.$parent.$parent.$parent.$parent,
};
},
props: {
@@ -355,16 +198,11 @@ export default {
},
mounted() {
this.init();
+ this.$refs.menu?.init();
},
computed: {
- commandIcon() {
- return this.quickcommandInfo.features?.icon || this.currentProgramLogo;
- },
- currentProgramLogo() {
- return "/logo/" + this.quickcommandInfo.program + ".png";
- },
allQuickCommandTags() {
- return this.configurationPage.allQuickCommandTags.filter(
+ return this.parentPage.allQuickCommandTags.filter(
(x) => x !== "默认" && x !== "未分类" && x !== "搜索结果"
);
},
@@ -382,14 +220,13 @@ export default {
this.quickcommandInfo,
JSON.parse(JSON.stringify(quickCommandInfo))
);
- // 获取当前命令的匹配类型及匹配规则
- let currentQuickCommandCmds = this.getCommandType();
- // 设置匹配类型下拉框的值（Object）及匹配规则的值
- this.cmdType = this.commandTypes[currentQuickCommandCmds.type];
- this.cmdMatch = currentQuickCommandCmds.match;
// monoca 相关
this.setLanguage(this.quickcommandInfo.program);
this.$refs.editor.setEditorValue(quickCommandInfo.cmd);
+ // 默认命令不可编辑
+ if (this.quickcommandInfo.tags?.includes("默认") && !utools.isDev()) {
+ this.canCommandSave = false;
+ }
// 只有新建或运行时才保存记录
if (this.action.type === "edit") return;
utools.onPluginOut(() => {
@@ -411,6 +248,7 @@ export default {
},
programChanged(value) {
this.setLanguage(value);
+ this.$refs.menu?.setIcon(value);
},
// 匹配编程语言
matchLanguage() {
@@ -426,6 +264,9 @@ export default {
let highlight = this.$programmings[language].highlight;
this.$refs.editor.setEditorLanguage(highlight ? highlight : language);
},
+ getLanguageIcon(program) {
+ return `/logo/${program}.png`;
+ },
// 打开文档
showHelp() {
utools.createBrowserWindow("./helps/quickcommand.html", {
@@ -523,7 +364,7 @@ export default {
// 替换特殊变量
async replaceTempInputVals(cmd) {
let tempInputVals = [];
- let specilaVals = [
+ let needInputVal = [
"input",
"subinput",
"pwd",
@@ -531,7 +372,7 @@ export default {
"WindowInfo",
"MatchedFiles",
];
- specilaVals.forEach((x) => {
+ needInputVal.forEach((x) => {
let m = cmd.match(new RegExp("{{" + x + ".*?}}", "g"));
m &&
m.forEach((y) => tempInputVals.includes(y) || tempInputVals.push(y));
@@ -568,47 +409,6 @@ export default {
},
// 保存
saveCurrentCommand() {},
- // 判断命令类型
- getCommandType() {
- let data = {};
- let cmds = this.quickcommandInfo.features.cmds;
- if (cmds.length === 1) {
- let { type, match } = cmds[0];
- data.type = type ? type : "keyword";
- data.match =
- data.type === "keyword" ? cmds[0] : match?.app ? match.app : match;
- } else {
- data.type = cmds.filter((x) => !x.length).length
- ? "professional"
- : "keyword";
- data.match =
- data.type === "keyword" ? cmds : JSON.stringify(cmds, null, 4);
- }
- return data;
- },
- // 正则不和规则自动加斜杠
- cmdMatchVerify() {
- this.cmdType.valueType === "regex" &&
- !/^\/.*?\/[igm]*$/.test(this.cmdMatch) &&
- (this.cmdMatch = `/${this.cmdMatch}/`);
- },
- // 平台为空自动补充
- platformVerify() {
- this.quickcommandInfo.features.platform > 0 ||
- this.quickcommandInfo.features.platform.push(window.processPlatform);
- },
},
};
-
-
diff --git a/src/components/CommandMenu.vue b/src/components/CommandMenu.vue
new file mode 100644
index 0000000..c02d372
--- /dev/null
+++ b/src/components/CommandMenu.vue
@@ -0,0 +1,352 @@
+
+
+
+
+
+
+
+
diff --git a/src/js/options/commandTypes.js b/src/js/options/commandTypes.js
index 9eaeed3..ac723b0 100644
--- a/src/js/options/commandTypes.js
+++ b/src/js/options/commandTypes.js
@@ -1,11 +1,13 @@
const commandTypes = {
- keyword: {
- name: "keyword",
+ key: {
+ name: "key",
label: "关键词",
icon: "font_download",
matchLabel: "关键词",
desc: "在主输入框输入对应关键字进入插件，最通用的一种模式，关键字可以设置多个",
- valueType: "array"
+ valueType: "array",
+ matchToCmds: (rules, desc) => rules,
+ verify: (rules) => rules.length > 0 || "关键词不能为空"
},
regex: {
name: "regex",
@@ -13,7 +15,14 @@ const commandTypes = {
matchLabel: "正则",
icon: "rule",
desc: "匹配主输入框或超级面板选中的文本，可以获取输入框文本或选中文本作为变量",
- valueType: "regex"
+ valueType: "regex",
+ matchToCmds: (rules, desc) => [{
+ label: desc,
+ type: "regex",
+ match: rules,
+ minNum: 1,
+ }, ],
+ verify: rules => !!rules > 0 || "正则不能为空"
},
over: {
name: "over",
@@ -21,7 +30,13 @@ const commandTypes = {
matchLabel: "无需设置",
icon: "emergency",
desc: "匹配主输入框的所有文本，但只有在该文本未设置对应的插件或功能时才生效",
- valueType: "null"
+ valueType: null,
+ matchToCmds: (rules, desc) => [{
+ label: desc,
+ type: "over",
+ minNum: 1,
+ }],
+ verify: rules => true
},
window: {
name: "window",
@@ -29,7 +44,15 @@ const commandTypes = {
matchLabel: "进程名",
icon: "widgets",
desc: "匹配呼出uTools前或唤出超级面板时的活动窗口，可以获取窗口的信息或文件夹路径作为变量",
- valueType: "array"
+ valueType: "array",
+ matchToCmds: (rules, desc) => [{
+ type: "window",
+ label: desc,
+ match: {
+ "app": rules
+ }
+ }],
+ verify: rules => rules.length > 0 || "进程名不能为空"
},
img: {
name: "img",
@@ -37,7 +60,12 @@ const commandTypes = {
matchLabel: "无需配置",
icon: "panorama",
desc: "匹配主输入框或超级面板选中的图片，并返回图片的 base64",
- valueType: "null"
+ valueType: null,
+ matchToCmds: (rules, desc) => [{
+ label: desc,
+ type: "img",
+ }],
+ verify: rules => true
},
files: {
name: "files",
@@ -45,7 +73,14 @@ const commandTypes = {
matchLabel: "正则",
icon: "description",
desc: "匹配主输入框或超级面板选中的文件，可以获取复制及选中的文件信息作为变量",
- valueType: "regex"
+ valueType: "regex",
+ matchToCmds: (rules, desc) => [{
+ type: "files",
+ label: desc,
+ match: rules,
+ "minLength": 1,
+ }, ],
+ verify: rules => !!rules > 0 || "正则不能为空"
},
professional: {
@@ -54,8 +89,60 @@ const commandTypes = {
matchLabel: "json配置",
icon: "construction",
desc: "通过json格式的配置实现同时匹配关键字、窗口、文件甚至图片，或者指定文件数量、窗口类等",
- valueType: "json"
+ valueType: "json",
+ matchToCmds: (rules, desc) => JSON.parse(rules),
+ verify: rules => {
+ try {
+ JSON.parse(rules);
+ return true
+ } catch (error) {
+ return "专业模式json配置错误"
+ }
+ },
+ jsonSample: [
+ "关键词",
+ {
+ "type": "img",
+ "label": "图片匹配"
+ },
+ {
+ "type": "files",
+ "label": "文件匹配",
+ "fileType": "file",
+ "match": "/aaa/",
+ "minLength": 1,
+ "maxLength": 99
+ },
+ {
+ "type": "regex",
+ "label": "文本正则匹配",
+ "match": "/bbb/i",
+ "minLength": 1,
+ "maxLength": 99
+ },
+ {
+ "type": "over",
+ "label": "无匹配时",
+ "exclude": "/ccc/i",
+ "minLength": 1,
+ "maxLength": 99
+ },
+ {
+ "type": "window",
+ "label": "窗口动作",
+ "match": {
+ "app": [
+ "ddd.app",
+ "eee.exe"
+ ],
+ "title": "/fff/",
+ "class": [
+ "ggg"
+ ]
+ }
+ }
+ ]
}
}
-export default commandTypes
\ No newline at end of file
+export default commandTypes
diff --git a/src/js/options/specialVars.js b/src/js/options/specialVars.js
new file mode 100644
index 0000000..f40c5d9
--- /dev/null
+++ b/src/js/options/specialVars.js
@@ -0,0 +1,64 @@
+const specialVars = {
+ isWin: {
+ name: "isWin",
+ label: "{{isWin}}",
+ desc: "是否Window系统, 返回1或0"
+ },
+ LocalId: {
+ name: "LocalId",
+ label: "{{LocalId}}",
+ desc: "本机唯一ID"
+ },
+ BrowserUrl: {
+ name: "BrowserUrl",
+ label: "{{BrowserUrl}}",
+ desc: "浏览器当前链接"
+ },
+ ClipText: {
+ name: "ClipText",
+ label: "{{ClipText}}",
+ desc: "剪贴板内容"
+ },
+ subinput: {
+ name: "subinput",
+ label: "{{subinput}}",
+ desc: "子输入框的文本"
+ },
+ input: {
+ name: "input",
+ label: "{{input}}",
+ desc: "主输入框的文本"
+ },
+ pwd: {
+ name: "pwd",
+ label: "{{pwd}}",
+ desc: "文件管理器当前目录"
+ },
+ WindowInfo: {
+ name: "WindowInfo",
+ label: "{{WindowInfo}}",
+ desc: "当前窗口信息，JSON格式"
+ },
+ SelectFile: {
+ name: "SelectFile",
+ label: "{{SelectFile}}",
+ desc: "文件管理器选中的文件，不支持Linux"
+ },
+ MatchedFiles: {
+ name: "MatchedFiles",
+ label: "{{MatchedFiles}}",
+ desc: "匹配的文件，JSON格式"
+ },
+ type: {
+ name: "type",
+ label: "{{type}}",
+ desc: "专业模式的type"
+ },
+ payload: {
+ name: "payload",
+ label: "{{payload}}",
+ desc: "专业模式的payload,JSON格式"
+ }
+}
+
+export default specialVars
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.opt.desc }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.opt.desc }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.opt.desc }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+