From ce293a085dfba638ac6b6280ebd2b845c3f88db0 Mon Sep 17 00:00:00 2001 From: shy Date: Sun, 13 Aug 2023 22:14:14 +0800 Subject: [PATCH] add some --- lib/base.js | 6 +++--- lib/page.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/base.js b/lib/base.js index 4835c19e..d88d90ab 100644 --- a/lib/base.js +++ b/lib/base.js @@ -44,10 +44,10 @@ Volcanos("base", { if (str.indexOf(ice.HTTP) == 0) { var res = this._parse(str, {type: mdb.LINK, name: "", text: str}); return res.name = res._origin.split("://").pop().split(nfs.PS)[0], res } try { res = JSON.parse(str), res.text = res.text||str, res.type = res.type||nfs.JSON } catch (e) { res = {type: mdb.TEXT, text: str} } return res }, - ParseSize: function(size) { size = size.toLowerCase() + ParseSize: function(size) { size = size.toLowerCase().split(" ")[0] if (size.endsWith("tb") || size.endsWith("t")) { return parseInt(size) * this._unit.t } - if (size.endsWith("gb") || size.endsWith("g")) { return parseInt(size) * this._unit.g } - if (size.endsWith("mb") || size.endsWith("m")) { return parseInt(size) * this._unit.m } + if (size.endsWith("gb") || size.endsWith("g") || size.endsWith("gib")) { return parseInt(size) * this._unit.g } + if (size.endsWith("mb") || size.endsWith("m") || size.endsWith("mib")) { return parseInt(size) * this._unit.m } if (size.endsWith("kb") || size.endsWith("k")) { return parseInt(size) * this._unit.k } return parseInt(size) }, _unit: {k: 1024, m: 1024*1024, g: 1024*1024*1024, t: 1024*1024*1024*1024}, diff --git a/lib/page.js b/lib/page.js index 5c052733..157363e9 100644 --- a/lib/page.js +++ b/lib/page.js @@ -185,7 +185,7 @@ Volcanos("page", { } }); return table }, RangeTable: function(can, table, index, asc) { index = can.base.isArray(index)? can.core.List(index, function(item) { if (item > -1) { return item } }): [index]; if (index.length == 0) { return } var list = can.page.Select(can, table, html.TR, function(tr) { if (can.page.isDisplay(tr)) { return tr } }).slice(1) - var is_time = true, is_number = true; can.core.List(list, function(tr) { var text = tr.childNodes[index[0]].innerHTML; is_time = is_time && Date.parse(text) > 0, is_number = is_number && !isNaN(parseInt(text)) }) + var is_time = true, is_number = true; can.core.List(list, function(tr) { var text = tr.childNodes[index[0]].innerHTML; is_time = is_time && Date.parse(text) > 0, is_number = is_number && !isNaN(parseFloat(text)) }) var num_list = can.core.List(list, function(tr) { var text = tr.childNodes[index[0]].innerHTML; return is_time? Date.parse(text): is_number? can.base.ParseSize(text): text }) function isless(a, b, index) { if (a.childNodes[index[0]] && b.childNodes[index[0]]) { if (a.childNodes[index[0]].innerHTML < b.childNodes[index[0]].innerHTML) { return true }