sbd-npm 1.4.98 → 1.4.99

package/package.json

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

package/status.js

@@ -69,7 +69,7 @@ $(function () {
                     Status.handle_site_map();
                     break;
             }
-            Status["data"][active_div] = 1;
+            Status.data[active_div] = 1;
         },
 
         handle_status: function () {
@@ -777,12 +777,12 @@ $(function () {
                     $("#machine_refresh").click(function() {
                         if (confirm("是否确定要“ 刷新Machine ” ？")) {
                             Util.show_loading();
-                            $("#machine_refresh").attr("disabled", true).html("正在处理中...");
+                            $("#machine_refresh").prop("disabled", true).html("正在处理中...");
                             Util.post(location.pathname, {active_div: "machine_refresh"}, function (j) {
                                 setTimeout(() => {
                                     $('#machine_process_div').html('');
                                     $('#machines').html('<option value="">暂无Machine</option>');
-                                    $("#machine_refresh").html("刷新Machine").attr("disabled", false);
+                                    $("#machine_refresh").html("刷新Machine").prop("disabled", false);
                                     Util.hide_tips();
                                     Util.show_tips("刷新成功", 3456, "alert-success");
                                 }, 2345);
@@ -1137,6 +1137,7 @@ $(function () {
             });
             cam_obj.on('hidden.bs.modal', function () {
                 $("#machine_instruction_tips").html("");
+                $("#machine_instruction_add").prop("disabled", false);
                 Util.hide_tips();
             });
             $("#machine_instruction_add").click(function() {
@@ -1150,9 +1151,9 @@ $(function () {
                     if (instruction) {
                         Util.show_loading();
                         $("#machine_instruction_tips").html("");
-                        $("#machine_instruction_add").attr("disabled", true);
+                        $("#machine_instruction_add").prop("disabled", true);
                         Util.post(location.pathname, {active_div: "machine_instruction_add", "machine_id": machine_id, "instruction": instruction, action_type: action_type}, function (j) {
-                            $("#machine_instruction_add").attr("disabled", false);
+                            $("#machine_instruction_add").prop("disabled", false);
                             if (j.code === 1) {
                                 $("#machine_instruction_tips").html("<b class='text-success'>任务`" + instruction + "`添加成功！</b>");
                                 $("#machine_instruction_modal_title_tips").html("&nbsp;(" + instruction + ")");
@@ -1221,6 +1222,7 @@ $(function () {
             ccm_obj.on('hidden.bs.modal', function () {
                 $("#machine_cookie_content").val("");
                 $("#machine_cookie_tips").html("");
+                $("#machine_cookie_add").prop("disabled", false);
                 Util.hide_tips();
             });
             $("#machine_cookie_add").click(function() {
@@ -1230,9 +1232,9 @@ $(function () {
                     if (machine_cookie) {
                         Util.show_loading();
                         $("#machine_cookie_tips").html("");
-                        $("#machine_cookie_add").attr("disabled", true);
+                        $("#machine_cookie_add").prop("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);
+                            $("#machine_cookie_add").prop("disabled", false);
                             if (j.code === 1) {
                                 $("#machine_cookie_tips").html("<b class='text-success'>Cookie添加成功！</b>");
                             } else if (j.code === 2) {
@@ -1377,10 +1379,10 @@ $(function () {
                         Util.show_loading();
                         ip = match_ip_data[0];
                         $("#ip").prop('disabled', true);
-                        $("#ip_query").attr("disabled", true);
+                        $("#ip_query").prop("disabled", true);
                         Util.post("/action", {action: "ip_query", ip: ip}, function (j) {
                             $("#ip").prop('disabled', false);
-                            $("#ip_query").attr("disabled", false);
+                            $("#ip_query").prop("disabled", false);
                             if (j.ip) {
                                 if (j.domain) {
                                     let domain = $("#ip").val().trim();
@@ -1421,10 +1423,10 @@ $(function () {
                 if (md5) {
                     Util.show_loading();
                     $("#md5").prop('disabled', true);
-                    $("#md5_encrypt").attr("disabled", true);
+                    $("#md5_encrypt").prop("disabled", true);
                     Util.post("/action", {action: "md5", md5: md5}, function (md5_result) {
                         $("#md5").prop('disabled', false);
-                        $("#md5_encrypt").attr("disabled", false);
+                        $("#md5_encrypt").prop("disabled", false);
                         $("#md5_result").html("<b class='text-success'>" + md5_result + "</b>");
                         Util.hide_tips();
                     }, "text");
@@ -1544,10 +1546,10 @@ $(function () {
             if (phone && Util.is_phone(phone)) {
                 Util.show_loading();
                 $("#phone").prop('disabled', true);
-                $("#phone_query").attr("disabled", true);
+                $("#phone_query").prop("disabled", true);
                 Util.post("/action", {action: "phone_query", phone: phone}, function (j) {
                     $("#phone").prop('disabled', false);
-                    $("#phone_query").attr("disabled", false);
+                    $("#phone_query").prop("disabled", false);
                     if (j.belong) {
                         let phone_url = Util.pack_html_link("https://www.ip138.com/mobile.asp?mobile=" + phone + "&action=mobile", "<i class='glyphicon glyphicon-link'></i> ");
                         $("#phone_result").html(Status.convert_phone(j) + "&nbsp;&nbsp;" + phone_url);
@@ -1695,10 +1697,10 @@ $(function () {
     });
 
     let request_arguments = Util.request_arguments();
-    if (request_arguments["tab"]) {
-        localStorage[Status.tab_token] = request_arguments["tab"];
-        if (request_arguments["tab"] === "tool" && request_arguments["phone"]) {
-            $("#phone").val(request_arguments["phone"]);
+    if (request_arguments.tab) {
+        localStorage[Status.tab_token] = request_arguments.tab;
+        if (request_arguments.tab === "tool" && request_arguments.phone) {
+            $("#phone").val(request_arguments.phone);
             setTimeout(() => {
                 Status.phone_query();
             }, 1234);

package/stock_basics.js

@@ -135,7 +135,7 @@ let Stock = {
                 Stock.fetch_hist_data();
                 break;
         }
-        Stock["data"][active_div] = 1;
+        Stock.data[active_div] = 1;
     },
 
     fetch_base: function () {
@@ -227,8 +227,8 @@ let Stock = {
                 }
                 remark_html += "&nbsp;&nbsp;<b>行业板块:</b> ";
                 item.industry_data.forEach(function (i_d) {
-                    let url = Util.get_url("summary_industry") + "?code=" + i_d["code"] + "&industry_type=" + i_d["industry_type"];
-                    remark_html += " <a href='" + url + "' class='btn btn-xs btn-warning'>" + i_d["name"] + "</a>";
+                    let url = Util.get_url("summary_industry") + "?code=" + i_d.code + "&industry_type=" + i_d.industry_type;
+                    remark_html += " <a href='" + url + "' class='btn btn-xs btn-warning'>" + i_d.name + "</a>";
                 });
             }
             if (item.is_sh50) {
@@ -382,7 +382,7 @@ let Stock = {
     },
 
     fetch_big_deal: function () {
-        if ($("#big_deal_table_body").length <= 0) {
+        if (!document.getElementById("big_deal_table_body")) {
             Util.show_loading();
             let money_inflow_url = Util.get_url("trend_money_inflow");
             Util.init_table_skeleton({
@@ -1145,7 +1145,7 @@ let Stock = {
                 }
             });
             Stock["margin_month_flow_chart"] = Util.chart_basic_bar(Stock["margin_month_flow_chart"], "margin_month_flow_bar_chart", date_data, flow_data, "增幅(单位:万)", color_data);
-            if ($("#margin_modal_body").length === 0) {
+            if (!document.getElementById("margin_modal_body")) {
                 Stock.fetch_margin_modal();
             }
             Util.hide_tips();
@@ -1265,7 +1265,7 @@ let Stock = {
                 color_data.push(item.value > 0 ? "#E74C3C" : "#1ABB9C");
             });
             Stock["hkex_holding_month_flow_chart"] = Util.chart_basic_bar(Stock["hkex_holding_month_flow_chart"], "hkex_holding_month_flow_chart", date_data, flow_data, "增幅", color_data);
-            if ($("#hkex_holding_modal_body").length === 0) {
+            if (!document.getElementById("hkex_holding_modal_body")) {
                 Stock.fetch_hkex_holding_modal();
             }
             Util.hide_tips();
@@ -1343,7 +1343,7 @@ let Stock = {
         Util.init_public_fund_component("public_fund_modal");
 
         let request_arguments = Util.request_arguments();
-        localStorage[Stock.tab_token] = request_arguments["tab"] ? request_arguments["tab"] : "base";
+        localStorage[Stock.tab_token] = request_arguments.tab ? request_arguments.tab : "base";
         Util.tab_switch(Stock.tab_token, Stock.fetch_data);
         Stock.fetch_data();
 

package/summary_daily.js

@@ -678,7 +678,7 @@ $(function () {
     let mam_obj = $('#index_hist_modal');
     mam_obj.on('shown.bs.modal', function (e) {
         Util.set_table_loading("index_hist_modal_body_body");
-        if ($("#index_hist_modal_start_date").length <= 0) {
+        if (!document.getElementById("index_hist_modal_start_date")) {
             Util.init_date_range_picker("index_hist_modal_start_end_date", DailySummary, "render_index_hist_modal");
         }
         $("#index_hist_modal_query").click(function () {

package/util.js

@@ -294,10 +294,10 @@ const Util = {
      * jsonpCallback：设置 JSONP 回调函数的名称
      * @param url
      * @param payload
-     * @param callback 回调函数
+     * @param callback_func 回调函数
      * @param data_type json | text
      */
-    post: function (url, payload, callback, data_type = "json") {
+    post: function (url, payload, callback_func, data_type = "json") {
         Util.is_load = true;
         $.ajax({
             url: url,
@@ -311,7 +311,7 @@ const Util = {
             dataType: data_type,
             data: payload,
             success: function(data) {
-                callback(data);
+                callback_func(data);
                 Util.is_init = 1;
                 Util.is_load = false;
             },
@@ -663,9 +663,9 @@ const Util = {
      */
     rand_stock: function (rand_btn_id, stock_type) {
         $("#" + rand_btn_id).click(function () {
-            $(this).attr("disabled", true);
+            $(this).prop("disabled", true);
             Util.post("/action", {action: "rand_stock", stock_type: stock_type}, function (j) {
-                $("#" + rand_btn_id).attr("disabled", false);
+                $("#" + rand_btn_id).prop("disabled", false);
                 if (j.code) {
                     window.open("/stock/" + j.code, "_blank");
                 }
@@ -1094,11 +1094,8 @@ const Util = {
         let html = [];
         html.push('<option value="0">板块</option>');
         classify_data.forEach(function (d) {
-            let num = "";
-            if (d["num"] > 0) {
-                num = "(" + d["num"] + ")";
-            }
-            html.push('<option value="', d["name"], '">', d["name"], num, '</option>');
+            let num = d.num > 0 ? ("(" + d.num + ")") : "";
+            html.push('<option value="', d.name, '">', d.name, num, '</option>');
         });
         let classify_obj = $("#" + classify_id);
         classify_obj.html(html.join(""));
@@ -1135,7 +1132,7 @@ const Util = {
      */
     fetch_rps_data: function (code, zone_id) {
         Util.show_loading();
-        if ($("#rps_table").length <= 0) {
+        if (!document.getElementById("rps_table")) {
             let rps_html = [];
             rps_html.push('<div class="x_panel">');
             rps_html.push('<div class="x_title">');
@@ -1214,7 +1211,7 @@ const Util = {
                     }
                 });
             }
-            if ($("#public_fund_date").length === 0) {
+            if (!document.getElementById("public_fund_date")) {
                 let fund_len = j.data ? j.data.length : 0;
                 let payload = {
                     action: "public_fund_date",
@@ -1343,7 +1340,7 @@ const Util = {
      */
     fetch_public_fund_change: function (code) {
         Util["pfc_stock_chart"] = Util.show_chart_loading(Util["pfc_stock_chart"], "pfc_stock_line_canvas");
-        if ($("#pfc_fund_table_body").length === 0) {
+        if (!document.getElementById("pfc_fund_table_body")) {
             Util.init_table_skeleton({
                 "element_id": "pfc_fund_table",
                 "head_columns": [
@@ -1355,7 +1352,7 @@ const Util = {
                     {"name": "持仓市值", "table_sort": 1, "title": "当时股价 * 持股总数"},
                 ]
             });
-            if ($("#is_fund10_num").length > 0) {
+            if (document.getElementById("is_fund10_num")) {
                 $("#is_fund10_num").click(function() {
                     Util.fetch_public_fund_change(code);
                 });
@@ -1364,7 +1361,7 @@ const Util = {
         Util.post("/stock/" + code, {action: "public_fund_change"}, function (j) {
             Util["pfc_stock_chart"].hideLoading();
             let date_data = [], fund_num_data = [], stock_num_data = [], value_data = [], price_data = [], html = [], is_fund10_num = 0;
-            if ($("#is_fund10_num").length > 0) {
+            if (document.getElementById("is_fund10_num")) {
                 is_fund10_num = $("#is_fund10_num").prop("checked") ? 1 : 0;
             }
             j.data.forEach(function (item) {
@@ -1491,7 +1488,7 @@ const Util = {
     render_portfolio_html: function () {
         if (Util["portfolio_table_id"]) {
             let html = [], total_num = 0;
-            let is_us = $("#portfolio_remark_title").length === 0 ? 1 : 0;
+            let is_us = document.getElementById("portfolio_remark_title") ? 0 : 1;
             if (Util["portfolio_data"]) {
                 let industry = $("#portfolio_industry").val();
                 let area = $("#portfolio_area").val();
@@ -1550,8 +1547,8 @@ const Util = {
                     Util.fetch_public_fund_detail(localStorage["modal_public_fund_code"], component_id);
                 } else {
                     let request_arguments = Util.request_arguments();
-                    if (request_arguments["fund_code"]) {
-                        Util.fetch_public_fund_detail(request_arguments["fund_code"], component_id);
+                    if (request_arguments.fund_code) {
+                        Util.fetch_public_fund_detail(request_arguments.fund_code, component_id);
                     }
                 }
             }
@@ -1709,7 +1706,7 @@ const Util = {
         Util.post(location.pathname, {active_div: "word", is_init: is_init, specify_day: specify_day, search_key: search_key}, function (j) {
             let html = [], index = 0;
             let is_mobile = Util.is_mobile();
-            let is_speech_synthesis = $("#word_recite").length > 0 ? 1 : 0;
+            let is_speech_synthesis = document.getElementById("word_recite") ? 1 : 0;
             j.data.forEach(function (item) {
                 index++;
                 html.push("<tr>");
@@ -1869,7 +1866,7 @@ const Util = {
         component_obj.on('shown.bs.modal', function (e) {   // 此事件在模态框已经显示出来触发
             let currency = $(e.relatedTarget).attr("data-code");
             Util.set_table_loading(component_id + "_body_body");
-            if ($("#currency_modal_start_date").length <= 0) {
+            if (!document.getElementById("currency_modal_start_date")) {
                 Util.init_date_range_picker("currency_modal_start_end_date", Util, "render_currency_modal", 60);
             }
             let title_obj = $("#currency_modal_title");
@@ -1961,7 +1958,7 @@ const Util = {
         component_obj.on('shown.bs.modal', function (e) {   // 此事件在模态框已经显示出来触发
             Util.set_table_loading(component_id + "_body_body");
             let coin = $(e.relatedTarget).attr("data-coin");
-            if ($("#" + component_id + "_start_date").length <= 0) {
+            if (!document.getElementById(component_id + "_start_date")) {
                 Util.init_date_range_picker(component_id + "_start_end_date", Util, "render_btc_modal", 60);
             }
             let title_obj = $("#" + component_id + "_title");
@@ -2422,8 +2419,8 @@ const Util = {
             let select_val = $("#" + select_id).val();
             let sd_obj = $('#' + start_id);
             let ed_obj = $('#' + end_id);
-            sd_obj.attr("disabled", false);
-            ed_obj.attr("disabled", false);
+            sd_obj.prop("disabled", false);
+            ed_obj.prop("disabled", false);
             let weekday = Util.get_weekday();
             let date = new Date();
             let year = date.getFullYear();
@@ -2491,8 +2488,8 @@ const Util = {
                     ed_obj.val(Util.seconds_to_format(midnight_second, "%Y-%m-%d"));
                     break;
                 case "99":
-                    sd_obj.attr("disabled", true);
-                    ed_obj.attr("disabled", true);
+                    sd_obj.prop("disabled", true);
+                    ed_obj.prop("disabled", true);
                     break;
                 case "100": // 还原
                     sd_obj.val(Obj.start_date);
@@ -2910,16 +2907,17 @@ const Util = {
      * @returns {{}}
      */
     request_arguments: function () {
-        let url = location.search; //获取url中"?"符后的字串
-        let obj = {};
-        if (url.includes("?")) {
-            let query_array = url.substring(1).split("&");
-            for (let i = 0; i < query_array.length; i++) {
-                let query = query_array[i].split("=");
-                obj[query[0]] = query[1];
-            }
-        }
-        return obj;
+        // let url = location.search; //获取url中"?"符后的字串
+        // let obj = {};
+        // if (url.includes("?")) {
+        //     let query_array = url.substring(1).split("&");
+        //     for (let i = 0; i < query_array.length; i++) {
+        //         let query = query_array[i].split("=");
+        //         obj[query[0]] = query[1];
+        //     }
+        // }
+        // return obj;
+        return Object.fromEntries(new URLSearchParams(location.search));
     },
 
     sleep: function (ms) {
@@ -3008,7 +3006,7 @@ const Util = {
      * @returns {boolean}
      */
     is_loading: function () {
-        return $("#" + Util.load_token).length > 0;
+        return document.getElementById(Util.load_token) !== null;
     },
 
     tooltip: function (element_id, tip) {
@@ -4023,7 +4021,7 @@ const Util = {
 
     init_metrics_statistics: function (metrics, title, callback_func) {
         let metrics_drop_down_id = metrics + "_time_drop_down";
-        if ($("#" + metrics_drop_down_id).length === 0) {
+        if (!document.getElementById(metrics_drop_down_id)) {
             let html = [];
             html.push('<div class="x_panel">');
             html.push('<div class="x_title"><div class="form-inline">');
@@ -4237,7 +4235,7 @@ const Util = {
         chart_instance.clear();
         let series_data = [];
         line_data.forEach(function (line) {
-            let color = line["color"] ? line["color"] : "#4DC9F6";
+            let color = line.color ? line.color : "#4DC9F6";
             let series = {
                 "type": "line",
                 "showSymbol": false,
@@ -4250,10 +4248,10 @@ const Util = {
                     "color": color
                 },
                 "markPoint": Util.chart_mark_point,
-                "data": line["data"]
+                "data": line.data
             };
-            if (line["label"]) {
-                series["name"] = line["label"];
+            if (line.label) {
+                series["name"] = line.label;
             }
             series_data.push(series);
         });