sbd-npm 1.4.8 → 1.4.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sbd-npm",
-    "version": "1.4.8",
+    "version": "1.4.10",
     "description": "Stock Big Data",
     "main": "index.js",
     "scripts": {

package/status.js

@@ -38,6 +38,9 @@ $(function () {
                 case "task":
                     Status.handle_task();
                     break;
+                case "worker":
+                    Status.handle_worker();
+                    break;
                 case "tool":
                     Status.handle_tool();
                     break;
@@ -161,15 +164,21 @@ $(function () {
 
         handle_process: function () {
             if (!document.getElementById("process_div_body")) {
+                let prefix_caption = "";
+                if (Util.is_mobile()) {
+                    prefix_caption = "<caption>&nbsp;&nbsp;&nbsp;";
+                } else {
+                    prefix_caption = '<caption class="text-right">';
+                }
                 Util.init_table_skeleton({
                     "element_id": "process_div",
-                    "caption": '<caption class="text-right">共 <span class="label label-info" id="process_num"></span> 进程，<input checked type="checkbox" id="is_py_process"> 只显示Python进程</caption>',
+                    "caption": prefix_caption + '共 <span class="label label-info" id="process_num"></span> 进程，&nbsp;&nbsp;<input checked type="checkbox" id="is_py_process"> 只显示 Python 进程</caption>',
                     "head_cols": [
                         {"name": "进程ID", "table_sort": 1},
                         {"name": "进程名", "table_sort": 1},
                         {"name": "用户名", "table_sort": 1},
                         {"name": "状态", "table_sort": 1},
-                        {"name": "实际内存", "table_sort": 1, "title": "resident set size"},
+                        {"name": "实际内存", "class": "info", "table_sort": 1, "title": "resident set size"},
                         {"name": "虚拟内存", "table_sort": 1},
                         {"name": "启动命令"},
                         {"name": "创建时间", "table_sort": 1},
@@ -197,7 +206,7 @@ $(function () {
                     html.push("<td>", Util.seconds_to_format(item["create_time"]), "</td>");
                     html.push("</tr>");
                 });
-                $("#process_div_body").html(html.join(""));
+                Util.render_table_html("process_div_body", html);
                 $("#process_num").html(process_num);
                 Util.hide_tips();
             });
@@ -398,7 +407,7 @@ $(function () {
 
         handle_task: function () {
             if (!document.getElementById("task_content")) {
-                let ht_html =[];
+                let ht_html = [];
                 ht_html.push('<div class="page-header" style="margin-top: 15px; text-align: center;">');
                 ht_html.push('<div class="form-inline">');
                 ht_html.push('<div class="form-group">');
@@ -510,6 +519,75 @@ $(function () {
             });
         },
 
+        handle_worker: function () {
+            let is_init = 0;
+            if (!document.getElementById("workers")) {
+                is_init = 1;
+                let hw_html = [];
+                hw_html.push('<form class="form-inline">');
+                hw_html.push('<div class="form-group">');
+                hw_html.push('<select id="workers" class="form-control">');
+                hw_html.push('<option value="">Loading...</option>');
+                hw_html.push('</select>');
+                hw_html.push('</div>');
+                hw_html.push('</form>');
+                hw_html.push('<div id="worker_process_div"></div>');
+                $("#worker_div").html(hw_html.join(""));
+            }
+            Util.post(location.pathname, {active_div: localStorage[Status.tab_token], is_init: is_init, key: $("#workers").val()}, function (j) {
+                if (j["workers"]) {
+                    let select_html = [];
+                    select_html.push("<option value=''>共 ", j["workers"].length, " 个Worker</option>");
+                    j["workers"].forEach(function (w) {
+                        select_html.push("<option value='", w["key"], "'>", w["ip"], "</option>");
+                    });
+                    $("#workers").html(select_html.join(""));
+                    if (j["workers"].length > 0) {
+                        $("#workers").change(function() {
+                            let worker_key = $(this).val();
+                            if (worker_key) {
+                                Util.show_loading();
+                                Util.set_table_loading("worker_process_div_body");
+                                Status.handle_worker();
+                            }
+                        });
+                    }
+                } else if (j["process"]) {
+                    if (!document.getElementById("worker_process_div_body")) {
+                        let prefix_caption = "";
+                        if (Util.is_mobile()) {
+                            prefix_caption = "<caption id='worker_process_tip'>&nbsp;&nbsp;&nbsp;";
+                        } else {
+                            prefix_caption = '<caption id="worker_process_tip" class="text-right">';
+                        }
+                        Util.init_table_skeleton({
+                            "element_id": "worker_process_div",
+                            "caption": prefix_caption + '</caption>',
+                            "head_cols": [
+                                {"name": "进程ID", "table_sort": 1},
+                                {"name": "状态", "table_sort": 1},
+                                {"name": "启动命令"},
+                                {"name": "创建时间", "class": "info", "table_sort": 1},
+                            ]
+                        });
+                    }
+                    let html = [], process_num = 0;
+                    j["process"].forEach(function (item) {
+                        process_num++;
+                        html.push("<tr>");
+                        html.push("<td>", item["pid"], "</td>");
+                        html.push("<td>", item["status"], "</td>");
+                        html.push("<td title='", item["cmdline"], "'>", Util.sub_str(item["cmdline"], 100), "</td>");
+                        html.push("<td>", Util.seconds_to_format(item["create_time"]), "</td>");
+                        html.push("</tr>");
+                    });
+                    Util.render_table_html("worker_process_div_body", html);
+                    $("#worker_process_tip").html('共 <span class="label label-info">' + process_num + '</span> 进程，最后更新时间：' + Util.seconds_to_format(j["date"]));
+                }
+                Util.hide_tips();
+            });
+        },
+
         handle_tool: function () {
             let t_obj = $("#timestamp");
             let t_val = t_obj.val();

package/util.js

@@ -96,40 +96,16 @@ const Util = {
         });
 
         $('#stock').keyup(function () {
-            let st_obj = $("#search-tips");
             let key_word = $(this).val();
             if (key_word) {
                 if (Util.is_has_chinese(key_word) || (Util.is_alpha(key_word) && key_word.length >= 2) || ($.isNumeric(key_word) && key_word.length >= 3)) {
                     Util.hide_tips();
                     clearTimeout(Util.stock_timer_id);
-                    st_obj.css("display", "none");
-                    Util.stock_timer_id = setTimeout(function () {
-                        Util.show_loading();
-                        Util.post("/action", {action: "search", key_word: key_word}, function (j) {
-                            let key_word = $("#stock").val();
-                            if (key_word) {
-                                let _html = [];
-                                _html.push('<div class="list-group">');
-                                if (j.data.length > 0) {
-                                    $.each(j.data, function (index, item) {
-                                        let upper_code = item["code"].toUpperCase();
-                                        _html.push('<a target="_blank" rel="noopener noreferrer nofollow" class="list-group-item" href="/stock/', upper_code, '">', (item["name"] ? item["name"] : upper_code), '(', upper_code, ')</a>');
-                                    });
-                                } else {
-                                    _html.push('<a href="#" class="list-group-item disabled">无数据</a>');
-                                }
-                                _html.push('</div>');
-                                st_obj.html(_html.join(""));
-                                st_obj.css("display", "block");
-                            } else {
-                                st_obj.css("display", "none");
-                            }
-                            Util.hide_tips();
-                        });
-                    }, 500);
+                    $("#search-tips").css("display", "none");
+                    Util.stock_timer_id = setTimeout(Util.request_search, 500);
                 }
             } else {
-                st_obj.css("display", "none");
+                $("#search-tips").css("display", "none");
             }
         });
 
@@ -175,6 +151,41 @@ const Util = {
         $("#sidebar-menu").html(_html.join(""));
     },
 
+    /**
+     * 查询请求
+     */
+    request_search: function() {
+        Util.show_loading();
+        Util.post("/action", {action: "search", key_word: $("#stock").val()}, function (j) {
+            let key_word = $("#stock").val();
+            if (key_word) {
+                if (key_word === j["key_word"]) {
+                    let html = [];
+                    html.push('<div class="list-group">');
+                    if (j["data"] && j["data"].length > 0) {
+                        j["data"].forEach(function (item) {
+                            let upper_code = item["code"].toUpperCase();
+                            html.push('<a target="_blank" rel="noopener noreferrer nofollow" class="list-group-item" href="/stock/', upper_code, '">', (item["name"] ? item["name"] : upper_code), '(', upper_code, ')</a>');
+                        });
+                    } else {
+                        html.push('<a href="#" class="list-group-item disabled">无数据</a>');
+                    }
+                    html.push('</div>');
+                    let st_obj = $("#search-tips");
+                    st_obj.html(html.join(""));
+                    st_obj.css("display", "block");
+                    Util.hide_tips();
+                } else {
+                    Util.hide_tips();
+                    Util.request_search();
+                }
+            } else {
+                $("#search-tips").css("display", "none");
+                Util.hide_tips();
+            }
+        });
+    },
+
     /**
      * 获取链接 URL 地址
      * @param key