sbd-npm 1.4.61 → 1.4.63

package/package.json

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

package/status.js

@@ -545,7 +545,7 @@ $(function () {
                 $("#task_add").click(function() {
                     let task_content = $("#task_content").val();
                     task_content = task_content.replace(/[^\w\u4e00-\u9fff-]/g, ''); // 去掉除字母、数字、下划线(_)、汉字、横杠(-)外的其他字符（䒚 /[^\w\u3400-\u9fff\u{20000}-\u{2EBEF}]/gu）
-                    if (task_content && task_content.length > 0) {
+                    if (Status.check_task_content(task_content)) {
                         $("#task_content").prop('disabled', true);
                         $("#task_add").prop('disabled', true);
                         Util.show_loading();
@@ -583,8 +583,6 @@ $(function () {
                             }
                             Util.hide_tips();
                         });
-                    } else {
-                        $("#task_tips").html("<b class='text-danger'>任务内容不能为空！</b>");
                     }
                     return false;
                 });
@@ -600,6 +598,23 @@ $(function () {
             Status.fetch_task_data(is_init);
         },
 
+        check_task_content: function(task_content) {
+            if (task_content && task_content.length > 0) {
+                let task_tips = $("#task_tips").text().trim();
+                if (task_tips.length > 0) {
+                    let tips_match = task_tips.match(/^任务\s`(.+?)`\sDONE$/);
+                    if (tips_match && tips_match[1] === task_content) {
+                        Util.show_tips("任务 `" + tips_match[1] + "` 已经执行过", 3456, "alert-danger");
+                        return false;
+                    }
+                }
+                return true;
+            } else {
+                $("#task_tips").html("<b class='text-danger'>任务内容不能为空！</b>");
+                return false;
+            }
+        },
+
         fetch_task_data: function(is_init = 0) {
             let machine_id = $("#task_machines").val();
             Util.post(location.pathname, {active_div: localStorage[Status.tab_token], is_init: is_init, machine_id: machine_id}, function (j) {
@@ -761,7 +776,7 @@ $(function () {
                             html.push("<td title='", item["cmdline"], "'>", cmdline, "</td>");
                         }
                         html.push("<td>", Util.seconds_to_format(item["create_time"]), "</td>");
-                        html.push("<td><a class='process_kill' href='#'>终止</a></td>");
+                        html.push("<td><a class='process_kill' href='#'>终止</a>&nbsp;&nbsp;<a class='process_screen' href='#'>会话</a></td>");
                         html.push("</tr>");
                     });
                     Util.render_table_html("machine_process_div_body", html);
@@ -788,6 +803,25 @@ $(function () {
                             }
                         });
                     });
+                    $("#machine_process_div_body .process_screen").each(function() {
+                        $(this).click(function() {
+                            let pid = $(this).parent().parent().children('td').eq(0).text();
+                            Util.show_loading();
+                            let action_content = "screen_" + pid;
+                            Util.post(location.pathname, {active_div: "machine_instruction_add", "machine_id": $("#machines").val(), "content": action_content, action_type: 2}, function (j) {
+                                Util.hide_tips();
+                                if (j["code"] === 1) {
+                                    Util.show_tips("进程 [" + pid + "] 已加到会话队列中", 4567, "alert-success");
+                                } else if (j["code"] === 2) {
+                                    Util.show_tips("Machine 不存在！", 4567, "alert-danger");
+                                } else if (j["code"] === 3) {
+                                    Util.show_tips("进程 [" + pid + "] 异常！", 4567, "alert-danger");
+                                } else {
+                                    Util.show_tips("进程值不能为空！", 4567, "alert-danger");
+                                }
+                            });
+                        });
+                    });
                 } else if (is_init === 1) {
                     $('#machines').html('<option value="">暂无Machine</option>');
                 }
@@ -1355,7 +1389,7 @@ $(function () {
         map_url: function (location, location_name = "") {
             location_name = location_name === "" ? location : location_name;
             let location_arr = location.split(' ');
-            if (location.indexOf("中国") > -1 || location.indexOf("省") > -1 || location.indexOf("市") > -1) {
+            if (/中国|省|市/.test(location)) {
                 let url = Util.map_url(location_arr[0]);
                 return url.replace('>' + location_arr[0] + '</a>', '>' + location_name + '</a>');
             }

package/util.js

@@ -416,7 +416,7 @@ const Util = {
             if (location_name === "") {
                 location_name = location.length > 20 ? location.substring(0, 20) : location;
             }
-            if (Util.is_has_chinese(location)) {
+            if (Util.is_has_chinese(location) && !/美国|加拿大|新加坡|日本|澳大利亚/.test(location)) {
                 //return "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://map.baidu.com/m?fr=ps01000&word=" + location + "'>" + location_name + "</a>";
                 return "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://www.amap.com/search?query=" + location + "'>" + location_name + "</a>";
             }