efront 4.7.3 → 4.8.2

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/crypt/encode62.js

@@ -104,7 +104,7 @@ Object.assign(encode62, {
         return encode62(string);
     },
     genb() {
-        return encode62(Date.now() * Math.random() + "" + Math.random().toString(36) + Math.random().toString(36).toUpperCase());
+        return encode62(new Date * Math.random() + "" + Math.random().toString(36) + Math.random().toString(36).toUpperCase());
     },
     huan(x, y) {
         return x.split("").map(s => y[map[s]]).join("");

package/coms/docs/codetext.xht

@@ -91,7 +91,9 @@
     };
     var typescript = new compile$Javascript;
     typescript.straps = typescript.straps.concat("interface", "implements", "declare", "module", "readonly", "enum");
+    typescript.tags[0].push(["{", "}"]);
     var js = new compile$Javascript;
+    js.tags[0].push(["{", "}"]);
     js.keepspace = true;
     var codesupports = {
         javascript(a, blink) {

package/coms/frame/chat.js

@@ -106,7 +106,7 @@ function chat(title = '会话窗口') {
     page.innerHTML = template;
     drag.on(page.firstElementChild, page);
     resize.on(page);
-    var localid = title.id || (Date.now() / 1000 | 0) + Math.sin(Math.random());
+    var localid = title.id || (new Date / 1000 | 0) + Math.sin(Math.random());
     var users = [];
     var addToMsgList = function (list, msgs) {
         list.push.apply(list, msgs);

package/coms/kugou/qqjc.js

@@ -153,7 +153,7 @@ var secret = "0b50b02fd0d73a9c4c8c3a781c30845f";
 function createSign(e) {
     if ("[object Object]" !== Object.prototype.toString.call(e))
         throw new Error("The parameter of query must be a Object.");
-    var t = Math.floor(Date.now() / 1e3);
+    var t = Math.floor(new Date / 1e3);
     extend(e, {
         timestamp: t,
         appid: 16073360

package/coms/pivot/acme2.js

@@ -185,8 +185,8 @@ var acme2 = new class {
     }
     async updateTime(update) {
         if (!acme2.nextUpdateTime || update) {
-            if (!acme2.lastUpdateTime || new Date(acme2.lastUpdateTime) + 86400000 + acme2.schadulePeriod * 86400000 < Date.now()) {
-                acme2.nextUpdateTime = parseDate(Date.now() + +acme2.schadulePeriod * 86400000);
+            if (!acme2.lastUpdateTime || new Date(acme2.lastUpdateTime) + 86400000 + acme2.schadulePeriod * 86400000 < +new Date) {
+                acme2.nextUpdateTime = parseDate(+new Date + +acme2.schadulePeriod * 86400000);
             }
             else {
                 acme2.nextUpdateTime = parseDate(new Date(acme2.lastUpdateTime) + +acme2.schadulePeriod * 86400000);
@@ -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) {
@@ -353,7 +357,7 @@ var acme2 = new class {
     async autoUpdate(saveUnique, domain, setauth, upload) {
         if (!domain.length) return;
         if (acme2.orders.length >= 20) acme2.orders.pop();
-        this.lastUpdateTime = filterTime(Date.now(), 'y-MM-dd hh:mm');
+        this.lastUpdateTime = filterTime(+new Date, 'y-MM-dd hh:mm');
         this.updateTime();
         var o = await acme2.newOrder({ domain });
         await saveUnique();// 及时保存订单信息以便后续查看

package/coms/random//350/272/253/344/273/275/350/257/201.js

@@ -75,7 +75,7 @@ var prefix = function (source) {
 // }([11, 15, 21, 23, 31, 37, 41, 46, 50, 54, 61, 65, 71, 71, 81, 82]);
 var birth = function (q) {
     var d = new Date(1000, q % 12, 1 + q % 31);
-    d = new Date(+d + (Date.now() - d) * (1 - Math.pow(.5, q % 9 + 2)));
+    d = new Date(+d + (+new Date - d) * (1 - Math.pow(.5, q % 9 + 2)));
     return d;
 }
 /**

package/coms/third-party/html2canvas.js

@@ -2356,7 +2356,7 @@ var Logger = /** @class */ (function () {
         var id = _a.id, enabled = _a.enabled;
         this.id = id;
         this.enabled = enabled;
-        this.start = Date.now();
+        this.start = +new Date;
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     Logger.prototype.debug = function () {
@@ -2376,7 +2376,7 @@ var Logger = /** @class */ (function () {
         }
     };
     Logger.prototype.getTime = function () {
-        return Date.now() - this.start;
+        return new Date - this.start;
     };
     Logger.create = function (options) {
         Logger.instances[options.id] = new Logger(options);
@@ -6937,7 +6937,7 @@ var renderElement = function (element, opts) {
                     if (!defaultView) {
                         throw new Error("Document is not attached to a Window");
                     }
-                    instanceName = (Math.round(Math.random() * 1000) + Date.now()).toString(16);
+                    instanceName = (Math.round(Math.random() * 1000) + +new Date).toString(16);
                     _a = isBodyElement(element) || isHTMLElement(element) ? parseDocumentSize(ownerDocument) : parseBounds(element), width = _a.width, height = _a.height, left = _a.left, top = _a.top;
                     defaultResourceOptions = {
                         allowTaint: false,

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/lazySwap.js

@@ -1,5 +1,5 @@
 var Timer = class {
-    startTime = Date.now();
+    startTime = +new Date;
     timeout = 600;
     timer = 0;
     target = null;

package/coms/zimoli/loading.html

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

package/coms/zimoli/menuList.js

@@ -166,10 +166,10 @@ function main() {
     }
     var enterMenuEnabled = 0;
     onmousemove(page, function () {
-        enterMenuEnabled = Date.now();
+        enterMenuEnabled = +new Date;
     });
     var enterMenu = lazy(function (menu) {
-        if (enterMenuEnabled + 200 < Date.now()) return;
+        if (enterMenuEnabled + 200 < +new Date) return;
         enterMenuEnabled = false;
         if (page.ispop) {
             page.setFocus(menu);

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/sessionStorage.js

@@ -9,7 +9,7 @@ var clear = function () {
         if (key.slice(0, session_storage_prefix.length) === session_storage_prefix)
             localStorage.removeItem(key);
     }
-    document.cookie = Date.now();
+    document.cookie = +new Date;
 };
 var read = function () {
     for (var cx = 0, dx = localStorage.length; cx < dx; cx++) {

package/coms/zimoli/speed_test.js

@@ -1,12 +1,12 @@
 var s = speed();
 var id = 0;
-var passed = Date.now();
+var passed = +new Date;
 var test = async function (wait, write = '') {
     var _id = ++id;
     await new Promise(ok => setTimeout(ok, wait));
     if (write) var read = s(write);
     else var read = s();
-    var now = Date.now();
+    var now = +new Date;
     if (passed) var waited = now - passed;
     else waited = 0;
     passed = now;

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);
+                    });
                 }
             }
         }

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

@@ -195,21 +195,48 @@
     });
     var loadcode = async function () {
         jschanged = false;
-        var modName = name.replace(/\.js$/, '_test');
+        var modName = name.replace(/\.js$/i, '_test');
         if (doc.test) {
-            var xhr = await cross('get', "./components:" + modName + '.js');
-            jstext = xhr.responseText;
+            var jstext = [], lessdata = [], htmldata = [];
+            for (var f of doc.test) {
+                var xhr = await cross("get", "./components:" + name.replace(/[^\\\/]+$/, '') + f);
+                if (/\.js$/i.test(f)) {
+                    jstext.push(xhr.response);
+                }
+                else if (/\.less$/i.test(f)) {
+                    lessdata.push(xhr.response);
+                }
+                else if (/\.html$/i.test(f)) {
+                    htmldata.push(xhr.response);
+                }
+                else if (/\.xht$/i.test(f)) {
+                    alert(i18n`这个文件内的测试代码暂不支持`, 'error');
+                    break;
+                    htmldata.push(xhr.response
+                        .replace(/\<script\>([\s\S]*?)\<\/script\>/ig, function (_, s) {
+                            jstext.push(s);
+                            return '';
+                        })
+                        .replace(/\<style\>([\s\S]*?)\<\/style\>/ig, function (_, s) {
+                            lessdata.push(s);
+                            return '';
+                        }));
+
+                }
+            }
+            jstext = jstext.join("\r\n");
+            lessdata = lessdata.join("\r\n");
+            htmldata = htmldata.join("\r\n");
             var code = compile$scanner2(jstext);
             var envs = code.envs;
             var vars = code.vars;
             var commName = modName.replace(/^[\s\S]*\//, '');
-            var lessName = commName + ".less", lessData;
+            var lessName = commName + ".less", lessdata;
             var cssWrap = `css-` + +new Date;
-            if (doc.test.indexOf(lessName) >= 0) {
-                lessData = await cross("get", "./components:" + modName + ".less");
-                lessData = compile$素馨(lessData.responseText, "." + cssWrap);
+            if (lessdata) {
+                lessdata = compile$素馨(lessdata, "." + cssWrap);
                 if (code.isExpressQueue()) {
-                    jstext = `return cless(${jstext},\`${lessData}\`,"${cssWrap}")`;
+                    jstext = `return cless(${jstext},\`${lessdata}\`,"${cssWrap}")`;
                 }
                 else {
                     var entryName;
@@ -217,7 +244,7 @@
                     else if (vars.Main) entryName = 'Main';
                     else if (vars.MAIN) entryName = "MAIN";
                     else if (vars[commName]) entryName = commName;
-                    if (entryName) jstext += `\r\nreturn cless(${entryName},\`${lessData}\`,"${cssWrap}")`;
+                    if (entryName) jstext += `\r\nreturn cless(${entryName},\`${lessdata}\`,"${cssWrap}")`;
                 }
             }
             else {
@@ -229,10 +256,9 @@
             }
             var templateName = commName;
             if (envs.template) templateName = 'template';
-            if (envs[templateName]) {
+            if (htmldata) {
                 delete envs[templateName];
-                var template = await cross("get", './components:' + modName + ".html");
-                jstext = `var ${templateName}={toString(){return \`${template.responseText.replace(/>\s+</g, '><')}\`}};\r\n` + jstext;
+                jstext = `var ${templateName}={toString(){return \`${htmldata.replace(/>\s+</g, '><')}\`}};\r\n` + jstext;
             }
             initcode(jstext);
         }

package/package.json

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