sbd-npm 1.1.62 → 1.1.66

package/.npmignore

@@ -0,0 +1 @@
+sbd-npm.md

package/menu.js

@@ -50,6 +50,7 @@ const MenuList = [
 			{'key': 'trend_doji', 'name': '十字星', 'url': '/718eac2cccaef1c7968f2d121b5f3070'},
 			{'key': 'trend_ma510', 'name': '突破5、10日均线', 'url': '/4d6d7ee173c87b1f939fa454093a63c7'},
 			{'key': 'trend_holder_minimum', 'name': '股东数历史最少', 'url': '/a9e45d918bc565afd76047cafea25824'},
+			{'key': 'trend_fund_hold', 'name': '基金持股变化', 'url': '/067740976f85ec14ddae02b51829ce35'},
 			{'key': 'trend_week_minimum', 'name': '周成交低点', 'url': '/722d94429b8e689fe78dca1cf67a4c67'},
 			{'key': 'trend_margin', 'name': '融资融券余额涨幅', 'url': '/1964a6bc56dc3ce6825b23667c7fb588'},
 			{'key': 'trend_price', 'name': '股价升跌幅度', 'url': '/43ef6aeb36475f8f8f44d477b1990390'},

package/package.json

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

package/util.js

@@ -364,11 +364,6 @@ const Util = {
                     $(this).html(Util.year_price_rate(item["price"], item["high_52week"]));
                 });
             }
-            if (item["holder_num"] && item["holder_num"] > 0 && item["pre_holder_num"]) {
-                $(".holder_" + code).each(function () {
-                    $(this).html(Util.pack_holder_num(item));
-                });
-            }
         }
         if (item["high"]) {
             let high_price = Util.digit_compare_trend(item["high"], item["previous_price"]);
@@ -1175,7 +1170,7 @@ const Util = {
      * 一周的哪一天（1-7，星期一：1，星期二：2，...星期日：7）
      * @returns {*|number}
      */
-    get_weekday: function() {
+    get_weekday: function () {
         let date = new Date();
         let weekday = date.getDay();
         weekday = weekday > 0 ? weekday : 7; // 星期天是0
@@ -1842,7 +1837,14 @@ const Util = {
         obj.tooltip();
     },
 
-    init_stock_stuff: function (element_id, index_list, is_us = 0) {
+    /**
+     * 初始一些数据
+     * @param element_id
+     * @param index_list
+     * @param is_us
+     * @param is_refresh 开市时是否定时刷新，1是0否
+     */
+    init_stock_stuff: function (element_id, index_list, is_us = 0, is_refresh = 1) {
         let code_list = Util.get_code_list(element_id);
         if (code_list.length > 0) {
             Util.show_tips("Loading...");
@@ -1850,6 +1852,11 @@ const Util = {
             Util.post("/action", {action: "code_detail", code_list: code_list.join("-")}, function (j) {
                 $.each(j, function (code, item) {
                     Util.render_price(item);
+                    if (item["holder_num"] && item["holder_num"] > 0) {
+                        $(".holder_" + code).each(function () {
+                            $(this).html(Util.pack_holder_num(item));
+                        });
+                    }
                     if ($("#remark_" + code).length) {
                         let remark = "";
                         if (parseInt(item["down_day"]) > 0) {
@@ -1877,37 +1884,24 @@ const Util = {
                         $("#remark_" + code).html(remark);
                     }
                 });
-                Util.refresh_index_price(element_id, index_list.join("-"), is_us);
+                if (is_refresh === 1) {
+                    Util.refresh_index_price(element_id, index_list.join("-"), is_us);
+                } else {
+                    Util.refresh_index_price(element_id, index_list.join("-"), is_us, 0);
+                }
                 Util.hide_tips();
             });
         }
     },
 
-    countdown_func: function (interval, tips_id, callback_func) {
-        if (interval > 0) {
-            $("#" + tips_id).html("交易中, " + interval + " 秒后刷新");
-            setTimeout(function () {
-                Util.countdown_func(interval - 1, tips_id, callback_func);
-            }, 1000);
-        } else {
-            $("#" + tips_id).html("刷新中...");
-            callback_func();
-        }
-    },
-
-    countdown_refresh_index_price: function (interval, element_id, index_list, is_us, us_market_status) {
-        if (interval > 0) {
-            $("#" + element_id + "_tips").html("交易中, " + interval + " 秒后刷新");
-            setTimeout(function () {
-                Util.countdown_refresh_index_price(interval - 1, element_id, index_list, is_us, us_market_status);
-            }, 1000);
-        } else {
-            $("#" + element_id + "_tips").html("刷新中...");
-            Util.refresh_index_price(element_id, index_list, is_us, us_market_status);
-        }
-    },
-
-    refresh_index_price: function (element_id, index_list, is_us = 0, us_market_status = -1) {
+    /**
+     * 刷新指数和价格数据
+     * @param element_id
+     * @param index_list
+     * @param is_us
+     * @param is_refresh 1刷新，0不刷新，-1美股开市则刷新
+     */
+    refresh_index_price: function (element_id, index_list, is_us = 0, is_refresh = -1) {
         let code_list = Util.get_code_list(element_id);
         if (code_list.length > 0) {
             let payload = {action: "index_price", index_list: index_list, code_list: code_list.join("-")};
@@ -1931,9 +1925,9 @@ const Util = {
                     }
                 });
                 if (is_us === 1) {
-                    if (us_market_status === 1) {
-                        Util.countdown_refresh_index_price(5, element_id, index_list, is_us, us_market_status);
-                    } else if (us_market_status === -1) {
+                    if (is_refresh === 1) {
+                        Util.countdown_refresh_index_price(5, element_id, index_list, is_us, is_refresh);
+                    } else if (is_refresh === -1) {  // 美股开市则刷新
                         Util.post("/action", {action: "us_market_status"}, function (ums) {
                             if (ums === "1") {
                                 Util.countdown_refresh_index_price(5, element_id, index_list, is_us, 1);
@@ -1941,14 +1935,48 @@ const Util = {
                         }, "text");
                     }
                 } else {
-                    if (j["is_holiday"] === 0 && Util.is_trade_time()) {
-                        Util.countdown_refresh_index_price(5, element_id, index_list, is_us, us_market_status);
+                    if (is_refresh !== 0 && j["is_holiday"] === 0) {
+                        if (Util.is_trade_time()) {
+                            Util.countdown_refresh_index_price(5, element_id, index_list, is_us, is_refresh);
+                        }
                     }
                 }
             });
         }
     },
 
+    /**
+     * 指数和价格数据刷新的倒计时
+     * @param interval
+     * @param element_id
+     * @param index_list
+     * @param is_us
+     * @param is_refresh
+     */
+    countdown_refresh_index_price: function (interval, element_id, index_list, is_us, is_refresh) {
+        if (interval > 0) {
+            $("#" + element_id + "_tips").html("交易中, " + interval + " 秒后刷新");
+            setTimeout(function () {
+                Util.countdown_refresh_index_price(interval - 1, element_id, index_list, is_us, is_refresh);
+            }, 1000);
+        } else {
+            $("#" + element_id + "_tips").html("刷新中...");
+            Util.refresh_index_price(element_id, index_list, is_us, is_refresh);
+        }
+    },
+
+    countdown_func: function (interval, tips_id, callback_func) {
+        if (interval > 0) {
+            $("#" + tips_id).html("交易中, " + interval + " 秒后刷新");
+            setTimeout(function () {
+                Util.countdown_func(interval - 1, tips_id, callback_func);
+            }, 1000);
+        } else {
+            $("#" + tips_id).html("刷新中...");
+            callback_func();
+        }
+    },
+
     /**
      * 获取页面标题
      * @returns {string}
@@ -2081,10 +2109,11 @@ const Util = {
      * @param item
      * @returns {string}
      */
-    pack_holder_num: function(item) {
-        if (item["holder_num"] && item["holder_num"] > 0 && item["pre_holder_num"]) {
+    pack_holder_num: function (item) {
+        if (item["holder_num"] && item["holder_num"] > 0) {
             let url = Util.get_url("holder_num") + "?code=" + item["code"];
-            return Util.pack_html_link(url, Util.digit_compare_trend(item["holder_num"], item["pre_holder_num"]));
+            let pre_holder_num = item["pre_holder_num"] ? item["pre_holder_num"] : 0;
+            return Util.pack_html_link(url, Util.digit_compare_trend(item["holder_num"], pre_holder_num));
         }
         return "--";
     },