sbd-npm 1.5.0 → 1.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/status.js +4 -2
  3. package/util.js +7 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sbd-npm",
3
- "version": "1.5.0",
3
+ "version": "1.5.2",
4
4
  "description": "Stock Big Data",
5
5
  "author": "DHQ <dhq314@gmail.com>",
6
6
  "license": "ISC",
package/status.js CHANGED
@@ -275,8 +275,8 @@ $(function () {
275
275
  {"name": "进程名", "table_sort": 1},
276
276
  {"name": "用户名", "table_sort": 1},
277
277
  {"name": "状态", "table_sort": 1},
278
- {"name": "实际内存", "class": "info", "table_sort": 1, "title": "resident set size"},
279
- {"name": "虚拟内存", "table_sort": 1},
278
+ {"name": "物理内存", "class": "info", "table_sort": 1, "title": "Resident Set Size(常驻内存,进程实际占用的物理内存)"},
279
+ {"name": "虚拟内存", "table_sort": 1, "title": "Virtual Memory Size(进程申请的虚拟地址空间总量)"},
280
280
  {"name": "启动命令"},
281
281
  {"name": "创建时间", "table_sort": 1},
282
282
  {"name": "操作"}
@@ -819,6 +819,7 @@ $(function () {
819
819
  "head_columns": [
820
820
  {"name": "进程ID", "table_sort": 1},
821
821
  {"name": "状态", "table_sort": 1},
822
+ {"name": "物理内存", "table_sort": 1, "title": "Resident Set Size(常驻内存,进程实际占用的物理内存)"},
822
823
  {"name": "启动命令"},
823
824
  {"name": "创建时间", "class": "info", "table_sort": 1},
824
825
  {"name": "操作"}
@@ -851,6 +852,7 @@ $(function () {
851
852
  }
852
853
  html.push("<td>", item.pid, "</td>");
853
854
  html.push("<td>", item.status, "</td>");
855
+ html.push("<td data-val='", item.rss, "'>", Util.trans_byte_size(item.rss), "</td>");
854
856
  let cmdline = Util.substring(item.cmdline, 100);
855
857
  if (is_xmr === 1) {
856
858
  html.push("<td>", Util.pack_html_link("/xmr", cmdline), "</td>");
package/util.js CHANGED
@@ -191,8 +191,14 @@ const Util = {
191
191
  html.push('<div class="list-group">');
192
192
  if (j.data && j.data.length > 0) {
193
193
  j.data.forEach(function (item) {
194
+ let href = "";
194
195
  let upper_code = item.code.toUpperCase();
195
- html.push('<a target="_blank" rel="noopener noreferrer nofollow" class="list-group-item" href="/stock/', upper_code, '">', (item.name ? item.name : upper_code), '(', upper_code, ')</a>');
196
+ if (item.type && item.type === 1) {
197
+ href = Util.get_url("fund_public") + "?fund_code=" + upper_code;
198
+ } else {
199
+ href = "/stock/" + upper_code;
200
+ }
201
+ html.push('<a target="_blank" rel="noopener noreferrer nofollow" class="list-group-item" href="', href, '">', (item.name ? item.name : upper_code), '(', upper_code, ')</a>');
196
202
  });
197
203
  } else {
198
204
  html.push('<a href="#" class="list-group-item disabled">无数据</a>');