sbd-npm 1.2.12 → 1.2.15

package/package.json

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

package/stock_basics.js

@@ -613,11 +613,11 @@ let Stock = {
             "element_id": "profit_table",
             "head_cols": [
                 {"name": "年份季度"},
-                {"name": "净资产收益率(ROE)", "tooltip": "Return On Equity"},
+                {"name": "ROE", "tooltip": "净资产收益率(Return On Equity)"},
                 {"name": "净利率(%)"},
                 {"name": "毛利率"},
                 {"name": "净利润"},
-                {"name": "每股收益(EPS)", "tooltip": "Earnings Per Share"},
+                {"name": "EPS", "tooltip": "每股收益(Earnings Per Share)"},
                 {"name": "营业收入"},
                 {"name": "每股主营业务收入"},
             ]
@@ -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

@@ -577,6 +577,13 @@ const Util = {
         return /(iPhone|iPad|iPod|iOS|Android|Mobile)/i.test(navigator.userAgent);
     },
 
+    /**
+     * 是否苹果系的设备
+     */
+    is_macintosh: function () {
+        return /(Mac|iPhone|iPod|iPad)/i.test(navigator.userAgent);
+    },
+
     /**
      * 分页函数
      * @param data_id