efront 4.23.7 → 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/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];
@@ -27,6 +26,7 @@ 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/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.7",
+    "version": "4.23.8",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {