efront 4.1.5 → 4.1.8

package/coms/basic/#loader.js

@@ -279,6 +279,7 @@ var loadModule = function (url, then, prebuilds = {}) {
             var data = responseTree[url];
             if (typeof data === "function") {
                 var mod = data;
+                mod.noenv = true;
                 flushTree(loadedModules, key, mod);
                 return;
             }
@@ -494,7 +495,6 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
         if (created) return result;
         return promise;
     });
-
     var _this = isModuleInit ? exports : window;
     var argsPromises = argsList.filter(isThenable);
     argsList = argsList.concat(exec.strs);
@@ -609,7 +609,12 @@ var init = function (url, then, prebuilds) {
         if (error) return crack(error);
 
         var module = loadedModules[key];
-        if (!module) return;
+        if (!module || module.noenv) {
+            // <!--
+            undefinedModules[key] = true;
+            // -->
+            return then();
+        }
         var args = module.args || [];
 
         if (!args || !args.length) {

package/coms/basic/refilm.js

@@ -1,4 +1,77 @@
 function refilm(str) {
     if (str.raw) str = str.raw;
     return refilm_decode.apply(null, [str].concat([].slice.call(arguments, 1)));
-}
+}
+var patchOffset = refilm.patchOffset = function (fields, offset = fields.offset || 0) {
+    fields.offset = offset;
+    fields.forEach(f => {
+        f.offset = offset;
+        fields[f.key] = f;
+        offset += f.size * f.ratio;
+    });
+    fields.size = offset - fields.offset;
+    return offset;
+};
+refilm.createFromFields = function (fields, values) {
+    if (!fields.size) patchOffset(fields);
+    var size = fields.size;
+    var data = new Uint8Array(size);
+    if (!values) values = Object.create(null);
+    for (var f of fields) {
+        if (f.key in values || !f.value) continue;
+        values[f.key] = f.value;
+    }
+    writeFields(data, fields, values, 0);
+    return data;
+}
+var writeField = refilm.writeField = function (data, field, value, offset = field.offset, byteLimit = field.size * field.ratio) {
+    if (isArrayLike(value));
+    else if (typeof value === "string") {
+        value = encodeUTF8(value);
+    }
+    else if (typeof value === "number") {
+        var v = [];
+        var limit = byteLimit;
+        while (limit-- > 0) {
+            v.push(value & 0xff);
+            value = value >>> 8;
+        }
+        if (value) throw new Error("数据过大");
+        value = v;
+    }
+    else value = [value | 0];
+    if (value.length > byteLimit) {
+        throw new Error("数据超出大小限制！");
+    }
+    var offset = field.offset;
+    while (value.length) data[offset++] = value.shift();
+};
+var writeFields = refilm.writeFields = function (data, fields, values, offset = fields.offset) {
+    for (var f of fields) {
+        var size = f.size * f.ratio;
+        if (f.key in values) writeField(data, f, values[f.key], offset, size);
+        offset += size;
+    }
+};
+var toint = function (buf) {
+    var n = 0;
+    for (var cx = 0, dx = buf.length; cx < dx; cx++) {
+        n += buf[cx] << (cx << 3);
+    }
+    return n;
+};
+var readField = refilm.readField = function (data, field, offset = field.offset, size = field.size * field.ratio) {
+    return data.slice(offset, offset + size);
+};
+
+refilm.readFields = function (data, fields, offset = fields.offset || 0) {
+    var res = Object.create(null);
+    for (var f of fields) {
+        var size = f.size * f.ratio;
+        var v = readField(data, f, offset, size);
+        if (size <= 4) v = toint(v);
+        res[f.key] = v;
+        offset += size;
+    }
+    return res;
+};

package/coms/basic/refilm_decode.js

@@ -411,6 +411,7 @@ function parse(piece) {
         name = is(name);
         key = is(key);
     }
+    if (typeof size === 'string') size = parseFloat(size);
     var field = {
         name, type, key, value, comment, options,
         size, unit, ratio,

package/coms/compile/Javascript.js

@@ -853,7 +853,7 @@ Javascript.prototype.fix = function (code) {
         });
         delete code.used.import;
         delete code.envs.import;
-        if (imports.length) code.used.import_meta = imports;
+        if (imports.length) code.used["import_meta"] = imports, code.envs["import_meta"] = true;
     }
     if (code.exportDecs) {
         var exportDecs = code.exportDecs;

package/coms/compile/autoenum.js

@@ -91,9 +91,13 @@ var maplist = function (u) {
             }
             if (enumtype & (REFSTRC | REFMOVE)) {
                 if (o.property) o[ignore] = true;
-                else m.wcount++;
+                else if (o.equal) m.enumref = o.enumref, m.wcount++;
+                else if (enumtype & REFMOVE) m.wcount++;
             }
         }
+        else if (enumtype & REFSTRC) {
+            if (o.enumref && o.enumref !== m.enumref) m.wcount++, m.enumref = o.enumref;
+        }
         if (o.called) m.ccount++;
     }
     return map;
@@ -220,6 +224,12 @@ function enumref(refitem, scoped) {
                     }
                 }
             }
+            else if (o.enumref) {
+                if (enumtype & REFSTRC) {
+                    em = o.enumref;
+                    continue;
+                }
+            }
             else {
                 if (enumtype & REFTYPE) {
                     if (tp) {

package/coms/compile/common.js

@@ -277,6 +277,11 @@ function snapSentenceHead(o) {
         }
         break;
     }
+    while (o) {
+        var p = o.prev;
+        if (!p || p.type !== LABEL) break;
+        o = p;
+    }
     return o;
 }
 var getStrapHead = function (o) {

package/coms/frame/list.less

@@ -6,12 +6,13 @@ btn {
     height: 100%;
 }
 
-btn{
+btn {
     margin-right: 6px;
 }
+
 table {
 
-    td {
+    tbody td {
 
         >[type=text] {
             white-space: pre-wrap;

package/coms/zimoli/table.js

@@ -230,7 +230,7 @@ function enrichField(f) {
             }
     }
     if (width > 600) width = 600;
-    f.width = width + 60;
+    f.width = parseFloat(width) + 60;
     if (!f.key && f.options && isEmpty(f.fixed)) {
         f.fixed = true;
     }

package/package.json

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