From c78581bc76b6fc84a2da925e52f7c81ffddee6b3 Mon Sep 17 00:00:00 2001 From: fofolee Date: Sun, 10 Apr 2022 12:29:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87=E5=8C=B9?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CommandCard.vue | 2 +- src/js/options/commandTypes.js | 8 ++++---- src/js/options/specialVars.js | 7 +++++++ src/router/routes.js | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/components/CommandCard.vue b/src/components/CommandCard.vue index ae17cbe..0a1d951 100644 --- a/src/components/CommandCard.vue +++ b/src/components/CommandCard.vue @@ -170,7 +170,7 @@ - + 图片 diff --git a/src/js/options/commandTypes.js b/src/js/options/commandTypes.js index af5885c..39bd431 100644 --- a/src/js/options/commandTypes.js +++ b/src/js/options/commandTypes.js @@ -65,7 +65,7 @@ const commandTypes = { icon: "rule", desc: "匹配主输入框或超级面板选中的文本,可以获取输入框文本或选中文本作为变量", valueType: "regex", - disabledSpecialVars: /{{SelectFile}}|{{WindowInfo.*?}}|{{pwd}}|{{MatchedFiles.*?}}/g, + disabledSpecialVars: /{{SelectFile}}|{{MatchImage}}|{{WindowInfo.*?}}|{{pwd}}|{{MatchedFiles.*?}}/g, matchToCmds: (rules, desc) => [{ label: desc, type: "regex", @@ -81,7 +81,7 @@ const commandTypes = { icon: "emergency", desc: "匹配主输入框的所有文本,但只有在该文本未设置对应的插件或功能时才生效", valueType: null, - disabledSpecialVars: /{{SelectFile}}|{{WindowInfo.*?}}|{{pwd}}|{{MatchedFiles.*?}}/g, + disabledSpecialVars: /{{SelectFile}}|{{MatchImage}}|{{WindowInfo.*?}}|{{pwd}}|{{MatchedFiles.*?}}/g, matchToCmds: (rules, desc) => [{ label: desc, type: "over", @@ -96,7 +96,7 @@ const commandTypes = { icon: "widgets", desc: "匹配呼出uTools前或唤出超级面板时的活动窗口,可以获取窗口的信息或文件夹路径作为变量", valueType: "array", - disabledSpecialVars: /{{input}}|{{MatchedFiles.*?}}/g, + disabledSpecialVars: /{{input}}|{{MatchImage}}|{{MatchedFiles.*?}}/g, matchToCmds: (rules, desc) => [{ type: "window", label: desc, @@ -127,7 +127,7 @@ const commandTypes = { icon: "description", desc: "匹配主输入框或超级面板选中的文件,可以获取复制及选中的文件信息作为变量", valueType: "regex", - disabledSpecialVars: /{{input}}|{{SelectFile}}|{{pwd}}|{{WindowInfo.*?}}/g, + disabledSpecialVars: /{{input}}|{{MatchImage}}|{{SelectFile}}|{{pwd}}|{{WindowInfo.*?}}/g, matchToCmds: (rules, desc) => [{ type: "files", label: desc, diff --git a/src/js/options/specialVars.js b/src/js/options/specialVars.js index 135b46b..518284e 100644 --- a/src/js/options/specialVars.js +++ b/src/js/options/specialVars.js @@ -90,6 +90,13 @@ const specialVars = { match: /{{WindowInfo(.*?)}}/mg, repl: jsonVar => handlingJsonVar(jsonVar, "WindowInfo") }, + MatchImage: { + name: "MatchImage", + label: "{{MatchImage}}", + desc: "匹配到图片的 DataUrl", + match: /{{MatchImage}}/mg, + repl: () => quickcommand.enterData.payload + }, SelectFile: { name: "SelectFile", label: "{{SelectFile}}", diff --git a/src/router/routes.js b/src/router/routes.js index 98438dd..f1384de 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -14,7 +14,7 @@ const routes = [{ import ('pages/NewCommand.vue') }, { - path: '/:type(default|files|key|regex|window|professional)_:uid(\\w+)', + path: '/:type(default|files|img|key|regex|window|professional)_:uid(\\w+)', component: () => import ('pages/CommandPage.vue') },