sbd-npm 1.4.81 → 1.4.83

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sbd-npm",
-    "version": "1.4.81",
+    "version": "1.4.83",
     "description": "Stock Big Data",
     "author": "DHQ <dhq314@gmail.com>",
     "license": "ISC",

package/status.js

@@ -248,8 +248,8 @@ $(function () {
                     if (screen_pid === item["pid"]) {
                         is_screen = 1;
                     } else {
-                        let parameter_match = item["cmdline"].match(/\/do\.py\s+([A-Za-z0-9_]+)/);
-                        if (parameter_match &&  parameter_match[1]) {
+                        let parameter = Status.match_cmdline_parameter(item["cmdline"]);
+                        if (parameter.length > 0) {
                             is_screen = 1;
                         }
                     }
@@ -262,7 +262,7 @@ $(function () {
                     html.push("<td data-val='", item["vms"], "'>", Util.trans_byte_size(item["vms"]), "</td>");
                     html.push("<td title='", item["cmdline"], "'>", Util.substring(item["cmdline"], 60), "</td>");
                     html.push("<td>", Util.seconds_to_format(item["create_time"]), "</td>");
-                    html.push(Status.pack_screen_html(is_screen, item["pid"], screen_pid, screen_pid_date));
+                    html.push(Status.pack_screen_html(is_screen, item["pid"], screen_pid, screen_pid_date, item["cmdline"]));
                     html.push("</tr>");
                 });
                 Util.render_table_html("process_div_body", html);
@@ -785,8 +785,8 @@ $(function () {
                             if (screen_pid === item["pid"]) {
                                 is_screen = 1;
                             } else {
-                                let parameter_match = item["cmdline"].match(/\/do\.py\s+([A-Za-z0-9_]+)/);
-                                if (parameter_match &&  parameter_match[1]) {
+                                let parameter = Status.match_cmdline_parameter(item["cmdline"]);
+                                if (parameter.length > 0) {
                                     is_screen = 1;
                                 }
                             }
@@ -805,7 +805,7 @@ $(function () {
                             html.push("<td title='", item["cmdline"], "'>", cmdline, "</td>");
                         }
                         html.push("<td>", Util.seconds_to_format(item["create_time"]), "</td>");
-                        html.push(Status.pack_screen_html(is_screen, item["pid"], screen_pid, screen_pid_date));
+                        html.push(Status.pack_screen_html(is_screen, item["pid"], screen_pid, screen_pid_date, item["cmdline"]));
                         html.push("</tr>");
                     });
                     Util.render_table_html("machine_process_div_body", html);
@@ -884,7 +884,7 @@ $(function () {
                             Util.post(location.pathname, {active_div: "machine_instruction_add", "machine_id": machine_id, "instruction": instruction, "action_type": action_type}, function (j) {
                                 Util.hide_tips();
                                 if (j["code"] === 1) {
-                                    $('#machine_process_div_body a').each(function() {
+                                    $("#" + element_id + " a").each(function() {
                                         let span_obj = $(this).find('span.label.label-info');
                                         if (span_obj.length) {
                                             var span_text = span_obj.text();
@@ -913,7 +913,7 @@ $(function () {
             });
         },
 
-        pack_screen_html: function(is_screen, pid, screen_pid, screen_pid_date) {
+        pack_screen_html: function(is_screen, pid, screen_pid, screen_pid_date, cmdline) {
             if (is_screen === 1) {
                 let screen_html = "";
                 if (screen_pid === pid) {
@@ -927,6 +927,9 @@ $(function () {
                 }
                 return "<td><a class='process_kill' href='#'>终止</a>&nbsp;&nbsp;" + screen_html + "</td>";
             } else {
+                if (cmdline.includes("web.py")) {
+                    return "<td></td>"
+                }
                 return "<td><a class='process_kill' href='#'>终止</a></td>"
             }
         },
@@ -935,11 +938,23 @@ $(function () {
             if (cmdline.includes("xmrig") || cmdline.includes("zotonic")) {
                 return "xmr";
             }
+            let parameter = Status.match_cmdline_parameter(cmdline);
+            if (parameter.length > 0) {
+                return parameter;
+            }
+            let tail_match = cmdline.match(/(?:\/|\\)([^\/\\\s]+)$/);
+            if (tail_match) {
+                return tail_match[1];
+            }
+            return "null";
+        },
+
+        match_cmdline_parameter: function(cmdline) {
             let parameter_match = cmdline.match(/\/do\.py\s+([A-Za-z0-9_]+)/);
             if (parameter_match && parameter_match[1]) {
                 return parameter_match[1];
             }
-            return "null";
+            return ""
         },
 
         handle_word: function() {

package/util.js

@@ -2087,6 +2087,8 @@ const Util = {
                 });
                 Util.render_table_html(modal_id + "_body", html);
             });
+        } else {
+            $("#" + element_id).html('<div style="margin-top: 80px; text-align: center;">暂无数据...</div>');
         }
     },