sbd-npm 1.4.9 → 1.4.10

package/package.json

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

package/status.js

@@ -546,6 +546,7 @@ $(function () {
                         $("#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();
                             }
@@ -564,7 +565,6 @@ $(function () {
                             "caption": prefix_caption + '</caption>',
                             "head_cols": [
                                 {"name": "进程ID", "table_sort": 1},
-                                {"name": "用户名", "table_sort": 1},
                                 {"name": "状态", "table_sort": 1},
                                 {"name": "启动命令"},
                                 {"name": "创建时间", "class": "info", "table_sort": 1},
@@ -576,9 +576,8 @@ $(function () {
                         process_num++;
                         html.push("<tr>");
                         html.push("<td>", item["pid"], "</td>");
-                        html.push("<td>", item["username"], "</td>");
                         html.push("<td>", item["status"], "</td>");
-                        html.push("<td title='", item["cmdline"], "'>", Util.sub_str(item["cmdline"], 60), "</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>");
                     });

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