sbd-npm 1.2.11 → 1.2.14

package/package.json

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

package/sbd.css

@@ -64,15 +64,16 @@ table a:hover, a.btn {
 }
 
 #loading_div {
-    position:absolute;
-    top:0;
-    left:0;
-    right:0;
-    bottom:0;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
     height: 100px;
     text-align: center;
-    margin-top: 200px;
+    margin-top: 300px;
 }
+
 #loading_div .circle {
     margin: 20px;
     height: 50px;
@@ -83,6 +84,7 @@ table a:hover, a.btn {
     transform: scale(0);
     animation: bulge 2s infinite ease-in-out;
 }
+
 #loading_div .circle::after {
     position: absolute;
     display: inline-block;
@@ -97,20 +99,25 @@ table a:hover, a.btn {
     transform: scale(1);
     animation: blow 2s infinite ease-in-out;
 }
+
 #loading_div .circle:nth-child(1) {
     animation-delay: 0s;
 }
+
 #loading_div .circle:nth-child(2) {
     animation-delay: .25s;
 }
+
 #loading_div .circle:nth-child(3) {
     animation-delay: .50s;
 }
+
 @keyframes bulge {
     50% {
         transform: scale(1);
     }
 }
+
 @keyframes blow {
     25% {
         opacity: 0.5;

package/stock_basics.js

@@ -1226,11 +1226,8 @@ let Stock = {
     },
 
     fetch_hkex_holding: function () {
+        let is_summary = Stock.hkex_holding_chart ? 0 : 1;
         Stock["hkex_holding_chart"] = Util.show_chart_loading(Stock["hkex_holding_chart"], "hkex_holding_line_canvas");
-        let is_summary = 0;
-        if (!Stock.hkex_holding_chart) {
-            is_summary = 1;
-        }
         let payload = {
             action: "hkex_holding",
             is_summary: is_summary,
@@ -1248,33 +1245,33 @@ let Stock = {
                 volume_data.push(item["volume"]);
                 price_data.push(item["price"]);
             });
-            if (!Stock.hkex_holding_chart && 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"]);
-                    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 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>)";
+            if (is_summary === 1) {
+                let hhs_obj = $("#hkex_holding_summary");
+                let hkex_holding_summary = "[" + Util.pack_html_link(j["url"], hhs_obj.text()) + "]";
+                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"]);
+                        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 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> 流通股, ";
                     }
-                    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") + ')');
                 }
-                let hhs_obj = $("#hkex_holding_summary");
-                let hkex_holding_summary = hhs_obj.text();
-                hkex_holding_summary = '[<a target="_blank" rel="noopener noreferrer nofollow" class="link_cls" href="' + j["url"] + '">' +
-                    hkex_holding_summary + "</a>]" + 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") + ')';
                 hhs_obj.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);

package/util.js

@@ -253,7 +253,7 @@ const Util = {
         let name = item["cname"] ? item["cname"] : (item["name"] ? item["name"].substr(0, 10) : symbol);
         html.push("<td>", Util.snowball_url(symbol), "</td>");
         html.push("<td>", Util.stock_url(item["code"], name), "</td>");
-        html.push("<td>", (item["pe_ttm"] ? item["pe_ttm"] : item["pe"]), "</td>");
+        html.push("<td>", Util.to_float((item["pe_ttm"] ? item["pe_ttm"] : item["pe"]), 2), "</td>");
         html.push("<td>", (item["market_capital"] ? (Util.to_float(item["market_capital"], 2) + "亿") : "--"), "</td>");
         html.push("<td>", Util.industry_url(item["code"], item["industry"]), "</td>");
         html.push("<td>", Util.map_url((item["province_city"] && item["province_city"] !== "None") ? item["province_city"] : item["area"]), "</td>");
@@ -445,7 +445,7 @@ const Util = {
         html.push("<td>", Util.stock_url(item["code"], name), "</td>");
         html.push("<td class='hk_industry'>", item["industry"], "</td>");
         html.push("<td>", Util.map_url(item["province_city"]), "</td>");
-        html.push("<td>", item["pe"], "</td>");
+        html.push("<td>", Util.to_float((item["pe_ttm"] ? item["pe_ttm"] : item["pe"]), 2), "</td>");
         html.push("<td>", Util.to_float(item["total_shares"], 2), "亿</td>");
         html.push("<td>", market_capital_hkd, "亿(", market_capital_cny, "亿)</td>");
         html.push("<td>", item["chairman"], "</td>");
@@ -470,7 +470,7 @@ const Util = {
         html.push("<td>", (item["sector"] ? item["sector"] : "--"), "</td>");
         html.push("<td>", Util.industry_url(item["code"], item["industry"]), "</td>");
         html.push("<td>", Util.map_url(item["registered"]), "</td>");
-        html.push("<td>", item["pe"], "</td>");
+        html.push("<td>", Util.to_float((item["pe_ttm"] ? item["pe_ttm"] : item["pe"]), 2), "</td>");
         html.push("<td>", Util.to_float(item["total_shares"], 2), "亿</td>");
         html.push("<td>", Util.to_float(item["market_capital"], 3), "亿</td>");
         html.push("<td class='price_", item["code"].toLowerCase(), "'>", item["price"], "</td>");
@@ -1213,7 +1213,7 @@ const Util = {
      * @param element_id
      * @param profile
      */
-    init_profile_component: function(element_id, profile) {
+    init_profile_component: function (element_id, profile) {
         if (profile && profile.length > 0) {
             let modal_id = element_id + "_modal";
             Util.init_modal_skeleton(modal_id);
@@ -2300,7 +2300,7 @@ const Util = {
      * @param item
      * @returns {string}
      */
-    pack_snowball_follower: function(item) {
+    pack_snowball_follower: function (item) {
         if (item["snowball_follower"] && item["snowball_follower"] > 0) {
             let snowball_follower_rank = Util.to_unit(item["snowball_follower"]) + "(" + item["snowball_follower_rank"] + ")";
             let market_type = Util.is_hk(item["code"]) ? "hk" : "cn";