sbd-npm 1.4.99 → 1.5.1

package/package.json

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

package/status.js

@@ -275,8 +275,8 @@ $(function () {
                         {"name": "进程名", "table_sort": 1},
                         {"name": "用户名", "table_sort": 1},
                         {"name": "状态", "table_sort": 1},
-                        {"name": "实际内存", "class": "info", "table_sort": 1, "title": "resident set size"},
-                        {"name": "虚拟内存", "table_sort": 1},
+                        {"name": "物理内存", "class": "info", "table_sort": 1, "title": "Resident Set Size(常驻内存，进程实际占用的物理内存)"},
+                        {"name": "虚拟内存", "table_sort": 1, "title": "Virtual Memory Size(进程申请的虚拟地址空间总量)"},
                         {"name": "启动命令"},
                         {"name": "创建时间", "table_sort": 1},
                         {"name": "操作"}
@@ -819,6 +819,7 @@ $(function () {
                             "head_columns": [
                                 {"name": "进程ID", "table_sort": 1},
                                 {"name": "状态", "table_sort": 1},
+                                {"name": "物理内存", "table_sort": 1, "title": "Resident Set Size(常驻内存，进程实际占用的物理内存)"},
                                 {"name": "启动命令"},
                                 {"name": "创建时间", "class": "info", "table_sort": 1},
                                 {"name": "操作"}
@@ -851,6 +852,7 @@ $(function () {
                         }
                         html.push("<td>", item.pid, "</td>");
                         html.push("<td>", item.status, "</td>");
+                        html.push("<td data-val='", item.rss, "'>", Util.trans_byte_size(item.rss), "</td>");
                         let cmdline = Util.substring(item.cmdline, 100);
                         if (is_xmr === 1) {
                             html.push("<td>", Util.pack_html_link("/xmr", cmdline), "</td>");
@@ -1669,7 +1671,7 @@ $(function () {
     });
 
     Util.init_modal_skeleton("mysql_access_modal");
-    $("#mysql_access_modal_title").html("连接 MySQL 的 IP 日志统计数据");
+    $("#mysql_access_modal_title").html("连接MySQL的IP日志统计数据");
     Util.init_table_skeleton({
         "element_id": "mysql_access_modal_body",
         "caption": '<caption class="' + (Util.is_mobile() ? "text-left" : "text-right") + '" id="mysql_access_summary"></caption>',
@@ -1689,6 +1691,7 @@ $(function () {
     });
     let mam_obj = $('#mysql_access_modal');
     mam_obj.on('shown.bs.modal', function (e) {
+        $("#mysql_access_filter").val("0");
         Status.fetch_mysql_access_data();
     });
     mam_obj.on('hidden.bs.modal', function () {

package/util.js

@@ -1797,7 +1797,7 @@ const Util = {
             Util.hide_tips();
         });
         let ctt_obj = $("#category_top_type");
-        ctt_obj.find("option[value='" + category_top_type + "']").attr("selected", true);
+        ctt_obj.val(category_top_type);
         ctt_obj.change(function() {
             Util.render_category_top_modal();
         });
@@ -2159,7 +2159,7 @@ const Util = {
         html.push('</select>');
         let obj = $("#" + component_id);
         obj.html(html.join(""));
-        obj.find("option[value='" + (select_val > 0 ? select_val : 100) + "']").attr("selected", true);
+        obj.val(select_val > 0 ? select_val : 100);
     },
 
     /**
@@ -3619,7 +3619,7 @@ const Util = {
             }
             nth -= 1;
         });
-        obj.find("option[value='" + option_val + "']").attr("selected", true);
+        obj.val(option_val);
     },
 
     /**
@@ -3637,7 +3637,7 @@ const Util = {
             }
         });
         if (option_val !== "") {
-            obj.find("option[value='" + option_val + "']").attr("selected", true);
+            obj.val(option_val);
         } else {
             Util.set_option_selected(obj, 100);
         }