From 6072b135e828351ade26e9bfbf1dacbc0818dbe5 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 27 Mar 2019 21:10:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=B3=E9=94=AE=E9=87=8D?=
 =?UTF-8?q?=E5=90=AF=E8=BF=9B=E7=A8=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html | 47 ++++++++++++++++++++++++++++++-----------------
 preload.js |  8 ++++++--
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/index.html b/index.html
index 9a2ee79..27dbd19 100644
--- a/index.html
+++ b/index.html
@@ -14,18 +14,23 @@
     <div id="tasklist"></div>
     <div id="infopannel"></div>
     <script>
-        kill = taskname => {
-            window.taskkill(taskname, err => {
+        kill = (taskname, taskpath) => {
+            window.taskkill(taskname, taskpath, err => {
                 if (err) {
                     $("#infopannel").css({ "background": "#EF5350" });
-                    $("#infopannel").html(err).fadeIn(300).delay(4000).fadeOut(300);
+                    $("#infopannel").html(err).fadeIn(300).delay(3000).fadeOut(300);
                 } else {
-                    $("[name='" + taskname + "']").fadeOut(300).remove()
-                    let tasknum = $(".taskinfo").length
-                    utools.setExpendHeight(tasknum > 10 ? 500 : 50 * tasknum);
-                    window.tasklist((task) => {
-                        window.tasks = task
-                    });
+                    if(taskpath == undefined){
+                        $("[name='" + taskname + "']").fadeOut(300).remove()
+                        let tasknum = $(".taskinfo").length
+                        utools.setExpendHeight(tasknum > 10 ? 500 : 50 * tasknum);
+                        window.tasklist((task) => {
+                            window.tasks = task
+                        });
+                    }else{
+                    $("#infopannel").css({ "background": "#83bf40" });
+                    $("#infopannel").html('重启进程成功！').fadeIn(300).delay(3000).fadeOut(300);
+                    }
                 }
             });
         }
@@ -38,21 +43,29 @@
                         for (var t of window.tasks) {
                             if (t.ProcessName.toUpperCase().search(text.toUpperCase()) != -1 || t.Description.toUpperCase().search(text.toUpperCase()) != -1) {
                                 let title = t.Description ? t.Description : t.ProcessName;
-                                taskinfo += '<div class="taskinfo" name="' + t.ProcessName + '" onclick=\'kill("' + t.ProcessName + '")\'><img src="file:///' + t.Icon + '">';
+                                taskinfo += '<div class="taskinfo" name="' + t.ProcessName + '">';
+                                taskinfo += '<img src="file:///' + t.Icon + '">';
                                 taskinfo += '<div class="description">' + title + '</div><div class="path">' + t.Path + '</div></div>';
                                 }
                             }
                         $("#tasklist").html(taskinfo);
                         let tasknum = $(".taskinfo").length
                         utools.setExpendHeight(tasknum > 10 ? 500 : 50 * tasknum);
-                }, '输入进程名，回车关闭，或点击关闭');
+                    }, '输入进程名，回车关闭，或点击关闭');
+                });
+            });
+            $("#tasklist").on('mousedown', '.taskinfo', function (e) {
+                if (1 == e.which) {
+                    kill($(this).attr('name'));
+                }else if(3 == e.which){
+                    kill($(this).attr('name'), $(this).children(".path").html().replace(/\\/g,'/'))
+                }
+             });
+            $(document).keydown(e => {
+                if (e.keyCode === 13) {
+                    kill($(".taskinfo").attr('name'));
+                }
             });
-        });
-        $(document).keydown(e => {
-            if (e.keyCode === 13) {
-                kill($(".taskinfo").attr('name'));
-            }
-        });
     </script>
 </body>
 
diff --git a/preload.js b/preload.js
index 4658a0f..7a8f861 100644
--- a/preload.js
+++ b/preload.js
@@ -51,8 +51,12 @@ tasklist = (callback) => {
     });
 }
 
-taskkill = (taskname, callback) => {
-    let ps = new PowerShell(`chcp 65001;Stop-Process -Name ${taskname}`);
+taskkill = (taskname, taskpath, callback) => {
+    if (taskpath == undefined) {
+        var ps = new PowerShell(`chcp 65001;Stop-Process -Name ${taskname}`);
+    } else {
+        var ps = new PowerShell(`chcp 65001;Stop-Process -Name ${taskname};Start-Process -FilePath "${taskpath}"`);
+    }
     ps.on("error-output", data => {
         callback(data.split('\n')[0])
     });