sbd-npm 1.4.26 → 1.4.27

package/package.json

@@ -1,11 +1,12 @@
 {
     "name": "sbd-npm",
-    "version": "1.4.26",
+    "version": "1.4.27",
     "description": "Stock Big Data",
+    "author": "DHQ <dhq314@gmail.com>",
+    "license": "ISC",
     "main": "index.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"
     },
-    "author": "dhq",
-    "license": "ISC"
+    "keywords": ["large", "scale", "data"]
 }

package/status.js

@@ -38,8 +38,11 @@ $(function () {
                 case "task":
                     Status.handle_task();
                     break;
-                case "worker":
-                    Status.handle_worker();
+                case "machine":
+                    Status.handle_machine();
+                    break;
+                case "word":
+                    Status.handle_word();
                     break;
                 case "tool":
                     Status.handle_tool();
@@ -526,27 +529,27 @@ $(function () {
             });
         },
 
-        handle_worker: function () {
+        handle_machine: function () {
             let is_init = 0;
-            if (!document.getElementById("workers")) {
+            if (!document.getElementById("machines")) {
                 is_init = 1;
-                let hw_html = [];
+                let machine_html = [];
                 if (Util.is_mobile()) {
-                    hw_html.push('<form class="form-inline" style="margin-bottom: 5px;">');
+                    machine_html.push('<form class="form-inline" style="margin-bottom: 5px;">');
                 } else {
-                    hw_html.push('<form class="form-inline">');
+                    machine_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('&nbsp;&nbsp;<a href="#" data-toggle="modal" data-target=".client_action_modal" data-type="2" class="btn btn-warning">添加任务</a>');
-                hw_html.push('<a href="#" data-toggle="modal" data-target=".client_cookie_modal" class="btn btn-warning">雪球Cookie</a>');
-                hw_html.push('<a href="#" id="machine_refresh" class="btn btn-warning">刷新Machine</a>');
-                hw_html.push('</form>');
-                hw_html.push('<div id="worker_process_div"></div>');
-                $("#worker_div").html(hw_html.join(""));
+                machine_html.push('<div class="form-group">');
+                machine_html.push('<select id="machines" class="form-control">');
+                machine_html.push('<option value="">Loading...</option>');
+                machine_html.push('</select>');
+                machine_html.push('</div>');
+                machine_html.push('&nbsp;&nbsp;<a href="#" data-toggle="modal" data-target=".client_action_modal" data-type="2" class="btn btn-warning">添加任务</a>');
+                machine_html.push('<a href="#" data-toggle="modal" data-target=".client_cookie_modal" class="btn btn-warning">雪球Cookie</a>');
+                machine_html.push('<a href="#" id="machine_refresh" class="btn btn-warning">刷新Machine</a>');
+                machine_html.push('</form>');
+                machine_html.push('<div id="machine_process_div"></div>');
+                $("#machine_div").html(machine_html.join(""));
                 if (!document.getElementById("client_action_add")) {
                     Status.init_client_action_modal();
                     Status.init_client_cookie_modal();
@@ -555,44 +558,44 @@ $(function () {
                         $("#machine_refresh").attr("disabled", true).html("正在处理中...");
                         Util.post(location.pathname, {active_div: "machine_refresh"}, function (j) {
                             setTimeout(function () {
-                                $('#workers').html('<option value="">暂无Machine</option>');
+                                $('#machines').html('<option value="">暂无Machine</option>');
                                 $("#machine_refresh").html("刷新Machine").attr("disabled", false);
                                 Util.hide_tips();
                                 Util.show_tips("刷新成功", 3456, "alert-success");
-                            }, 3456);
+                            }, 2345);
                         });
                         return false;
                     });
                 }
             }
-            Util.post(location.pathname, {active_div: localStorage[Status.tab_token], is_init: is_init, machine_id: $("#workers").val()}, function (j) {
-                if (j["workers"]) {
+            Util.post(location.pathname, {active_div: localStorage[Status.tab_token], is_init: is_init, machine_id: $("#machines").val()}, function (j) {
+                if (j["machines"]) {
                     let select_html = [];
-                    select_html.push("<option value=''>共 ", j["workers"].length, " 个Worker</option>");
-                    j["workers"].forEach(function (w) {
+                    select_html.push("<option value=''>共 ", j["machines"].length, " 个Machine</option>");
+                    j["machines"].forEach(function (w) {
                         select_html.push("<option value='", w["machine_id"], "'>", w["ip"], "(", w["num"], ")</option>");
                     });
-                    $("#workers").html(select_html.join(""));
-                    if (j["workers"].length > 0) {
-                        $("#workers").change(function() {
+                    $("#machines").html(select_html.join(""));
+                    if (j["machines"].length > 0) {
+                        $("#machines").change(function() {
                             let machine_id = $(this).val();
                             if (machine_id) {
                                 Util.show_loading();
-                                Util.set_table_loading("worker_process_div_body");
-                                Status.handle_worker();
+                                Util.set_table_loading("machine_process_div_body");
+                                Status.handle_machine();
                             }
                         });
                     }
                 } else if (j["process"]) {
-                    if (!document.getElementById("worker_process_div_body")) {
+                    if (!document.getElementById("machine_process_div_body")) {
                         let prefix_caption = "";
                         if (Util.is_mobile()) {
-                            prefix_caption = "<caption id='worker_process_tip'>&nbsp;&nbsp;&nbsp;";
+                            prefix_caption = "<caption id='machine_process_tip'>&nbsp;&nbsp;&nbsp;";
                         } else {
-                            prefix_caption = '<caption id="worker_process_tip" class="text-right">';
+                            prefix_caption = '<caption id="machine_process_tip" class="text-right">';
                         }
                         Util.init_table_skeleton({
-                            "element_id": "worker_process_div",
+                            "element_id": "machine_process_div",
                             "caption": prefix_caption + '</caption>',
                             "head_cols": [
                                 {"name": "进程ID", "table_sort": 1},
@@ -621,12 +624,54 @@ $(function () {
                         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"]) + '，Revision：' + j["revision"] + '，MachineId：' + j["machine_id"]);
-                    $("#workers option[value='" + $("#workers").val() + "']").text(j["ip"] + "(" + process_num + ")");
+                    Util.render_table_html("machine_process_div_body", html);
+                    $("#machine_process_tip").html('共 <span class="label label-info">' + process_num + '</span> 进程，最后更新时间：' + Util.seconds_to_format(j["date"]) + '，Revision：' + j["revision"] + '，MachineId：' + j["machine_id"]);
+                    $("#machines option[value='" + $("#machines").val() + "']").text(j["ip"] + "(" + process_num + ")");
                 } else if (is_init === 1) {
-                    $('#workers').html('<option value="">暂无Machine</option>');
+                    $('#machines').html('<option value="">暂无Machine</option>');
+                }
+                Util.hide_tips();
+            });
+        },
+
+        handle_word: function() {
+            if (!document.getElementById("word_process_div")) {
+                let word_html = [];
+                if (Util.is_mobile()) {
+                    word_html.push('<form class="form-inline" style="margin-bottom: 5px;">');
+                } else {
+                    word_html.push('<form class="form-inline">');
                 }
+                word_html.push('<a href="#" id="word_previous" class="btn btn-warning">前一天WORD</a>');
+                word_html.push('</form>');
+                word_html.push('<div id="word_process_div"></div>');
+                $("#word_div").html(word_html.join(""));
+                Util.init_table_skeleton({
+                    "element_id": "word_process_div",
+                    "caption": '<caption class="text-right" id="word_num"></caption>',
+                    "head_cols": [
+                        {"name": "序号", "table_sort": 1},
+                        {"name": "单词", "table_sort": 1},
+                        {"name": "中文"},
+                        {"name": "时间", "table_sort": 1},
+                        {"name": "操作"},
+                    ]
+                });
+            }
+            Util.post(location.pathname, {active_div: localStorage[Status.tab_token]}, function (j) {
+                let html = [], index = 0;
+                j["data"].forEach(function (item) {
+                    index++;
+                    html.push("<tr>");
+                    html.push("<td>", index, "</td>");
+                    html.push("<td>", Util.pack_html_link("https://cn.bing.com/dict/search?q=" + item["word"], item["word"]), "</td>");
+                    html.push("<td>", item["chinese"], "</td>");
+                    html.push("<td>", Util.seconds_to_format(item["date"]), "</td>");
+                    html.push("<td><a href='#'>修改</a> &nbsp; <a href='#'>删除</a></td>");
+                    html.push("</tr>");
+                });
+                Util.render_table_html("word_process_div_body", html);
+                $("#word_num").html("共 <span class='label label-info'>" + index + "</span> 条");
                 Util.hide_tips();
             });
         },
@@ -636,10 +681,10 @@ $(function () {
             $("#client_action_modal_title").html("添加任务");
             let html = [];
             html.push('<form data-parsley-validate class="form-horizontal form-label-left">');
-            html.push('<div class="form-group" id="action_worker_div">');
-            html.push('<label class="control-label col-md-3 col-sm-3 col-xs-12" for="search_ip">Worker </label>');
+            html.push('<div class="form-group" id="action_machine_div">');
+            html.push('<label class="control-label col-md-3 col-sm-3 col-xs-12" for="search_ip">Machine </label>');
             html.push('<div class="col-md-6 col-sm-6 col-xs-12">');
-            html.push('<select id="client_action_worker" class="form-control col-md-7 col-xs-12">');
+            html.push('<select id="client_action_machine" class="form-control col-md-7 col-xs-12">');
             html.push('<option value="">Loading...</option>');
             html.push('</select>');
             html.push('</div>');
@@ -667,21 +712,21 @@ $(function () {
                 Util.show_loading();
                 let action_type = parseInt($(e.relatedTarget).attr("data-type"));
                 if (action_type === 1) {
-                    $("#action_worker_div").css("display", "none");
+                    $("#action_machine_div").css("display", "none");
                 } else {
-                    $("#action_worker_div").css("display", "block");
+                    $("#action_machine_div").css("display", "block");
                 }
                 Util.post(location.pathname, {active_div: "client_action", action_type: action_type}, function (j) {
-                    if (j["workers"]) {
-                        let worker_html = [];
-                        j["workers"].forEach(function (w) {
-                            worker_html.push("<option value='", w["machine_id"], "'>", w["ip"], "(", w["num"], ")</option>");
+                    if (j["machines"]) {
+                        let machine_html = [];
+                        j["machines"].forEach(function (w) {
+                            machine_html.push("<option value='", w["machine_id"], "'>", w["ip"], "(", w["num"], ")</option>");
                         });
-                        let caw_obj = $("#client_action_worker");
-                        caw_obj.html(worker_html.join(""));
-                        let worker = $("#workers").val();
-                        if (worker) {
-                            caw_obj.find("option[value='" + worker + "']").attr("selected", true);
+                        let caw_obj = $("#client_action_machine");
+                        caw_obj.html(machine_html.join(""));
+                        let machine = $("#machines").val();
+                        if (machine) {
+                            caw_obj.find("option[value='" + machine + "']").attr("selected", true);
                         }
                     }
                     if (j["actions"]) {
@@ -700,9 +745,9 @@ $(function () {
             });
             $("#client_action_add").click(function() {
                 let action_type = 1, machine_id = "1";
-                if ($("#action_worker_div").css("display") === "block") {
+                if ($("#action_machine_div").css("display") === "block") {
                     action_type = 2;
-                    machine_id = $("#client_action_worker").val();
+                    machine_id = $("#client_action_machine").val();
                 }
                 if (machine_id) {
                     let action_content = $("#client_action_content").val();
@@ -715,7 +760,7 @@ $(function () {
                             if (j["code"] && j["code"] === 1) {
                                 $("#client_action_tips").html("<b class='text-success'>任务`" + action_content + "`添加成功！</b>");
                             } else if (j["code"] && j["code"] === 2) {
-                                $("#client_action_tips").html("<b class='text-danger'>Worker 不存在！</b>");
+                                $("#client_action_tips").html("<b class='text-danger'>Machine 不存在！</b>");
                             } else if (j["code"] && j["code"] === 3) {
                                 $("#client_action_tips").html("<b class='text-danger'>任务内容异常！</b>");
                             } else {
@@ -727,7 +772,7 @@ $(function () {
                         $("#client_action_tips").html("<b class='text-danger'>任务内容不能为空！</b>");
                     }
                 } else {
-                    $("#client_action_tips").html("<b class='text-danger'>Worker 异常！</b>");
+                    $("#client_action_tips").html("<b class='text-danger'>Machine 异常！</b>");
                 }
                 return false;
             });
@@ -738,10 +783,10 @@ $(function () {
             $("#client_cookie_modal_title").html("雪球Cookie");
             let html = [];
             html.push('<form data-parsley-validate class="form-horizontal form-label-left">');
-            html.push('<div class="form-group" id="action_worker_div">');
-            html.push('<label class="control-label col-md-3 col-sm-3 col-xs-12" for="search_ip">Worker </label>');
+            html.push('<div class="form-group" id="action_machine_div">');
+            html.push('<label class="control-label col-md-3 col-sm-3 col-xs-12" for="search_ip">Machine </label>');
             html.push('<div class="col-md-6 col-sm-6 col-xs-12">');
-            html.push('<select id="client_cookie_worker" class="form-control col-md-7 col-xs-12">');
+            html.push('<select id="client_cookie_machine" class="form-control col-md-7 col-xs-12">');
             html.push('<option value="">Loading...</option>');
             html.push('</select>');
             html.push('</div>');
@@ -766,16 +811,16 @@ $(function () {
             ccm_obj.on('show.bs.modal', function (e) {
                 Util.show_loading();
                 Util.post(location.pathname, {active_div: "client_action", action_type: 2}, function (j) {
-                    if (j["workers"]) {
-                        let worker_html = [];
-                        j["workers"].forEach(function (w) {
-                            worker_html.push("<option value='", w["machine_id"], "'>", w["ip"], "(", w["num"], ")</option>");
+                    if (j["machines"]) {
+                        let machine_html = [];
+                        j["machines"].forEach(function (w) {
+                            machine_html.push("<option value='", w["machine_id"], "'>", w["ip"], "(", w["num"], ")</option>");
                         });
-                        let caw_obj = $("#client_cookie_worker");
-                        caw_obj.html(worker_html.join(""));
-                        let worker = $("#workers").val();
-                        if (worker) {
-                            caw_obj.find("option[value='" + worker + "']").attr("selected", true);
+                        let caw_obj = $("#client_cookie_machine");
+                        caw_obj.html(machine_html.join(""));
+                        let machine = $("#machines").val();
+                        if (machine) {
+                            caw_obj.find("option[value='" + machine + "']").attr("selected", true);
                         }
                     }
                     Util.hide_tips();
@@ -787,7 +832,7 @@ $(function () {
                 Util.hide_tips();
             });
             $("#client_cookie_add").click(function() {
-                let machine_id = $("#client_cookie_worker").val();
+                let machine_id = $("#client_cookie_machine").val();
                 if (machine_id) {
                     let client_cookie = $("#client_cookie_content").val();
                     if (client_cookie) {
@@ -799,7 +844,7 @@ $(function () {
                             if (j["code"] && j["code"] === 1) {
                                 $("#client_cookie_tips").html("<b class='text-success'>Cookie添加成功！</b>");
                             } else if (j["code"] && j["code"] === 2) {
-                                $("#client_cookie_tips").html("<b class='text-danger'>Worker 不存在！</b>");
+                                $("#client_cookie_tips").html("<b class='text-danger'>Machine 不存在！</b>");
                             } else if (j["code"] && j["code"] === 3) {
                                 $("#client_cookie_tips").html("<b class='text-danger'>Cookie异常！</b>");
                             } else {
@@ -811,7 +856,7 @@ $(function () {
                         $("#client_cookie_tips").html("<b class='text-danger'>Cookie不能为空！</b>");
                     }
                 } else {
-                    $("#client_cookie_tips").html("<b class='text-danger'>Worker 异常！</b>");
+                    $("#client_cookie_tips").html("<b class='text-danger'>Machine 异常！</b>");
                 }
                 return false;
             });

package/util.js

@@ -95,7 +95,7 @@ const Util = {
             Util.save_page_content_image(element);
         });
 
-        $('#stock').keyup(function () {
+        $("#stock").on("focus keyup", function () {
             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)) {
@@ -173,9 +173,7 @@ const Util = {
                         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");
+                    $("#search-tips").html(html.join("")).css("display", "block");
                     Util.hide_tips();
                 } else {
                     Util.hide_tips();