sbd-npm 1.5.3 → 1.5.5

package/constant.js

@@ -160,11 +160,11 @@ const MenuList = [
 		'icon': 'retweet',
 		'menu': [
 			{'key': 'portfolio_recommend', 'name': '关注', 'url': '/0x2da99e58e28de94b670c4200657ac7e26dd8dceb'},
+			{'key': 'portfolio_gao', 'name': '高大侠', 'url': '/0x44fe5ef98b6802a9e7a893a1dcc231031ef8683d'},
 			{'key': 'portfolio_chen', 'name': '陈营长极品投资', 'url': '/0x3f8cbeeeb38138a626e935017a4cc25f47ce3dbe'},
 			{'key': 'portfolio_stratagem', 'name': '上兵伐谋zgz', 'url': '/0x622a4a04d7a04e3b28c85a36500371ba28edea83'},
 			{'key': 'portfolio_zeng', 'name': '老曾阿牛', 'url': '/0x2cf53b473b916e1d8b9998de00bb782171bb2630'},
 			{'key': 'portfolio_dao', 'name': '专注成长的股事笔记', 'url': '/0xf9d3664538c43bf7f886674abe7af9710aab82ec'},
-			{'key': 'portfolio_vegetable', 'name': 'Veget', 'url': '/0x671dd9dcfca7dbc220c8164c92a74d2c561c6464'},
 			{'key': 'portfolio_tianjin', 'name': '天津股侠', 'url': '/0xb8428e42237a7485a787e2ab1b5ae0f057258f18'},
 			{'key': 'portfolio_junk', 'name': 'HK破烂王', 'url': '/0xfa43c30e5399feb566fb9a8181c175b0af0dff7f'},
 			{'key': 'portfolio_star50', 'name': '科创50', 'url': '/0x378b2601d83c467f81f1d4e323c8bfbc72f6cc0d'},

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sbd-npm",
-    "version": "1.5.3",
+    "version": "1.5.5",
     "description": "Stock Big Data",
     "author": "DHQ <dhq314@gmail.com>",
     "license": "ISC",

package/status.js

@@ -880,9 +880,15 @@ $(function () {
         handle_process_kill: function(element_id, action_type) {
             $("#" + element_id + " .process_kill").each(function() {
                 $(this).click(function() {
-                    let pid = $(this).parent().parent().children('td').eq(0).text();
-                    let cmdline_index = action_type === 2 ? 2 : 6;
-                    let cmdline_obj = $(this).parent().parent().children('td').eq(cmdline_index);
+                    let tr_obj = $(this).parent().parent();
+                    let pid = tr_obj.children('td').eq(0).text();
+                    let cmdline_index = tr_obj.parent().parent().find('thead td').filter(function () {
+                        return $(this).text().includes('启动命令');
+                    }).index();
+                    if (cmdline_index < 0) {
+                        cmdline_index = action_type === 2 ? 3 : 6;
+                    }
+                    let cmdline_obj = tr_obj.children('td').eq(cmdline_index);
                     let cmdline = cmdline_obj.attr('title') ? cmdline_obj.attr('title') : cmdline_obj.text();
                     let action = Status.parse_machine_action(cmdline);
                     let pid_action = "[" + pid + "(" + action + ")]";

package/util.js

@@ -323,6 +323,23 @@ const Util = {
             },
             error: function (jqXHR, textStatus, errorThrown) {
                 Util.hide_tips();
+                if (errorThrown) {
+                    if (jqXHR.status) {
+                        errorThrown += '(HTTP ' + jqXHR.status + ')';
+                    }
+                } else {
+                    if ((textStatus === 'error' && jqXHR.status === 0) || !navigator.onLine) {
+                        errorThrown = "网络异常";
+                    } else if (textStatus === 'timeout') {
+                        errorThrown = "请求超时";
+                    } else if (textStatus === 'abort') {
+                        errorThrown = "请求被中止";
+                    } else if (jqXHR.status) {
+                        errorThrown = '请求失败(HTTP ' + jqXHR.status + ')';
+                    } else {
+                        errorThrown = "未知错误";
+                    }
+                }
                 let msg = "[" + textStatus + "] " + errorThrown;
                 Util.show_tips(msg, 0, "alert-danger");
             }