efront 4.7.3 → 4.8.1

package/coms/compile/common.js

@@ -36,9 +36,13 @@ var skipAssignment = function (o, cx) {
     else if (o.type & (SPACE | COMMENT)) o = o.next;
     var needpunc = false;
     var qcount = 0;
+    var condition = false;
     var ifdeep = 0;
-    var labeled = o && o.type === LABEL;
-    while (o && o.type === LABEL) next();
+    var labeled = o && (o.type === LABEL || o.type === STRAP && /^(var|const|let)$/i.test(o.text));
+    var skipLabel = function () {
+        while (o?.type === LABEL) next();
+    };
+    skipLabel();
     loop: while (o) switch (o.type) {
         case LABEL:
             if (!ifdeep) break loop;
@@ -51,7 +55,7 @@ var skipAssignment = function (o, cx) {
                     next();
                     break;
                 case ",":
-                    if (!ifdeep && !labeled) break loop;
+                    if (!ifdeep && !labeled && !condition) break loop;
                     needpunc = false;
                     next();
                     break;
@@ -132,6 +136,7 @@ var skipAssignment = function (o, cx) {
                 if (o.text === 'catch') {
                     next();
                     if (o && o.entry === '(') next();
+                    skipLabel();
                     needpunc = false;
                     break;
                 }
@@ -147,14 +152,23 @@ var skipAssignment = function (o, cx) {
                 if (ifdeep <= 0) break loop;
                 ifdeep--;
                 needpunc = false;
+                skipLabel();
                 next();
             }
             else if (/^(if|while|with|switch|try)$/.test(o.text)) {
                 if (o.text === 'if') ifdeep++;
+                skipLabel();
                 next();
-                if (o.entry === "(") next();
+                skipLabel();
+                if (o?.entry === "(") next();
+                skipLabel();
+                if (o?.type === SCOPED && o.entry === '{') {
+                    condition = false;
+                }
+                else condition = true;
             }
             else if (o.text === 'do') {
+                skipLabel();
                 next();
                 next();
                 next();
@@ -162,6 +176,7 @@ var skipAssignment = function (o, cx) {
             else if (o.text === 'for') {
                 next();
                 if (o.type === STRAP && o.text === 'await') next();
+                skipLabel();
                 next();
             }
             else if (o.text === "class") {
@@ -289,12 +304,15 @@ function snapSentenceHead(o) {
                 p = o.prev;
                 if (!p) break;
             }
-            else if (p.type === STRAP) {
-                var pp = getContitionHeadBeforeScoped(o, false);
-                if (pp) { o = pp; break; }
-                pp = getFunctionHeadBeforeScoped(o);
-                if (pp) { o = pp; continue };
-            }
+            var pp = getContitionHeadBeforeScoped(o, false);
+            if (pp) { o = pp; break; }
+            pp = getFunctionHeadBeforeScoped(o);
+            if (pp) {
+                o = pp;
+                p = o.prev;
+                if (!p || p.type === STAMP && /^[,;]$/.test(p.text)) break;
+                continue
+            };
         }
         var maybeprop = o.type === SCOPED && o.entry !== "{" || o.type === EXPRESS && /^[\.\[]/.test(o.text);
         if (p.type === EXPRESS) {
@@ -325,7 +343,12 @@ function snapSentenceHead(o) {
                 var pp = getContitionHeadBeforeScoped(p, true);
                 if (pp) { o = pp; break; }
                 var pp = getFunctionHeadBeforeScoped(p);
-                if (pp) { o = pp; continue; }
+                if (pp) {
+                    o = pp;
+                    p = o.prev;
+                    if (!p || p.type === STAMP && /^[,;]$/.test(p.text)) break;
+                    continue;
+                }
             }
             break;
         }
@@ -361,7 +384,7 @@ function snapSentenceHead(o) {
             if (/^[\?\:]$/.test(p.text)) {
                 if (o) {
                     var e = snapExpressFoot(o).next;
-                    if (e.type === STAMP && equal_reg.test(e.text)) break;
+                    if (!e || e.type === STAMP && equal_reg.test(e.text)) break;
                 }
             }
             if (/^(?:[!~]|\+\+|\-\-)$/.test(p.text)) {
@@ -375,11 +398,6 @@ function snapSentenceHead(o) {
                 o = p;
                 continue;
             }
-            var pp = p.prev;
-            if (pp.type === STAMP && /^(\+\+|\-\-)$/.test(pp.text) && pp.prev) {
-                o = pp.prev;
-                continue;
-            }
             o = p.prev;
             continue;
         }
@@ -541,6 +559,7 @@ var createScoped = function (parsed, wash) {
                 case VALUE:
                     if (o.isdigit || /^(null|false|true)$/.test(o.text)) break;
                 case EXPRESS:
+                    if (needhead_reg.test(o.text)) break;
                     // if (o.text === 'readFileAsync') console.log(o)
                     if (o.prev && o.prev.type === EXPRESS) {
                         if (/\.$/.test(o.prev.text)) break;
@@ -548,6 +567,7 @@ var createScoped = function (parsed, wash) {
                     if (o.next && o.next.type === STAMP && o.next.text === "=>") {
                         isScope = true;
                         isArrow = true;
+                        isAsync = o.prev?.type === STRAP && o.prev.text === 'async';
                     }
                     else {
                         var u = o.text;
@@ -569,7 +589,7 @@ var createScoped = function (parsed, wash) {
                     name = name.replace(/\s*\:$/, '');
                     vars[name] = true;
                     o.kind = "label";
-                    saveTo(used, name, o);
+                    saveTo(labelused, name, o);
                     break;
 
                 case STRAP:
@@ -663,7 +683,7 @@ var createScoped = function (parsed, wash) {
                         if (o.next && o.next.type === STAMP && o.next.text === "=>") {
                             isArrow = true;
                             isScope = true;
-                            if (o.prev && o.prev.text === 'async') {
+                            if (o.prev?.type === STRAP && o.prev.text === 'async') {
                                 isAsync = true;
                             }
                         }
@@ -801,6 +821,7 @@ var createScoped = function (parsed, wash) {
                 }
                 else if (isArrow) {
                     var next = skipAssignment(o);
+                    scoped.arraw = o;
                     var u = o;
                     while (o !== next) {
                         var n = run(o, 0);
@@ -1047,6 +1068,7 @@ var saveTo = function (used, k, o) {
     k = uncode(k);
     if (!(used[k] instanceof Array)) used[k] = [];
     used[k].push(o);
+    o.tack = k;
 };
 
 var mergeTo = function (used, used0) {
@@ -1114,6 +1136,27 @@ var relink = function (list) {
     list.last = p;
     return list;
 };
+var rehead = function (list) {
+    for (var cx = 0, dx = list.length; cx < dx; cx++) {
+        var o = list[cx];
+        if (o.type & (COMMENT | SPACE)) {
+            o.prev = null;
+            continue;
+        }
+        list.first = o;
+        break;
+    }
+    for (var cx = list.length - 1; cx >= 0; cx--) {
+        var o = list[cx];
+        if (o.type & (COMMENT | SPACE)) {
+            o.last = null;
+            continue;
+        }
+        list.last = o;
+        break;
+    }
+    return list;
+}
 var setqueue = function (list, queue = list) {
     /**
      * @type {PropertyDescriptor}
@@ -1219,6 +1262,9 @@ var createString = function (parsed) {
                         }
                     }
                     intag = 0;
+                    if (o.short && attributes.length > 0 && !(lasttype & (SPACE | QUOTED))) {
+                        if (!/[\s'"]$/.test(result[result.length - 1])) result.push(' ');
+                    }
                 }
                 if (o.closed) {
                     if (!o.short) {
@@ -1521,6 +1567,25 @@ var pickSentence = function (o) {
     } while (h !== e);
     return res;
 };
+var pickExpress = function (o) {
+    o = snapExpressFoot(o);
+    var e = snapExpressFoot(o);
+    var os = [];
+    do {
+        os.push(o);
+    }
+    while (o && o !== e);
+    return os;
+};
+var pickAssignment = function (n) {
+    var e = skipAssignment(n);
+    var values = [];
+    while (n && n !== e) {
+        values.push(n);
+        n = n.next;
+    }
+    return values;
+}
 var insertBefore = function () {
     var [o] = arguments;
     var queue = this || o.queue;
@@ -1565,12 +1630,57 @@ var unshort = function (o, text) {
     o.type = EXPRESS;
     delete o.short;
 };
+var getFuncBody = function (o) {
+    var q = o.queue;
+    while (q && !(q.scoped?.isfunc)) q = q.queue;
+    return q;
+};
 var getBodyWith = function (o, k) {
     var q = o.queue;
     while (q && (!q.scoped || !q.scoped.caps[k])) q = q.queue;
     return q;
 };
 
+
+var createSeeker = function (o) {
+    var os = pickExpress(o);
+    var ids = [];
+    for (var o of os) {
+        if (o.type === SCOPED) {
+            if (o.entry !== '[') break;
+            var t = o.last;
+            if (!t) throw new Error(i18n`格式错误`);
+            if (t.type === QUOTED) {
+                if (!t.length) {
+                    if (/\.|^#/.test(t.text)) {
+                        ids.push(`[${t.text}]`);
+                    }
+                    else {
+                        ids.push(strings.decode(t.text));
+                    }
+                }
+                else {
+                    ids.push("...");
+                    break;
+                }
+            }
+        }
+        else if (o.type === EXPRESS) {
+            var t = o.text.replace(/^\.\.\./, "").replace(/^[^\.\[]+/, '');
+            t.replace(/[^\.\[]+|\[[\s\S]*?\]/g, function (m) {
+                if (/^\[/.test(m)) {
+                    ids.push(strings.decode(m.slice(1, -1)));
+                }
+                else {
+                    ids.push(m);
+                }
+            })
+        }
+
+    }
+    return ids;
+};
+
 var patchArrawScope = function (arraw, origin) {
     var s1 = createScoped(arraw);
     if (s1.caps.this) {
@@ -1604,6 +1714,7 @@ module.exports = {
     skipAssignment,
     getDeclared,
     getBodyWith,
+    getFuncBody,
     patchArrawScope,
     remove,
     createString,
@@ -1612,6 +1723,8 @@ module.exports = {
     snapSentenceHead,
     pickArgument,
     pickSentence,
+    pickExpress,
+    pickAssignment,
     snapExpressHead,
     snapExpressFoot,
     skipSentenceQueue,
@@ -1620,6 +1733,8 @@ module.exports = {
     isEval,
     rename,
     relink,
+    rehead,
+    createSeeker,
     setqueue,
     replace,
     canbeTemp,

package/coms/compile/downLevel.js

@@ -1,7 +1,7 @@
 var scanner2 = require("./scanner2");
 var strings = require("../basic/strings");
 var Program = scanner2.Program;
-var { STAMP, SCOPED, STRAP, EXPRESS, COMMENT, SPACE, PROPERTY, VALUE, LABEL, QUOTED, snapExpressFoot, isEval, canbeTemp, rename, isHalfSentence, skipFunction, getDeclared, skipAssignment, skipSentenceQueue, createScoped, createString, splice, relink, snapExpressHead, needBreakBetween } = require("./common");
+var { STAMP, SCOPED, STRAP, EXPRESS, pickAssignment, COMMENT, SPACE, PROPERTY, VALUE, LABEL, QUOTED, snapExpressFoot, isEval, canbeTemp, rename, isHalfSentence, skipFunction, getDeclared, skipAssignment, skipSentenceQueue, createScoped, createString, splice, relink, snapExpressHead, needBreakBetween } = require("./common");
 var splice2 = function (q, from, to, ...a) {
     var cx = q.indexOf(from);
     if (cx < 0) throw console.log(splice2.caller, console.format(`\r\n<red2>${i18n`自`}</red2>`), from && createString([from]), console.format(`\r\n<yellow>${i18n`至`}</yellow>`), to && createString([to]), console.format(`\r\n<cyan>${i18n`码列`}</cyan>`), createString(q)), i18n`结构异常`;
@@ -1721,13 +1721,19 @@ var down = function (scoped) {
         fordeep = saveddeep;
     };
     if (scoped.isfunc) {
-        if (!scoped.body && scoped.head) scoped.body = scoped.head.next;
+        if (!scoped.body && scoped.head?.next?.type === SCOPED && scoped.head.next.entry === "{") scoped.body = scoped.head.next;
         if (scoped.head) var [argsmap, argcodes] = killarg(scoped.head, scoped.body, _letname, false);
         else argcodes = [];
         if ((markcodes.length || argcodes.length) && !funcMark) precode(markcodes.concat(argcodes).join(";") + ";");
         if (scoped.body) scoped.body.keeplet = false, _killobj(_getname, scoped.body);
-
         scoped.forEach(kill);
+        var requeue = null, requeuei = -1, requeuee = -1;
+        if (!scoped.body && scoped.arraw) {
+            requeue = scoped.arraw.queue;
+            requeuei = requeue.indexOf(scoped.arraw);
+            scoped.body = pickAssignment(scoped.arraw);
+            requeuee = requeue.indexOf(scoped.body[scoped.body.length - 1], requeuei) + 1;
+        }
         if (funcMark) {
             var argname = _letname("_");
             unstruct.debug = downLevel.debug;
@@ -1761,6 +1767,8 @@ var down = function (scoped) {
         if (argsmap) vars1 = vars1.filter(k => !(k in argsmap));
         if (vars1.length && scoped.body) scoped.body.push(...scanner2(`\r\nvar ${vars1}`));
         if (scoped.body) relink(scoped.body);
+
+        if (requeuei >= 0) splice(requeue, requeuei, requeuee - requeuei, ...scoped.body);
     }
     else {
         kill(scoped);

package/coms/compile/downLevel_test.js

@@ -85,7 +85,7 @@ assert(downLevel(`class a { static{ a.a=1}}`), "function a() {}; (function () {
 assert(downLevel(`if(a) a = 1; class a {}`), "if (a) a = 1; function a() {}")
 assert(downLevel(`async function(){if(a) a = 1; class a {}}`), `function () { return async_(
 function () {
-a = function a() {}; if (!a) return [1, 0]; a = 1; return [1, 0]
+a = function () {}; if (!a) return [1, 0]; a = 1; return [1, 0]
 })
 var a, _0 }`)
 assert(downLevel(`if(a) class b{ c(){}};`), `if (a) var b = function (b) { b["prototype"].c = function () {}\r\nreturn b }(function b() {});`)
@@ -424,3 +424,11 @@ function (_) {
 _0 = _; _0 = _0.a; a = _0
 })
 var a, _0`)
+
+assert(downLevel(`async a=>await a`), `function (a) { return return async_(
+function () {
+_0 = a; return [_0, 1]
+})
+var a, _0 }`)
+
+assert(downLevel(`function(a=b=>b,c){c}`), 'function (a, c) { if (a === undefined) a = function (b) { return b }; c }')

package/coms/compile/prefunc.js

@@ -0,0 +1,38 @@
+var { COMMENT, SPACE, STRAP, EXPRESS, STAMP, skipAssignment, isHalfSentence, splice } = common;
+// 将当前代码队列中的function及class声明提前
+var prefunc = function (sbody) {
+    var fx = 0;
+    for (var cx = 0, dx = sbody.length; cx < dx; cx++) {
+        var o = sbody[cx];
+        var bx = cx;
+        while (o && o.type & (SPACE | COMMENT)) o = sbody[++cx];
+        if (!o) break;
+        if (o.type === STRAP && /^(async|function|class)$/.test(o.text)) {
+            if (!o.isExpress) {
+                var ex = skipAssignment(sbody, cx);
+                var fname = '';
+                o = o.next;
+                while (o.type & (STRAP | STAMP)) o = o.next;
+                if (o.type === EXPRESS) fname = o.text;
+                if (fname) {
+                    var ni = sbody.indexOf(o, cx);
+                    splice(sbody, ni, 1);
+                    if (isHalfSentence(sbody, cx - 1)) {
+                        splice(sbody, cx, 0, o, { type: STAMP, text: "=" });
+                        ex++;
+                        dx++;
+                    }
+                    else {
+                        var sb = splice(sbody, bx, ex - bx);
+                        splice(sbody, fx, 0, { type: SPACE, text: "\r\n" }, o, { type: STAMP, text: "=" }, ...sb);
+                        fx += ex - bx + 2;
+                        ex += 2;
+                        dx += 2;
+                    }
+                }
+                cx = ex;
+                continue;
+            }
+        }
+    }
+};

package/coms/compile/translate.js

@@ -110,7 +110,7 @@ function translate([imap, supports], code) {
 
         var imp = imap[tt];
         if (!imp) {
-            if (warn !== false && !warningMap[tt]) warningMap[tt] = true, console.warn(`<yellow>${i18n`翻译缺失：`}</yellow>${tt}`);
+            if (warn !== false && !/^\s*$/.test(tt) && !warningMap[tt]) warningMap[tt] = true, console.warn(`<yellow>${i18n`翻译缺失：`}</yellow>${tt}`);
             imp = imap[tt] = supports.map(_ => tt);
         }
         if (nodup && imp.length <= 1) nodup = false;
@@ -158,7 +158,7 @@ function translate([imap, supports], code) {
                         if (a in t) v = t[a];
                         else v = scanner2(JSON.stringify(v));
                     }
-                    else if (k === 'name') v = ctn('i18n' + getm(v, t.nodup, t.warn), t);
+                    else if (/^(name|holder|comment)$/.test(k)) v = ctn('i18n' + getm(v, t.nodup, t.warn), t);
                     else v = scanner2(JSON.stringify(v));
                     o.push({ type: PROPERTY, isprop: true, text: JSON.stringify(k) }, { type: STAMP, text: ':' }, ...v, { type: STAMP, text: ',' });
                 })

package/coms/compile/unstruct.js

@@ -1,4 +1,4 @@
-var { SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL, canbeTemp: _canbeTemp, isEval, createString, skipAssignment, pickSentence, skipSentenceQueue, isHalfSentence, splice, relink, createExpressList, snapExpressHead, snapExpressFoot } = require("./common");
+var { SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL, canbeTemp: _canbeTemp, isEval, createString, skipAssignment, pickSentence, skipSentenceQueue, splice, relink, createExpressList, snapExpressHead, snapExpressFoot } = require("./common");
 var scanner2 = require("./scanner2");
 var returnText = function () { return this.text };
 var NodeNotClone = o => Object.assign(Object.create(null), o, { toString: returnText });
@@ -889,38 +889,6 @@ var ternary = function (body, getname, ret) {
     }
     return explist;
 };
-var prefunc = function (sbody) {
-    var fx = 0;
-    for (var cx = 0, dx = sbody.length; cx < dx; cx++) {
-        var o = sbody[cx];
-        var bx = cx;
-        while (o && o.type & (SPACE | COMMENT)) o = sbody[++cx];
-        if (!o) break;
-        if (o.type === STRAP && /^(async|function|class)$/.test(o.text)) {
-            if (!o.isExpress) {
-                var ex = skipAssignment(sbody, cx);
-                var fname = '';
-                o = o.next;
-                while (o.type & (STRAP | STAMP)) o = o.next;
-                if (o.type === EXPRESS) fname = o.text;
-                if (fname) {
-                    if (isHalfSentence(sbody, cx - 1)) {
-                        splice(sbody, cx, 0, { type: EXPRESS, text: fname }, { type: STAMP, text: "=" });
-                    }
-                    else {
-                        var sb = splice(sbody, bx, ex - bx);
-                        splice(sbody, fx, 0, { type: EXPRESS, text: fname }, { type: STAMP, text: "=" }, ...sb);
-                        fx += ex - bx + 2;
-                    }
-                    ex += 2;
-                    dx += 2;
-                }
-                cx = ex;
-                continue;
-            }
-        }
-    }
-};
 
 var isFunctionOnly = function (body) {
     for (var cx = 2, dx = body.length; cx < dx; cx++) {

package/coms/compile/unstruct_test.js

@@ -91,14 +91,14 @@ test("try{a=2+1}catch(e){}", 'return [1, 7];\r\n a = 2 + 1; return [0, 9];\r\n r
 test("try{a=2+1}catch(e){a=3}", 'return [65537, 7];\r\n a = 2 + 1; return [0, 9];\r\n e = @; a = 3; return [0, 9];\r\n return [1, 9]', true);
 test("(function(){})", '_ = function () {}; _', true);
 test("(1+2*function(){}())", '_ = 2 * function () {}(), _ = 1 + _; _', true);
-test("function a(){}", 'a = function a() {}', true);
-test("if(1) function a(){}", 'if (false) return [1, 0]; a = function a() {}; return [1, 0]', true);
-test("if(1) {function a(){}}", 'if (false) return [1, 0]; a = function a() {}; return [1, 0]', true);
-test("if(a) a = 1;function a(){}", "a = function a() {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
-test("if(a) a = 1;async function a(){}", "a = async function a() {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
-test("if(a) a = 1;async function* a(){}", "a = async function* a() {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
-test("if(a) a = 1;class a{}", "a = class a{}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
-test("if(a) a = 1;function* a(){}", "a = function* a() {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
+test("function a(){}", 'a = function () {}', true);
+test("if(1) function a(){}", 'if (false) return [1, 0]; a = function () {}; return [1, 0]', true);
+test("if(1) {function a(){}}", 'if (false) return [1, 0]; a = function () {}; return [1, 0]', true);
+test("if(a) a = 1;function a(){}", "a = function () {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
+test("if(a) a = 1;async function a(){}", "a = async function () {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
+test("if(a) a = 1;async function* a(){}", "a = async function* () {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
+test("if(a) a = 1;class a{}", "a = class {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
+test("if(a) a = 1;function* a(){}", "a = function* () {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
 test("await new Promise(function(){})", '_ = function () {}; _ = new Promise(_); return [_, 1]', true);
 test(`onerror({ status: xhr.status, response: "Cookie解析异常!", toString: toResponse })`, '_ = { status: xhr.status, response: "Cookie解析异常!", toString: toResponse }; onerror(_)', true);
 test(`if (!/^https\\:\\/\\/|^s\\/\\//.test(url)) console.warn("请使用https访问如下路径:" + url)`, '_ = /^https\\:\\/\\/|^s\\/\\//.test(url); if (_) return [1, 0]; _ = "请使用https访问如下路径:" + url; _ = console.warn(_); return [1, 0]', true);

package/coms/pivot/acme2.js

@@ -324,6 +324,7 @@ var acme2 = new class {
     }
     async auditOrder(o, setauth) {
         if (o.status !== 'pending') return o;
+        var bs = [];
         a: for (var a of o.authorizations) {
             var b = await data.fromURL(a);
             if (b.challenges) {
@@ -335,9 +336,12 @@ var acme2 = new class {
                         continue a;
                     }
                 }
+                bs.push(c);
             }
         }
-        o = await this.waitStatus(o);
+        if (bs.length === 0) {
+            o = await this.waitStatus(o);
+        }
         return o;
     }
     async finalizeOrder(o, upload) {

package/coms/zimoli/alert.js

@@ -83,6 +83,9 @@ function alert() {
         }
         if (close_timer) clearTimeout(close_timer);
     });
+    on('removed')(elem, function () {
+        if (!container.children.length) remove(container);
+    });
     onremove(elem, _onclose);
     var close_timer;
     elem.setText = function () {

package/coms/zimoli/loading.html

@@ -1,3 +1,3 @@
-加载中..
+${i18n`加载中..`}
 <div class="loader">
 </div>

package/coms/zimoli/remove.js

@@ -31,6 +31,7 @@ function remove(node, transition) {
             if (node.with) {
                 remove(node.with, transition);
             }
+            dispatch(node, createEvent('removed'));
         }
     }
 }

package/coms/zimoli/zimoli.js

@@ -12,7 +12,6 @@ var sessionInitHash = sessionStorage.getItem(sessionSavedHashKey);
 var hostoryStorage = sessionStorage;
 var pagehash_reg = /#([\/\w\:@\.\_\(\)\+\-\*\$@!~_'\?,&~%]+)$/;
 var locationInitHash = location.hash;
-var hashchangecount = 0;
 var isFirstTimeLoad = sessionInitHash === null;
 var isSimpleRefresh = sessionInitHash === locationInitHash;
 var isWithHashLoad = !!location.hash;
@@ -25,10 +24,8 @@ if (isWithHashLoad && !isSimpleRefresh) {
 
 if (/MSIE\s*[2-7]/.test(navigator.userAgent)) {
     window.onhistorychange = function (url) {
-        hashchangecount++;
         // 如果是返回事件，一定不是第一次改变hash
         // 这里刚好可以屏蔽首次手动改变url可能产生的hashchange事件
-        if (hashchangecount < 2) return;
         if (preventNextHashChange) return preventNextHashChange = false, window_history.go(-1);
         if (preventNextHashChange === void 0 ? onback && onback() === true : preventNextHashChange = void 0) { }
     };
@@ -48,7 +45,6 @@ if (/MSIE\s*[2-7]/.test(navigator.userAgent)) {
     backman();
 } else {
     onhashchange(window, function (event) {
-        hashchangecount++;
         // 如果是返回事件，一定不是第一次改变hash
         // 这里刚好可以屏蔽首次手动改变url可能产生的hashchange事件
         var targetHash = location.hash;
@@ -550,6 +546,7 @@ var checkonback = function (elements) {
         var onback = element && element.onback;
         if (isFunction(onback)) {
             onback = element.onback();
+            if (onback === false) console.info(i18n`onback中阻止跳转的功能在新老版本的chrome上及其他不同浏览器上的表现均不一致，建议更换实现方式！`);
         }
         if (onback === false || isString(onback)) {
             break;

package/docs//345/267/245/345/205/267//345/233/275/351/231/205/345/214/226.xht

@@ -46,6 +46,7 @@
             width: 100%;
             height: 36px;
         }
+
         &:last-child {
             float: left;
         }
@@ -467,14 +468,7 @@
             detailWindow.initialStyle = "margin-left:-100px;opacity:0";
             render(detailWindow, detailScope);
             on("remove")(detailWindow, function () {
-                var count = 0;
-                var fanyi = detailScope.fanyi;
-                for (var s of supports) {
-                    if (fanyi[s.id] && fanyi[s.id].trim()) count++;
-                }
-                if (detailScope.item) {
-                    detailScope.item.liang = count;
-                }
+                更新翻译数();
                 if (activedRow) {
                     removeClass(activedRow, "actived");
                     activedRow = null;
@@ -484,8 +478,19 @@
 
         }
     }
+    var 更新翻译数 = function () {
+        var count = 0;
+        var fanyi = detailScope.fanyi;
+        if (fanyi) for (var s of supports) {
+            if (fanyi[s.id] && fanyi[s.id].trim()) count++;
+        }
+        if (detailScope.item) {
+            detailScope.item.liang = count;
+        }
+    };
     var showDetail = function (event) {
         initDetailWindow();
+        更新翻译数();
         var tr = getTargetIn(tableElement.children[1], event.active, false);
         var item = detailScope.item = event.item;
         if (activedRow !== tr) {
@@ -558,6 +563,7 @@
         var textMap = Object.create(null);
         已找到的字符串.is_loading = true;
         var addTranslate = function (translate) {
+            if (!isHandled(translate)) return;
             var tmap = textMap[translate];
             if (!tmap) tmap = textMap[translate] = Object.create(null), tmap["#count"] = 0;
             if (!tmap[e.path]) tmap[e.path] = [];
@@ -573,7 +579,11 @@
                     addTranslate(t.translate);
                 }
                 else if (t.transtype === compile$translate.字段名) {
-                    t.fields.forEach(f => addTranslate(f.name));
+                    t.fields.forEach(f => {
+                        addTranslate(f.name);
+                        addTranslate(f.holder);
+                        addTranslate(f.comment);
+                    });
                 }
             }
         }