efront 4.28.2 → 4.28.4

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,20 +1,23 @@
-- zh-CN: 不启用
-  en:    Disable
+- zh-CN: 路径$1中发现冲突常量$2
+  en:    Conflict constant $2 found in path $1
 
-- zh-CN: 禁用
-  en:    Disable
+- zh-CN: 英文
+  en:    English
 
-- zh-CN: 无法在当前浏览器操作！
-  en:    Cannot operate in the current browser!
+- zh-CN: 英语
+  en:    English
 
-- zh-CN: 无法在当前浏览器操作!
-  en:    Cannot operate in the current browser!
+- zh-CN: 中文繁体
+  en:    Traditional Chinese
 
-- zh-CN: 确定
-  en:    Confirm
+- zh-CN: 繁体中文
+  en:    Traditional Chinese
 
-- zh-CN: 确认
-  en:    Confirm
+- zh-CN: 返回
+  en:    Return
+
+- zh-CN: 返回
+  en:    Back
 
 - zh-CN: "参数异常: $1"
   en:    "Parameter exception: $1"
@@ -22,23 +25,23 @@
 - zh-CN: 参数异常:$1
   en:    "Parameter exception: $1"
 
-- zh-CN: 返回
-  en:    Return
+- zh-CN: 确定
+  en:    Confirm
 
-- zh-CN: 返回
-  en:    Back
+- zh-CN: 确认
+  en:    Confirm
 
-- zh-CN: 中文繁体
-  en:    Traditional Chinese
+- zh-CN: 无法在当前浏览器操作！
+  en:    Cannot operate in the current browser!
 
-- zh-CN: 繁体中文
-  en:    Traditional Chinese
+- zh-CN: 无法在当前浏览器操作!
+  en:    Cannot operate in the current browser!
 
-- zh-CN: 英文
-  en:    English
+- zh-CN: 不启用
+  en:    Disable
 
-- zh-CN: 英语
-  en:    English
+- zh-CN: 禁用
+  en:    Disable
 
 - zh-CN: 无法打开媒体设备
   en:    Unable to open media device

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/compile/auto-const.js

@@ -52,9 +52,7 @@ var getAssignedConst = function (a, used) {
     return nn;
 
 }
-var findConsts = function (text) {
-    var code = scanner2(text);
-    code.fix();
+var findConsts = function (code) {
     var consts = getExported(code);
     if (!consts) return;
     autoiota(code);
@@ -82,20 +80,54 @@ var setEnvDefinedConsts = function (used, k, v) {
         else {
             insertBefore(a, comment);
         }
-        removeFromList(uk, a);
         a.type = v.type;
         a.text = v.text;
     }
 };
-var setMapDefinedConsts = function (u, m) {
-
+var setMapDefinedConsts = function (used, k, consts) {
+    var u = used[k];
+    if (!u) return;
+    for (var o of u) {
+        var exp = pickAssignment(o);
+        var e = exp[exp.length - 1];
+        if (!isSimpleEqual(exp, o)) continue;
+        if (e !== o) {
+            if (e.prev !== o) continue;
+            if (o.text !== k) continue;
+            var t = null;
+            switch (e.type) {
+                default: continue;
+                case EXPRESS:
+                    t = e.text;
+                    t = t.replace(/^\./, '');
+                    if (/[\.\[]/.test(t)) continue;
+                    break;
+                case SCOPED:
+                    if (e.entry !== "[" || e.first !== e.last) continue;
+                    var t = getOnlyString(e);
+                    break;
+            }
+            if (!t || !(t in consts)) continue;
+            var c = consts[t];
+            o.type = c.type;
+            o.text = c.text;
+            if (c.isdigit) o.isdigit = true;
+            remove(e);
+            continue;
+        }
+        set1Equal(exp, consts, used);
+    }
 };
 var getMaped = require("./getMaped");
 var maped = Object.create(null);
-var loadConsts = function (fullpath) {
+var loadConsts = function (fullpath, commap) {
     if (fullpath in maped) return maped[fullpath];
+    maped[fullpath] = null;
     var data = fs.readFileSync(fullpath);
-    var consts = findConsts(String(data));
+    var code = scanner2(String(data));
+    code.fix();
+    autoConst.call(commap, code, fullpath);
+    var consts = findConsts(code);
     maped[fullpath] = consts;
     return consts;
 };
@@ -113,11 +145,43 @@ var getCopy = function (o) {
     return a;
 }
 
-var setRequiredConsts = function (code, fullpath, commap) {
-    var mmap = commap["?"]
-    if (!mmap) return code;
-    var url = mmap[fullpath];
-    var upath = split(url);
+var set1Equal = function (exp, consts, used) {
+    var f = exp[0];
+    if (f.type === SCOPED && f.entry === "{") {
+        var o = f.first;
+        var collected = [];
+        while (o) {
+            var exp = pickArgument(o);
+            var e = exp[exp.length - 1].next;
+            if (exp.length === 1) a: {
+                var t = o.text;
+                if (/[\.\[]/.test(t)) break a;
+                if (!(t in consts)) break a;
+                remove(o, e);
+                o.kind = 'const';
+                var eq = { type: STAMP, text: '=' };
+                o.equal = eq;
+                o.type = EXPRESS;
+                delete o.short;
+                collected.push(o, eq, getCopy(consts[t]), { type: STAMP, text: ',' });
+                var name = o.origin || o.tack;
+                var u = used[name];
+                removeFromList(u, o);
+                u.unshift(o);
+            }
+            if (e?.type === STAMP && e.text === ',') e = e.next;
+            o = e;
+        }
+        insertBefore(f, ...collected);
+    }
+};
+var isSimpleEqual = function (exp, o) {
+    var f = exp[0];
+    if (!f) return false;
+    var eq = f.equal;
+    return eq === f.next && eq?.next === o;
+}
+var setRequiredConsts = function (code, upath, commap) {
     var requires = code.used.require;
     if (!requires) return code;
     var used = code.used;
@@ -128,9 +192,10 @@ var setRequiredConsts = function (code, fullpath, commap) {
         if (!t) continue;
         var p = getMaped(upath, commap, t);
         if (!p) continue;
-        var consts = loadConsts(p);
+        var consts = loadConsts(p, commap);
         if (!consts) continue;
         var exp = pickAssignment(r);
+        if (!isSimpleEqual(exp, r)) continue;
         var e = exp[exp.length - 1];
         if (e !== q) {
             if (e.prev !== q) continue;
@@ -153,60 +218,44 @@ var setRequiredConsts = function (code, fullpath, commap) {
         }
         var f = exp[0];
         if (f.type === EXPRESS) {
-            setMapDefinedConsts(f.text, consts);
+            setMapDefinedConsts(used, f.text, consts);
             continue;
         }
-        if (f.type === SCOPED && f.entry === "{") {
-            var o = f.first;
-            var collected = [];
-            while (o) {
-                var exp = pickArgument(o);
-                var e = exp[exp.length - 1].next;
-                if (exp.length === 1) a: {
-                    var t = o.text;
-                    if (/[\.\[]/.test(t)) break a;
-                    if (!(t in consts)) break a;
-                    remove(o, e);
-                    o.kind = 'const';
-                    var eq = { type: STAMP, text: '=' };
-                    o.equal = eq;
-                    o.type = EXPRESS;
-                    delete o.short;
-                    collected.push(o, eq, getCopy(consts[t]), { type: STAMP, text: ',' });
-                    var name = o.origin || o.tack;
-                    var u = used[name];
-                    removeFromList(u, o);
-                    u.unshift(o);
-                }
-                if (e?.type === STAMP && e.text === ',') e = e.next;
-                o = e;
-            }
-            insertBefore(f, ...collected);
-        }
+        set1Equal(exp, consts, used);
     }
     return code;
 }
+
 var autoConst = function (code, fullpath, ignoreImported) {
     var vmap = this?.["&"];
     var { envs, used, envs } = code;
-    if (!vmap) {
-        if (!ignoreImported) return setRequiredConsts(code, fullpath, this);
-        return code;
-    }
     var p = path.dirname(fullpath);
-    var mp = vmap[p];
-    if (!mp) {
-        if (!ignoreImported) return setRequiredConsts(code, fullpath, this);
-        return code;
+    var mp = vmap?.[p];
+    if (mp) {
+        for (var k in envs) if (k in mp) {
+            setEnvDefinedConsts(used, k, mp[k]);
+            delete envs[k];
+            delete used[k];
+            continue;
+        }
     }
+    var mmap = this?.["?"];
+    if (!mmap) return code;
+    var url = mmap[fullpath];
+    var upath = split(url);
+    if (ignoreImported) return code;
     for (var k in envs) {
         if (k === 'require') {
-            if (!ignoreImported) setRequiredConsts(code, fullpath, this);
+            setRequiredConsts(code, upath, this);
             continue;
         }
-        if (k in mp) setEnvDefinedConsts(used, k, mp[k]), delete envs[k];
+        p = getMaped(upath, this, k);
+        if (!p) continue;
+        var consts = loadConsts(p, this);
+        if (!consts) continue;
+        setMapDefinedConsts(used, k, consts)
     }
     return code;
 };
-autoConst.findConsts = findConsts;
+autoConst.loadConsts = loadConsts;
 module.exports = autoConst;

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.2",
+    "version": "4.28.4",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {