efront 3.36.6 → 3.36.9

package/coms/compile/unstruct.js

@@ -1,11 +1,12 @@
-var { SPACE, COMMENT, EXPRESS, STRAP, STAMP, SCOPED, VALUE, LABEL, createString, skipAssignment, relink } = require("./common");
+var { SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL, createString, skipAssignment, relink } = require("./common");
 var scanner2 = require("./scanner2");
 var RE = { type: STRAP, text: "@re" };// if (_) return
 var RZ = { type: STRAP, text: "@rz" };// if (!_) return
 var RD = { type: STRAP, text: "@rd" };// if (_) return
 var RETURN = { type: STRAP, text: "@ret" };// return;
+var YIELD = { type: STRAP, text: "@yield" };// return;
 var NEXT = { type: STRAP, text: "@next" };// return;
-var _break = function (body, cx, result) {
+var _break = function (body, cx, result, iscontinue) {
     var label;
     do {
         var o = body[++cx];
@@ -14,15 +15,20 @@ var _break = function (body, cx, result) {
     } while (true);
     var bx = cx;
     if (label) {
+        var s;
         for (var cx = labels.length - 1; cx >= 0; cx--) {
             var b = labels[cx];
             if (b.type === LABEL && b.text === label) {
                 if (!b.breaks) b.breaks = [];
                 var _b = scanner2(`return[]`);
+                if (iscontinue) _b.continue = s, s.continue = true;
                 addresult(result, _b);
                 b.breaks.push(_b);
                 break;
             }
+            else {
+                s = b;
+            }
         }
     }
     else {
@@ -31,6 +37,7 @@ var _break = function (body, cx, result) {
             if (b.type !== LABEL) {
                 if (!b.breaks) b.breaks = [];
                 var _b = scanner2(`return[]`);
+                if (iscontinue) _b.continue = b, b.continue = true;
                 addresult(result, _b);
                 b.breaks.push(_b);
                 break;
@@ -154,11 +161,21 @@ var _switch = function (body, cx, unblock, result, getname) {
 };
 var _for = function (body, cx, unblock, result, tmpname) {
     var o = body[cx];
+    var label = o;
     o = o.next;
     var m = o.first;
     if (m.type === STRAP && /^(let|const|var)$/.test(m.text)) {
         m = m.next;
     }
+    var mn = m.next;
+    if (mn.type === STRAP && mn.text === 'in') {
+        // 含有高级语法的 for in 语句在 ./downLevel.js 中预处理
+        var dx = cx;
+        var n = o.next;
+        while (body[dx] !== n) dx++;
+        addresult(result, body.slice(cx, dx));
+        return dx;
+    }
     var cy = 0;
     while (o[cy] !== m) cy++;
     var block = getblock(o, cy);// init
@@ -177,19 +194,44 @@ var _for = function (body, cx, unblock, result, tmpname) {
     relink(result[result.length - 1]);
     var i = result.length;
     unblock(block_);
+    if (label.continue) label.continue = result.length, result[result.length - 1].cont = true, label.contat = result.length;
     unblock(block2);
     result[result.length - 1].push(...scanner2(`;return [${i - result.length},0]`));
     b[b.length - 1].push(...scanner2(`${result.length - i + 1},0`));
     relink(result[result.length - 1]);
     return cx;
 };
+var getCondition = function (o, unblock, not_) {
+    var n = '';
+    var f = o.first;
+    var not = f.type === STAMP && f.text === "!";
+    if (not) f = f.next;
+    if (not_) not = !not;
+    if (f && f === o.last) {
+        if (f.type & (EXPRESS | VALUE)) {
+            n = f.text;
+        }
+        if (not && n) {
+            if (f.type === VALUE) {
+                n = String(eval("!" + f.text));
+            }
+            else n = "!" + n;
+        }
+    }
+    if (!n) {
+        n = unblock(o);
+        n = n.await ? ret_ : n.name;
+        if (not) n = "!" + n;
+    }
+    return n;
+}
 var _while = function (body, cx, unblock, result, tmpname) {
     var o = body[cx];
+    o.contat = result.length;
     o = o.next;
     while (body[cx] !== o) cx++;
-    var b = scanner2(`;if(!${tmpname})return []`)
-    unblock(o);
-    result[result.length - 1].push(...b);
+    var b = scanner2(`if(${getCondition(o, unblock, true)})return []`)
+    result.push(b);
     relink(result[result.length - 1]);
     var block = getblock(body, ++cx);
     var i = result.length;
@@ -211,7 +253,7 @@ var pushstep = function (result, step) {
         relink(step);
         result.push(step);
     }
-    else if (q.ifrt) {
+    else if (q.ifrt || q.cont) {
         result.push(step);
     }
     else {
@@ -277,19 +319,20 @@ var addresult = function (result, step) {
 };
 var _do = function (body, cx, unblock, result, tmpname) {
     var o = body[cx];
+    var label = o;
     o = o.next;
     var i = result.length;
     unblock(o);
     o = o.next.next;
-    unblock(o);
-    var b = scanner2(`return [${tmpname}?${i - result.length}:${1},0]`);
+    if (label.continue) result[result.length - 1].cont = true, label.contat = result.length;
+    var b = scanner2(`if(${getCondition(o, unblock)})return [${i - result.length},0];return [1,0]`);
     addresult(result, b);
     while (body[cx] !== o) cx++;
     return cx;
 };
 
 var needbreak = function (o) {
-    return o === RE || o === RZ || o === RETURN || o === NEXT || o === RD;
+    return o === RE || o === RZ || o === RD || o === RETURN || o === NEXT || o === YIELD;
 };
 var _return = function (r, nextindex) {
     var name = r.name;
@@ -301,9 +344,11 @@ var _return = function (r, nextindex) {
     semicolon = semicolon && semicolon.type === STAMP && /^[,;]$/.test(semicolon.text);
     var x;
     if (e === RETURN) {
-        if (nextindex === 1) r._return = true;
         x = scanner2(`return [${name},2]`);
     }
+    else if (e === YIELD) {
+        x = scanner2(`return [${name},3]`);
+    }
     else if (e === NEXT) {
         x = scanner2(`return [${name},1]`);
         r.await = true;
@@ -354,7 +399,7 @@ var _invoke = function (t, getname) {
                 cy = skipAssignment(o, cy);
                 if (by === cy) continue;
                 var m = o.slice(by, cy);
-                if (m.length === 1 && (m[0].type === EXPRESS && /\./.test(m[0].text) || m[0].type === VALUE)) {
+                if (m.length === 1 && (m[0].type === EXPRESS && !/\./.test(m[0].text) || m[0].type === VALUE || m[0].type === QUOTED)) {
                     continue;
                 }
                 var q = toqueue(m, getdeepname, true);
@@ -410,12 +455,14 @@ var ternary = function (body, getname, ret) {
             var bx = question.pop();
             if (!question.length) {
                 var b = body.slice(0, bx);
-                b = _express(b, getname, true);
+                relink(b);
                 var c = ternary(body.slice(bx + 1, cx), getname, true);
                 var d = ternary(body.slice(cx + 1), getname, true);
-                b[b.length - 1].push(...scanner2(`;return [${getname(0)}?1:${c.length + 1},0]`));
-                c[c.length - 1].push(...scanner2(`;return [${d.length + 1},0]`));
-                res.push(...b);
+                addresult(c, scanner2(`return [${d.length + 1},0]`));
+                addresult(res, scanner2(`if(${getCondition(b, function (b) {
+                    addresult(res, _express(b));
+                    return res[res.length - 1];
+                })})return [1,0]`));
                 res.push(...c);
                 res.push(...d);
             }
@@ -441,6 +488,10 @@ var _express = function (body, getname, ret) {
     for (var cx = 0, dx = body.length; cx < dx; cx++) {
         var o = body[cx];
         if (o.type & (COMMENT | SPACE)) continue;
+        if (o.type === STRAP && /^(var|let|const)/.test(o.text)) {
+            bx = cx + 1;
+            continue;
+        }
         if (o.type & (STRAP | STAMP)) {
             var p = 0;
             if (o.text === '=') {
@@ -470,7 +521,7 @@ var _express = function (body, getname, ret) {
                 var p0 = cache.pop();
                 var t = cache.pop();
                 var isawait = _await(t);
-                if (p0 > powermap["="]) q.push(...scanner2(`${getname(t.index)}=`));
+                if (p0 > powermap["="] || isawait) q.push(...scanner2(`${getname(t.index)}=`));
                 q.push.apply(q, t);
                 q.push.apply(q, b);
                 if (isawait) q.push(NEXT);
@@ -500,41 +551,44 @@ var _express = function (body, getname, ret) {
         }
     }
     var b = body.slice(bx, cx);
+    var needname = false;
     if (cache.length) while (cache.length) {
         var p = cache.pop();
         if (needcomma(q)) q.push({ type: STAMP, text: ',' });
         nameindex = cache[cache.length - 1].index;
         var t = cache.pop();
         var isawait = _await(t, nameindex);
-        if (p > powermap["="] && (ret || cache.length > 0)) q.push(...scanner2(`${getname(nameindex)}=`));
+        if (p > powermap["="] && (ret || ax >= 1 || cache.length > 0 || isawait)) q.push(...scanner2(`${getname(nameindex)}=`));
         q.push.apply(q, t);
         q.push.apply(q, b);
         if (isawait) q.push(NEXT);
+        needname = true;
         b = [{ type: EXPRESS, text: getname(nameindex) }];
     }
     else if (ax !== 1) {
         if (ret && b.length || ax > 1) {
             q.push(...scanner2(`${getname(nameindex)}=`));
             q.push(...b);
+            needname = true;
         }
         else {
             q.push(...b);
         }
     }
-    q.name = getname(nameindex);
+    if (needname) q.name = getname(nameindex);
     if (ax === 1) {
         if (q.length) q.push({ type: STAMP, text: ';' });
         q.push(exps[0], { type: STAMP, text: "=" });
         q.push(...b);
         q.name = exps[0].text;
-        exps[0].set = getname(nameindex);
+        if (evals.length) exps[0].set = getname(nameindex);
         exps.shift();
     }
     if (ax > 1) {
         while (ax > 0) {
             q.push({ type: STAMP, text: ';' });
             var [e] = exps.splice(ax - 1, 1);
-            e.set = getname(nameindex + 1);
+            if (evals.length) e.set = getname(nameindex + 1);
             q.push(e);
             q.push(...scanner2(`=${getname(nameindex)}`))
             ax--;
@@ -568,6 +622,10 @@ var getblock = function (body, cx) {
     return body.slice(ax, cx);
 };
 var labels = [];
+var scopes = [];
+var isbreak = function (o) {
+    return o.type === STRAP && /^(break|return|continue|yield)$/.test(o.text);
+};
 
 function toqueue(body, getname, ret = false) {
     var retn = false;
@@ -577,19 +635,28 @@ function toqueue(body, getname, ret = false) {
         addresult(result, re);
     }
     var uniftop = function () {
-        for (var cx = 2, dx = iftop.length; cx < dx; cx += 2) {
+        for (var cx = 3, dx = iftop.length; cx < dx; cx += 3) {
             var findex = iftop[cx];
+            var r = iftop[cx + 1];
             var p = result[findex - 1];
-            p.pop();
-            p.push(...scanner2(`[${result.length + 1 - findex},0]`));
-            relink(p);
+            if (!r) {
+                p.pop();
+                p.push(...scanner2(`[${result.length + 1 - findex},0]`));
+                relink(p);
+            }
         }
-        for (var cx = 0, dx = iftop.length - 1; cx < dx;) {
+        for (var cx = 0, dx = iftop.length - 2; cx < dx;) {
             var findex = iftop[cx++];
             var f = result[findex];
+            var r = iftop[cx++];
             var n = iftop[cx++];
-            if (f) {
-                var c = scanner2(`if(!${n})return [${iftop.length > cx ? iftop[cx] - findex : result.length - findex},0];`);
+            if (r) {
+                var c = scanner2(`if(${n})`);
+                f.unshift.apply(f, c);
+                relink(f);
+            }
+            else if (f) {
+                var c = scanner2(`if(${n})return [${iftop.length > cx ? iftop[cx] - findex : result.length - findex},0];`);
                 f.unshift.apply(f, c);
                 relink(f);
             }
@@ -608,6 +675,7 @@ function toqueue(body, getname, ret = false) {
                 relink(q);
             }
         }
+        return result[result.length - 1];
     };
     var poplabel = function () {
         var e = labels.pop();
@@ -619,7 +687,7 @@ function toqueue(body, getname, ret = false) {
                     var r = result[cx];
                     if (r[r.length - 1] === end) { break }
                 }
-                end.push({ type: VALUE, text: result.length - cx }, { type: STAMP, text: "," }, { type: VALUE, text: "0" });
+                end.push({ type: VALUE, text: b.contat - cx ? b.continue : result.length - cx }, { type: STAMP, text: "," }, { type: VALUE, text: "0" });
                 relink(end);
             }
         }
@@ -634,23 +702,20 @@ function toqueue(body, getname, ret = false) {
         if (!o) break;
         while (labels.length) {
             var e = labels[labels.length - 1];
-            if (e.type !== LABEL) {
-                break;
-            }
-            if (e.keep) {
-                e.keep = false;
-                break;
-            }
+            if (e.type !== LABEL && !iftop) break;
+            if (scopes.lastIndexOf(e.scope) >= 0) break;
             poplabel();
         }
 
         if (o.type === LABEL) {
-            o.keep = true;
+            o.scope = scopes[scopes.length - 1];
             labels.push(o);
             continue;
         }
         if (o.type === SCOPED && o.entry === '{' && !o.isExpress) {
+            scopes.push(o);
             var b = toqueue(o, getname, false);
+            scopes.pop();
             // addresult(result, b);
             result.push.apply(result, b);
             cx++;
@@ -658,7 +723,14 @@ function toqueue(body, getname, ret = false) {
             continue;
         }
         a: if (o.type === STRAP) {
-            if (/^(new|typeof|yield|await)$/.test(o.text)) {
+            if (/^(new|typeof|await)$/.test(o.text)) {
+                break a;
+            }
+            if (o.text === 'yield') {
+                retn = [YIELD];
+                ret = true;
+                bx = cx + 1;
+                cx++;
                 break a;
             }
             if (o.text === 'return') {
@@ -668,8 +740,14 @@ function toqueue(body, getname, ret = false) {
                 cx++;
                 break a;
             }
-            if (o.text === 'break') {
-                cx = _break(body, cx, result);
+            if (/^(async|function)$/.test(o.text)) {
+                cx = skipAssignment(body, cx);
+                addresult(result, body.slice(bx, cx));
+                bx = cx + 1;
+                break a;
+            }
+            if (/^(break|continue)$/.test(o.text)) {
+                cx = _break(body, cx, result, o.text === 'continue');
                 bx = cx + 1;
                 continue;
             };
@@ -714,32 +792,25 @@ function toqueue(body, getname, ret = false) {
             var elseif = false;
             if (o.text === 'else') {
                 ifpatch();
-                iftop.push(result.length);
                 while (body[cx] !== o.next) cx++;
                 o = o.next;
+                var isbr = isbreak(o);
+                iftop.push(result.length, isbr);
                 elseif = true;
             }
             if (o.text === 'if') {
                 while (body[cx] !== o.next) cx++;
                 o = o.next;
-                var n = '';
-                if (o.first && o.first === o.last) {
-                    if (o.first.type === EXPRESS) {
-                        n = o.first.text;
-                    }
-                }
-                if (!n) {
-                    unblock(o);
-                    n = getname(0);
-                }
+                var isbr = isbreak(o.next);
+                var n = getCondition(o, unblock, !isbr);
+                o = o.next;
                 if (!elseif) {
                     if (iftop) uniftop();
-                    iftop = [result.length, n];
+                    iftop = [result.length, isbr, n];
                 }
                 else {
                     iftop.push(n);
                 }
-                o = o.next;
                 elseif = true;
             }
             if (elseif) {
@@ -778,7 +849,13 @@ var ret_ = '';
 module.exports = function (body, newname, ret) {
     if (ret) ret = isString(ret) ? ret : newname();
     var ret0 = ret_;
-    ret_ = ret;
+    var ret1 = null;
+    if (ret) ret_ = isString(ret) ? ret : {
+        toString() {
+            if (ret1) return ret1;
+            return newname();
+        }
+    };
     var tmpnames = [];
     var p = 0;
     var getname = function (i) {
@@ -786,7 +863,7 @@ module.exports = function (body, newname, ret) {
         if (!tmpnames[i]) tmpnames[i] = newname();
         return tmpnames[i];
     };
-    var res = toqueue(body, getname, ret);
+    var res = toqueue(body, getname, false);
     ret_ = ret0;
     return res;
 };

package/coms/compile/unstruct_test.js

@@ -16,7 +16,7 @@ test('a * a + b * c', "_ = a * a, _0 = b * c, _ + _0");
 test('a * a + b * c * c ** d', "_ = a * a, _0 = b * c, _1 = c ** d, _0 = _0 * _1, _ + _0");
 test('a * a || b * c * c ** d', "_ = a * a @re _ = b * c, _0 = c ** d, _ * _0");
 test('a * a || b * c || c * d', "_ = a * a @re _ = b * c @re c * d");
-test('a?b:c', "_ = a; return [_ ? 1 : 2, 0]; _ = b; return [2, 0]; _ = c");
+test('a?b:c', "if (a) return [1, 0]; _ = b; return [2, 0]; _ = c");
 test('a * a && b * c * c ** d', "_ = a * a @rz _ = b * c, _0 = c ** d, _ * _0");
 test('a = 1 + 2', "_ = 1 + 2, a = _", true);
 test('a = b', "a = b", true);
@@ -24,32 +24,35 @@ test('a = b = c', "_ = c, b = _, a = _", true);
 test('a = b = c + d', "_ = c + d, b = _, a = _", true);
 test('a = b = c + d * 1', "_ = d * 1, _ = c + _, b = _, a = _", true);
 test('return a = b', "a = b; return [a, 2]", true);
-test('a*a', "_ = a * a", true);
-test('a * a && b * c * c ** d', "_ = a * a; if (!_) return [1, 0]; _ = b * c, _0 = c ** d, _ = _ * _0", true);
-test('a * a || b * c * c ** d', "_ = a * a; if (_) return [1, 0]; _ = b * c, _0 = c ** d, _ = _ * _0", true);
-test('a * a ?? b * c * c ** d', "_ = a * a; if (_ !== null && _ !== undefined) return [1, 0]; _ = b * c, _0 = c ** d, _ = _ * _0", true);
-test('a * a && await b*c', "_ = a * a; if (!_) return [2, 0]; _ = b; return [_, 1]; _ = @; _ = _ * c", true);
+test('a*a', "a * a", true);
+test('a * a && b * c * c ** d', "_ = a * a; if (!_) return [1, 0]; _ = b * c, _0 = c ** d, _ * _0", true);
+test('a * a || b * c * c ** d', "_ = a * a; if (_) return [1, 0]; _ = b * c, _0 = c ** d, _ * _0", true);
+test('a * a ?? b * c * c ** d', "_ = a * a; if (_ !== null && _ !== undefined) return [1, 0]; _ = b * c, _0 = c ** d, _ * _0", true);
+test('a * a && await b*c', "_ = a * a; if (!_) return [2, 0]; _ = b; return [_, 1]; _ = @; _ * c", true);
 
 test("await a", "_ = a; return [_, 1]", true);
+test("yield a", "_ = a; return [_, 3]", true);
 test("await a()", "_ = a(); return [_, 1]", true);
-test("(1+ +1)", "_ = +1, _ = 1 + _; _ = (_)", true);
+test("yield a()", "_ = a(); return [_, 3]", true);
+test("(1+ +1)", "_ = +1, _ = 1 + _; (_)", true);
 test("await a(await b)", "_ = b; return [_, 1]; _ = @; _ = a(_); return [_, 1]", true);
 test("await a(await b).s(await c)", "_ = b; return [_, 1]; _ = @; _ = a(_); _0 = c; return [_0, 1]; _0 = @; _ = _.s(_0); return [_, 1]", true);
-test("a*a + await a(await b).s(await c)", "_ = a * a; _0 = b; return [_0, 1]; _0 = @; _0 = a(_0); _1 = c; return [_1, 1]; _1 = @; _0 = _0.s(_1); return [_0, 1]; _0 = @; _ = _ + _0", true);
-test("a*a + await a(await b(await c)).s(await c)", "_ = a * a; _0 = c; return [_0, 1]; _0 = @; _0 = b(_0); return [_0, 1]; _0 = @; _0 = a(_0); _1 = c; return [_1, 1]; _1 = @; _0 = _0.s(_1); return [_0, 1]; _0 = @; _ = _ + _0", true);
+test("a*a + await a(await b).s(await c)", "_ = a * a; _0 = b; return [_0, 1]; _0 = @; _0 = a(_0); _1 = c; return [_1, 1]; _1 = @; _0 = _0.s(_1); return [_0, 1]; _0 = @; _ + _0", true);
+test("a*a + await a(await b(await c)).s(await c)", "_ = a * a; _0 = c; return [_0, 1]; _0 = @; _0 = b(_0); return [_0, 1]; _0 = @; _0 = a(_0); _1 = c; return [_1, 1]; _1 = @; _0 = _0.s(_1); return [_0, 1]; _0 = @; _ + _0", true);
 test("await a, await b", "_ = a; return [_, 1]; _ = b; return [_, 1]", true);
-test("await a * b, await b", "_ = a; return [_, 1]; _ = @; _ = _ * b; _ = b; return [_, 1]", true);
+test("await a * b, await b", "_ = a; return [_, 1]; _ = @; _ * b; _ = b; return [_, 1]", true);
 test("if(a);", "", true);
 test("if(a) await b", "if (!a) return [1, 0]; _ = b; return [_, 1]", true);
 test("if(a) await b; else await c", "if (!a) return [2, 0]; _ = b; return [_, 1]; return [2, 0]; _ = c; return [_, 1]", true);
 test("if(a) b; else await c", "if (!a) return [1, 0]; _ = b; return [2, 0]; _ = c; return [_, 1]", true);
 test("if(a) await b; else if(e) await c", "if (!a) return [2, 0]; _ = b; return [_, 1]; return [2, 0]; if (!e) return [1, 0]; _ = c; return [_, 1]", true);
 test("if(a) await b; else if(e) await c else await d", "if (!a) return [2, 0]; _ = b; return [_, 1]; return [4, 0]; if (!e) return [2, 0]; _ = c; return [_, 1]; return [2, 0]; _ = d; return [_, 1]", true);
-test("if(await a) await b", "_ = a; return [_, 1]; if (!_) return [1, 0]; _ = b; return [_, 1]", true);
+test("if(await a) await b", "_ = a; return [_, 1]; if (!@) return [1, 0]; _ = b; return [_, 1]", true);
 test("for(a=0;a<10;a++) await a", "a = 0; return [1, 0]; _ = a < 10; if (!_) return [3, 0]; _ = a; return [_, 1]; _ = a++; return [-2, 0]", true);
 test("for(a=0;a<10;a++) await a, await b", "a = 0; return [1, 0]; _ = a < 10; if (!_) return [4, 0]; _ = a; return [_, 1]; _ = b; return [_, 1]; _ = a++; return [-3, 0]", true);
-test("while(a) await b", "_ = a; if (!_) return [3, 0]; _ = b; return [_, 1]; return [-2, 0]", true);
-test("do{await b}while(a)", "_ = b; return [_, 1]; _ = a; return [_ ? -2 : 1, 0]", true);
+test("for(a=0;b=2,a<10;a++) await a, await b", "a = 0; return [1, 0]; b = 2; _ = a < 10; if (!_) return [4, 0]; _ = a; return [_, 1]; _ = b; return [_, 1]; _ = a++; return [-3, 0]", true);
+test("while(a) await b", "if (!a) return [3, 0]; _ = b; return [_, 1]; return [-2, 0]", true);
+test("do{await b}while(a)", "_ = b; return [_, 1]; _ = @; if (a) return [-1, 0]; return [1, 0]", true);
 test("switch(a){case 1:}", "_ = a; _0 = 1; if (_ === _0) return [1, 0]", true);
 test("switch(a){case 1:break;}", "_ = a; _0 = 1; if (_ === _0) return [1, 0]; return [1, 0]", true);
 test("switch(a){case 1:break;case 2:break;}", "_ = a; _0 = 1; if (_ === _0) return [1, 0]; _0 = 2; if (_ === _0) return [2, 0]; return [2, 0]; return [1, 0]", true);

package/coms/kugou/buildScroll.js

@@ -1,6 +1,5 @@
 function Main(dataid, datapath, titleid) {
     var _titlebar = titlebar(" ");
-    state.with(_titlebar);
     var page = createVboxWithState(state);
     page.initialStyle = 'margin-left:100%';
     page.innerHTML = buildScroll;

package/coms/zimoli/zimoli.js

@@ -280,10 +280,6 @@ function prepare(pgpath, ok) {
     var state = createState(pgpath);
     state.state = state;
     var _with_elements = [];
-    state.with = function (element) {
-        if (element) _with_elements.push(element);
-        return _with_elements;
-    };
     state.path = function (url) {
         if (/^\.+\//.test(url)) {
             url = pgpath.replace(/[^\/]*$/, url);
@@ -304,10 +300,6 @@ function prepare(pgpath, ok) {
         }
         return url;
     };
-    state.popup = function (a) {
-        a = state.path(a);
-        return popup.apply(this, [a].concat([].slice.call(arguments, 1)));
-    };
     state.init = function (a) {
         a = state.path(a);
         return init.apply(this, [a].concat([].slice.call(arguments, 1)));
@@ -347,7 +339,7 @@ function prepare(pgpath, ok) {
     };
     state.titlebar = function () {
         var realTitleBar = titlebar.apply(null, arguments);
-        if (!realTitleBar.parentNode) state.with(realTitleBar);
+        if (!realTitleBar.parentNode) _with_elements.push(realTitleBar);
         return realTitleBar;
     };
     var roles = res || null;
@@ -405,7 +397,7 @@ function create(pagepath, args, from, needroles) {
     }
     else if (isFunction(pagepath)) {
         var pg = pagepath;
-        var { with: _with_elements, state = {}, onback: _pageback_listener, roles } = pg;
+        var { with: _with_elements = [], state = {}, onback: _pageback_listener, roles } = pg;
     }
     if (!checkroles(user.roles, roles) || !checkroles(user.roles, needroles)) {
         // 检查权限
@@ -414,18 +406,15 @@ function create(pagepath, args, from, needroles) {
         }
         return alert(i18n`没有权限！`, 0);
     }
-    _with_elements = [].concat(_with_elements);
-    state.with = function (element) {
-        if (element) _with_elements.push(element);
-        return _with_elements;
-    };
+    var _with_length = _with_elements.length;
     state.onback = function (handler) {
         _pageback_listener = handler;
     };
     var _page = pg.call(state, args, from);
     if (undefined === args || null === args) args = {};
     if (_page) {
-        if (_with_elements.length) _page.with = _with_elements.concat(_page.with || []);
+        if (_with_length) _page.with = _with_elements.concat(_page.with || []);
+        _with_elements.splice(_with_length, _with_elements.length - _with_length);
         if (args.initialStyle) _page.initialStyle = args.initialStyle;
         if (args.holdupStyle) _page.holdupStyle = args.holdupStyle;
         if (_page.initialStyle && !_page.holdupStyle) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.36.6",
+    "version": "3.36.9",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {