sbd-npm 1.3.16 → 1.3.18

package/package.json

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

package/stock_basics.js

@@ -1177,51 +1177,104 @@ let Stock = {
         };
         Util.post("/stock/" + Stock["code"], payload, function (j) {
             Stock["hkex_holding_chart"].hideLoading();
-            let date_data = [];
-            let volume_data = [];
-            let price_data = [];
+            let date_data = [], volume_data = [], price_data = [];
             j["data"].forEach(function (item) {
                 date_data.push(Util.seconds_to_format(item["date"], "%Y-%m-%d"));
                 volume_data.push(item["volume"]);
                 price_data.push(item["price"]);
             });
-            let hhs_obj = $("#hkex_holding_summary");
-            let hkex_holding_summary = "[" + Util.pack_html_link(j["url"], hhs_obj.text()) + "]";
+            let hkex_holding_summary = "[" + Util.pack_html_link(j["url"] + "&code=" + Stock["code"] + "&name=" + Stock["name"], Stock["name"]) + "]";
             if (j["latest"].length > 0) {
-                let circulation_stock = $("#circulation_stock").attr("data-val");
-                let latest_html = "";
-                if (j["latest"].length === 1) {
-                    let holding_num = Util.to_hundred_million(j["latest"][0]["volume"], 3);
-                    let holding_rate = Math.round((holding_num / circulation_stock) * 10000) / 100;
-                    latest_html = "最新(" + Util.seconds_to_format(j["latest"][0]["date"], "%Y-%m-%d") + "): " + holding_num + "亿股, 占 <b>" + holding_rate + "%</b> 流通股, ";
-                } else if (j["latest"].length === 2) {
+                let latest_html = "最新(" + Util.seconds_to_format(j["latest"][0]["date"], "%Y-%m-%d") + "): <span style='color: #FFF;' class='label label-info'>" + Util.to_hundred_million(j["latest"][0]["volume"], 4) + "</span>亿股";
+                let dist_tips = "";
+                if (j["latest"].length === 2) {
                     let d1 = j["latest"][0];
                     let d2 = j["latest"][1];
                     let difference = d1["volume"] - d2["volume"];
-                    let dist_tips = "";
                     if (difference > 0) {
                         dist_tips = "(<b title='" + Util.strip_html(Util.to_unit(d2["volume"])) + "股' style='color: #a94442;'>+" + Util.strip_html(Util.to_unit(difference)) + "股</b>)";
                     } else if (difference < 0) {
                         dist_tips = "(<b title='" + Util.strip_html(Util.to_unit(d2["volume"])) + "股' style='color: #3c763d;'>" + Util.strip_html(Util.to_unit(difference)) + "股</b>)";
                     }
-                    let holding_num = Util.to_hundred_million(d1["volume"]);
-                    let holding_rate = Math.round((holding_num / circulation_stock) * 10000) / 100;
-                    latest_html = "最新(" + Util.seconds_to_format(d1["date"], "%Y-%m-%d") + "): " + holding_num + "亿股" + dist_tips + ", 占 <b>" + holding_rate + "%</b> 流通股, ";
                 }
-                hkex_holding_summary += (latest_html + ' 最高: ' + Util.to_unit(j["high"]["volume"]) + '股(' + Util.seconds_to_format(j["high"]["date"], "%Y-%m-%d") +
-                    ') 最低: ' + Util.to_unit(j["low"]["volume"]) + '股(' + Util.seconds_to_format(j["low"]["date"], "%Y-%m-%d") + ')');
+                latest_html += dist_tips + ", 占 <span style='color: #FFF;' class='label label-info'>" + j["latest"][0]["ratio"] + "%</span> 流通股, ";
+                hkex_holding_summary += (latest_html + ' 最高: <span style="color: #FFF;" class="label label-danger">' + Util.strip_html(Util.to_unit(j["high"]["volume"])) + '股</span>(' + Util.seconds_to_format(j["high"]["date"], "%Y-%m-%d") +
+                    ') 最低: <span style="color: #FFF;" class="label label-success">' + Util.strip_html(Util.to_unit(j["low"]["volume"])) + '股</span>(' + Util.seconds_to_format(j["low"]["date"], "%Y-%m-%d") + ')');
             }
-            hhs_obj.html(hkex_holding_summary);
+            $("#hkex_holding_summary").html(hkex_holding_summary);
             Stock["hkex_holding_chart"] = Util.multi_axis_line(Stock["hkex_holding_chart"], "hkex_holding_line_canvas", date_data, '持股数', volume_data, '股价', price_data);
-            let flow_data = [];
+            let flow_data = [], color_data = [];
             date_data = [];
-            let color_data = [];
             j["flow_data"].forEach(function (item) {
                 date_data.push(item["date"]);
                 flow_data.push(item["value"]);
                 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) {
+                Stock.fetch_hkex_holding_modal();
+            }
+            Util.hide_tips();
+        });
+    },
+
+    fetch_hkex_holding_modal: function () {
+        Util.init_modal_skeleton("hkex_holding_modal", '');
+        $("#hkex_holding_modal_title").html("[" + Stock["name"] + "]港股通持股明细数据<span style='color: #BDBDBD;' id='hkex_holding_modal_summary'></span>");
+        let hhm_obj = $('#hkex_holding_modal');
+        hhm_obj.on('shown.bs.modal', function (e) {
+            Util.init_table_skeleton({
+                "element_id": "hkex_holding_modal_body",
+                "caption": "none",
+                "head_cols": [
+                    {"name": "日期", "class": "info", "table_sort": 1},
+                    {"name": "持股量(万股)", "table_sort": 1},
+                    {"name": "净买入股数", "table_sort": 1},
+                    {"name": "收盘价", "table_sort": 1},
+                    {"name": "涨跌", "table_sort": 1},
+                    {"name": "持股比例", "table_sort": 1, "title": "内地港股通账户持仓股数 / 流通股本数"},
+                ]
+            });
+            Util.post("/stock/{{ stock['code'] }}", {action: "hk_stock_exchange"}, function (j) {
+                let _html = [];
+                j["data"].forEach(function (item, index) {
+                    _html.push("<tr>");
+                    _html.push("<td>", Util.seconds_to_format(item["date"], "%Y-%m-%d"), "</td>");
+                    _html.push("<td title='", item["volume"], "' data-val='", item["volume"], "'>", Util.to_ten_thousand(item["volume"], 4), "万股</td>");
+                    let net_volume = "--", gap_volume = 0;
+                    if (j["data"][index + 1] && j["data"][index + 1]["volume"]) {
+                        gap_volume = item["volume"] - j["data"][index + 1]["volume"];
+                        if (gap_volume > 0) {
+                            net_volume = "<b class='text-danger'>+" + Util.to_ten_thousand(gap_volume, 4) + "万股</b>";
+                        } else if (gap_volume < 0) {
+                            net_volume = "<b class='text-success'>" + Util.to_ten_thousand(gap_volume, 4) + "万股</b>";
+                        }
+                    }
+                    _html.push("<td data-val='", gap_volume, "'>", net_volume, "</td>");
+                    let text_color = Util.text_color(item["p_change"]);
+                    _html.push("<td><b class='", text_color, "'>", item["close"], "</b></td>");
+                    item["p_change"] = item["p_change"] > 0 ? ("+" + item["p_change"]) : item["p_change"];
+                    _html.push("<td><b class='", text_color, "'>", item["p_change"], "%</b></td>");
+                    _html.push("<td>", item["ratio"], "%</td>");
+                    _html.push("</tr>");
+                });
+                if (j["data"].length > 1) {
+                    let hkex_holding_modal_summary = " (当前最新的持股比例<b class='text-info'>(" + j["data"][0]["ratio"] + "%)</b>";
+                    let gap_volume = j["data"][0]["volume"] - j["data"][1]["volume"];
+                    if (gap_volume > 0) {
+                        hkex_holding_modal_summary += "相对于前一天持股增加 <b class='text-danger'>+" + Util.to_ten_thousand(gap_volume) + "万股</b>";
+                    } else if (gap_volume < 0) {
+                        hkex_holding_modal_summary += "相对于前一天持股减少 <b class='text-success'>" + Util.to_ten_thousand(gap_volume) + "万股</b>";
+                    }
+                    hkex_holding_modal_summary += ")";
+                    $("#hkex_holding_modal_summary").html(hkex_holding_modal_summary);
+                }
+                Util.render_table_html("hkex_holding_modal_body_body", _html);
+                Util.hide_tips();
+            });
+        });
+        hhm_obj.on('hidden.bs.modal', function () {
+            $("#hkex_holding_modal_body").html("Loading...");
             Util.hide_tips();
         });
     },

package/util.js

@@ -1091,8 +1091,8 @@ const Util = {
             Util.render_type_option($("#stock_category_industry"), j["data"], "industry", Util.render_stock_category_html);
             Util.render_type_option($("#stock_category_area"), j["data"], "area", Util.render_stock_category_html);
             Util.render_stock_category_html();
-            if (j["concept_url"]) {
-                $("#stock_category_remark_title").html(Util.pack_html_link(j["concept_url"], "备注<i class='glyphicon glyphicon-link'></i>"));
+            if (j["portfolio_url"]) {
+                $("#stock_category_remark_title").html(Util.pack_html_link(j["portfolio_url"], "备注<i class='glyphicon glyphicon-link'></i>"));
             }
             Util.hide_tips();
         });
@@ -2210,6 +2210,7 @@ const Util = {
                 if (sort_type === Obj[sort_key].toString()) {
                     let sort_cls = Obj[sort_order] === 0 ? "fa-sort-desc" : "fa-sort-asc";
                     $("<i class='fa fa-fw " + sort_cls + "'></i>").insertAfter($(this));
+                    $(this).parent().addClass("info");
                 } else {
                     $("<i class='fa fa-fw fa-sort'></i>").insertAfter($(this));
                 }