sbd-npm 1.2.9 → 1.2.12

package/package.json

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

package/sbd.css

@@ -61,4 +61,75 @@ table a:hover, a.btn {
     .modal-xlg {
         width: 90%;
     }
-}
+}
+
+#loading_div {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    height: 100px;
+    text-align: center;
+    margin-top: 300px;
+}
+
+#loading_div .circle {
+    margin: 20px;
+    height: 50px;
+    width: 50px;
+    border-radius: 50%;
+    display: inline-block;
+    background-color: #4695B8;
+    transform: scale(0);
+    animation: bulge 2s infinite ease-in-out;
+}
+
+#loading_div .circle::after {
+    position: absolute;
+    display: inline-block;
+    content: '';
+    height: 100%;
+    width: 100%;
+    border-radius: 50%;
+    background-color: inherit;
+    top: 0;
+    left: 0;
+    z-index: -1;
+    transform: scale(1);
+    animation: blow 2s infinite ease-in-out;
+}
+
+#loading_div .circle:nth-child(1) {
+    animation-delay: 0s;
+}
+
+#loading_div .circle:nth-child(2) {
+    animation-delay: .25s;
+}
+
+#loading_div .circle:nth-child(3) {
+    animation-delay: .50s;
+}
+
+@keyframes bulge {
+    50% {
+        transform: scale(1);
+    }
+}
+
+@keyframes blow {
+    25% {
+        opacity: 0.5;
+    }
+    50% {
+        opacity: 0.5;
+    }
+    90% {
+        opacity: 0;
+    }
+    100% {
+        transform: scale(2);
+        opacity: 0;
+    }
+}

package/stock_basics.js

@@ -35,7 +35,7 @@ let Stock = {
         if (Stock.data.hasOwnProperty(active_div)) {
             return false;
         }
-        Util.show_tips("Loading...");
+        Util.show_loading();
         switch (active_div) {
             case "base":
                 Stock.fetch_base();
@@ -274,7 +274,7 @@ let Stock = {
     },
 
     fetch_hist_data: function () {
-        Util.show_tips("Loading...");
+        Util.show_loading();
         let hist_type = $("#hist_type").val();
         let payload = {
             sort_type: Stock.sort_type,
@@ -344,7 +344,7 @@ let Stock = {
 
     fetch_big_deal: function () {
         if ($("#big_deal_table_body").length <= 0) {
-            Util.show_tips("Loading...");
+            Util.show_loading();
             Util.init_table_skeleton({
                 "element_id": "big_deal_summary_table",
                 "head_cols": [
@@ -429,7 +429,7 @@ let Stock = {
     },
 
     fetch_rps_data: function () {
-        Util.show_tips("Loading...");
+        Util.show_loading();
         Util.post("/stock/" + Stock.code, {action: "rps"}, function (j) {
             let _html = [];
             j["data"].forEach(function (item) {
@@ -460,7 +460,7 @@ let Stock = {
     },
 
     fetch_holder_top: function () {
-        Util.show_tips("Loading...");
+        Util.show_loading();
         Util.init_table_skeleton({
             "element_id": "circulation_holder_table",
             "head_cols": [
@@ -571,7 +571,7 @@ let Stock = {
     },
 
     fetch_finance: function () {
-        Util.show_tips("Loading...");
+        Util.show_loading();
         Util.init_table_skeleton({
             "element_id": "cash_flow_table",
             "head_cols": [
@@ -812,7 +812,7 @@ let Stock = {
     },
 
     fetch_notice: function () {
-        Util.show_tips("Loading...");
+        Util.show_loading();
         Util.init_table_skeleton({
             "element_id": "notice_table",
             "head_cols": [
@@ -859,7 +859,7 @@ let Stock = {
 
     // 机构研究报告数据
     fetch_report_organization: function () {
-        Util.show_tips("Loading...");
+        Util.show_loading();
         Util.init_table_skeleton({
             "element_id": "report_organization_table",
             "head_cols": [
@@ -890,7 +890,7 @@ let Stock = {
 
     // 公募持股
     fetch_public_fund: function () {
-        Util.show_tips("Loading...");
+        Util.show_loading();
         Util.init_table_skeleton({
             "element_id": "public_fund_table",
             "head_cols": [
@@ -1120,7 +1120,7 @@ let Stock = {
     },
 
     fetch_bias_data: function () {
-        Util.show_tips("Loading...");
+        Util.show_loading();
         Util.post("/stock/" + Stock["code"], {action: "bias"}, function (j) {
             let date_data = [];
             let bias20_data = [];

package/summary_daily.js

@@ -74,7 +74,7 @@ $(document).ready(function () {
                 return false;
             }
             DailySummary.is_load = true;
-            Util.show_tips("Loading...");
+            Util.show_loading();
             Util.post(location.pathname, {date: $("#trade_date").val(), action: "market_overview"}, function (j) {
                 DailySummary.pack_market_overview(j["market_overview"]);
                 DailySummary.fetch_statistics_daily();
@@ -400,7 +400,7 @@ $(document).ready(function () {
          * 沪深港股通每日十大成交活跃股数据
          */
         fetch_hsgt_ten: function (hsgt_type) {
-            Util.show_tips("Loading...");
+            Util.show_loading();
             let date = $("#trade_date").val();
             Util.post(location.pathname, {date: date, action: "hsgt_stock", "hsgt_type": hsgt_type}, function (j) {
                 DailySummary.pack_hsgt_ten(j["data"], "hgt", j["url"]);
@@ -488,7 +488,7 @@ $(document).ready(function () {
             if (Modal.mo_end_time === 0) {
                 Modal.init_market_overview_time(obj);
             } else {
-                Util.show_tips("Loading...");
+                Util.show_loading();
                 let data_type = $(obj).attr("id");
                 let payload = {
                     date: $("#trade_date").val(),
@@ -531,7 +531,7 @@ $(document).ready(function () {
         },
 
         render_stock_rate_modal: function (obj) {
-            Util.show_tips("Loading...");
+            Util.show_loading();
             let cp = $(obj).attr("data-cp");
             let payload = {date: $("#trade_date").val(), action: "p_change", p_change_type: $("#p_change_type").val()};
             if (cp) {
@@ -579,7 +579,7 @@ $(document).ready(function () {
         },
 
         render_news_modal: function () {
-            Util.show_tips("Loading...");
+            Util.show_loading();
             Util.post(location.pathname, {action: "pbc_news"}, function (j) {
                 let _html = [];
                 let index = 0;
@@ -671,7 +671,7 @@ $(document).ready(function () {
     });
 
     $("#news_type").change(function () {
-        Util.show_tips("Loading...");
+        Util.show_loading();
         let news_type = parseInt($("#news_type").val());
         let payload = {action: "news", limit_num: DailySummary.limit_num(), news_type: news_type};
         Util.post(location.pathname, payload, function (j) {

package/util.js

@@ -22,6 +22,7 @@
 const Util = {
 
     tips_token: "util-tips-div",
+    load_token: "loading_div",
     interval_timer: null,
     stock_timer_id: 0,
     // 1年的天数
@@ -46,7 +47,7 @@ const Util = {
     },
 
     sbd_init: function () {
-        Util.show_tips("Loading...");
+        Util.show_loading();
 
         Util.init_menu();
 
@@ -88,7 +89,7 @@ const Util = {
                     clearTimeout(Util.stock_timer_id);
                     st_obj.css("display", "none");
                     Util.stock_timer_id = setTimeout(function () {
-                        Util.show_tips("Loading...");
+                        Util.show_loading();
                         Util.post("/action", {action: "search", key_word: key_word}, function (j) {
                             let key_word = $("#stock").val();
                             if (key_word) {
@@ -252,7 +253,7 @@ const Util = {
         let name = item["cname"] ? item["cname"] : (item["name"] ? item["name"].substr(0, 10) : symbol);
         html.push("<td>", Util.snowball_url(symbol), "</td>");
         html.push("<td>", Util.stock_url(item["code"], name), "</td>");
-        html.push("<td>", (item["pe_ttm"] ? item["pe_ttm"] : item["pe"]), "</td>");
+        html.push("<td>", Util.to_float((item["pe_ttm"] ? item["pe_ttm"] : item["pe"]), 2), "</td>");
         html.push("<td>", (item["market_capital"] ? (Util.to_float(item["market_capital"], 2) + "亿") : "--"), "</td>");
         html.push("<td>", Util.industry_url(item["code"], item["industry"]), "</td>");
         html.push("<td>", Util.map_url((item["province_city"] && item["province_city"] !== "None") ? item["province_city"] : item["area"]), "</td>");
@@ -444,7 +445,7 @@ const Util = {
         html.push("<td>", Util.stock_url(item["code"], name), "</td>");
         html.push("<td class='hk_industry'>", item["industry"], "</td>");
         html.push("<td>", Util.map_url(item["province_city"]), "</td>");
-        html.push("<td>", item["pe"], "</td>");
+        html.push("<td>", Util.to_float((item["pe_ttm"] ? item["pe_ttm"] : item["pe"]), 2), "</td>");
         html.push("<td>", Util.to_float(item["total_shares"], 2), "亿</td>");
         html.push("<td>", market_capital_hkd, "亿(", market_capital_cny, "亿)</td>");
         html.push("<td>", item["chairman"], "</td>");
@@ -469,7 +470,7 @@ const Util = {
         html.push("<td>", (item["sector"] ? item["sector"] : "--"), "</td>");
         html.push("<td>", Util.industry_url(item["code"], item["industry"]), "</td>");
         html.push("<td>", Util.map_url(item["registered"]), "</td>");
-        html.push("<td>", item["pe"], "</td>");
+        html.push("<td>", Util.to_float((item["pe_ttm"] ? item["pe_ttm"] : item["pe"]), 2), "</td>");
         html.push("<td>", Util.to_float(item["total_shares"], 2), "亿</td>");
         html.push("<td>", Util.to_float(item["market_capital"], 3), "亿</td>");
         html.push("<td class='price_", item["code"].toLowerCase(), "'>", item["price"], "</td>");
@@ -837,7 +838,7 @@ const Util = {
      * @param alert_tips
      */
     init_stock_category_data: function (stock_category, table_id, alert_tips = "") {
-        Util.show_tips("Loading...");
+        Util.show_loading();
         let head_cols = [
             {"name": "代码"},
             {"name": "名称"},
@@ -1008,7 +1009,7 @@ const Util = {
      * @param component_id
      */
     fetch_public_fund_stock: function (fund_code, date, component_id) {
-        Util.show_tips("Loading...");
+        Util.show_loading();
         let component_tr = component_id + "_tr";
         $("." + component_tr).each(function () {
             $(this).remove();
@@ -1110,7 +1111,7 @@ const Util = {
         if (!currency) {
             return false;
         }
-        Util.show_tips("Loading...");
+        Util.show_loading();
         let payload = {
             currency: currency,
             start_date: $("#currency_modal_start_date").val(),
@@ -1212,7 +1213,7 @@ const Util = {
      * @param element_id
      * @param profile
      */
-    init_profile_component: function(element_id, profile) {
+    init_profile_component: function (element_id, profile) {
         if (profile && profile.length > 0) {
             let modal_id = element_id + "_modal";
             Util.init_modal_skeleton(modal_id);
@@ -1712,13 +1713,15 @@ const Util = {
             }
             $(this).click(function () {
                 if (!Util.is_loading()) {
-                    $(this).parent().parent().find("i").each(function () {
+                    let this_parent = $(this).parent();
+                    this_parent.parent().find("i").each(function () {
                         if ($(this).hasClass("fa")) {
                             $(this).removeClass("fa-sort-asc");
                             $(this).removeClass("fa-sort-desc");
                             if (!$(this).hasClass("fa-sort")) {
                                 $(this).addClass("fa-sort");
                             }
+                            $(this).parent().removeClass("info");
                         }
                     });
                     let sort_type = $(this).attr("data-val").toString();
@@ -1729,12 +1732,13 @@ const Util = {
                         Obj[sort_order] = Obj[sort_order] === 0 ? 1 : 0;
                     }
                     let sort_cls = Obj[sort_order] === 0 ? "fa-sort-desc" : "fa-sort-asc";
-                    $(this).parent().find("i").each(function () {
+                    this_parent.find("i").each(function () {
                         if ($(this).hasClass("fa")) {
                             $(this).removeClass("fa-sort");
                             $(this).addClass(sort_cls);
                         }
                     });
+                    this_parent.addClass("info");
                     callback_func(1);
                 }
                 return false;
@@ -1819,6 +1823,7 @@ const Util = {
                         if (!$(this).hasClass("fa-sort")) {
                             $(this).addClass("fa-sort");
                         }
+                        $(this).parent().removeClass("info");
                     }
                 });
                 $(this).find("i").each(function () {
@@ -1827,6 +1832,7 @@ const Util = {
                         $(this).addClass(sort_cls);
                     }
                 });
+                $(this).addClass("info");
             });
         });
     },
@@ -1927,9 +1933,23 @@ const Util = {
     },
 
     hide_tips: function () {
-        let obj = $('#' + Util.tips_token);
-        if (obj.length) {
-            obj.remove();
+        let tips_obj = $('#' + Util.tips_token);
+        if (tips_obj.length) {
+            tips_obj.remove();
+        }
+        let load_obj = $('#' + Util.load_token);
+        if (load_obj.length) {
+            load_obj.remove();
+        }
+    },
+
+    show_loading: function () {
+        let load_obj = document.getElementById(Util.load_token);
+        if (!load_obj) {
+            let load_obj = document.createElement('div');
+            load_obj.id = Util.load_token;
+            load_obj.innerHTML = '<div class="circle"></div><div class="circle"></div><div class="circle"></div>';
+            document.getElementsByTagName('body')[0].appendChild(load_obj);
         }
     },
 
@@ -1938,7 +1958,7 @@ const Util = {
      * @returns {boolean}
      */
     is_loading: function () {
-        return $("#" + Util.tips_token).length > 0;
+        return $("#" + Util.load_token).length > 0;
     },
 
     tooltip: function (element_id, tip) {
@@ -1966,7 +1986,7 @@ const Util = {
     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...");
+            Util.show_loading();
             //获取股票详情数据
             Util.post("/action", {action: "code_detail", code_list: code_list.join("-")}, function (j) {
                 let valid_code_list = [];
@@ -2280,13 +2300,16 @@ const Util = {
      * @param item
      * @returns {string}
      */
-    pack_snowball_follower: function(item) {
+    pack_snowball_follower: function (item) {
         if (item["snowball_follower"] && item["snowball_follower"] > 0) {
             let snowball_follower_rank = Util.to_unit(item["snowball_follower"]) + "(" + item["snowball_follower_rank"] + ")";
             let market_type = Util.is_hk(item["code"]) ? "hk" : "cn";
-            snowball_follower_rank = Util.pack_html_link(Util.get_url("rank_holder") + "?sort_type=snowball_follower&market_type=" + market_type, snowball_follower_rank);
+            let url = Util.get_url("rank_holder") + "?sort_type=snowball_follower&market_type=" + market_type;
+            if (item["code"]) {
+                url += "&code=" + item["code"];
+            }
             let tooltip = item["snowball_follower"] + " 人关注，关注排名第 " + item["snowball_follower_rank"] + " 位";
-            $("#snowball_follower").html(snowball_follower_rank + ' <i class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="top" data-original-title="' + tooltip + '"></i>');
+            $("#snowball_follower").html(Util.pack_html_link(url, snowball_follower_rank) + ' <i class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="top" data-original-title="' + tooltip + '"></i>');
             $("[data-toggle='tooltip']").tooltip();
         }
     },
@@ -2831,7 +2854,7 @@ const Util = {
      * @returns {*|jQuery|void}
      */
     show_chart_loading: function (chart_instance, element_id) {
-        Util.show_tips("Loading...");
+        Util.show_loading();
         if (!chart_instance) {
             chart_instance = Util.init_chart_instance(element_id);
         }
@@ -3414,4 +3437,3 @@ Object.size = function (obj) {
         console.log(Notification.permission);
         break;
 }*/
-