efront 4.8.1 → 4.8.2

package/apps/pay/alipay-query.jsp

@@ -1,9 +1,9 @@
 <script serverside>
-    var time = Date.now();
+    var time = +new Date;
     var out_trade_no = encode62.timedecode(request.id);
     var payed = /^(TRADE_FINISHED|TRADE_SUCCESS)$/i;
     for (var cx = 0, dx = 10; cx < dx; cx++) {
-        if (Date.now() - time > 30000) return;
+        if (+new Date - time > 30000) return;
         var data = await _runtask("couchdb", 'get', `alipay-log/${out_trade_no}`);
         if (data.return_time || data.notify_time || payed.test(data.trade_status)) return JSON.stringify(data);
         var data1 = await _runtask("alipay-query", out_trade_no);

package/apps/pivot/cert/orders.xht

@@ -137,7 +137,7 @@
                     o.removable = true;
                 }
                 else {
-                    if (o.certificate && +o.expires < Date.now()) {
+                    if (o.certificate && +o.expires < +new Date) {
                         o.removable = true;
                     }
                 }

package/apps/pivot/home/welcome.js

@@ -4,7 +4,7 @@ function main() {
     renderWithDefaults(page, {
         status: [],
         version: data.from("version"),
-        hrtime: data.from("uptime", a => Date.now() - a * 1000),
+        hrtime: data.from("uptime", a => new Date - a * 1000),
         filterTime,
         async run(id) {
             await new Promise(ok => setTimeout(ok, 2000));

package/coms/basic/Speed.js

@@ -105,7 +105,6 @@ inertia.REBOUNDING = 回弹;
 inertia.DOCKING = 停靠;
 var performance = this.performance;
 if (!performance || !performance.now) performance = Date;
-var now = performance.now;
 if (!performance.now) performance.now = function () {
     return +new Date;
 }

package/coms/basic/Timer.js

@@ -1,15 +1,15 @@
 class Timer {
-    capture = Date.now();
+    capture = +new Date;
     value = 0;
     pause() {
-        this.value += Date.now() - this.capture;
+        this.value += new Date - this.capture;
         this.capture = null;
     }
     resume() {
-        this.capture = Date.now();
+        this.capture = +new Date;
     }
     valueOf() {
-        return this.capture !== null ? this.value + Date.now() - this.capture : this.value;
+        return this.capture !== null ? this.value + +new Date - this.capture : this.value;
     }
 }
 module.exports = Timer;

package/coms/basic/compile_test.js

@@ -69,13 +69,13 @@ var assert = require("./assert");
 
 
 function test(test, count) {
-    var time = Date.now();
+    var time = +new Date;
     if (test instanceof Function) {
         while (count-- > 0) {
             test();
         }
     }
-    return Date.now() - time;
+    return new Date - time;
 }
 
 

package/coms/basic/cookie.js

@@ -12,7 +12,7 @@ var parseCookieFromText = function (cookie) {
                 break;
             case "max-age":
                 k = "expires";
-                v = Date.now() + v * 1000;
+                v = +new Date + v * 1000;
                 break;
         }
         info[k] = v;
@@ -67,7 +67,7 @@ CookieProto.getCookies = function getCookies(domainPath) {
     var cookieObject = {};
     var splited = domainPath.split("/");
     var domain = splited[0];
-    var now = Date.now();
+    var now = +new Date;
     do {
         var copy = splited.slice(0);
         do {

package/coms/basic/lazy_test.js

@@ -5,10 +5,10 @@ async function test(sch, pending, callsch) {
     var wait = t => new Promise(a => setTimeout(a, t));
     var waits = t => wait(t * Math.abs(sch));
     var waite = async (t) => (await waits(t), await wait(pending));
-    var count = 0, start = Date.now(), time = start;
+    var count = 0, start = +new Date, time = start;
     var f = lazy(function () {
         count++;
-        var now = Date.now();
+        var now = +new Date;
         var delta = now - time;
         time = now;
         if (count > 1) assert(delta >= Math.abs(sch), true, '触发间隔' + delta);

package/coms/compile/Html_test.js

@@ -18,3 +18,5 @@ test('<input ng-model=data.name />');
 test('<input ng-model=data.name/>', '<input ng-model=data.name />');
 test('<!--<input ng-model=data.name/>-->');
 test('<div><!--<input ng-model=data.name/>--></div>');
+test('<div><div>{</div><div>}</div></div>');
+test('<div>${`<div></div>`}</div>');

package/coms/compile/Program.js

@@ -23,9 +23,9 @@ var sortRegExpSource = function (a, b) {
 var createQuotedMap = function (entry) {
     var map = {};
     var end = {};
-    entry.forEach(k => {
-        // if (k.length < 4) return;
-        var [a, b] = k.slice(-2);
+    entry.forEach(e => {
+        if (!(e instanceof Array)) return;
+        var [a, b] = e.slice(-2);
         if (a instanceof RegExp) a = stringsFromRegExp(a);
         if (b instanceof RegExp) b = stringsFromRegExp(b);
         combine([].concat(a), [].concat(b)).forEach(([a, b]) => {
@@ -91,7 +91,7 @@ class Program {
         ["`", "`", /\\[\s\S]/, ["${", "}"]],
     ]
     tags = [
-        [["<", "</"], /\/?>/, null, ["'", '"', "<!--", "{", "}"]]
+        [["<", "</"], /\/?>/, null, "'", '"', "<!--", ["${", "}"]]
     ];
     scriptTags = [];
     ignoreTags = ["STYLE", "SCRIPT"];

package/coms/compile/scanner.js

@@ -1,12 +1,12 @@
 "use strict";
 function test(test, count) {
-    var time = Date.now();
+    var time = +new Date;
     if (test instanceof Function) {
         while (count-- > 0) {
             test();
         }
     }
-    return Date.now() - time;
+    return new Date - time;
 }
 // -   function () {
 //         single_comment_scanner.call("'", 0) === 1;
@@ -622,11 +622,11 @@ function lookback_scanner(blockIndex, blocks) {
 var scanner = module.exports = function (s, keepdeep) {
     var blocks = [];
     var s = String(s);
-    // var time = Date.now();
+    // var time = +new Date;
     // for (var i = 0; i < 1000; i++) {
     //     block_code_scanner.call(s, 0, blocks);
     // }//angular 1.5.3 x1000 7.0s
-    // console.log(Date.now() - time);
+    // console.log(+new Date - time);
     block_code_scanner.call(s, 0, blocks, keepdeep);
     // console.log(blocks.map(a => s.slice(a.start, a.end)).join())
     return blocks;

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);
@@ -357,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/lazySwap.js

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

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/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/docs//347/273/204/344/273/266.xht

@@ -199,7 +199,7 @@
         if (doc.test) {
             var jstext = [], lessdata = [], htmldata = [];
             for (var f of doc.test) {
-                var xhr = await cross("get", "/components:" + name.replace(/[^\\\/]+$/, '') + f);
+                var xhr = await cross("get", "./components:" + name.replace(/[^\\\/]+$/, '') + f);
                 if (/\.js$/i.test(f)) {
                     jstext.push(xhr.response);
                 }

package/package.json

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