sbd-npm 1.3.66 → 1.3.68

package/constant.js

@@ -27,7 +27,7 @@ const MenuList = [
 			{'key': 'trend_kdj', 'name': 'KDJ金叉', 'url': '/0x3382bdaec4e8715ce27ca2b538dce09a2f8f5e50'},
 			{'key': 'trend_macd_cross', 'name': 'MACD金叉', 'url': '/0x277bc35fcd21059103dd7917c8bfe0c474880b85'},
 			{'key': 'trend_bull_trend', 'name': '多头趋势', 'url': '/0x37b24777154ee090926e57bfa5602efa5c89b8a8'},
-			{'key': 'trend_fund_hold', 'name': '基金数持股变化', 'url': '/0x706c0e77ca3e314b5186c763e6ee857b744e9880'},
+			{'key': 'trend_fund_hold', 'name': '基金持股变化', 'url': '/0x706c0e77ca3e314b5186c763e6ee857b744e9880'},
 			{'key': 'trend_money_inflow', 'name': '资金流入历史最高', 'url': '/0xfbfc92be1eebe9ccf5b2f14b9a2ea25f2cc941b8'},
 			{'key': 'trend_boll', 'name': '布林线', 'url': '/0x7f2c6b9542ce7626669ab4910cbf7e8812883fea'},
 			{'key': 'trend_holder_minimum', 'name': '股东数历史最少', 'url': '/0xf0c0c360a283689c83ae216c6bbb03777d8068ca'},

package/package.json

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

package/stock_basics.js

@@ -238,6 +238,11 @@ let Stock = {
             if (item["is_hs300"]) {
                 remark_html += " <a href='" + (Util.get_url("summary_index") + "?index_code=SH000300") + "' class='btn btn-xs btn-warning'>沪深300</a>";
             }
+            if (item["etf_data"]) {
+                item["etf_data"].forEach(function (etf) {
+                    remark_html += " <a class='btn btn-xs btn-warning' data-toggle='modal' data-target='.public_fund_modal' data-val='" + etf["etf_code"] + "'>" + etf["etf_name"] + "</a>";
+                });
+            }
             if (item["links"]) {
                 if (remark_html.length > 0) {
                     remark_html += "<br>";

package/util.js

@@ -351,7 +351,7 @@ const Util = {
         let name = symbol;
         if (item["cname"]) {
             if (Util.is_us(item["code"])) {
-                name = item["cname"].replace("公司", "").replace("•", "").replace("•", "");
+                name = item["cname"].replace("有限公司", "").replace("公司", "").replace("•", "").replace("•", "");
             } else {
                 name = item["cname"];
             }
@@ -1224,23 +1224,38 @@ const Util = {
      */
     fetch_public_fund_change: function (code) {
         Util["pfc_stock_chart"] = Util.show_chart_loading(Util["pfc_stock_chart"], "pfc_stock_line_canvas");
-        Util.init_table_skeleton({
-            "element_id": "pfc_fund_table",
-            "head_cols": [
-                {"name": "时间", "class": "info", "table_sort": 1},
-                {"name": "当时股价", "table_sort": 1},
-                {"name": "总持股数", "table_sort": 1},
-                {"name": "持仓家数", "table_sort": 1},
-                {"name": "持仓市值", "table_sort": 1, "title": "当时股价 * 总持股数"},
-            ]
-        });
+        if ($("#pfc_fund_table_body").length === 0) {
+            Util.init_table_skeleton({
+                "element_id": "pfc_fund_table",
+                "head_cols": [
+                    {"name": "季度时间", "class": "info", "table_sort": 1},
+                    {"name": "当时股价", "table_sort": 1, "title": "当季最后一个交易日的收盘价"},
+                    {"name": "持股总数", "table_sort": 1},
+                    {"name": "持仓基金数", "table_sort": 1},
+                    {"name": "持股进前10的基金数", "table_sort": 1, "title": "基金数以持股数占比进前10内的股票来统计"},
+                    {"name": "持仓市值", "table_sort": 1, "title": "当时股价 * 持股总数"},
+                ]
+            });
+            if ($("#is_fund10_num").length > 0) {
+                $("#is_fund10_num").click(function() {
+                    Util.fetch_public_fund_change(code);
+                });
+            }
+        }
         Util.post("/stock/" + code, {action: "public_fund_change"}, function (j) {
             Util["pfc_stock_chart"].hideLoading();
-            let date_data = [], fund_num_data = [], stock_num_data = [], price_data = [], _html = [];
+            let date_data = [], fund_num_data = [], stock_num_data = [], price_data = [], _html = [], is_fund10_num = 0;
+            if ($("#is_fund10_num").length > 0) {
+                is_fund10_num = $("#is_fund10_num").prop("checked") ? 1 : 0;
+            }
             j["data"].forEach(function (item) {
                 let date_format = Util.seconds_to_format(item["date"], "%Y-%m-%d");
                 date_data.push(date_format);
-                fund_num_data.push(item["fund_num"]);
+                if (is_fund10_num === 1) {
+                    fund_num_data.push(item["fund_rank_num"]);
+                } else {
+                    fund_num_data.push(item["fund_num"]);
+                }
                 stock_num_data.push(item["stock_num"]);
                 price_data.push(item["price"]);
                 _html.push("<tr>");
@@ -1259,9 +1274,13 @@ const Util = {
                 if (item["pre_fund_num"]) {
                     fund_num_rate = "(" + Util.year_price_rate(item["fund_num"], item["pre_fund_num"], 1) + ")";
                 }
-                _html.push("<td>", item["fund_num"], fund_num_rate, "</td>");
-                let market_capital = item["price"] * item["stock_num"];
-                _html.push("<td data-val='", market_capital, "' title='", market_capital, "'>", Util.to_unit(market_capital, 4), "</td>");
+                _html.push("<td data-val='", item["fund_num"], "'>", item["fund_num"], fund_num_rate, "</td>");
+                let fund_rank_num_rate = "";
+                if (item["pre_fund_rank_num"]) {
+                    fund_rank_num_rate = "(" + Util.year_price_rate(item["fund_rank_num"], item["pre_fund_rank_num"], 1) + ")";
+                }
+                _html.push("<td data-val='", item["fund_rank_num"], "'>", item["fund_rank_num"], fund_rank_num_rate, "</td>");
+                _html.push("<td data-val='", item["hold_value"], "' title='", item["hold_value"], "'>", Util.to_unit(item["hold_value"], 3), "</td>");
                 _html.push("</tr>");
             });
             date_data = date_data.reverse();