sbd-npm 1.1.53 → 1.1.57

package/menu.js

@@ -64,6 +64,7 @@ const MenuList = [
 		'name': '宏观数据',
 		'icon': 'globe',
 		'menu': [
+			{'key': 'macro_global_economy', 'name': '全球经济总览', 'url': '/b8fd4bd44505109d47a52f30d0f79fe5'},
 			{'key': 'macro_bond_yield', 'name': '十年国债收益率', 'url': '/b3481c3916ef5e907f329c32ad87f7ce'},
 			{'key': 'macro_money_supply', 'name': '货币供应量', 'url': '/30cb50c21d82b67d4442df16cffde341'},
 			{'key': 'macro_currency', 'name': '货币汇率', 'url': '/58ec93ac74847aaec304e4a577c15799'},
@@ -124,10 +125,10 @@ const MenuList = [
 		'name': '概念股',
 		'icon': 'retweet',
 		'menu': [
-			{'key': 'concept_week_recommend', 'name': '每周精选', 'url': '/9c3fbc44e6ad96fbd8a57b227771eea0'},
 			{'key': 'concept_recommend', 'name': '关注', 'url': '/27ca098faad33a8e4d109efe0112fd16'},
 			{'key': 'concept_bellwether', 'name': '龙头股', 'url': '/2995afdea420471e00c536182e711bef'},
 			{'key': 'concept_market_situation', 'name': '市值风云', 'url': '/02fdaf4d66cdecb092bcd65f569aa493'},
+			{'key': 'concept_down_top', 'name': '15-21年的超跌股', 'url': '/ae3bbf97a358392cfaa0ceb35cb3fb57'},
 			{'key': 'concept_cannon', 'name': '黄家礼炮', 'url': '/d6128a3ad91d545f2920fa2e324c37e1'},
 			{'key': 'concept_cloud', 'name': '心似白云常自在', 'url': '/1d883188398a3a8c743748c5eb81fe7b'},
 			{'key': 'concept_niu', 'name': '老曾阿牛', 'url': '/0f4a2714971424024c1ddd8651c26569'},
@@ -138,7 +139,6 @@ const MenuList = [
 			{'key': 'concept_us', 'name': '美股', 'url': '/f986a81550e4d8a902f8bc0ef07757a6'},
 			{'key': 'concept_chip', 'name': '芯片', 'url': '/491de7096b1cb9355766e5ffdd7018b6'},
 			{'key': 'concept_military', 'name': '军工', 'url': '/1eb37c30e6be05148ba47c8ca6498a48'},
-			{'key': 'concept_msci', 'name': 'MSCI', 'url': '/ff6c00cf10a8f17ae0e4fb1ca444f7fc'},
 			{'key': 'concept_hkscc', 'name': '港交所', 'url': '/f23d044c3944d827d799f77da41a911e'},
 			{'key': 'concept_ah', 'name': 'AH股', 'url': '/16f12053b288726b5d4720de879c3b5c'},
 			{'key': 'concept_st', 'name': 'ST股', 'url': '/e0eb8a51da63f7ceb16a769d7d20bada'},

package/package.json

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

package/util.js

@@ -261,13 +261,32 @@ const Util = {
                 return location;
             }
             if (location_name === "") {
-                location_name = location.length > 8 ? location.substr(0, 8) : location;
+                location_name = location.length > 10 ? location.substr(0, 10) : location;
             }
             return "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://map.baidu.com/m?fr=ps01000&word=" + location + "'>" + location_name + "</a>";
         }
         return "--";
     },
 
+    /**
+     * 谷歌Google地图链接地址
+     * @param location
+     * @param location_name
+     * @returns {string}
+     */
+    google_map_url: function (location, location_name = "") {
+        if (location) {
+            if (location === "--") {
+                return location;
+            }
+            if (location_name === "") {
+                location_name = location.length > 10 ? location.substr(0, 10) : location;
+            }
+            return "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://www.google.com/maps?&hl=zh-Hans&q=" + location + "'>" + location_name + "</a>";
+        }
+        return "--";
+    },
+
     /**
      * 返回股票代码列表
      * @param obj
@@ -620,6 +639,11 @@ const Util = {
             let is_table_sort = 0;
             let is_tooltip = 0;
             let _html = [];
+            if (options["alert"]) {
+                _html.push('<div class="alert alert-info" role="alert">');
+                _html.push(options["alert"]);
+                _html.push('</div>');
+            }
             let table_class = options["table_class"] ? options["table_class"] : "table table-bordered table-hover table-striped text-center";
             _html.push('<table class="' + table_class + '">');
             if (options["caption"]) {
@@ -762,8 +786,9 @@ const Util = {
      * 初始分类股票的显示表格
      * @param stock_category
      * @param table_id
+     * @param alert_tips
      */
-    init_stock_category_data: function (stock_category, table_id) {
+    init_stock_category_data: function (stock_category, table_id, alert_tips = "") {
         Util.show_tips("Loading...");
         let head_cols = [
             {"name": "代码"},
@@ -780,15 +805,19 @@ const Util = {
         ];
         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": "股东数", "table_sort": 1});
             head_cols.push({"name": "备注", "id": "remark_title"});
         }
-        Util.init_table_skeleton({
+        let table_options = {
             "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
-        });
+        };
+        if (alert_tips.length > 0) {
+            table_options["alert"] = alert_tips;
+        }
+        Util.init_table_skeleton(table_options);
         Util.post(location.pathname, {active_div: stock_category}, function (j) {
             let _html = [];
             let total_num = 0;