efront 4.0.56 → 4.0.58

package/coms/compile/Javascript.js

@@ -384,7 +384,7 @@ Javascript.prototype.setType = function (o) {
         }
     }
     if (o.type === STAMP) {
-        if (!last || last.type & (STAMP | STRAP)) {
+        if (!last || last.type & (STAMP | STRAP) || last.type === SCOPED && /^[\{\[]$/.test(last.entry) && !last.isExpress) {
             o.unary = /^[^=;,\*]$|.[^\=\>\<\|\&\^]$/.test(o.text);
         }
     }

package/coms/compile/common.js

@@ -404,7 +404,7 @@ var createScoped = function (parsed, wash) {
             var function_obj = null;
             if (o.type === STAMP && equal_reg.test(o.text)) {
                 var p = snapExpressHead(o.prev);
-                if (!p || p.type & (STRAP | STAMP)) {
+                if (!p || p.type & (STRAP | STAMP) || !p.isExpress) {
                     let n = o.next;
                     if (n && n.type & (EXPRESS | VALUE)) {
                         n.equal = o;
@@ -1001,6 +1001,7 @@ var setqueue = function (list, queue = list) {
 var createString = function (parsed) {
     var autospace = parsed.autospace !== false;
     var keepspace = parsed.keepspace !== false;
+    var patchspace = autospace && keepspace;
     var helpcode = parsed.helpcode;
     var lasttype = SPACE;
     var uncomment = parsed.comment === false;
@@ -1008,7 +1009,7 @@ var createString = function (parsed) {
     var helpcolor = parsed.keepcolor === false;
     var run = (o, i, a) => {
         var prev = o.prev;
-        if (!((SPACE | COMMENT | STAMP | PIECE | SCOPED) & o.type) && prev && lasttype !== SPACE && autospace) {
+        if (!((SPACE | COMMENT | STAMP | PIECE | SCOPED) & o.type) && prev && lasttype !== SPACE && patchspace) {
             if ((QUOTED | SCOPED | STRAP | LABEL | COMMENT) & lasttype
                 || prev.type === STAMP && !prev.unary
             ) {
@@ -1049,7 +1050,7 @@ var createString = function (parsed) {
                     }
                 }
                 if (keepspace && !opentmp) {
-                    if (autospace && lasttype !== SPACE && lasttype !== EXPRESS) result.push(" ");
+                    if (patchspace && lasttype !== SPACE && lasttype !== EXPRESS) result.push(" ");
                     result.push(tmp);
                 }
                 break;
@@ -1069,21 +1070,21 @@ var createString = function (parsed) {
                     break;
                 }
             case SCOPED:
-                if (autospace && o.type !== QUOTED && (lasttype & (STRAP | COMMENT | STAMP)
+                if (patchspace && o.type !== QUOTED && (lasttype & (STRAP | COMMENT | STAMP)
                     && (!o.prev || !/[\+\-\~\!]$/.test(o.prev.text) || /[\+\-]$/.test(o.prev.text) && (!o.prev.prev || !((STAMP | STRAP) & o.prev.prev.type)))
                     || lasttype === SCOPED && o.entry === "{"
                 )) result.push(" ");
                 result.push(o.entry);
                 if (o.length > 0) {
                     if (o.entry === "{" && o[0].type !== SPACE) {
-                        if (autospace && lasttype !== PIECE) {
+                        if (patchspace && lasttype !== PIECE) {
                             result.push(" ");
                         }
                     }
                     lasttype = SPACE;
                     o.forEach(run);
                     if (o.prev && o.prev.type === STRAP && /^for$/.test(o.prev.text));
-                    else if (/^[,;]$/.test(result[result.length - 1]) && !keepspace) {
+                    else if (/^[,;]$/.test(result[result.length - 1]) && autospace && !keepspace) {
                         var last = o.last;
                         var lp = last && last.prev;
                         if (!lp) result.pop();
@@ -1094,7 +1095,7 @@ var createString = function (parsed) {
                         }
                     }
                     if (o.leave === "}" && o.entry === "{" && o[o.length - 1].type !== SPACE) {
-                        if (autospace) result.push(" ");
+                        if (patchspace) result.push(" ");
                     }
                 }
                 result.push(o.leave);
@@ -1120,10 +1121,10 @@ var createString = function (parsed) {
                         }
 
                         else if (o.text === '*') {
-                            if (autospace && lasttype !== SPACE && (lasttype !== STRAP || o.prev && o.prev.text !== 'function')) result.push(" ");
+                            if (patchspace && lasttype !== SPACE && (lasttype !== STRAP || o.prev && o.prev.text !== 'function')) result.push(" ");
                         }
                         else if (!/^(\+\+|\-\-)$/.test(o.text) || o.prev && o.prev.type & (STAMP | STRAP)) {
-                            if (autospace && lasttype !== SPACE) result.push(" ");
+                            if (patchspace && lasttype !== SPACE) result.push(" ");
                         }
                     }
                     if (o.type === VALUE) {

package/coms/compile/richcss.js

@@ -1,7 +1,11 @@
-var { STAMP, PROPERTY, SCOPED, VALUE, EXPRESS, QUOTED, SPACE, COMMENT, createString } = require("./common");
+var { STAMP, PROPERTY, SCOPED, VALUE, EXPRESS, QUOTED, SPACE, COMMENT, createString: _createString, splice } = require("./common");
+var createString = function (a) {
+    a.autospace = false;
+    return _createString(a);
+};
 class Richarg extends Program {
     straps = ["and"];
-    stamps = ',:;'.split("");
+    stamps = ',:;>+~&!/'.split("");
     quotes = this.quotes.slice(0, 2).concat();
     keepspace = true;
     scopes = [["(", ")"], ["{", "}"]];
@@ -9,49 +13,87 @@ class Richarg extends Program {
 
 var rarg = new Richarg;
 rarg.quotes.push(["url(", ")"]);
-var killcalc = a => createString(a).replace(/((?:[\+\-]+)?(?:\d+(?:\.\d*)?|\.\d+))\s*(px|%|pt|cm|mm|r?em)?\s*([\/\*]\s*|[\+\-]\s+)((?:[\+\-]+)?(?:\d+(?:\.\d*)?|\.\d+))(px|%|pt|cm|mm|r?em)?/ig, function (_, d1, p1 = '', c, d2, p2 = '') {
-    d1 = eval(d1);
-    d2 = eval(d2);
-    if (!p2) {
-        if (c === '*') {
-            return d1 * d2 + p1;
-        }
-        if (c === '/') {
-            return d1 / d2 + p1;
-        }
-    }
-    else if (p1 === p2) {
-        if (c === "+") {
-            return (+d1 + +d2) + p1;
-        }
-        if (c === '-') {
-            return (d1 - d2) + p1;
-        }
-    }
-    return _;
-});
+var numberReg = /((?:[\+\-]+)?(?:\d+(?:\.\d*)?|\.\d+))(?:\s*(px|%|pt|pc|in|cm|mm|r?em|deg|rad|vw|vh|%))?/;
+var replaceHReg = new RegExp(numberReg.source + /\s*([\/\*])\s*/.source + numberReg.source, 'gi');
+var replaceLReg = new RegExp(numberReg.source + /(\s*[\+\-]\s+|[\+\-])/.source + numberReg.source, 'gi');
+var replaceTReg = new RegExp(numberReg.source + /\s*[\/\*\+\-]\s*/.source + numberReg.source, 'i');
+var remove_quote = a => a.replace(/~\s*(['"`])((?:\\[\s\S]|[^'"`\\])*?)\1/g, '$2');
+var replace_punc = function (a) {
+    if (typeof a !== "string") return a;
+    a = remove_quote(a);
+    if (/\(/.test(a)) return a;
+    do {
+        var replaced = false;
+        a = a.replace(replaceHReg, function (_, d1, p1, c, d2, p2) {
+            if (!p2 || !p1) {
+                p1 = p1 || p2 || '';
+                d1 = eval(d1);
+                d2 = eval(d2);
+                if (c === '*') {
+                    replaced = true;
+                    return d1 * d2 + p1;
+                }
+                if (c === '/') {
+                    replaced = true;
+                    return d1 / d2 + p1;
+                }
+            }
+            return _;
+        });
+    } while (replaced);
+    do {
+        var replaced = false;
+        a = a.replace(replaceLReg, function (_, d1, p1 = '', c, d2, p2 = '') {
+            if (p1 === p2) {
+                d1 = eval(d1);
+                d2 = eval(d2);
+                c = c.trim();
+                if (c === "+") {
+                    replaced = true;
+                    return (+d1 + +d2) + p1;
+                }
+                if (c === '-') {
+                    replaced = true;
+                    return (d1 - d2) + p1;
+                }
+            }
+            return _;
+        });
+    } while (replaced);
+    return a;
+}
+var killcalc = a => replace_punc(createString(a));
 var seprateFunc = function (express) {
     var express = scanner2(express, rarg);
     var sps = [];
     var sp = [];
-    sp.autospace = false;
     for (var cx = 0, dx = express.length; cx < dx; cx++) {
         var o = express[cx];
         if (o.type === SCOPED && o.entry === '(') {
-            if (!sp.length) continue;
             var p = sp[sp.length - 1];
-            if (p.type & (EXPRESS | PROPERTY)) {
+            if (!p) {
+                sp.push(o);
+                sps.push(killcalc(sp));
+                sp.splice(0, sp.length);
+            }
+            else if (p.type & (EXPRESS | PROPERTY)) {
                 sp.pop();
                 if (sp.length) sps.push(killcalc(sp));
                 sp.splice(0, sp.length, p, o);
                 sps.push(createString(sp));
                 sp.splice(0, sp.length);
             }
+            else {
+                sps.push(killcalc(sp));
+                sp.splice(0, sp.length, o);
+                sps.push(createString(sp));
+                sp.splice(0, sp.length);
+            }
         }
-        else if (o.type === QUOTED) {
+        else if (o.type === QUOTED && !/^['"`]/.test(o.text)) {
             if (sp.length) sps.push(killcalc(sp));
             sp.splice(0, sp.length);
-            sps.push(createString([o]));
+            sps.push(o.text);
         }
         else sp.push(o);
     }
@@ -61,21 +103,18 @@ var seprateFunc = function (express) {
 var splitParams = function (params) {
     if (!params) return [];
     params = scanner2(params, rarg);
-    var o = params.first;
-    var params = [];
-    while (o) {
-        var p = [];
-        while (o) {
-            if (o.type === STAMP && o.text === ',') {
-                o = o.next;
-                break;
-            }
-            p.push(o);
-            o = o.next;
+    var code = params;
+    var params = [], p = [];
+    for (var cx = 0, dx = code.length; cx < dx; cx++) {
+        var o = code[cx];
+        if (o.type === STAMP && o.text === ',') {
+            params.push(createString(p));
+            p = [];
+            continue;
         }
-        p.autospace = false;
-        params.push(createString(p));
+        p.push(o);
     }
+    if (p.length) params.push(createString(p));
     return params;
 }
 var createArgMap = function (args, split = ',', equal = ':') {
@@ -107,6 +146,10 @@ var createArgMap = function (args, split = ',', equal = ':') {
 };
 
 var macros = Object.create(null);
+macros.calc = function (a) {
+    if (replaceTReg.test(a)) return `calc(${a})`;
+    return a;
+};
 macros.range = function () {
     if (arguments.length === 1) {
         return ArrayFill(arguments[0], 0).map((a, i) => i + 1);
@@ -161,6 +204,9 @@ var wrapColor = function (f) {
         return f;
     }
 }
+macros[""] = function (a) {
+    return a;
+};
 macros.saturate = wrapColor(color.strurate);
 macros.desaturate = wrapColor(color.desaturate);
 macros.lighten = wrapColor(color.lighten);
@@ -230,7 +276,7 @@ macros.each = function (list, body) {
 
 class Richcss extends Program {
     straps = ["and"];
-    stamps = `;:`.split("");
+    stamps = `;:,>+~&!/`.split("");
     quotes = rarg.quotes;
     keepspace = true;
     scopes = [["{", "}"], ["(", ")"]]
@@ -245,42 +291,21 @@ Richcss.prototype.setType = function (o) {
             o.type = PROPERTY;
             return;
         }
+        if (p.type === PROPERTY && o.type !== STAMP && o.type !== SCOPED) {
+            o.type = PROPERTY;
+            return;
+        }
     }
     if (!p) return;
-    var q = o.queue;
-    if (o.type & (PROPERTY | EXPRESS) && p && p === q[q.length - 1] && p.type & (PROPERTY | EXPRESS)) {
-        return false;
-    }
     if (o.type === SCOPED && o.entry === "{") {
         if (p && p.type & (PROPERTY | EXPRESS) && /@$/.test(p.text)) {
             return false;
         }
-        var pps = [];
-        while (p && !(p.type === STAMP && p.text === ';' || p.type === SCOPED)) {
-            pps.push(p);
+        while (p && (p.type !== SCOPED || p.entry !== "{") && (p.type !== STAMP || p.text !== ';')) {
+            p.isprop = true;
+            if (p.type !== SCOPED) p.type = PROPERTY;
             p = p.prev;
         }
-        if (pps.length > 1) {
-            var i = q.lastIndexOf(p = pps.pop());
-            q.splice(i + 1, q.length);
-            p.type = PROPERTY;
-            p.end = pps[0].end;
-            q.last = p;
-            return;
-        }
-    }
-    if (!q.entry && o.type !== SCOPED) {
-        var p = q.last;
-        if (p && p.type === STAMP && p.text === ':') {
-            if (p.keep) return;
-        }
-        else if (o.type === STAMP && o.text === ':') {
-            if (p.type & (EXPRESS | PROPERTY)) {
-                o.keep = true;
-                return;
-            }
-        }
-        if (o.type === STAMP && o.text !== ";") return false;
     }
 };
 
@@ -309,7 +334,10 @@ Richcss.prototype.createScoped = function (code) {
         for (var cx = 0, dx = code.length; cx < dx; cx++) {
             var o = code[cx];
             if (o && (o.type & (SPACE | COMMENT) || o.type === STAMP && o.text === ';')) continue;
-            if (o.type !== PROPERTY) throw new Error("结构异常");
+            if (o.type !== PROPERTY) {
+                console.log(createString([o]), o.type, createString(code))
+                throw new Error("结构异常");
+            }
             var p = [], v = [];
             while (o && (o.type !== SCOPED || o.entry !== "{")) {
                 if (o.type === STAMP) break;
@@ -336,10 +364,9 @@ Richcss.prototype.createScoped = function (code) {
                 }
                 o = n;
             }
-            else if (o) {
+            else if (o && o.type === SCOPED) {
                 v = run(o);
             }
-            p.autospace = false;
             var pj = createString(p).trim();
             if (!propmap[pj]) propmap[pj] = [];
             var vs = [];
@@ -377,7 +404,9 @@ var fixBase = function (b, a) {
         if (presets.test(a)) a = `@{${a}}`;
         var replaced = false;
         return b.split(/\s*,\s*/).map(b => {
-            var a1 = a.replace(/(:scope|&)/g, function (match) {
+            b = b.replace(/^(&|\:scope|\:root)\s*/g, "");
+            if (!b) return a;
+            var a1 = a.replace(/&|\:scope|\:root/g, function (match) {
                 replaced = true;
                 return b;
             });
@@ -391,19 +420,12 @@ var fixBase = function (b, a) {
         }).join(",");
     }).join(",");
 }
-function evalscoped(scoped, scopeNames, base = '') {
+function evalscoped(scoped, base = '') {
     var smaps = scoped.maps;
-    var root = smaps[":root"], scope = smaps[":scope"], and = smaps["&"];
+    var root = smaps[":root"], scope = smaps[":scope"];
     var vars = extend(Object.create(null), scoped.vars);
     if (root) root.forEach(r => extend(vars, r.vars));
     if (scope) scope.forEach(s => extend(vars, s.vars));
-    if (and) and.forEach(s => extend(vars, s.vars));
-    scopeNames.forEach(s => {
-        var ss = smaps[s];
-        if (ss) ss.forEach(s => {
-            extend(vars, s.vars), s.rooted = true;
-        })
-    });
     var vlist = [vars];
     var mlist = [macros];
     var clist = [smaps];
@@ -435,10 +457,9 @@ function evalscoped(scoped, scopeNames, base = '') {
             });
         };
         var evalproc = function (k, retnoparam) {
-            var match = (retnoparam !== false ? /^([^\(\)\s,;:]+)(?:\s*\(([\s\S]*)\))$/ : /^([^\(\)\s,;:]+)(?:\s*\(([\s\S]*)\))?$/).exec(k);
+            var match = (retnoparam !== false ? /^([^\(\)\s,;:]*)(?:\s*\(([\s\S]*)\))$/ : /^([^\(\)\s,;:]+)(?:\s*\(([\s\S]*)\))?$/).exec(k);
             if (!match) return calcvars(k);
             var [, name, params] = match;
-            params = splitParams(params);
             var method = getFromScopeList(name, mlist);
             if (!isFunction(method)) {
                 if (/^@/.test(name)) return calcvars(k);
@@ -454,7 +475,8 @@ function evalscoped(scoped, scopeNames, base = '') {
                 }
                 else return k;
             };
-            params = params.map(evalproc);
+            params = splitParams(params);
+            params = params.map(evalproc).map(replace_punc);
             return method.apply(null, params);
         };
 
@@ -464,7 +486,6 @@ function evalscoped(scoped, scopeNames, base = '') {
                 if (!match) continue;
                 if (presets.test(match[1])) continue;
                 var [, name, args] = match;
-                p.base = base;
                 args = createArgMap(args);
                 p.args = args;
                 p.reg = new RegExp(args.join("|") + /|@\{[^\}@]+\}/.source, 'g');
@@ -475,6 +496,7 @@ function evalscoped(scoped, scopeNames, base = '') {
                 });
                 methods[name] = function () {
                     var valueMap = Object.create(null);
+                    this.base = p.base || base;
                     vlist.push(valueMap);
                     var argDefaults = this.args.defaults;
                     this.args.forEach((k, i) => {
@@ -492,7 +514,7 @@ function evalscoped(scoped, scopeNames, base = '') {
                     });
                     var vars = this.vars;
                     if (vars) Object.keys(vars).forEach(k => {
-                        valueMap[k] = replace(calcvars(vars[k]));
+                        valueMap[k] = seprateFunc(replace(calcvars(vars[k]))).map(evalproc).join('');
                     });
                     var body = evalthis(this);
                     var rest = body.rest.map(a => a.map(replace));
@@ -519,7 +541,7 @@ function evalscoped(scoped, scopeNames, base = '') {
             else if (p.length) {
                 k = calcvars(k);
                 p = calcvars(p.join(" "));
-                p = seprateFunc(p).map(evalproc).join('');
+                p = replace_punc(seprateFunc(p).map(evalproc).join(''));
                 result.push(k, ":", p, ';');
             }
             else {
@@ -543,21 +565,8 @@ function richcss(text, scopeName, compress) {
     if (!rcss) rcss = new Richcss;
     rcss.debug = true;
     var code = scanner2(text, rcss);
-    var scopeNames = [];
-    if (scopeName) code.forEach(c => {
-        if (c.type === PROPERTY) {
-            var replaced = false;
-            c.text = c.text.replace(/\:(scope|root)|&/g, function () {
-                replaced = true;
-                return scopeName;
-            });
-            if (replaced) {
-                scopeNames.push(c.text);
-            }
-        }
-    })
     var { scoped } = code;
-    var result = evalscoped(scoped, scopeNames, scopeName);
+    var result = evalscoped(scoped, scopeName);
     var queried = [];
     var getquried = function () {
         if (!queried.length) return "";
@@ -574,7 +583,7 @@ function richcss(text, scopeName, compress) {
         a = a.replace(/@\{(@[^\}]*)\}\s*/g, function (_, q) {
             ats.push(q);
             return ''
-        }).replace(/~\s*(['"`])((?:\\[\s\S]|[^'"`\\])*?)\1/g, '$2');
+        });
         if (!a) return '';
         var atk = ats.join(';');
         if (queried.key !== atk) {

package/coms/compile/richcss_test.js

@@ -1,7 +1,7 @@
 var test = function (data, expect) {
     assert(richcss(data), expect);
 };
-test(`&{--a:1}a{opacity:--a}`, `a{opacity:1;}`);
+test(`&{--a:1;a{opacity:--a}}`, `a{opacity:1;}`);
 test(`:root{--a:1}a{opacity:--a}`, `a{opacity:1;}`);
 test(`:scope{--a:1}a{opacity:--a}`, `a{opacity:1;}`);
 test(`:scope{--b:--a;--a:1;}a{opacity:--b}`, `a{opacity:1;}`);
@@ -25,6 +25,20 @@ test(`@a:1;a{@a:2;@{a}:@a}`, `a{2:2;}`);
 test(`@a:1;@a{@a:2;@{a}:@a}`, `1{2:2;}`);
 test(`@b(@a:1){@a{a:b}}@b(2)`, `2{a:b;}`);
 test(`@a:1; a{a:@a/2}`, `a{a:0.5;}`);
+test(`@a:1; a{a:(@a/2)}`, `a{a:0.5;}`);
+test(`@a:1; a{a:(@a/2)+1}`, `a{a:1.5;}`);
+test(`@a:1; a{a:(@a/2) + 1}`, `a{a:1.5;}`);
+test(`@a:1px; a{a:(@a/2) +1px}`, `a{a:0.5px +1px;}`);
+test(`@a:1px; a{a:(@a/2) -1px}`, `a{a:0.5px -1px;}`);
+test(`@a:1px; a{a:(@a/2)-1px}`, `a{a:-0.5px;}`);
+test(`@a:1px; a{a:1px+ (@a/2)}`, `a{a:1.5px;}`);
+test(`&{a:calc(100% - 1px)}`, `&{a:calc(100% - 1px);}`);
+test(`&{a:calc(~"100% - 1px")}`, `&{a:calc(100% - 1px);}`);
+test(`&{a:calc(~"100vw - 1px")}`, `&{a:calc(100vw - 1px);}`);
+test(`&{a:calc(~"100px - 1px")}`, `&{a:99px;}`);
+test(`&{a:url(~"100px - 1px")}`, `&{a:url(100px - 1px);}`);
+test(`&{a:url("100px - 1px")}`, `&{a:url("100px - 1px");}`);
+test(`&{a:calc(100px - 1px)}`, `&{a:99px;}`);
 test(`.a(){b{a:2}} .a();`, `b{a:2;}`);
 test(`#a(){b{a:2}} #a();`, `b{a:2;}`);
 test(`#a{a:1}`, `#a{a:1;}`);
@@ -38,3 +52,14 @@ test(`b{a:darken(#fff,10%)}`, `b{a:#f5f5f5;}`);
 test(`b{a:darken(hsl(90, 80%, 50%), 20%)}`, `b{a:#6cd205;}`);
 test(`b{a:darken(#6cd205, 20%)}`, `b{a:#58be00;}`);
 test(`b{a:darken(#7ff,10%)}`, `b{a:#6df5f5;}`);
+
+test(`:not(a):not(b){c:d}`, `:not(a):not(b){c:d;}`);
+assert(richcss(`:not(a):not(b){c:d}`, 'abc'), `abc :not(a):not(b){c:d;}`);
+assert(richcss(`&:not(a):not(b){c:d}`, 'abc'), `abc:not(a):not(b){c:d;}`);
+assert(richcss(`:scope{&:not(a):not(b){c:d}}`, 'abc'), `abc:not(a):not(b){c:d;}`);
+assert(richcss(`:root{&:not(a):not(b){c:d}}`, 'abc'), `abc:not(a):not(b){c:d;}`);
+assert(richcss(`&{&:not(a):not(b){c:d}}`, 'abc'), `abc:not(a):not(b){c:d;}`);
+assert(richcss(`:root>a{&:not(a):not(b){c:d}}`, '.abc-'), `.abc->a:not(a):not(b){c:d;}`);
+assert(richcss(`a>:root{&:not(a):not(b){c:d}}`, '.abc-'), `a>.abc-:not(a):not(b){c:d;}`);
+
+assert(richcss(`.a (){ &:after{abc:1}} .b{.a();}`, '.abc-'), `.abc- .b:after{abc:1;}`);

package/coms/docs/codetext.xht

@@ -167,11 +167,13 @@
     }
     var typescript = new compile$Javascript;
     typescript.straps = typescript.straps.concat("interface", "implements", "declare", "module", "readonly", "enum");
+    var js = new compile$Javascript;
+    js.keepspace = true;
     var codesupports = {
         javascript(a, blink) {
             if (blink) var index = a.indexOf(blink);
             if (index >= 0) a = a.slice(0, index) + a.slice(index + 1);
-            var c = compile$scanner2(a);
+            var c = compile$scanner2(a, js);
             if (index >= 0) {
                 var patched = patchBlink(c, index, blink);
             }

package/coms/zimoli/HexEditor.less

@@ -1,6 +1,7 @@
-*{
+* {
     box-sizing: border-box;
 }
+
 & {
     background: #fff;
     display: inline-block;
@@ -8,9 +9,10 @@
     font-size: 16px;
     position: relative;
     min-height: 100px;
-    padding: 0 6px 10px 16px;
+    padding: 0 4px 10px 16px;
     font-family: 宋体;
-    width: 438px;
+    width: 440px;
+    border: 1.2px solid #000;
 
     >a {
         display: inline-block;
@@ -40,10 +42,11 @@
         word-spacing: 2px;
         font-size: inherit;
         line-height: 30px;
-        margin: 0 -6px 10px -16px;
+        margin: 0 -4px 10px -16px;
         padding: 0 16px 0 16px;
         position: sticky;
         top: 0;
+        text-transform: uppercase;
         background: #333;
         content: "00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f";
         display: block;

package/coms/zimoli/menu_test.js

@@ -12,12 +12,12 @@ function main() {
     var page = div();
     page.innerHTML = template;
     var data = random([{
-        name: '一级目录',
+        name: '${inc} 一级目录',
         children: [{
-            name: "二级目录",
+            name: "${inc} 二级目录",
             children: [
                 {
-                    name: "三级目录"
+                    name: "${inc} 三级目录"
                 }
             ]
         }]

package/coms/zimoli/menu_test.less

@@ -2,5 +2,5 @@ ylist{
     height: 100%!important;
 }
 &{
-    height: 100%;
+    height: 300px;
 }

package/coms/zimoli/random.js

@@ -13,7 +13,7 @@ function singleSource(_, type) {
 
     }
 }
-function random(source, decimal) {
+function random(source, decimal, ...deeprand) {
     if (!source) {
         if (arguments.length > 1) {
             return random(arguments[Math.random() * arguments.length | 0]);
@@ -45,8 +45,10 @@ function random(source, decimal) {
             return random(source[Math.random() * source.length | 0]);
         } else {
             var dst = [];
-            for (var cx = 0, dx = decimal > 1 ? decimal : Math.random() * 10 + 50; cx < dx; cx++) {
-                dst.push(random(source[source.length * Math.random() | 0]))
+            for (var cx = 0, dx = decimal > 0 ? decimal | 0 : Math.random() * 10 | 1; cx < dx; cx++) {
+                var arg = deeprand;
+                if (!arg.length) arg = [[0, Math.random() * 2 | 0, Math.random() * 5 | 0, Math.random() * 10 | 0, Math.random() * 20 | 0, Math.random() * 50 | 0, Math.random() * 100 | 0][Math.random() * 7 | 0]];
+                dst.push(random(source[source.length * Math.random() | 0], ...arg))
             }
             return dst;
         }
@@ -58,7 +60,7 @@ function random(source, decimal) {
         var dst = {};
         for (var k in source) {
             var v = source[k];
-            dst[k] = v[0] instanceof Object ? random(v, 1) : random(v, 0);
+            dst[k] = v[0] instanceof Object ? random(v, decimal) : random(v, 0);
         }
         return dst;
     }

package/docs//347/273/204/344/273/266.xht

@@ -214,7 +214,7 @@
                 }
             }
             else {
-                if (code.isExpressQueue()) codetext = "return " + codetext;
+                if (code.isExpressQueue()) codetext = "return " + codetext.trim();
                 else if (vars.main) codetext += '\r\nreturn main';
                 else if (vars.Main) codetext += '\r\nreturn Main';
                 else if (vars.MAIN) codetext += "\r\nreturn MAIN";
@@ -365,7 +365,7 @@
             var code = compile$scanner2(codetext);
             var envs = code.envs;
             var argNames = Object.keys(envs);
-            var args = await Promise.all(argNames.map(a => init(a + "*" + live, null, { ["init*" + live]: init, ["put*" + live]: put, ["zimoli*" + live]: zimoli, ["appendChild*" + live]: appendChild, ["remove*" + live]: remove })));
+            var args = await Promise.all(argNames.map(a => init(a + "*" + live, null, { ["init*" + live]: init, ["put*" + live]: put, ["zimoli*" + live]: zimoli, ["appendChild*" + live]: appendChild, ["remove*" + live]: remove, ["render*" + live]: render })));
             var func = createFunction("", codetext, argNames, code.async, code.yield);
             var res = func.apply(window, args);
             if (isFunction(res)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.0.56",
+    "version": "4.0.58",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {
@@ -10,7 +10,7 @@
         "efront": "public/efront.js"
     },
     "scripts": {
-        "prepack": "node tools/build-efront.js --uplevel --node --deno",
+        "prepack": "node tools/build-efront.js --uplevel --node --deno --no-target",
         "start": "efront ./efront/ --libs=typescript,esprima,escodegen,esmangle,pngjs,less-node"
     },
     "repository": {