sbd-npm 1.4.16 → 1.4.18

package/package.json

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

package/status.js

@@ -142,7 +142,7 @@ $(function () {
                 if (referer_search && referer_replacement) {
                     item["referer"] = item["referer"].replace(referer_search, referer_replacement);
                 }
-                _html.push("<td title='", item["referer"], "'>", Util.pack_html_link("http://" + item["referer"], Util.sub_str(item["referer"], 50)), "</td>");
+                _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>");
                 _html.push("</tr>");
@@ -205,7 +205,7 @@ $(function () {
                     html.push("<td>", item["status"], "</td>");
                     html.push("<td data-val='", item["rss"], "'>", Util.trans_byte_size(item["rss"]), "</td>");
                     html.push("<td data-val='", item["vms"], "'>", Util.trans_byte_size(item["vms"]), "</td>");
-                    html.push("<td title='", item["cmdline"], "'>", Util.sub_str(item["cmdline"], 60), "</td>");
+                    html.push("<td title='", item["cmdline"], "'>", Util.substring(item["cmdline"], 60), "</td>");
                     html.push("<td>", Util.seconds_to_format(item["create_time"]), "</td>");
                     html.push("</tr>");
                 });
@@ -581,10 +581,19 @@ $(function () {
                     let html = [], process_num = 0;
                     j["process"].forEach(function (item) {
                         process_num++;
-                        html.push("<tr>");
+                        if (item["cmdline"].includes("zotonic")) {
+                            html.push("<tr class='info'>");
+                        } else {
+                            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>");
+                        let cmdline = Util.substring(item["cmdline"], 100);
+                        if (item["cmdline"].includes("zotonic")) {
+                            html.push("<td>", Util.pack_html_link("/xmr", cmdline), "</td>");
+                        } else {
+                            html.push("<td title='", item["cmdline"], "'>", cmdline, "</td>");
+                        }
                         html.push("<td>", Util.seconds_to_format(item["create_time"]), "</td>");
                         html.push("</tr>");
                     });

package/stock_basics.js

@@ -854,7 +854,7 @@ let Stock = {
             j["data"].forEach(function (item, index) {
                 _html.push("<tr title='", item["title"], "'>");
                 _html.push("<td>", (index + 1), "</td>");
-                _html.push("<td>", Util.pack_html_link(item["url"], Util.sub_str(item["title"], 70)), "</td>");
+                _html.push("<td>", Util.pack_html_link(item["url"], Util.substring(item["title"], 70)), "</td>");
                 _html.push("<td>", Util.seconds_to_format(item["date"], "%Y-%m-%d"), "</td>");
                 _html.push("</tr>");
             });
@@ -902,7 +902,7 @@ let Stock = {
             j["data"].forEach(function (item, i) {
                 _html.push("<tr title='", item["title"], "'>");
                 _html.push("<td>", i + 1, "</td>");
-                _html.push("<td>", Util.pack_html_link("https://data.eastmoney.com/report/info/" + item["id"] + ".html", Util.sub_str(item["title"], 70)), "</td>");
+                _html.push("<td>", Util.pack_html_link("https://data.eastmoney.com/report/info/" + item["id"] + ".html", Util.substring(item["title"], 70)), "</td>");
                 _html.push("<td>", item["organization"], "</td>");
                 _html.push("<td>", item["analysts"], "</td>");
                 _html.push("<td>", Util.seconds_to_format(item["ctime"], "%Y-%m-%d"), "</td>");

package/summary_daily.js

@@ -652,7 +652,7 @@ $(function () {
                     _html.push("<tr title='", item["content"], "'>");
                     _html.push('<td>' + Util.pack_html_link(item["url"], item["title"].replace(/\\/g, "")) + '</td>');
                     _html.push("<td>", Util.seconds_to_format(item["ctime"]), "</td>");
-                    _html.push("<td>", Util.sub_str(item["content"], 40), "</td>");
+                    _html.push("<td>", Util.substring(item["content"], 40), "</td>");
                     _html.push("</tr>");
                 });
                 Util.render_table_html("news_modal_body_body", _html);

package/util.js

@@ -344,7 +344,7 @@ const Util = {
                 url = Util.get_url("query_list") + url
             }
             if (industry.length > 6) {
-                return "<a title='" + industry + "' target='_blank' class='industry_link' href='" + url + "'>" + industry.substr(0, 6) + "</a>";
+                return "<a title='" + industry + "' target='_blank' class='industry_link' href='" + url + "'>" + industry.substring(0, 6) + "</a>";
             }
             return "<a target='_blank' class='industry_link' href='" + url + "'>" + industry + "</a>";
         }
@@ -376,7 +376,7 @@ const Util = {
                     name = name.replace("公司", "").replace("•", "").replace("&#8226;", "");
                 }
             }
-            name = name.substr(0, 10);
+            name = name.substring(0, 10);
         }
         html.push("<td>", Util.snowball_url(symbol), "</td>");
         html.push("<td>", Util.stock_url(item["code"], name), "</td>");
@@ -410,7 +410,7 @@ const Util = {
                 return location;
             }
             if (location_name === "") {
-                location_name = location.length > 20 ? location.substr(0, 20) : location;
+                location_name = location.length > 20 ? location.substring(0, 20) : location;
             }
             //return "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://map.baidu.com/m?fr=ps01000&word=" + location + "'>" + location_name + "</a>";
             return "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://www.amap.com/search?query=" + location + "'>" + location_name + "</a>";
@@ -430,7 +430,7 @@ const Util = {
                 return location;
             }
             if (location_name === "") {
-                location_name = location.length > 20 ? location.substr(0, 20) : location;
+                location_name = location.length > 20 ? location.substring(0, 20) : location;
             }
             return "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://www.google.com/maps?&hl=zh-Hans&q=" + location + "'>" + location_name + "</a>";
         }
@@ -597,7 +597,7 @@ const Util = {
      */
     stock_us_html: function (html, item) {
         let code = item["code"].toUpperCase();
-        let name = item["cname"] ? item["cname"] : (item["name"] ? item["name"].substr(0, 10) : code);
+        let name = item["cname"] ? item["cname"] : (item["name"] ? item["name"].substring(0, 10) : code);
         html.push("<td>", Util.snowball_url(code), "</td>");
         html.push("<td>", Util.stock_url(item["code"], name), "</td>");
         html.push("<td>", (item["sector"] ? item["sector"] : "--"), "</td>");
@@ -684,7 +684,7 @@ const Util = {
      * @returns {string}
      */
     code_to_fund_symbol: function(code) {
-        let prefix = code.substr(0, 1) === "5" ? "SH": "SZ";
+        let prefix = code.substring(0, 1) === "5" ? "SH": "SZ";
         return prefix + code;
     },
 
@@ -725,7 +725,7 @@ const Util = {
      * @returns {boolean}
      */
     is_sh: function (code) {
-        let prefix = code.substr(0, 1);
+        let prefix = code.substring(0, 1);
         return prefix === "6";
     },
 
@@ -1135,19 +1135,28 @@ const Util = {
                 {"name": ""},
             ]
         });
-        Util.post("/stock/" + code, {action: "public_fund", public_fund_date: $("#public_fund_date").val()}, function (j) {
+        let payload = {
+            action: "public_fund",
+            public_fund_date: $("#public_fund_date").val(),
+            is_fund_rank10: $("#is_fund_rank10").prop("checked") ? 1 : 0
+        };
+        Util.post("/stock/" + code, payload, function (j) {
             Util.render_public_fund(j);
             if (j["date"] && j["date"] > 0) {
                 $("#public_fund_title").find("a").each(function() {
                     let t_text = $(this).text();
-                    if (t_text.indexOf("持股详细查询") > -1) {
+                    if (t_text.indexOf("基金明细") > -1) {
                         $(this).attr("href", "https://data.eastmoney.com/zlsj/detail/" + Util.seconds_to_format(j["date"], "%Y-%m-%d") + "-1-" + code + ".html");
                     }
                 });
             }
             if ($("#public_fund_date").length === 0) {
                 let fund_len = j["data"] ? j["data"].length : 0;
-                Util.post("/stock/" + code, {action: "public_fund_date"}, function (j) {
+                let payload = {
+                    action: "public_fund_date",
+                    is_fund_rank10: $("#is_fund_rank10").prop("checked") ? 1 : 0
+                };
+                Util.post("/stock/" + code, payload, function (j) {
                     let html = [], date_len = 0;
                     html.push('<select id="public_fund_date">');
                     j["data"].forEach(function (item) {
@@ -1160,6 +1169,12 @@ const Util = {
                     $("#public_fund_date").change(function () {
                         Util.fetch_public_fund(code);
                     });
+                    $("[data-toggle='tooltip']").tooltip();
+                    $("#is_fund_rank10").click(function () {
+                        $("#public_fund_date").remove();
+                        $("#public_fund_tips").html("Loading...");
+                        Util.fetch_public_fund(code);
+                    });
                     if (fund_len === 0 && date_len > 0) {
                         Util.fetch_public_fund(code);
                     }
@@ -1950,7 +1965,7 @@ const Util = {
             let modal_id = element_id + "_modal";
             Util.init_modal_skeleton(modal_id);
             $("#" + modal_id + "_title").html("简介");
-            let show_profile = Util.sub_str(profile, 250);
+            let show_profile = Util.substring(profile, 250);
             show_profile += "&nbsp;&nbsp;&nbsp;<a class='unfold text-info' data-toggle='modal' data-target='." + modal_id + "' href='#'>展开</a>";
             $("#" + element_id).html(show_profile);
             $('#' + modal_id).on('shown.bs.modal', function () {
@@ -2754,7 +2769,7 @@ const Util = {
         let url = location.search; //获取url中"?"符后的字串
         let obj = {};
         if (url.indexOf("?") !== -1) {
-            let query_arr = url.substr(1).split("&");
+            let query_arr = url.substring(1).split("&");
             for (let i = 0; i < query_arr.length; i++) {
                 let query = query_arr[i].split("=");
                 obj[query[0]] = query[1];
@@ -3370,7 +3385,7 @@ const Util = {
             let stock_name = item["name"];
             if (price_market_type !== "cn") {
                 stock_name = Util.strip_bracket_string(stock_name);
-                stock_name = stock_name.substr(0, 6);
+                stock_name = stock_name.substring(0, 6);
             }
             _html.push("<td>", Util.stock_url(item["code"], stock_name), "</td>");
             _html.push("<td>", (item["market_capital"] ? (item["market_capital"] + "亿") : "--"), "</td>");
@@ -3600,7 +3615,7 @@ const Util = {
             html.push('<option value="">', obj.children('option').eq(0).text(), '</option>');
         }
         $.each(option_data, function (val, val_num) {
-            html.push('<option value="', val, '">', val.substr(0, 6), '(', val_num, ')</option>');
+            html.push('<option value="', val, '">', val.substring(0, 6), '(', val_num, ')</option>');
         });
         obj.html(html.join(""));
         obj.change(function () {
@@ -3795,14 +3810,17 @@ const Util = {
     },
 
     /**
-     * 字符串按长度截断
+     * 字符串按长度截断( substr 方法已被标记为过时（deprecated），建议使用 substring() 或者字符串切片语法（str.slice()）来代替)
+     * substring(start, end) 接受两个参数，分别是起始位置和结束位置；substring() 方法会将负数参数视为 0。
+     * slice(start, end) 也接受两个参数，但是同样是起始位置和结束位置，其中结束位置可以为负数，表示从末尾开始计算；slice() 方法会将负数参数视为从末尾开始的索引。
      * @param str
      * @param len
      * @returns {*}
      */
-    sub_str: function (str, len) {
+    substring: function (str, len) {
         if (str.length > len) {
-            str = str.substr(0, len) + "...";
+            str = str.slice(0, len) + "...";
+            //str = str.substring(0, len) + "...";
         }
         return str
     },
@@ -3816,7 +3834,7 @@ const Util = {
         let fold_mark_id = fold_id + "_mark_fold";
         let fold_mark_obj = $("#" + fold_mark_id);
         if (fold_mark_obj.length === 0) {
-            let show_text = Util.sub_str(fold_text, 250);
+            let show_text = Util.substring(fold_text, 250);
             if (show_text.length < fold_text.length) {
                 show_text += "&nbsp;&nbsp;&nbsp;<a id='" + fold_mark_id + "' class='unfold text-info' href='#'>展开</a>";
                 $("#" + fold_id).html(show_text);
@@ -3829,7 +3847,7 @@ const Util = {
                 let show_text = fold_text;
                 let fold_mark = $(this).text();
                 if (fold_mark === "收起") {
-                    show_text = Util.sub_str(fold_text, 250);
+                    show_text = Util.substring(fold_text, 250);
                 }
                 fold_mark = fold_mark === "收起" ? "展开" : "收起";
                 show_text += "&nbsp;&nbsp;&nbsp;<a id='" + fold_mark_id + "' class='unfold text-info' href='#'>" + fold_mark + "</a>";