efront 4.23.6 → 4.23.8

package/apps/pivot/cert/orders.xht

@@ -196,8 +196,7 @@
                         remove(e);
                     }
                 })
-                popup(e);
-                move.setPosition(e, [.5, .5]);
+                popup(e, [.5, .5]);
             },
             async upload(o) {
                 var cert = await data.fromURL(o.certificate);

package/coms/basic/JSAM.js

@@ -21,7 +21,7 @@ var isValidK = function (k) {
     return k.length < 16 && !/^\d|[,:'"\\\/`\-\[\]\{\}\(\)\.\+\#\@\&^]/.test(k) && spaces.trim(k) === k;
 };
 var extractK = function (k) {
-    return k.length < 16 && isFinite(k);
+    return /^\d{1,16}$/.test(k) && !/^0\d/.test(k);
 };
 var noDulp = false, plength = 0, dulp = false;
 var hasOwnProperty = {}.hasOwnProperty;
@@ -85,12 +85,12 @@ function _tostring(memery, preload, dist) {
             v = _tostring(v, preload);
         }
 
-        if (k && +k === inc) {
-            arr.push(v);
+        if (extractK(k)) {
+            if (+k === inc) arr.push(v);
+            else arr.push("+" + k + ":" + v);
         }
         else {
-            if (extractK(k)) k = "+" + k;
-            else if (!isValidK(k)) k = string(String(k));
+            if (!isValidK(k)) k = string(String(k));
             arr.push(k + ":" + v);
         }
         inc++;

package/coms/basic/JSAM_test.js

@@ -11,6 +11,10 @@ var test_self = function () {
     test(null) // null;
     test(undefined); // 空字符串
     test(1); // 1
+    test([0]); 
+    test(["00"]);
+    test({"0":"00"});
+    test({"00":"00"});
     test(true); // true
     test(false); // false 
     test(NaN); // NaN 
@@ -328,6 +332,24 @@ function test_time() {
     var t4 = gettime(() => JSAM.stringify(data, false));
     console.log(t1, t2, t3, t4);
 }
+function test_encode() {
+    for (var cx = 0, dx = 0xffff; cx < dx; cx++) {
+        var str = String.fromCodePoint(cx);
+        var enc = JSAM.stringify(str);
+        var dec = JSAM.parse(enc);
+        assert(str, dec);
+        var obj = { [str]: str };
+        enc = JSAM.stringify(obj);
+        dec = JSAM.parse(enc);
+        if (!assert(dec, obj) || cx === 0x41) {
+            console.log(cx, str, cx.toString(16), enc);
+        };
+        obj = { [str]: obj, [enc]: obj };
+        enc = JSAM.stringify(obj);
+        dec = JSAM.parse(enc);
+        assert(dec, obj);
+    }
+}
 function JSAM_test() {
     test_self();
     test_json();
@@ -336,4 +358,5 @@ function JSAM_test() {
     test_parse();
     JSAM.debug = false;
     test_time();
+    test_encode();
 }

package/coms/basic/strings.js

@@ -8,7 +8,6 @@ var escapeMap = {
     "\u2028": "\\u2028",
     "\u2029": "\\u2029",
 };
-var unescapeReg = new RegExp(`[${Object.keys(escapeMap).map(a => escapeMap[a]).join('')}]`, 'g');
 var unescapeFun = a => escapeMap[a];
 var unescapeUnc = function (a) {
     if (escapeMap.hasOwnProperty(a)) return escapeMap[a];
@@ -23,8 +22,11 @@ var unescapeUnc = function (a) {
     }
     return "\\u" + code;
 };
-var unescapeMap = {};
+var unescapeMap = {
+    "\\v": "\v",
+};
 for (var k in escapeMap) unescapeMap[escapeMap[k]] = k;
+var unescapeReg = new RegExp(`[${Object.keys(escapeMap).map(a => escapeMap[a]).join('')}]`, 'g');
 function encode(str, q = "\"", escapeUnicode = true) {
     str = str.replace(new RegExp(`[\\\\${q}]`, 'g'), "\\$&");
     if (escapeUnicode) str = str.replace(/[\r\n\t\v\f\u0008\u0000-\u001f\u007f-\uffff]/g, unescapeUnc);

package/coms/basic/strings_test.js

@@ -0,0 +1,11 @@
+function test_recode(a, b = a) {
+    assert(strings.recode(a), b);
+}
+test_recode(`"\v"`, `"\\u000b"`);
+test_recode(`"\b"`, `"\\b"`);
+test_recode(`"\f"`, `"\\f"`);
+test_recode(`"\t"`, `"\\t"`);
+test_recode(`"\r"`, `"\\r"`);
+test_recode(`"\n"`, `"\\n"`);
+test_recode(`"\0"`, `"\\u0000"`);
+test_recode(`"\u0001"`, `"\\u0001"`);

package/coms/basic_/JSON_test.js

@@ -1,5 +1,4 @@
 var JSON0 = window.JSON;
-console.log(JSON0);
 var test = function (JSON) {
     var parse = function (s) {
         try {
@@ -172,10 +171,33 @@ var test2 = function (JSON) {
     assert(JSON.parse(`{/*a*/"1":\r\n2}`), { "1": 2 })
     assert(JSON.parse(`{"1/*a*/":\r\n2}`), { "1/*a*/": 2 })
 }
+var test3 = function (JSON) {
+    console.log(JSON, JSON0, JSON === JSON0);
+    var start_time = performance.now();
+    for (var cx = 0, dx = 0xffff; cx < dx; cx++) {
+        var str = String.fromCodePoint(cx);
+        var enc = JSON.stringify(str);
+        var dec = JSON.parse(enc);
+        assert(dec, str);
+        var obj = { [str]: str };
+        enc = JSON.stringify(obj);
+        dec = JSON.parse(enc);
+        assert(dec, obj);
+        obj = { [enc]: dec, [str]: obj };
+        var enc = JSON.stringify(obj);
+        dec = JSON.parse(enc);
+        if (!assert(dec, obj)) {
+            console.log(cx, str, cx.toString(16), enc, dec, obj);
+            process.exit(1);
+        }
+    }
+    console.log(performance.now() - start_time);
+}
 function JSON_test() {
     window.JSON0 = JSON0;
     window.JSON = void 0;
     delete modules.JSON;
     modules.init("JSON", test2);
+    modules.init("JSON", test3);
     window.JSON = JSON0;
 }

package/coms/pivot/acme2.js

@@ -199,29 +199,29 @@ var acme2 = new class {
         var acme2 = this;
         var extra;
         [private_key, public_key, extra] = unique.split(',');
-        if (extra) {
-            extra = JSON.parse(decodeUTF8(fromBase64(extra)));
-            acme2.email = extra.email;
-            acme2.kid = extra.kid;
-            if (extra.kid) {
-                var account = data.getUrlParamsForApi(accountApi, extra.kid);
-                acme2.aid = account.aid;
-            }
-            acme2.domain = extra.domain;
-            acme2.termsOfServiceAgreed = extra.termsOfServiceAgreed;
-            acme2.orders = extra.orders;
-            acme2.lastUpdateTime = filterTime(extra.lastUpdateTime, "y-MM-dd hh:mm");
-            acme2.nextUpdateTime = parseDate(extra.nextUpdateTime);
-            acme2.schadulePeriod = +extra.schadulePeriod || 80;
-            acme2.schaduleEnabled = extra.schaduleEnabled;
-            this.updateTime();
-        }
         if (!this.enabled) {
             public_key = null;
             private_key = null;
             return;
         }
         try {
+            if (extra) {
+                extra = JSON.parse(decodeUTF8(fromBase64(extra)));
+                acme2.email = extra.email;
+                acme2.kid = extra.kid;
+                if (extra.kid) {
+                    var account = data.getUrlParamsForApi(accountApi, extra.kid);
+                    acme2.aid = account.aid;
+                }
+                acme2.domain = extra.domain;
+                acme2.termsOfServiceAgreed = extra.termsOfServiceAgreed;
+                acme2.orders = extra.orders;
+                acme2.lastUpdateTime = filterTime(extra.lastUpdateTime, "y-MM-dd hh:mm");
+                acme2.nextUpdateTime = parseDate(extra.nextUpdateTime);
+                acme2.schadulePeriod = +extra.schadulePeriod || 80;
+                acme2.schaduleEnabled = extra.schaduleEnabled;
+                this.updateTime();
+            }
             privateKey = await subtle.importKey("pkcs8", new Uint8Array(fromBase64(private_key)), {
                 name: RSASSA_PKCS1_v1_5,
                 hash: "SHA-256",
@@ -231,7 +231,9 @@ var acme2 = new class {
                 hash: "SHA-256",
             }, true, ["verify"]);
             acme2.public_key = public_key;
-        } catch (e) { alert("加载服务器公钥异常！", "error"); throw e }
+        } catch (e) {
+            alert("加载服务器公钥异常！", "error");
+        }
     }
     pickUnique() {
         var acme2 = this;

package/coms/zimoli/field.js

@@ -109,7 +109,7 @@ function main(elem) {
     if (elem.break === false) elem.break = Infinity;
     resizingList.set(elem, reshape);
     elem.setAttribute("field", '');
-    elem.$digest = ondigest;
+    elem.$digest = reshape;
     elem.removeAttribute("tabindex");
 
     if (!elem.childNodes.length) {
@@ -120,7 +120,7 @@ function main(elem) {
         if (head) addClass(head, "head");
         if (body) addClass(body, "body");
         if (foot) addClass(foot, "foot");
-        elem.$renders = [reshape];
     }
+    elem.$renders = [checkValue];
     return elem;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.23.6",
+    "version": "4.23.8",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {