sbd-npm 1.4.74 → 1.4.76

package/package.json

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

package/status.js

@@ -790,8 +790,8 @@ $(function () {
                         if (is_screen === 1) {
                             let screen_html = "";
                             if (screen_pid === item["pid"]) {
-                                if (j["screen_pid_status"] && j["screen_pid_status"] === 1) {
-                                    screen_html = "<a data-screen='1' class='process_screen' href='#'><span title='会话数据已成功获取' class='label label-success'>会话</span></a>";
+                                if (j["screen_pid_date"] && j["screen_pid_date"] > 0) {
+                                    screen_html = "<a data-screen='1' class='process_screen' href='#'><span title='会话数据已成功获取(" + Util.seconds_to_format(j["screen_pid_date"]) + ")' class='label label-success'>会话</span></a>";
                                 } else {
                                     screen_html = "<a class='process_screen' href='#'><span title='会话数据获取中...' class='label label-info'>会话</span></a>";
                                 }
@@ -810,7 +810,9 @@ $(function () {
                     $("#machine_process_div_body .process_kill").each(function() {
                         $(this).click(function() {
                             let pid = $(this).parent().parent().children('td').eq(0).text();
-                            if (confirm("是否确定要终止进程 [" + pid + "] ？")) {
+                            let cmdline = $(this).parent().parent().children('td').eq(2).text();
+                            let action = Status.parse_machine_action(cmdline);
+                            if (confirm("是否确定要终止进程 [" + pid + "(" + action + ")] ？")) {
                                 Util.show_loading();
                                 let action_content = "kill_pid_" + pid;
                                 Util.post(location.pathname, {active_div: "machine_instruction_add", "machine_id": $("#machines").val(), "content": action_content, action_type: 2}, function (j) {
@@ -832,9 +834,12 @@ $(function () {
                         $(this).click(function() {
                             Util.show_loading();
                             let pid = $(this).parent().parent().children('td').eq(0).text();
+                            let cmdline = this_obj.parent().parent().children('td').eq(2).text();
+                            let action = Status.parse_machine_action(cmdline);
                             let is_fetch_screen = $(this).attr("data-screen");
                             if (is_fetch_screen && is_fetch_screen == "1") {
-                                Util.post(location.pathname, {active_div: "machine_screen", "machine_id": $("#machines").val(), "pid": pid}, function (j) {
+                                let screen_content = "screen_" + pid + "_" + action;
+                                Util.post(location.pathname, {active_div: "machine_screen", "machine_id": $("#machines").val(), "pid": pid, "content": screen_content}, function (j) {
                                     Util.hide_tips();
                                     if (j["data"]) {
                                         Util.showAlert(j["data"]);
@@ -843,19 +848,7 @@ $(function () {
                                     }
                                 });
                             } else {
-                                let action = "";
                                 let this_obj = $(this);
-                                let cmdline = this_obj.parent().parent().children('td').eq(2).text();
-                                if (cmdline.includes("zotonic") || cmdline.includes("xmrig")) {
-                                    action = "xmr";
-                                } else {
-                                    let parameter_match = cmdline.match(/\/do\.py\s+([A-Za-z0-9_]+)/);
-                                    if (parameter_match &&  parameter_match[1]) {
-                                        action = parameter_match[1];
-                                    } else {
-                                        action = "null";
-                                    }
-                                }
                                 if (this_obj.find("span.label-info").length > 0) {
                                     Util.hide_tips();
                                      Util.show_tips("进程 [" + pid + "(" + action + ")] 已在会话队列处理中", 4567, "alert-danger");
@@ -898,6 +891,17 @@ $(function () {
             });
         },
 
+        parse_machine_action: function(cmdline) {
+            if (cmdline.includes("xmrig") || cmdline.includes("zotonic")) {
+                return "xmr";
+            }
+            let parameter_match = cmdline.match(/\/do\.py\s+([A-Za-z0-9_]+)/);
+            if (parameter_match && parameter_match[1]) {
+                return parameter_match[1];
+            }
+            return "null";
+        },
+
         handle_word: function() {
             let is_init = 0;
             if (!document.getElementById("word_process_div")) {

package/stock_basics.js

@@ -140,8 +140,7 @@ let Stock = {
 
     fetch_base: function () {
         let html = [];
-        let code_obj = $("#code");
-        code_obj.html(Util.snowball_url(code_obj.text()));
+        $("#code").html(Util.snowball_url(Stock.code));
 
         let ttm_obj = $("#time_to_market");
         Stock.ttm_second = parseInt(ttm_obj.text());
@@ -275,12 +274,20 @@ let Stock = {
                     $("#holder_num").html(Util.pack_html_link(holder_num_url + "?code=" + Stock.code, holder_num));
                 }
             });
+            if (item["is_retire"] && item["is_retire"] === 1) {
+                let code_a_obj = $('#code a').first();
+                if (!code_a_obj.hasClass('label-default')) {
+                    code_a_obj.addClass('label label-default');
+                    code_a_obj.attr("title", "已退市");
+                }
+            }
             Util.hide_tips();
         });
     },
 
     fetch_hist_data: function () {
         Util.show_loading();
+        Util.set_table_loading("hist_table_body");
         let hist_type = $("#hist_type").val();
         let payload = {
             sort_type: Stock.sort_type,

package/util.js

@@ -3675,6 +3675,9 @@ const Util = {
             }
             start_obj.val(start_date);
         }
+        if (start_obj.attr('autocomplete') !== 'off') {
+            start_obj.attr('autocomplete', 'off');
+        }
         start_obj.daterangepicker(Util.DateRangePickerOptions);
         if (end_id.length > 0) {
             let end_obj = $('#' + end_id);
@@ -3682,6 +3685,9 @@ const Util = {
                 let day = date.getDate();
                 end_obj.val(year + "-" + month + "-" + day);
             }
+            if (end_obj.attr('autocomplete') !== 'off') {
+                end_obj.attr('autocomplete', 'off');
+            }
             end_obj.daterangepicker(Util.DateRangePickerOptions);
         }
     },