sbd-npm 1.3.21 → 1.3.23

package/constant.js

@@ -37,6 +37,7 @@ const MenuList = [
 		'icon': 'edit',
 		'menu': [
 			{'key': 'trend_price', 'name': '股价阶段涨跌幅度', 'url': '/0x84527c7c3487b39afd820f2b309355cd75c01653'},
+			{'key': 'trend_day3_stabilize', 'name': '连续三日收红', 'url': '/0x7e9df652521f334030e0be383f5fe10f01a67243'},
 			{'key': 'trend_macd_down', 'name': 'MACD金叉', 'url': '/0x96943c359b08b02392a168ad6cd4b5703e3e9267'},
 			{'key': 'trend_kdj', 'name': 'KDJ金叉', 'url': '/0x3382bdaec4e8715ce27ca2b538dce09a2f8f5e50'},
 			{'key': 'trend_money_inflow', 'name': '资金流入历史最高', 'url': '/0xfbfc92be1eebe9ccf5b2f14b9a2ea25f2cc941b8'},
@@ -46,7 +47,6 @@ const MenuList = [
 			{'key': 'trend_ma20_60', 'name': '20、60日均线交叉', 'url': '/0x4f3b8625bcfcf0c4289b0a7df82d0afc1af4d026'},
 			{'key': 'trend_doji', 'name': '十字星', 'url': '/0x60f986e9f89a1dfafc8ae792bf0b5fb8e0d1887c'},
 			{'key': 'trend_ma510', 'name': '突破5、10日均线', 'url': '/0x46044beeaca896fe6acd86be3c94778f4c57e316'},
-			{'key': 'trend_day3_stabilize', 'name': '连续三日收红', 'url': '/0x7e9df652521f334030e0be383f5fe10f01a67243'},
 			{'key': 'trend_holder_minimum', 'name': '股东数历史最少', 'url': '/0xf0c0c360a283689c83ae216c6bbb03777d8068ca'},
 			{'key': 'trend_down_maximum', 'name': '历史高位最大跌幅', 'url': '/0x8d7b8abeec94e2ebe4b25115272d9d5899355c43'},
 			{'key': 'trend_fund_hold', 'name': '基金数持股变化', 'url': '/0x706c0e77ca3e314b5186c763e6ee857b744e9880'},

package/package.json

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

package/stock_basics.js

@@ -1220,9 +1220,11 @@ let Stock = {
 
     fetch_hkex_holding_modal: function () {
         Util.init_modal_skeleton("hkex_holding_modal", '');
-        $("#hkex_holding_modal_title").html("[" + Stock["name"] + "]港股通持股明细数据<span style='color: #BDBDBD;' id='hkex_holding_modal_summary'></span>");
         let hhm_obj = $('#hkex_holding_modal');
         hhm_obj.on('shown.bs.modal', function (e) {
+            let url = $("#hkex_holding_summary").find("a").first().attr("href");
+            let title = Util.pack_html_link(url, "[" + Stock["name"] + "]港股通持股明细数据");
+            $("#hkex_holding_modal_title").html(title + "<span style='color: #BDBDBD;' id='hkex_holding_modal_summary'></span>");
             Util.init_table_skeleton({
                 "element_id": "hkex_holding_modal_body",
                 "caption": "none",

package/util.js

@@ -1046,19 +1046,19 @@ const Util = {
 
     /**
      * 初始分类股票的显示表格
-     * @param stock_category
+     * @param portfolio
      * @param table_id
      * @param alert_tips
      */
-    init_stock_category_data: function (stock_category, table_id, alert_tips = "") {
+    init_portfolio_data: function (portfolio, table_id, alert_tips = "") {
         Util.show_loading();
         let head_cols = [
             {"name": "代码"},
             {"name": "名称"},
             {"name": "PE", "title": "市盈率(Price Earnings Ratio)", "table_sort": 1},
             {"name": "总市值", "table_sort": 1},
-            {"name": "行业", "select_id": "stock_category_industry"},
-            {"name": "地区", "select_id": "stock_category_area"},
+            {"name": "行业", "select_id": "portfolio_industry"},
+            {"name": "地区", "select_id": "portfolio_area"},
             {"name": "当前价", "table_sort": 1},
             {"name": "最高价", "table_sort": 1},
             {"name": "最低价", "table_sort": 1},
@@ -1066,12 +1066,12 @@ const Util = {
             {"name": "近5日", "table_sort": 1},
             {"name": "52周最高", "table_sort": 1}
         ];
-        if (stock_category !== "us") {
+        if (portfolio !== "us") {
             head_cols.push({"name": "成交额", "table_sort": 1});
             head_cols.push({"name": "成交均价", "table_sort": 1});
             head_cols.push({"name": "股东数", "table_sort": 1});
             head_cols.push({"name": "基金数", "table_sort": 1});
-            head_cols.push({"name": "备注", "id": "stock_category_remark_title"});
+            head_cols.push({"name": "备注", "id": "portfolio_remark_title"});
         } else {
             head_cols.unshift({"name": ""});
         }
@@ -1084,28 +1084,28 @@ const Util = {
             table_options["alert"] = alert_tips;
         }
         Util.init_table_skeleton(table_options);
-        Util["stock_category_table_id"] = table_id;
-        Util.post(location.pathname, {active_div: stock_category}, function (j) {
-            Util["stock_category_data"] = j["data"] ? j["data"] : [];
-            Util["stock_category_index"] = j["index_list"] ? j["index_list"] : [];
-            Util.render_type_option($("#stock_category_industry"), j["data"], "industry", Util.render_stock_category_html);
-            Util.render_type_option($("#stock_category_area"), j["data"], "area", Util.render_stock_category_html);
-            Util.render_stock_category_html();
+        Util["portfolio_table_id"] = table_id;
+        Util.post(location.pathname, {active_div: portfolio}, function (j) {
+            Util["portfolio_data"] = j["data"] ? j["data"] : [];
+            Util["portfolio_index"] = j["index_list"] ? j["index_list"] : [];
+            Util.render_type_option($("#portfolio_industry"), j["data"], "industry", Util.render_portfolio_html);
+            Util.render_type_option($("#portfolio_area"), j["data"], "area", Util.render_portfolio_html);
+            Util.render_portfolio_html();
             if (j["portfolio_url"]) {
-                $("#stock_category_remark_title").html(Util.pack_html_link(j["portfolio_url"], "备注<i class='glyphicon glyphicon-link'></i>"));
+                $("#portfolio_remark_title").html(Util.pack_html_link(j["portfolio_url"], "备注<i class='glyphicon glyphicon-link'></i>"));
             }
             Util.hide_tips();
         });
     },
 
-    render_stock_category_html: function () {
-        if (Util["stock_category_table_id"]) {
+    render_portfolio_html: function () {
+        if (Util["portfolio_table_id"]) {
             let _html = [], total_num = 0;
-            let is_us = $("#stock_category_remark_title").length === 0 ? 1 : 0;
-            if (Util["stock_category_data"]) {
-                let industry = $("#stock_category_industry").val();
-                let area = $("#stock_category_area").val();
-                Util["stock_category_data"].forEach(function (item) {
+            let is_us = $("#portfolio_remark_title").length === 0 ? 1 : 0;
+            if (Util["portfolio_data"]) {
+                let industry = $("#portfolio_industry").val();
+                let area = $("#portfolio_area").val();
+                Util["portfolio_data"].forEach(function (item) {
                     if (Util.is_industry_area(item, industry, area)) {
                         total_num++;
                         _html.push("<tr>");
@@ -1130,7 +1130,7 @@ const Util = {
                     }
                 });
             }
-            let table_body_id = Util["stock_category_table_id"] + "_body";
+            let table_body_id = Util["portfolio_table_id"] + "_body";
             Util.render_table_html(table_body_id, _html);
             if (is_us === 1) {
                 $("img").on("error", function () {
@@ -1138,7 +1138,7 @@ const Util = {
                 });
             }
             $("#" + table_body_id + "_tips").html('共 <span class="label label-info">' + total_num + '</span> 家');
-            let index_list = Util["stock_category_index"] ? Util["stock_category_index"] : [];
+            let index_list = Util["portfolio_index"] ? Util["portfolio_index"] : [];
             Util.init_stock_stuff(table_body_id, index_list, is_us);
         }
     },
@@ -2835,17 +2835,16 @@ const Util = {
      * @returns {string}
      */
     pack_holder_num: function (item) {
+        let holder_info = "--";
         if (item["holder_num"] && item["holder_num"] > 0) {
-            let holder_url = Util.get_url("holder_num") + "?code=" + item["code"];
-            let holder_info = "";
             if (item["pre_holder_num"] && item["pre_holder_num"] > 0) {
                 holder_info = Util.digit_compare_trend(item["holder_num"], item["pre_holder_num"]);
             } else {
                 holder_info = Util.digit_compare_trend(item["holder_num"], 0);
             }
-            return Util.pack_html_link(holder_url, holder_info);
         }
-        return "--";
+        let holder_url = Util.get_url("holder_num") + "?code=" + item["code"];
+        return Util.pack_html_link(holder_url, holder_info);
     },
 
     /**
@@ -2854,11 +2853,11 @@ const Util = {
      * @returns {string}
      */
     pack_fund_num: function (item) {
+        let fund_num = "--";
         if (item["cur_fund_num"] && item["cur_fund_num"] > 0) {
-            let fund_num = Util.digit_compare_trend(item["cur_fund_num"], item["pre_fund_num"]);
-            return Util.pack_html_link("/stock/" + item["code"] + "?tab=public_fund", fund_num);
+            fund_num = Util.digit_compare_trend(item["cur_fund_num"], item["pre_fund_num"]);
         }
-        return "--";
+        return Util.pack_html_link("/stock/" + item["code"] + "?tab=public_fund", fund_num);
     },
 
     /**