efront 4.28.3 → 4.28.4

package/apps/pivot/home/welcome.html

@@ -60,9 +60,11 @@
             ${i18n`内存`}:
         </span>
         <span>
-            <progbar danger:="memery[0]/memery[1]<.05" :current="memeryUsed" :total="memery[1]"></progbar>
+            <progbar danger:="memery[0]/memery[1]<.05" :pending="maxRss" :current="memeryUsed" :total="memery[1]">
+            </progbar>
             <div>
                 <span -bind="size(memery[1])"></span> \
+                <span style="color:#292" -bind="size(maxRss.summary)"></span> +
                 <span -bind="size(memery[0])"></span>
             </div>
         </span>

package/apps/pivot/home/welcome.js

@@ -8,6 +8,7 @@ function main() {
         filterTime,
         memeryUsed: 0,
         memery: [0, 1],
+        maxRss: 0,
         platform: i18n`未知`,
         arch: i18n`未知`,
         nodeVersion: i18n`未知`,
@@ -30,12 +31,14 @@ function main() {
     renderWithDefaults(page, scope);
     (function (a) {
         var [mr, mt] = a.memery;
-        scope.memeryUsed = mt - mr;
         scope.memery = a.memery;
         scope.nodeVersion = a.nodeVersion;
         scope.platform = a.platform;
         scope.arch = a.arch;
         scope.usercode = a.userid;
+        var rss = scope.maxRss = [].concat(a.maxRSS).map(a => a * 1024);
+        rss.summary = sum(rss);
+        scope.memeryUsed = mt - mr - rss.summary;
     }(serverStatus));
     return page;
 }

package/apps/pivot/home/welcome.less

@@ -3,7 +3,7 @@
 }
 
 progbar {
-    width: 120px;
+    width: 180px;
 }
 
 btn {

package/coms/basic/color.js

@@ -109,7 +109,7 @@ function rotate_rgb(RGBA, theta) {
 	[r, g, b] = rgb4h(r, g, b, h);
 	[r, g, b] = rgb4s(r, g, b, s);
 	[r, g, b] = rgb4v(r, g, b, v);
-	return [r, g, b];
+	return [r, g, b, a];
 	// var s = rgb2s(r, g, b);
 	// var v = rgb2v(r, g, b);
 	// var u = sqrt(3) / 3;

package/coms/basic/mark.js

@@ -1,8 +1,8 @@
 "use strict";
 var MARK_PRE1, MARK_PRE2, _PRE1, _PRE2 = _PRE1 = "<b>";
 var MARK_AFT1, MARK_AFT2, _AFT1, _AFT2 = _AFT1 = "</b>";
-var mark = function (source, search) {
-    return power(source, search)[1];
+var mark = function (source, search, wrap) {
+    return power(source, search, wrap)[1];
 };
 var pair = function (source, search, t1, t2, t3, t4) {
     switch (arguments.length) {
@@ -86,7 +86,7 @@ var power_ = function (source, search, func, mp) {
         else if (ap >= p) {
             p += ap / source.length / search.length * .01 - .2;
         }
-        return [p, concat1(match_text_pre, match_text, match_text_aft)];
+        return [p, concat1(match_text_pre, match_text, match_text_aft, searchText)];
     }
     return [0, source];
 };

package/coms/pivot/sum.js

@@ -0,0 +1,7 @@
+function sum(numarr) {
+    var s = 0;
+    for (var n of numarr) {
+        s += n;
+    }
+    return s;
+}

package/coms/zimoli/alert.js

@@ -93,7 +93,7 @@ function alert() {
             if (!isMounted(container)) popup(container);
         });
         if (!isMounted(elem)) appendChild(container, elem);
-        waitclose(autoclose, 400);
+        waitclose(autoclose, 900);
         return elem;
     };
     var elem = setContent();

package/coms/zimoli/cless.js

@@ -59,7 +59,7 @@ function cless(commFactory, innerCss, className) {
         } else {
             stylesheet.innerHTML = innerCss;
         }
-        if (!stylesheet.parentNode) appendChild(head, stylesheet);
+        if (stylesheet.parentNode !== head) appendChild(head, stylesheet);
     }
     return _create(commFactory, className, _create);
 }

package/coms/zimoli/marker.js

@@ -1,10 +1,11 @@
-var b = function (match) {
+var b = function (match, isFullmatch) {
     var b = document.createElement('b');
     b.innerText = match;
+    if (isFullmatch) b.setAttribute('fullmatch', '');
     return b;
 };
-var wrap = function (pre, match, aft) {
-    return [].concat(pre, b(match), aft);
+var wrap = function (pre, match, aft, search) {
+    return [].concat(pre, b(match, match.length === search.length), aft);
 };
 function marker(e) {
     if (!e) e = document.createElement("marker");

package/coms/zimoli/progbar.xht

@@ -1,46 +1,95 @@
 <style>
     & {
+        outline-offset: -3px;
+        outline: 1px solid #3ae;
         display: inline-block;
         min-width: 60px;
         height: 14px;
-        color: #3ae;
-        border: 3px double;
-        background: #f2f2f2;
+        border: 1px solid;
+        background: #eee1;
         position: relative;
         border-radius: 4px;
+        overflow: hidden;
+        white-space: nowrap;
     }
-    
+
     &[danger] {
-        color: #c24;
+        outline: 1px solid #c24;
+
+        >[value] {
+            color: #c243;
+            @bgimg(#c24, #fff);
+        }
     }
-    
+
     >div {
+        vertical-align: top;
+        display: inline-block;
         position: relative;
-        border-top: 7px solid;
+        border-top: 11px solid;
         border-bottom: 1px solid;
-        border-left: 2px solid;
-        border-right: 2px solid;
         height: 100%;
+
+        &:first-child {
+            border-radius: 4px 0 0 4px;
+        }
+    }
+
+    @bgimg(@line, @back) {
+        background-image: linear-gradient(58deg, @back, 50%, @line, 50%, @line, 53%, @back, 53%, @back);
+    }
+
+    >[value] {
+        @bgimg(#3ae, #fff);
+        background-size: 10px 16px;
+        background-position: 0 0;
+        background-repeat: repeat;
+        background-clip: border-box;
+        color: #3ae2;
+    }
+
+    >[state] {
+        background-clip: content-box;
+        background-color: #6ca;
     }
 </style>
 <div>
-    <div -style="{width:value}"></div>
+    <div value -style="{width:value}"></div>
+    <div state -repeat="(s,i) in state" -style="{width:s,color:color.rotate('#f003',i)}"></div>
 </div>
 <script>
-    var { total, current } = this;
-    var calc = function () {
+    var { total, current, pending } = this;
+    var calc = function (current) {
         var v = (current / total * 10000 + .5) | 0;
         if (v < 0) v = 0;
         if (v > 10000) v = 10000;
         return v / 100 + "%";
     };
-    var value = calc();
+    var calcAll = function (pending) {
+        var res = [].concat(pending);
+        var s = sum(res);
+        res = res.map(calc);
+        res.summary = calc(s);
+        return res;
+    };
+    var state = calcAll(pending);
+    var value = calc(current);
     Object.defineProperties(this, {
+        pending: {
+            set(v) {
+                pending = v;
+                state = calcAll(pending);
+            },
+            get() {
+                return pending;
+            }
+        },
         total: {
             set(v) {
                 if (total === v) return;
                 total = v;
-                value = calc();
+                value = calc(current);
+                state = calcAll(pending);
             },
             get() {
                 return total;
@@ -50,7 +99,7 @@
             set(v) {
                 if (current === v) return;
                 current = v;
-                value = calc();
+                value = calc(current);
             },
             get() {
                 return current;

package/coms/zimoli/script.js

@@ -15,7 +15,7 @@ function script(url, judger) {
         clear();
         if (!needcallback || needcallback > 1000) return;
         var res = seek(window, judger);
-        if (res !== undefined){
+        if (res !== undefined) {
             if (res && res.then instanceof Function) {
                 var proto = Object.getPrototypeOf instanceof Function ? Object.getPrototypeOf(res) : res.__proto__;
                 if (Object.setPrototypeOf instanceof Function) Object.setPrototypeOf(res, null);
@@ -24,7 +24,7 @@ function script(url, judger) {
                     var _then = res.then;
                     res.then = null;
                     if (res.then) _then = null;
-    
+
                 }
                 resolve(res.then instanceof Function ? null : res);
                 if (proto) {
@@ -36,7 +36,7 @@ function script(url, judger) {
                 resolve(res);
             }
             return ok(res);
-        } 
+        }
         requestAnimationFrame(onload);
         needcallback++;
     };
@@ -60,8 +60,8 @@ function script(url, judger) {
         if (f instanceof Function) oh = f;
         return script;
     };
-    script.then = function (f) {
-        return promise.then(f);
+    script.then = function (f1, f2) {
+        return promise.then(f1, f2);
     };
     script.catch = function (f) {
         return promise.catch(f);

package/coms/zimoli/table.less

@@ -283,4 +283,7 @@ scrollbar[x] {
     }
 
     width: 100%;
+}
+b[fullmatch]{
+    color:#824;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.28.3",
+    "version": "4.28.4",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {