sbd-npm 1.1.89 → 1.1.92

package/menu.js

@@ -32,15 +32,6 @@ const MenuList = [
 			{'key': 'daily_block', 'name': '大宗交易', 'url': '/3eec763b6402d5327a2f1d8964f78c93'},
 		]
 	},
-	{
-		'name': '沪深港股通',
-		'icon': 'cogs',
-		'menu': [
-			{'key': 'hsgt_flow', 'name': '资金流向', 'url': '/e0c6105a6de37e91aa886c70d2227948'},
-			{'key': 'hsgt_trade_stock', 'name': '成交股统计', 'url': '/521e408d5c995460426beba4d039df06'},
-			{'key': 'hsgt_hkex_holding', 'name': '港资持股比例', 'url': '/4cb33e167aca1978b304af3bbe6ea2dd'},
-		]
-	},
 	{
 		'name': '趋势分析',
 		'icon': 'edit',
@@ -62,6 +53,15 @@ const MenuList = [
 			{'key': 'trend_query', 'name': '趋势查询', 'url': '/7a7cec0124836383ad76faa457d19403'},
 		]
 	},
+	{
+		'name': '沪深港股通',
+		'icon': 'cogs',
+		'menu': [
+			{'key': 'hsgt_flow', 'name': '资金流向', 'url': '/e0c6105a6de37e91aa886c70d2227948'},
+			{'key': 'hsgt_trade_stock', 'name': '成交股统计', 'url': '/521e408d5c995460426beba4d039df06'},
+			{'key': 'hsgt_hkex_holding', 'name': '港资持股比例', 'url': '/4cb33e167aca1978b304af3bbe6ea2dd'},
+		]
+	},
 	{
 		'name': '宏观数据',
 		'icon': 'globe',

package/package.json

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

package/util.js

@@ -368,6 +368,16 @@ const Util = {
                     }
                 }
             });
+            $(".d5_price_" + code).each(function () {
+                if (item["d5_price"]) {
+                    $(this).html(Util.year_price_rate(item["price"], item["d5_price"]));
+                } else {
+                    let d5_price = $(this).attr("data-val");
+                    if (d5_price) {
+                        $(this).html(Util.year_price_rate(item["price"], Util.to_float(d5_price)));
+                    }
+                }
+            });
             if (item["high_52week"]) {
                 $(".high_52week_" + code).each(function () {
                     $(this).html(Util.year_price_rate(item["price"], item["high_52week"]));
@@ -641,6 +651,7 @@ const Util = {
         if (options["head_cols"]) {
             let is_table_sort = 0;
             let is_tooltip = 0;
+            let head_length = options["head_cols"].length;
             let _html = [];
             if (options["alert"]) {
                 _html.push('<div class="alert alert-info" role="alert">');
@@ -687,6 +698,12 @@ const Util = {
                     if (col["class"]) {
                         td_class.push(col["class"]);
                     }
+                    if (col["colspan"]) {
+                        if (col["colspan"] > 1) {
+                            head_length += (col["colspan"] - 1);
+                        }
+                        td_attr += ' colspan="' + col["colspan"] + '"';
+                    }
                     if (col["table_sort"]) {
                         is_table_sort = 1;
                         td_class.push("table_sort");
@@ -715,7 +732,7 @@ const Util = {
             });
             _html.push('</tr></thead>');
             _html.push('<tbody id="', options["element_id"], '_body"><tr>');
-            _html.push('<td class="text-center" colspan="', options["head_cols"].length, '">', (options["body_tips"] ? options["body_tips"] : "Loading..."), '</td>');
+            _html.push('<td class="text-center" colspan="', head_length, '">', (options["body_tips"] ? options["body_tips"] : "Loading..."), '</td>');
             _html.push('</tr></tbody>');
             _html.push('</table>');
             let tz_obj = $("#" + options["element_id"]);