sbd-npm 1.4.52 → 1.4.54

package/package.json

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

package/status.js

@@ -154,10 +154,32 @@ $(function () {
                 }
                 html.push("<td title='", item["referer"], "'>", Util.pack_html_link("http://" + item["referer"], Util.substring(item["referer"], 50)), "</td>");
                 html.push("<td>", item["visit"], "</td>");
-                html.push("<td>", Util.seconds_to_format(item["time"]), "</td>");
+                if (item["is_block"] === 1) {
+                    html.push("<td>", Util.seconds_to_format(item["time"]), "</td>");
+                } else {
+                    html.push("<td><a href='#' class='block_ip' data-val='", item["ip"], "'>", Util.seconds_to_format(item["time"]), "</a></td>");
+                }
                 html.push("</tr>");
             });
             Util.render_table_html("ip_daily_data", html);
+            $("#ip_daily_data .block_ip").each(function() {
+                $(this).click(function() {
+                    let ip = $(this).attr("data-val");
+                    if (confirm("是否确定要屏蔽IP “ " + ip + " ” ？")) {
+                        Util.show_loading();
+                        Util.post(location.pathname, {"active_div": "block_ip", "ip": ip}, function (j) {
+                            Util.hide_tips();
+                            if (j["code"] === 1) {
+                                Util.show_tips("IP “ " + ip + " ” 已加到屏蔽队列中", 4567, "alert-success");
+                            } else if (j["code"] === 2) {
+                                Util.show_tips("IP “ " + ip + " ” 已在屏蔽队列中", 4567, "alert-success");
+                            } else {
+                                Util.show_tips("屏蔽IP “ " + ip + " ” 失败", 4567, "alert-danger");
+                            }
+                        });
+                    }
+                });
+            });
         },
 
         pack_ip_link: function(ip) {
@@ -237,9 +259,9 @@ $(function () {
                     ]
                 });
             }
-            Util.post(location.pathname, {active_div: localStorage[Status.tab_token]}, function (j) {
+            Util.post(location.pathname, {active_div: "get_block_ip"}, function (j) {
                 let html = [], ip_num = j["num"];
-                $("#ip_num").html("共 <span class='label label-info'>" + j["num"] + "</span> 条(" + j["total_ip_num"] + ")&nbsp;");
+                $("#ip_num").html("共 <span class='label label-info'>" + ip_num + "</span> 条(" + j["total_ip_num"] + ")&nbsp;");
                 j["data"].forEach(function (item) {
                     html.push("<tr>");
                     html.push("<td>", ip_num, "</td>");
@@ -506,14 +528,14 @@ $(function () {
                 $("#task_div").html(ht_html.join(""));
                 $("#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）
+                    task_content = task_content.replace(/[^\w\u4e00-\u9fff-]/g, ''); // 去掉除字母、数字、下划线(_)、汉字、横杠(-)外的其他字符（䒚 /[^\w\u3400-\u9fff\u{20000}-\u{2EBEF}]/gu）
                     if (task_content && task_content.length > 0) {
                         $("#task_content").prop('disabled', true);
                         $("#task_add").prop('disabled', true);
                         Util.show_loading();
                         $("#task_tips").html("");
                         Util.post(location.pathname, {active_div: "task_add", "task_content": task_content, machine_id: $("#task_machines").val()}, function (j) {
-                            if (j["code"] && j["code"] === 1) {
+                            if (j["code"] === 1) {
                                 Status.task_status = 1;
                                 $("#task_add").html('任务处理中...').removeClass("btn-default").addClass("btn-warning");
                                 if (!document.getElementById("task_result")) {
@@ -525,16 +547,16 @@ $(function () {
                                 }
                                 $("#task_result").val(task_result);
                                 if ($("#is_refresh_task").prop("checked")) {
-                                    Status.task_timer_id = setTimeout(function () {
+                                    Status.task_timer_id = setTimeout(() => {
                                         Status.fetch_task_data(0);
                                     }, 5678);
                                 }
                             } else {
                                 Status.task_status = 0;
-                                if (j["code"] && j["code"] === 2) {
+                                if (j["code"] === 2) {
                                     let do_content = j["do_content"] ? ("(" + j["do_content"] + ")") : "";
                                     $("#task_tips").html("<b class='text-danger'>已添加新任务" + do_content + "在处理中！</b>");
-                                } else if (j["code"] && j["code"] === 3) {
+                                } else if (j["code"] === 3) {
                                     let doing_content = j["doing_content"] ? ("(" + j["doing_content"] + ")") : "";
                                     $("#task_tips").html("<b class='text-danger'>有任务" + doing_content + "在执行中！</b>");
                                 } else {
@@ -597,7 +619,7 @@ $(function () {
                         ta_obj.html('任务处理中...').prop('disabled', true).removeClass("btn-default").addClass("btn-warning");
                         tc_obj.prop('disabled', true);
                         if ($("#is_refresh_task").prop("checked")) {
-                            Status.task_timer_id = setTimeout(function () {
+                            Status.task_timer_id = setTimeout(() => {
                                 Status.fetch_task_data(0);
                             }, 3456);
                         }
@@ -660,7 +682,7 @@ $(function () {
                             Util.show_loading();
                             $("#machine_refresh").attr("disabled", true).html("正在处理中...");
                             Util.post(location.pathname, {active_div: "machine_refresh"}, function (j) {
-                                setTimeout(function () {
+                                setTimeout(() => {
                                     $('#machine_process_div').html('');
                                     $('#machines').html('<option value="">暂无Machine</option>');
                                     $("#machine_refresh").html("刷新Machine").attr("disabled", false);
@@ -875,11 +897,11 @@ $(function () {
                         $("#machine_action_add").attr("disabled", true);
                         Util.post(location.pathname, {active_div: "machine_action_add", "machine_id": machine_id, "content": action_content, action_type: action_type}, function (j) {
                             $("#machine_action_add").attr("disabled", false);
-                            if (j["code"] && j["code"] === 1) {
+                            if (j["code"] === 1) {
                                 $("#machine_action_tips").html("<b class='text-success'>任务`" + action_content + "`添加成功！</b>");
-                            } else if (j["code"] && j["code"] === 2) {
+                            } else if (j["code"] === 2) {
                                 $("#machine_action_tips").html("<b class='text-danger'>Machine 不存在！</b>");
-                            } else if (j["code"] && j["code"] === 3) {
+                            } else if (j["code"] === 3) {
                                 $("#machine_action_tips").html("<b class='text-danger'>任务内容异常！</b>");
                             } else {
                                 $("#machine_action_tips").html("<b class='text-danger'>任务内容不能为空！</b>");
@@ -954,9 +976,9 @@ $(function () {
                         $("#machine_cookie_add").attr("disabled", true);
                         Util.post(location.pathname, {active_div: "machine_cookie_add", "machine_id": machine_id, "cookie": machine_cookie}, function (j) {
                             $("#machine_cookie_add").attr("disabled", false);
-                            if (j["code"] && j["code"] === 1) {
+                            if (j["code"] === 1) {
                                 $("#machine_cookie_tips").html("<b class='text-success'>Cookie添加成功！</b>");
-                            } else if (j["code"] && j["code"] === 2) {
+                            } else if (j["code"] === 2) {
                                 $("#machine_cookie_tips").html("<b class='text-danger'>Machine 不存在！</b>");
                             } else {
                                 $("#machine_cookie_tips").html("<b class='text-danger'>Cookie异常！</b>");
@@ -1033,11 +1055,11 @@ $(function () {
                         let chinese = $("#word_chinese").val();
                         if (chinese) {
                             Util.post(location.pathname, {"active_div": "word_modify", "word": word, "chinese": chinese}, function (j) {
-                                if (j["code"] && j["code"] === 1) {
+                                if (j["code"] === 1) {
                                     $("#word_chinese").val(j["chinese"]);
                                     $(tr_obj).children('td').eq(2).html(j["chinese"]);
                                     $("#word_tips").html("<b class='text-success'>修改成功！</b>");
-                                } else if (j["code"] && j["code"] === 2) {
+                                } else if (j["code"] === 2) {
                                     $("#word_tips").html("<b class='text-danger'>中文有误！</b>");
                                 } else {
                                     $("#word_tips").html("<b class='text-danger'>修改失败！</b>");
@@ -1364,7 +1386,7 @@ $(function () {
         localStorage[Status.tab_token] = request_arguments["tab"];
         if (request_arguments["tab"] === "tool" && request_arguments["phone"]) {
             $("#phone").val(request_arguments["phone"]);
-            setTimeout(function () {
+            setTimeout(() => {
                 Status.phone_query();
                 Enterprise.fetch_enterprise_detail(j["unified_code"]);
             }, 1234);

package/util.js

@@ -77,18 +77,14 @@ const Util = {
             return false;
         });
 
-        $("#random_walk").click(function () {
-            let url_arr = [];
-            $('.side-menu li a').each(function () {
-                let url = $(this).attr("href");
-                if (url) {
-                    url_arr.push(url);
-                }
-            });
-            if (url_arr.length > 0) {
-                window.open(Util.array_rand(url_arr), "_blank");
+        document.getElementById("random_walk").addEventListener("click", () => {
+            let nodeObject = document.querySelectorAll(".side-menu li a");
+            let url_array = Array.from(nodeObject).map(a => a.getAttribute("href")).filter(Boolean);
+            if (url_array.length > 0) {
+                window.open(Util.array_rand(url_array), "_blank");
             }
         });
+
         $("#save_page_content").click(function() {
             let element;
             if (document.getElementsByClassName("save_page_div").length > 0) {
@@ -115,21 +111,21 @@ const Util = {
                 $("#search-tips").css("display", "none");
             }
         });
-
-        $(document).click(function (event) {
-            let e_obj = Util.eventTarget(event);
-            let e_id = $(e_obj).attr("id");
-            if (e_id !== "stock") {
-                $("#search-tips").css("display", "none");
+        document.addEventListener("click", function(event) {
+            if (event.target.id !== "stock") {
+                let st_object = document.getElementById("search-tips");
+                if (st_object) {
+                    st_object.style.display = "none";
+                }
             }
         });
 
         Util.table_sort();
 
         let page_title = Util.get_page_title();
-        if (page_title && page_title.length > 0) {
+        if (page_title.length > 0) {
             let d_title = document.title;
-            if (d_title.indexOf(page_title) === -1) {
+            if (!d_title.includes(page_title)) {
                 document.title = page_title + " - " + d_title;
             }
         }
@@ -481,7 +477,7 @@ const Util = {
                 });
                 if (interval > 0 && Util.is_trade_time()) {
                     interval = parseInt(interval > 4321 ? interval : 4321);
-                    setTimeout(function () {
+                    setTimeout(() => {
                         Util.refresh_price(element_id, interval);
                     }, interval);
                 }
@@ -1716,9 +1712,11 @@ const Util = {
                     let word = $(tr_obj).children('td').eq(1).text();
                     let chinese = $(tr_obj).children('td').eq(2).text();
                     if (confirm("是否确定要删除“ " + word + "「" + chinese + "」 ” ？")) {
+                        Util.show_loading();
                         Util.post(location.pathname, {"active_div": "word_del", "word": word}, function () {
                             $(tr_obj).remove();
-                            Util.show_tips("删除 “ " + word + " ” 成功", 3456, "alert-success");
+                            Util.hide_tips();
+                            Util.show_tips("删除 “ " + word + " ” 成功", 4567, "alert-success");
                         });
                     }
                 });
@@ -2901,7 +2899,7 @@ const Util = {
                     loading = loading < 5 ? (loading + 1) : 1;
                     let load_str = ".".repeat(loading);
                     tips_obj.innerHTML = origin_msg + load_str;
-                    setTimeout(function () {
+                    setTimeout(() => {
                         Util.show_tips(msg, interval, cls, loading);
                     }, 300);
                 }
@@ -2921,9 +2919,9 @@ const Util = {
                 }
                 if (msg.indexOf(".") > -1 && msg.endsWith('.')) {
                     loading = msg.replace(/[^.]/g, '').length;
-                    setTimeout(function () {
+                    setTimeout(() => {
                         Util.show_tips(msg, interval, cls, loading);
-                    }, 200)
+                    }, 200);
                 }
             }
         }
@@ -3137,7 +3135,7 @@ const Util = {
     countdown_refresh_index_price: function (interval, element_id, index_list, is_us, is_refresh) {
         if (interval > 0) {
             $("#" + element_id + "_tips").html("交易中, " + interval + " 秒后刷新");
-            Util.countdown_timer_id = setTimeout(function () {
+            Util.countdown_timer_id = setTimeout(() => {
                 Util.countdown_refresh_index_price(interval - 1, element_id, index_list, is_us, is_refresh);
             }, 1000);
         } else {
@@ -3149,7 +3147,7 @@ const Util = {
     countdown_func: function (interval, tips_id, callback_func) {
         if (interval > 0) {
             $("#" + tips_id).html("交易中, " + interval + " 秒后刷新");
-            Util.countdown_timer_id = setTimeout(function () {
+            Util.countdown_timer_id = setTimeout(() => {
                 Util.countdown_func(interval - 1, tips_id, callback_func);
             }, 1000);
         } else {
@@ -3163,17 +3161,13 @@ const Util = {
      * @returns {string}
      */
     get_page_title: function () {
-        let page_title = "";
-        if (location.pathname) {
-            let current_url = location.pathname;
-            $('.side-menu li a').each(function () {
-                let url = $(this).attr("href");
-                if (url && url === current_url) {
-                    page_title = $(this).text();
-                }
-            });
+        let current_url = location.pathname;
+        if (current_url) {
+            let nodeObject = document.querySelectorAll('.side-menu li a');
+            let match = Array.from(nodeObject).find(a => a.getAttribute("href") === current_url);
+            return match ? match.textContent : "";
         }
-        return page_title;
+        return "";
     },
 
     /**