efront 4.19.0 → 4.19.2

package/apps/pivot/db/config.xht

@@ -37,6 +37,7 @@
     var [db] = arguments;
     var save = async function () {
         await data.from('dbset', db);
+        history.back();
     };
     console.log(db)
 </script>

package/apps/pivot/main.js

@@ -49,7 +49,10 @@ data.bindInstance("base", async function (base) {
     cross.addDirect(base.base);
     var apimap = await data.getConfig();
     for (var k in apimap) {
-        if (/options|put/.test(apimap[k].method)) apimap[k].base = base.base;
+        var api = apimap[k];
+        if (api.base || !/^\w+\:\/\//.test(api.url)) {
+            api.base = base.base;
+        }
     }
 });
 var base = data.getInstance('base').base;

package/coms/basic/cross_.js

@@ -35,23 +35,28 @@ function isChildPath(relative, path) {
     return relative.replace(/^(.*\/)[^\/]*$/, path);
 }
 
+var encodeNA = function (a) {
+    return a.replace(/[^\u0021-\u007f]/g, encodeURI);
+};
 var getCrossUrl = function (domain, headers, encrypt) {
     if (notCross(domain, encrypt)) return domain;
     var basehost = parseURL(base).host || parseURL(location_href).host;
     var ishttps = /^(https\:|s\/\/)/i.test(domain);
     var _headers = serialize(headers);
     if (_headers) _headers = "," + _headers;
+    var b = encrypt ? "!" : `*`;
     if (parseURL(domain).host === basehost) {
         if (!encrypt) return domain;
         domain = domain.replace(domainReg, "/$3$4");
         if (_headers) domain = _headers + domain;
     }
     else {
-        domain = domain
+        domain = encodeNA(domain)
             .replace(/^(s?)(\/\/)/i, "http$1:$2")
-            .replace(domainReg, `$2${_headers}/$3$4`)
+            .replace(domainReg, (_, _1, $2, $3, $4) => {
+                return [$2, _headers, '/', $3, $4].join('');
+            });
     }
-    var b = encrypt ? "!" : `*`;
     if (ishttps) domain = b + domain;
     if (encrypt) domain = encode62.timeencode(encode62.safeencode(domain, encrypt));
     return base + b + domain;

package/coms/compile/unstruct.js

@@ -327,6 +327,7 @@ var _while = function (body, cx, unblock, result) {
     var b = rescan`if (${getCondition(o, unblock, true)}) return []`;
     var be = b[b.length - 1];
     pushstep(result, b);
+    var i2 = result.length - 1;
     relink(result[result.length - 1]);
     var block = getblock(body, ++cx);
     cx += block.length;
@@ -335,7 +336,8 @@ var _while = function (body, cx, unblock, result) {
     var we = wend[wend.length - 1];
     pushstep(result, wend);
     we[0].text = String(1 + i - result.length);
-    be.push(...scanner2(`${result.length - i}, 0`));
+    be.push(...scanner2(`${result.length - i2}, 0`));
+
     relink(be);
     return cx;
 };

package/coms/compile/unstruct_test.js

@@ -161,4 +161,6 @@ test("if(a){if(b){c}else{d}}else{e}", `if (!a) return [3, 0]; if (!b) return [1,
 test("if(a&&b||c){d}", `_ = a; if (!_) return [1, 0]; _ = b;\r\n if (_) return [1, 0]; _ = c;\r\n if (!_) return [1, 0]; d; return [1, 0]`, true);
 test("if(a)switch(b){case c:d;break;} else{h}", `if (!a) return [3, 0]; if (b === c) return [1, 0]; return [2, 0];\r\n d; return [1, 0];\r\n return [2, 0];\r\n h; return [1, 0]`)
 test("var res = null, krc;", `res = null; krc`)
-test("res = null, krc;", `res = null; krc`)
+test("res = null, krc;", `res = null; krc`)
+test(`while (a && b);`, '_ = a; if (!_) return [1, 0]; _ = b;\r\n if (!_) return [1, 0]; return [-1, 0]', true);
+test(`while (a < b);`, '_ = a < b; if (!_) return [1, 0]; return [0, 0]', true);

package/package.json

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