sbd-npm 1.3.58 → 1.3.60

package/package.json

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

package/stock_basics.js

@@ -86,7 +86,7 @@ let Stock = {
                 Stock.fetch_report_organization();
                 break;
             case "public_fund":
-                Stock.fetch_public_fund();
+                Util.fetch_public_fund(Stock["code"]);
                 break;
             case "public_fund_change":
                 Stock.fetch_public_fund_change();
@@ -916,99 +916,6 @@ let Stock = {
         });
     },
 
-    /**
-     * 公募持股
-     */
-    fetch_public_fund: function () {
-        Util.show_loading();
-        Util.init_table_skeleton({
-            "element_id": "public_fund_table",
-            "head_cols": [
-                {"name": "序号"},
-                {"name": "基金代码"},
-                {"name": "基金名"},
-                {"name": "净值", "tooltip": "单位净值", "table_sort": 1},
-                {"name": "资产规模", "table_sort": 1},
-                {"name": "基金类型"},
-                {"name": "投资类型"},
-                {"name": "基金公司"},
-                {"name": "成立日期", "table_sort": 1},
-                {"name": "持有量", "table_sort": 1, "class": "info"},
-                {"name": "持仓市值", "table_sort": 1},
-                {"name": ""},
-            ]
-        });
-        let payload = {
-            action: "public_fund",
-            public_fund_date: $("#public_fund_date").val()
-        };
-        Util.post("/stock/" + Stock["code"], payload, function (j) {
-            let _html = [], total_public_fund = 0, total_stock_num = 0, total_market_capital = 0;
-            j["data"].forEach(function (item) {
-                total_public_fund++;
-                total_stock_num += item["stock_num"];
-                total_market_capital += item["market_capital"];
-                let public_date = "--";
-                if (item["public_date"] > 0) {
-                    public_date = Util.seconds_to_format(item["public_date"], "%Y-%m-%d");
-                }
-                let net = item["net"];
-                let cls = Util.text_color(item["change_percent"])
-                if (cls !== "") {
-                    net = "<b class='" + cls + "'>" + net + "(" + Util.to_float(item["change_percent"], 2) + "%)</b>";
-                }
-                _html.push("<tr class='", (($.inArray(item["fund_code"], j["etf_code_list"]) > -1) ? "danger" : ""), "'>");
-                _html.push("<td>", total_public_fund, "</td>");
-                _html.push("<td>", Util.pack_html_link('https://fund.eastmoney.com/' + item["fund_code"] + '.html', item["fund_code"]), "</td>");
-                _html.push("<td title='基金概况'>", Util.pack_html_link('https://fundf10.eastmoney.com/jbgk_' + item["fund_code"] + '.html', item["fund_name"]), "</td>");
-                _html.push("<td>", net, "</td>");
-                _html.push("<td>", item["assets"], "亿</td>");
-                _html.push("<td>", item["fund_type"], "</td>");
-                _html.push("<td>", item["invest_type"], "</td>");
-                _html.push("<td>", Util.pack_html_link("https://baike.baidu.com/item/" + item["administrator"].replace("基金管理", "基金"), item["administrator"]), "</td>");
-                _html.push("<td>", public_date, "</td>");
-                _html.push("<td data-val='", item["stock_num"], "' title='", item["stock_num"], "'>", Util.to_unit(item["stock_num"], 3), "股</td>");
-                _html.push("<td data-val='", item["market_capital"], "' title='", item["market_capital"], "'>", Util.to_unit(item["market_capital"], 3), "</td>");
-                _html.push("<td><a class='link_cls' data-toggle='modal' data-target='.public_fund_modal' data-val='", item["fund_code"], "'>详细</a></td>");
-                _html.push("</tr>");
-            });
-            Util.render_table_html("public_fund_table_body", _html);
-            let public_fund_tips = "";
-            if (j["cur_fund_num"]) {
-                total_public_fund = Util.pack_html_link(Util.get_url("trend_fund_hold"), '<span class="label label-info">' + j["cur_fund_num"] + '</span>');
-                public_fund_tips = '共 ' + total_public_fund + ' 家(' + Util.year_price_rate(j["cur_fund_num"], j["pre_fund_num"], 1) + ')， <span class="label label-info">' + Util.to_unit(j["cur_stock_num"], 3) + '</span> 股(' + Util.year_price_rate(j["cur_stock_num"], j["pre_stock_num"], 1) + ')，<span class="label label-info">' + Util.to_unit(j["hold_value"], 3) + '</span>市值';
-            } else {
-                total_public_fund = Util.pack_html_link(Util.get_url("trend_fund_hold"), '<span class="label label-info">' + total_public_fund + '</span>');
-                public_fund_tips = '共 ' + total_public_fund + ' 家， <span class="label label-info">' + Util.to_unit(total_stock_num, 3) + '</span> 股，<span class="label label-info">' + Util.to_unit(total_market_capital, 3) + '</span>市值';
-            }
-            $("#public_fund_tips").html(public_fund_tips);
-            if (j["date"] && j["date"] > 0) {
-                $("#public_fund_title").find("a").each(function() {
-                    let t_text = $(this).text();
-                    if (t_text.indexOf("持股详细查询") > -1) {
-                        $(this).attr("href", "https://data.eastmoney.com/zlsj/detail/" + Util.seconds_to_format(j["date"], "%Y-%m-%d") + "-1-" + Stock["code"] + ".html");
-                    }
-                });
-            }
-            if ($("#public_fund_date").length === 0) {
-                Util.post("/stock/" + Stock["code"], {action: "public_fund_date"}, function (j) {
-                    let _html = [];
-                    _html.push('<select id="public_fund_date">');
-                    j["data"].forEach(function (item) {
-                        let date_format = Util.seconds_to_format(item["date"], "%Y-%m-%d");
-                        _html.push('<option value="', date_format, '">', date_format, '(', item["num"], ')</option>');
-                    });
-                    _html.push('</select>');
-                    $("#public_fund_date_zone").html(_html.join(""));
-                    $("#public_fund_date").change(function () {
-                        Stock.fetch_public_fund();
-                    });
-                });
-            }
-            Util.hide_tips();
-        });
-    },
-
     /**
      * 公募持股变化
      */

package/util.js

@@ -1070,6 +1070,100 @@ const Util = {
         });
     },
 
+    /**
+     * 公募持股
+     * @param code
+     */
+    fetch_public_fund: function (code) {
+        Util.show_loading();
+        Util.init_table_skeleton({
+            "element_id": "public_fund_table",
+            "head_cols": [
+                {"name": "序号"},
+                {"name": "基金代码"},
+                {"name": "基金名"},
+                {"name": "净值", "tooltip": "单位净值", "table_sort": 1},
+                {"name": "资产规模", "table_sort": 1},
+                {"name": "基金类型"},
+                {"name": "投资类型"},
+                {"name": "基金公司"},
+                {"name": "成立日期", "table_sort": 1},
+                {"name": "持有量", "table_sort": 1, "class": "info"},
+                {"name": "持仓市值", "table_sort": 1},
+                {"name": ""},
+            ]
+        });
+        let payload = {
+            action: "public_fund",
+            public_fund_date: $("#public_fund_date").val()
+        };
+        Util.post("/stock/" + code, payload, function (j) {
+            let _html = [], total_public_fund = 0, total_stock_num = 0, total_market_capital = 0;
+            j["data"].forEach(function (item) {
+                total_public_fund++;
+                total_stock_num += item["stock_num"];
+                total_market_capital += item["market_capital"];
+                let public_date = "--";
+                if (item["public_date"] > 0) {
+                    public_date = Util.seconds_to_format(item["public_date"], "%Y-%m-%d");
+                }
+                let net = item["net"];
+                let cls = Util.text_color(item["change_percent"])
+                if (cls !== "") {
+                    net = "<b class='" + cls + "'>" + net + "(" + Util.to_float(item["change_percent"], 2) + "%)</b>";
+                }
+                _html.push("<tr class='", (($.inArray(item["fund_code"], j["etf_code_list"]) > -1) ? "danger" : ""), "'>");
+                _html.push("<td>", total_public_fund, "</td>");
+                _html.push("<td>", Util.pack_html_link('https://fund.eastmoney.com/' + item["fund_code"] + '.html', item["fund_code"]), "</td>");
+                _html.push("<td title='基金概况'>", Util.pack_html_link('https://fundf10.eastmoney.com/jbgk_' + item["fund_code"] + '.html', item["fund_name"]), "</td>");
+                _html.push("<td>", net, "</td>");
+                _html.push("<td>", item["assets"], "亿</td>");
+                _html.push("<td>", item["fund_type"], "</td>");
+                _html.push("<td>", item["invest_type"], "</td>");
+                _html.push("<td>", Util.pack_fund_administrator(item), "</td>");
+                _html.push("<td>", public_date, "</td>");
+                _html.push("<td data-val='", item["stock_num"], "' title='", item["stock_num"], "'>", Util.to_unit(item["stock_num"], 3), "股</td>");
+                _html.push("<td data-val='", item["market_capital"], "' title='", item["market_capital"], "'>", Util.to_unit(item["market_capital"], 3), "</td>");
+                _html.push("<td><a class='link_cls' data-toggle='modal' data-target='.public_fund_modal' data-val='", item["fund_code"], "'>详细</a></td>");
+                _html.push("</tr>");
+            });
+            Util.render_table_html("public_fund_table_body", _html);
+            let public_fund_tips = "";
+            if (j["cur_fund_num"]) {
+                total_public_fund = Util.pack_html_link(Util.get_url("trend_fund_hold"), '<span class="label label-info">' + j["cur_fund_num"] + '</span>');
+                public_fund_tips = '共 ' + total_public_fund + ' 家(' + Util.year_price_rate(j["cur_fund_num"], j["pre_fund_num"], 1) + ')， <span class="label label-info">' + Util.to_unit(j["cur_stock_num"], 3) + '</span> 股(' + Util.year_price_rate(j["cur_stock_num"], j["pre_stock_num"], 1) + ')，<span class="label label-info">' + Util.to_unit(j["hold_value"], 3) + '</span>市值';
+            } else {
+                total_public_fund = Util.pack_html_link(Util.get_url("trend_fund_hold"), '<span class="label label-info">' + total_public_fund + '</span>');
+                public_fund_tips = '共 ' + total_public_fund + ' 家， <span class="label label-info">' + Util.to_unit(total_stock_num, 3) + '</span> 股，<span class="label label-info">' + Util.to_unit(total_market_capital, 3) + '</span>市值';
+            }
+            $("#public_fund_tips").html(public_fund_tips);
+            if (j["date"] && j["date"] > 0) {
+                $("#public_fund_title").find("a").each(function() {
+                    let t_text = $(this).text();
+                    if (t_text.indexOf("持股详细查询") > -1) {
+                        $(this).attr("href", "https://data.eastmoney.com/zlsj/detail/" + Util.seconds_to_format(j["date"], "%Y-%m-%d") + "-1-" + code + ".html");
+                    }
+                });
+            }
+            if ($("#public_fund_date").length === 0) {
+                Util.post("/stock/" + code, {action: "public_fund_date"}, function (j) {
+                    let _html = [];
+                    _html.push('<select id="public_fund_date">');
+                    j["data"].forEach(function (item) {
+                        let date_format = Util.seconds_to_format(item["date"], "%Y-%m-%d");
+                        _html.push('<option value="', date_format, '">', date_format, '(', item["num"], ')</option>');
+                    });
+                    _html.push('</select>');
+                    $("#public_fund_date_zone").html(_html.join(""));
+                    $("#public_fund_date").change(function () {
+                        Util.fetch_public_fund(code);
+                    });
+                });
+            }
+            Util.hide_tips();
+        });
+    },
+
     /**
      * 初始分类股票的显示表格
      * @param portfolio
@@ -1219,8 +1313,7 @@ const Util = {
                 _html.push("<tr><td colspan='3'>基金类型</td><td colspan='4'>", j["fund_type"], "</td><td colspan='3'>投资类型</td><td colspan='4'>", j["invest_type"], "</td></tr>");
                 _html.push("<tr><td colspan='3'>单位净值</td><td colspan='4'>", net, "</td><td colspan='3'>资产规模</td><td colspan='4'>", assets, "</td></tr>");
                 _html.push("<tr><td colspan='3'>成立日期</td><td colspan='4'>", public_date, "</td><td colspan='3'>发行日期</td><td colspan='4'>", issue_date, "</td></tr>");
-                let administrator = Util.pack_html_link("https://baike.baidu.com/item/" + j["administrator"].replace("基金管理", "基金"), j["administrator"]);
-                _html.push("<tr><td colspan='3'>基金管理公司</td><td colspan='4'>", administrator, "</td><td colspan='3'>基金经理</td><td colspan='4'>", j["managers"], "</td></tr>");
+                _html.push("<tr><td colspan='3'>基金管理公司</td><td colspan='4'>", Util.pack_fund_administrator(j), "</td><td colspan='3'>基金经理</td><td colspan='4'>", j["managers"], "</td></tr>");
                 _html.push("<tr><td colspan='5'>基金托管人</td><td colspan='9'>", (j["custodian"] ? j["custodian"] : "--"), "</td></tr>");
                 _html.push("<tr><td colspan='5'>经办律师事务所</td><td colspan='9'>", (j["lawyer"] ? j["lawyer"] : "--"), "</td></tr>");
                 _html.push("<tr><td colspan='5'>会计师事务所</td><td colspan='9'>", (j["accounting"] ? j["accounting"] : "--"), "</td></tr>");
@@ -2904,6 +2997,9 @@ const Util = {
      */
     pack_holder_num: function (item) {
         let holder_info = "--";
+        if (item["code"] && Util.is_hk(item["code"])) {
+            return holder_info;
+        }
         if (item["holder_num"] && item["holder_num"] > 0) {
             if (item["pre_holder_num"] && item["pre_holder_num"] > 0) {
                 holder_info = Util.digit_compare_trend(item["holder_num"], item["pre_holder_num"]);
@@ -2928,6 +3024,24 @@ const Util = {
         return Util.pack_html_link("/stock/" + item["code"] + "?tab=public_fund", fund_num);
     },
 
+    /**
+     * 组装基金公司数据
+     * @param item
+     * @returns {string}
+     */
+    pack_fund_administrator: function (item) {
+        if (item["administrator"]) {
+            let url = "";
+            if (item["administrator_code"]) {
+                url = "https://fund.eastmoney.com/company/" + item["administrator_code"] + ".html";
+            } else {
+                url = "https://baike.baidu.com/item/" + item["administrator"].replace("基金管理", "基金");
+            }
+            return Util.pack_html_link(url, item["administrator"]);
+        }
+        return "--";
+    },
+
     /**
      * 雪球人数关注排名数据
      * @param item