sbd-npm 1.1.46 → 1.1.50

package/menu.js

@@ -127,10 +127,10 @@ const MenuList = [
 			{'key': 'concept_recommend', 'name': '关注', 'url': '/0f7226866475982d2a80497b9fa1719a'},
 			{'key': 'concept_bellwether', 'name': '龙头股', 'url': '/2e1a34cc6bd2d6e92f962e4ef9b9f333'},
 			{'key': 'concept_market_situation', 'name': '市值风云', 'url': '/4229754a8bec7b021c259956c70dba74'},
+			{'key': 'concept_cannon', 'name': '黄家礼炮', 'url': '/8cd8b9d6e96fba8cc87185ec5aa3b429'},
 			{'key': 'concept_niu', 'name': '老曾阿牛', 'url': '/65656ebe27216279cd66db60c7837349'},
 			{'key': 'concept_qian', 'name': '唐史主任司马迁', 'url': '/ee1480d344e0a5cc26db27e180f1e75e'},
 			{'key': 'concept_dan', 'name': '但斌', 'url': '/548a55ff9dc4e6e09d02693cd6428983'},
-			{'key': 'concept_cannon', 'name': '黄家礼炮', 'url': '/8cd8b9d6e96fba8cc87185ec5aa3b429'},
 			{'key': 'concept_hill', 'name': '高瓴资本', 'url': '/a260940f6937ebb225f802b1dffd772e'},
 			{'key': 'concept_hk', 'name': '港股', 'url': '/8bb2e92c534697fd52bff0faa7af854e'},
 			{'key': 'concept_us', 'name': '美股', 'url': '/43d9d1304310863541c8bbb8ea8e8664'},

package/package.json

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

package/summary_daily.js

@@ -31,8 +31,7 @@ $(document).ready(function () {
         },
 
         load_cache: function () {
-            DailySummary["hsgt_money_flow_chart"] = Util.init_echarts_instance("hsgt_money_flow_line");
-            DailySummary["hsgt_money_flow_chart"].showLoading();
+            DailySummary["hsgt_money_flow_chart"] = Util.show_chart_loading(DailySummary["hsgt_money_flow_chart"], "hsgt_money_flow_line");
             try {
                 let cache = DailySummary.get_cache();
                 if (cache.hasOwnProperty("market_overview")) {

package/util.js

@@ -215,7 +215,7 @@ const Util = {
      * @returns {string}
      */
     industry_url: function (code, industry) {
-        if (industry === "undefined") {
+        if (industry === "undefined" || industry === "None") {
             return "--";
         }
         if (industry) {
@@ -345,6 +345,12 @@ 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 () {
+                    let url = Util.get_url("holder_num") + "?code=" + item["code"];
+                    $(this).html(Util.pack_html_link(url, Util.digit_compare_trend(item["holder_num"], item["pre_holder_num"])));
+                });
+            }
         }
         if (item["high"]) {
             let high_price = Util.digit_compare_trend(item["high"], item["previous_price"]);
@@ -752,6 +758,69 @@ const Util = {
         });
     },
 
+    /**
+     * 初始分类股票的显示表格
+     * @param stock_category
+     * @param table_id
+     */
+    init_stock_category_data: function (stock_category, table_id) {
+        Util.show_tips("Loading...");
+        let head_cols = [
+            {"name": "代码"},
+            {"name": "名称"},
+            {"name": "PE", "title": "市盈率(Price Earnings Ratio)", "table_sort": 1},
+            {"name": "总市值", "table_sort": 1},
+            {"name": "行业"},
+            {"name": "地区"},
+            {"name": "当前价", "table_sort": 1},
+            {"name": "最高价"},
+            {"name": "最低价"},
+            {"name": "年初至今", "table_sort": 1},
+            {"name": "52周最高", "table_sort": 1}
+        ];
+        if (stock_category !== "us") {
+            head_cols.push({"name": "成交金额", "table_sort": 1});
+            head_cols.push({"name": "成交均价"});
+            head_cols.push({"name": "股东数", "table_sort": 1});
+            head_cols.push({"name": "备注", "id": "remark_title"});
+        }
+        Util.init_table_skeleton({
+            "element_id": table_id,
+            "caption": '<caption><span id="index_data"></span><div class="pull-right" id="' + table_id + '_body_tips"></div></caption>',
+            "head_cols": head_cols
+        });
+        Util.post(location.pathname, {active_div: stock_category}, function (j) {
+            let _html = [];
+            let total_num = 0;
+            j["data"].forEach(function (item) {
+                total_num++;
+                _html.push("<tr>");
+                item["code"] = item["code"].toLowerCase();
+                _html = Util.stock_basics_html(_html, item);
+                _html.push("<td id='high_", item["code"], "'>0</td>");
+                _html.push("<td id='low_", item["code"], "'>0</td>");
+                _html.push("<td data-val='", item["year_price"], "' class='year_price_", item["code"], "'>--</td>");
+                _html.push("<td class='high_52week_", item["code"], "'>--</td>");
+                if (stock_category !== "us") {
+                    _html.push("<td id='amount_", item["code"], "'>--</td>");
+                    _html.push("<td id='average_", item["code"], "'>--</td>");
+                    _html.push("<td class='holder_", item["code"], "'>--</td>");
+                    _html.push("<td id='remark_", item["code"], "'></td>");
+                }
+                _html.push("</tr>");
+            });
+            Util.render_table_html(table_id + "_body", _html);
+            $("#" + table_id + "_body_tips").html('共 <span class="label label-info">' + total_num + '</span> 家');
+            if (j["concept_url"]) {
+                $("#remark_title").html(Util.pack_html_link(j["concept_url"], "备注<i class='glyphicon glyphicon-link'></i>"));
+            }
+            Util.hide_tips();
+            let index_list = j["index_list"] ? j["index_list"] : [];
+            let is_us = stock_category === "us" ? 1 : 0;
+            Util.init_stock_stuff(table_id + "_body", index_list, is_us);
+        });
+    },
+
     /**
      * 初始公募基金组件
      * @param component_id
@@ -1026,7 +1095,7 @@ const Util = {
                         _html.push("</tr>");
                     });
                     Util.render_table_html(component_id + "_body_body", _html);
-                    $("#" + component_id + "_title").html("[" + Util.stock_url(code, j["stock_name"]) + "]资金流向明细(<span>净买入:<b title='" + summary_inflow + "' class='" + Util.text_color(summary_inflow) + "'>" + Util.to_unit(summary_inflow) + "</b>, 上榜次数:" + total_times + ", 买入次数:<b class='text-danger'>" + buy_times + "</b>, 卖出次数:<b class='text-success'>" + sell_times + "</b></span>)");
+                    $("#" + component_id + "_title").html("[" + Util.stock_url(code, j["stock_name"]) + "]资金流向明细(<span>净买入:<b title='" + summary_inflow + "' class='" + Util.text_color(summary_inflow) + "'>" + Util.to_unit(summary_inflow) + "</b>, 上榜次数:<b class='text-info'>" + total_times + "</b>, 买入次数:<b class='text-danger'>" + buy_times + "</b>, 卖出次数:<b class='text-success'>" + sell_times + "</b></span>)");
                 });
             }
         });
@@ -1307,7 +1376,11 @@ const Util = {
         return default_val;
     },
 
-    // [为什么要用 setTimeout 模拟 setInterval ？](https://segmentfault.com/a/1190000038829248)
+    /**
+     * [为什么要用 setTimeout 模拟 setInterval ？](https://segmentfault.com/a/1190000038829248)
+     * @param func
+     * @param timeout
+     */
     set_interval: function (func, timeout) {
         let handler = function () {
             func.call(null);
@@ -1321,11 +1394,22 @@ const Util = {
         // }
     },
 
-    encode_base64: function (encode_string) {
+    /**
+     * Base64 编码
+     * https://baike.baidu.com/item/base64
+     * @param encode_string
+     * @returns {string}
+     */
+    base64_encode: function (encode_string) {
         return btoa(encodeURI(encode_string));
     },
 
-    decode_base64: function (base64) {
+    /**
+     * Base64 解码
+     * @param base64
+     * @returns {string}
+     */
+    base64_decode: function (base64) {
         return decodeURI(atob(base64));
     },
 
@@ -1507,6 +1591,10 @@ const Util = {
         });
     },
 
+    /**
+     * 表格排序
+     * @param element_id
+     */
     table_sort: function (element_id = "") {
         let selector = element_id === "" ? ".table_sort" : ("#" + element_id + " .table_sort");
         $(selector).each(function () {
@@ -2347,7 +2435,7 @@ const Util = {
      * @param date_type
      */
     startup_metrics_statistics: function (chart_instance, metrics, date_type) {
-        chart_instance = Util.show_echarts_loading(chart_instance, metrics + "_bar_canvas");
+        chart_instance = Util.show_chart_loading(chart_instance, metrics + "_bar_canvas");
         $("." + metrics + "_bar_btn").each(function () {
             let d_type = $(this).attr("data-val");
             $(this).removeClass("btn-default");
@@ -2407,7 +2495,12 @@ const Util = {
         return 0;
     },
 
-    init_echarts_instance: function (element_id) {
+    /**
+     * 初始一个图表实例
+     * @param element_id
+     * @returns {*|jQuery|void}
+     */
+    init_chart_instance: function (element_id) {
         let element = document.getElementById(element_id);
         element.style.width = "width:100%";
         if (!element.style.height) {
@@ -2424,16 +2517,25 @@ const Util = {
         return echarts.init(element);
     },
 
-    show_echarts_loading: function (chart_instance, element_id) {
+    /**
+     * 初始图表加载状态
+     * @param chart_instance
+     * @param element_id
+     * @returns {*|jQuery|void}
+     */
+    show_chart_loading: function (chart_instance, element_id) {
         Util.show_tips("Loading...");
         if (!chart_instance) {
-            chart_instance = Util.init_echarts_instance(element_id);
+            chart_instance = Util.init_chart_instance(element_id);
         }
         chart_instance.showLoading();
         return chart_instance;
     },
 
-    echarts_mark_point: {
+    /**
+     * 图表描点配置
+     */
+    chart_mark_point: {
         "symbol": "circle",
         "symbolSize": 8,
         "label": {
@@ -2445,7 +2547,14 @@ const Util = {
         ]
     },
 
-    echarts_mark_line: function (chart_instance, y_val, color = "") {
+    /**
+     * 在图表上标线
+     * @param chart_instance
+     * @param y_val
+     * @param color
+     * @returns {*}
+     */
+    chart_mark_line: function (chart_instance, y_val, color = "") {
         color = color === "" ? "#E74C3C" : color;
         chart_instance.setOption({
             series: [{
@@ -2462,10 +2571,18 @@ const Util = {
         return chart_instance;
     },
 
-    // https://www.chartjs.org/samples/latest/charts/line/basic.html
+    /**
+     * https://www.chartjs.org/samples/latest/charts/line/basic.html
+     * @param chart_instance
+     * @param element_id
+     * @param x_data
+     * @param line_data
+     * @param fill
+     * @returns {*|jQuery|void}
+     */
     chart_basic_line: function (chart_instance, element_id, x_data, line_data, fill = false) {
         if (!chart_instance) {
-            chart_instance = Util.init_echarts_instance(element_id);
+            chart_instance = Util.init_chart_instance(element_id);
         }
         chart_instance.clear();
         let series_data = [];
@@ -2482,7 +2599,7 @@ const Util = {
                 "itemStyle": {
                     "color": color
                 },
-                "markPoint": Util.echarts_mark_point,
+                "markPoint": Util.chart_mark_point,
                 "data": line["data"]
             };
             if (line["label"]) {
@@ -2531,7 +2648,7 @@ const Util = {
     // https://www.chartjs.org/samples/latest/charts/bar/vertical.html
     chart_basic_bar: function (chart_instance, element_id, x_data, bar_data, bar_title, bar_color_data) {
         if (!chart_instance) {
-            chart_instance = Util.init_echarts_instance(element_id);
+            chart_instance = Util.init_chart_instance(element_id);
         }
         chart_instance.clear();
         chart_instance.setOption({
@@ -2593,7 +2710,7 @@ const Util = {
     // https://www.chartjs.org/samples/latest/charts/line/multi-axis.html
     multi_axis_line: function (chart_instance, element_id, x_data, y1_title, y1_data, y2_title, y2_data) {
         if (!chart_instance) {
-            chart_instance = Util.init_echarts_instance(element_id);
+            chart_instance = Util.init_chart_instance(element_id);
         }
         chart_instance.clear();
         chart_instance.setOption({
@@ -2618,7 +2735,7 @@ const Util = {
                     "itemStyle": {
                         "color": "#36A2EB"
                     },
-                    "markPoint": Util.echarts_mark_point,
+                    "markPoint": Util.chart_mark_point,
                     "data": y1_data
                 },
                 {
@@ -2633,7 +2750,7 @@ const Util = {
                     "itemStyle": {
                         "color": "#FF6384"
                     },
-                    "markPoint": Util.echarts_mark_point,
+                    "markPoint": Util.chart_mark_point,
                     "data": y2_data,
                     "yAxisIndex": 1
                 }
@@ -2677,7 +2794,7 @@ const Util = {
     // https://www.chartjs.org/samples/latest/charts/combo-bar-line.html
     chart_bar_line: function (chart_instance, element_id, x_data, bar_data, bar_title, bar_color_data, line_data, line_title, zoom_start = 0) {
         if (!chart_instance) {
-            chart_instance = Util.init_echarts_instance(element_id);
+            chart_instance = Util.init_chart_instance(element_id);
         }
         chart_instance.clear();
         let low_bar_index = 0;
@@ -2727,7 +2844,7 @@ const Util = {
                     "itemStyle": {
                         "color": "#4DC9F6"
                     },
-                    "markPoint": Util.echarts_mark_point,
+                    "markPoint": Util.chart_mark_point,
                     "data": line_data
                 },
                 {
@@ -2829,7 +2946,7 @@ const Util = {
 
     bias_bar_line: function (chart_instance, element_id, x_data, bias120_data, color_data, bias20_data, bias60_data, price_data) {
         if (!chart_instance) {
-            chart_instance = Util.init_echarts_instance(element_id);
+            chart_instance = Util.init_chart_instance(element_id);
         }
         chart_instance.clear();
         chart_instance.setOption({