From 52719bb0b8de191c3e7842a0666573157f54a800 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 10 Apr 2020 03:04:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AA=97=E5=8F=A3=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/index.js | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/assets/index.js b/assets/index.js
index ac2e9f7..f6da81d 100644
--- a/assets/index.js
+++ b/assets/index.js
@@ -1,4 +1,4 @@
-utools.onPluginEnter(({ code, type, payload }) => {
+utools.onPluginEnter( async ({ code, type, payload }) => {
     // checkUpdate();
     // 配置页面
     if (code == 'options') {
@@ -16,10 +16,28 @@ utools.onPluginEnter(({ code, type, payload }) => {
         } else {
             option = programs[db.program];
         }
-        // 通过主输入框直接进入
-        if (type == 'over') cmd = cmd.replace(/\{\{input\}\}/mg, payload);
+        // 正则
+        if (type == 'regex') cmd = cmd.replace(/\{\{input\}\}/mg, payload);
+        // 窗口
+        if (type == 'window') {
+            // 获取选中的文件
+            if (cmd.includes('{{SelectFile}}')) {
+                let repl = await getSelectFile(payload.id);
+                cmd = cmd.replace(/\{\{SelectFile\}\}/mg, repl)
+            }
+            // 获取资源管理器或访达当前目录
+            if (cmd.includes('{{pwd}}')) {
+                let repl = await pwd(payload.id);
+                cmd = cmd.replace(/\{\{pwd\}\}/mg, repl)
+            }
+            // 获取窗口信息
+            if (cmd.includes('{{WindowInfo}}')) {
+                let repl = JSON.stringify(payload);
+                cmd = cmd.replace(/\{\{WindowInfo\}\}/mg, repl)
+            }
+        }
         // 无输出的批处理
-        if (db.output == 'ignore' && option.ext == 'bat') option.bin = 'explorer';
+        // if (db.output == 'ignore' && option.ext == 'bat') option.bin = 'explorer';
         if (db.hasSubInput) {
             // 启动子命令输入
             // 清空输出
@@ -52,8 +70,8 @@ utools.onPluginEnter(({ code, type, payload }) => {
 function runCmd(cmd, option, codec, output) {
     // 不需要输出的，提前关闭窗口
     if (['ignore', 'clip', 'send', 'notice', 'terminal'].indexOf(output) !== -1){
-        utools.outPlugin()
         utools.hideMainWindow()
+        utools.outPlugin()
     }
     var terminal = false;
     if(output == 'terminal') terminal = true;