sbd-npm 1.2.43 → 1.2.45

package/constant.js

@@ -212,8 +212,8 @@ const MenuList = [
 			{'key': 'rank_profit', 'name': '净利润/营业收入', 'url': '/90ee0f9bcf37d965d0f894c6bd6be788'},
 			{'key': 'rank_roe', 'name': 'ROE(净资产收益率)', 'url': '/575707ea27d7de73d5467660b9181606'},
 			{'key': 'rank_dividend', 'name': '股息', 'url': '/83070c336bee9b99bd4f9ad54963f9ef'},
-			{'key': 'rank_circulation_stock', 'name': '流通股比例', 'url': '/212721244ee3f9bab3ea2275f6f25272'},
-			{'key': 'rank_holder', 'name': '股东比', 'url': '/5f09520c907774de4e1dfcf78e7f45b8'},
+			{'key': 'rank_circulation_stock', 'name': '流通股份', 'url': '/212721244ee3f9bab3ea2275f6f25272'},
+			{'key': 'rank_holder', 'name': '股东户数', 'url': '/5f09520c907774de4e1dfcf78e7f45b8'},
 			{'key': 'rank_goodwill', 'name': '商誉占比', 'url': '/81e1e604b6fd26be1ab3f496e5edd742'},
 		]
 	},
@@ -264,6 +264,7 @@ const IndexList = [
 	{'code': 'SH000906', 'name': '中证800', 'is_industry': 1, 'is_key': 1},
 	{'code': 'SH000852', 'name': '中证1000', 'is_industry': 1, 'is_key': 1},
 	{'code': 'SZ399303', 'name': '国证2000', 'is_industry': 0, 'is_key': 1},
+	{'code': 'SZ399959', 'name': '军工指数', 'is_industry': 0, 'is_key': 0},
 	{'code': 'SH000985', 'name': '中证全指', 'is_industry': 0, 'is_key': 0},
 	{'code': 'SH000922', 'name': '中证红利', 'is_industry': 0, 'is_key': 0},
 	{'code': 'SH000003', 'name': 'B股指数', 'is_industry': 0, 'is_key': 0},

package/package.json

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

package/util.js

@@ -253,12 +253,20 @@ const Util = {
         let symbol = Util.is_alpha(item["code"]) ? item["code"].toUpperCase() : item["code"];
         let name = symbol;
         if (item["cname"]) {
-            name = item["cname"];
+            if (Util.is_us(item["code"])) {
+                name = item["cname"].replace("公司", "").replace("•", "").replace("•", "");
+            } else {
+                name = item["cname"];
+            }
         } else if (item["name"]) {
             name = item["name"];
-            if (Util.is_us(item["code"]) && name.indexOf(' ') !== -1) {
-                let name_arr = name.split(' ');
-                name = name_arr[0] ? name_arr[0] : name;
+            if (Util.is_us(item["code"])) {
+                if (name.indexOf(' ') !== -1) {
+                    let name_arr = name.split(' ');
+                    name = name_arr[0] ? name_arr[0] : name;
+                } else {
+                    name = name.replace("公司", "").replace("•", "").replace("•", "");
+                }
             }
             name = name.substr(0, 10);
         }
@@ -500,7 +508,7 @@ const Util = {
     us_logo_html: function (code) {
         code = code.toUpperCase();
         let logo_url = "https://storage.googleapis.com/iex/api/logos/" + code + ".png";
-        return '<a rel="noopener noreferrer nofollow" href="' + logo_url + '" target="_blank"><img alt="' + code + '" width="20px" src="' + logo_url + '"/><a>';
+        return '<a rel="noopener noreferrer nofollow" href="' + logo_url + '" target="_blank"><img alt="' + code + '" width="20px" src="' + logo_url + '"/></a>';
     },
 
     /**
@@ -1334,6 +1342,23 @@ const Util = {
         $("#" + component_id).html(html.join(""));
     },
 
+    /**
+     * 初始 select 组件
+     * @param component_id
+     * @param data
+     */
+    init_select_component: function (component_id, data) {
+        let element_id = component_id.replace("_div", "");
+        let html = [];
+        html.push('<label for="', element_id, '"></label>');
+        html.push('<select id="', element_id, '" class="form-control">');
+        data.forEach(function (item) {
+            html.push('<option value="', item["val"], '">', item["name"], '</option>');
+        });
+        html.push('</select>');
+        $("#" + component_id).html(html.join(""));
+    }
+
     /**
      * 当前时间戳
      * @returns {number}
@@ -2461,23 +2486,6 @@ const Util = {
         }
     },
 
-    /**
-     * 获取股东数据
-     * @param element_id
-     */
-    fetch_holder_num: function (element_id) {
-        let code_list = Util.get_code_list(element_id);
-        if (code_list.length > 0) {
-            Util.post("/action", {action: "holder_num", code_list: code_list.join("-")}, function (j) {
-                $.each(j, function (code, item) {
-                    $(".holder_" + code).each(function () {
-                        $(this).html(Util.pack_holder_num(item));
-                    });
-                });
-            });
-        }
-    },
-
     /**
      * 设置 option 的第 nth 项为默认项
      * @param obj
@@ -2722,7 +2730,10 @@ const Util = {
         } else if (digit >= 10000 || digit <= -10000) {
             return "<span title='" + digit + "'>" + Util.to_float(digit / 10000, fraction) + "万</span>";
         }
-        return Util.to_float(digit, fraction);
+        if (Util.is_float(digit)) {
+            return Util.to_float(digit, fraction);
+        }
+        return digit;
     },
 
     /**
@@ -2750,6 +2761,24 @@ const Util = {
         return 0;
     },
 
+    /**
+     * 是否浮点数
+     * @param n
+     * @returns {boolean}
+     */
+    is_float: function (n) {
+        return Number(n) === n && n % 1 !== 0;
+    },
+
+    /**
+     * 是否整数
+     * @param n
+     * @returns {boolean}
+     */
+    is_int: function (n) {
+        return Number(n) === n && n % 1 === 0;
+    },
+
     /**
      * 触发事件的对象的引用
      * https://developer.mozilla.org/zh-CN/docs/Web/API/Event/target