efront 3.38.1 → 3.38.2

package/coms/basic_/JSON.js

@@ -199,11 +199,11 @@ var getString = function (object, filter, space) {
         while (cx < dx) {
             key = ks ? ks[cx] : cx;
             var backlength = str.length;
-            if (backlength > 1) str += ',';
+            if (cx > 0) str += ',';
             if (space) str += '\n' + new Array(objects.length + 1).join(space);
             if (ks) {
-                str += (toString(key) + ":");
-                if (space) str += (" ");
+                str += toString(key) + ":";
+                if (space) str += " ";
             };
             var v = get(object[key]);
             if (isObject(v)) {
@@ -221,7 +221,7 @@ var getString = function (object, filter, space) {
         }
         if (cx === dx) {
             if (dx > 0) {
-                if (space) str += ('\n' + new Array(objects.length).join(space))
+                if (space) str += '\n' + new Array(objects.length).join(space)
             }
             str += ks ? '}' : ']';
             pop();

package/coms/basic_/JSON_test.js

@@ -64,7 +64,7 @@ var test = function (JSON) {
             var start = new Date();
             try {
                 var res = call(arg, null, space);
-            } catch{
+            } catch {
                 res = "error";
             }
             var delta = new Date - start;
@@ -79,10 +79,88 @@ var test = function (JSON) {
     });
 
 };
+var test2 = function (JSON) {
+    var data = [{
+        "name": i18n(`\u4ee3\u7406\u8def\u5f84`, `Proxy Path`),
+        "type": "input",
+        "key": "url",
+        "comment": "",
+        "size": "120",
+        "unit": "bit",
+        "ratio": 0.125,
+        "required": true
+    }, {
+        "name": i18n(`\u4e8c\u7ef4\u7801`, `QR code`),
+        "type": "1byte",
+        "key": "url",
+        "comment": "",
+        "size": "1",
+        "unit": "byte",
+        "ratio": 1,
+        "readonly": true
+    }, {
+        "name": i18n(`\u771f\u5b9e\u8def\u5f84`, `Real path`),
+        "type": "url",
+        "key": "realpath",
+        "comment": "",
+        "size": "300",
+        "unit": "bit",
+        "ratio": 0.125
+    }, {
+        "name": i18n(`\u52a8\u4f5c`, `action`),
+        "type": "select",
+        "key": "action",
+        "comment": "",
+        "options": [{
+            "name": "跳转",
+            "value": 0
+        }, {
+            "name": "转发",
+            "value": 1
+        }],
+        "size": "100",
+        "unit": "bit",
+        "ratio": 0.125
+    }, {
+        "name": i18n(`\u72b6\u6001`, `state`),
+        "type": "select",
+        "key": "status",
+        "comment": "",
+        "options": [{
+            "name": "启用",
+            "value": 0
+        }, {
+            "name": "禁用",
+            "value": 1
+        }],
+        "size": "100",
+        "unit": "bit",
+        "ratio": 0.125
+    }, {
+        "name": i18n(``, ``),
+        "type": "byte",
+        "key": "",
+        "comment": "",
+        "options": {
+            name: "访问",
+            do(o) {
+                var url = o.url;
+                if (!/^\//.test(url))
+                    url = "/" + url;
+                window.open(url, null);
+            }
+        },
+        "size": 1,
+        "unit": "byte",
+        "ratio": 1,
+        "readonly": true
+    }];
+    assert(JSON.stringify(data, null, 4), JSON0.stringify(data, null, 4))
+}
 function JSON_test() {
     window.JSON0 = JSON0;
     window.JSON = void 0;
     delete modules.JSON;
-    modules.init("JSON", test);
+    modules.init("JSON", test2);
     window.JSON = JSON0;
 }

package/coms/compile/breakcode.js

@@ -63,19 +63,17 @@ var trimStringLiteral = function (block) {
     }
     return block_string;
 };
-var paramsMap = Object.create(null);
+var paramsMap = null;
 var module_string = '';
-function breakcode(data, args) {
-    if (!args) return [data];
+function breakcode(data, occurs) {
+    if (!occurs) return [data];
     module_string = data;
-    Object.keys(args).forEach(function (key) {
-        paramsMap[key] = true;
-    });
+    paramsMap = Object.assign(Object.create(null), occurs);
     var code_blocks = scanner(module_string);
     module_string = code_blocks.map(trimStringLiteral).join("");
-    var res = Object.keys(paramsMap).filter(k => !hasOwnProperty.call(args, k));
+    var res = Object.keys(paramsMap).filter(k => !hasOwnProperty.call(occurs, k));
     var val = res.map(k => paramsMap[k]);
-    paramsMap = Object.create(null);
+    paramsMap = null;
     data = module_string;
     module_string = '';
     return [data, res, val];

package/coms/compile/scanner2.js

@@ -126,6 +126,24 @@ class Code extends Array {
     set scoped(w) {
         this._scoped = w;
     }
+    get occurs() {
+        var rest = [this.scoped];
+        var occurs = Object.create(null);
+        Object.assign(occurs, this.scoped.envs);
+        while (rest.length) {
+            var scoped = rest.pop();
+            for (var k in scoped.vars) {
+                if (k in occurs) continue;
+                occurs[k] = true;
+            }
+            for (var k in scoped.lets) {
+                if (k in occurs) continue;
+                occurs[k] = true;
+            }
+            rest.push(...scoped);
+        }
+        return occurs;
+    }
     getUndecleared() {
         var res = Object.create(null);
         for (var k in this.envs) {

package/coms/zimoli/deepEqual_test.js

@@ -26,8 +26,8 @@ var checkUnEqual = function (deepEqual) {
         && !deepEqual({ b: 0 }, { a: 0 })
         && !deepEqual({ b: 0 }, { a: 0 })
         && !deepEqual(new Date(1), new Date(2))
-        && !deepEqual(document.createElement("a"), document.createElement("b"))
-        && !deepEqual(window, document)
+        // && !deepEqual(document.createElement("a"), document.createElement("b"))
+        // && !deepEqual(window, document)
         && !deepEqual(function () { }, function (a) { return a })
         && !deepEqual({ a: {} }, { a: new Date() })
         && !deepEqual({ a: { c: {} } }, { a: { b: {} } })

package/package.json

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