efront 4.3.15 → 4.4.1

package/coms/compile/Program.js

@@ -10,6 +10,7 @@ const {
     /* 256 */SCOPED,
     /* 512 */LABEL,
     /*1024 */PROPERTY,
+    /*2048 */ELEMENT,
     createString,
     number_reg,
 } = require("./common");
@@ -90,8 +91,10 @@ class Program {
         ["`", "`", /\\[\s\S]/, ["${", "}"]],
     ]
     tags = [
-        [["<", "</"], /\/?>/, null, ["=", "'", '"', "{", "}"], [/<!--/, /--!?>/]]
+        [["<", "</"], /\/?>/, null, ["'", '"', "{", "}"], [/<!--/, /--!?>/]]
     ];
+    scriptTags = [];
+    ignoreTags = ["STYLE", "SCRIPT"];
     comments = [
         ["//", /(?=[\r\n\u2028\u2029])/],
         ["/*", "*/"],
@@ -213,45 +216,79 @@ class Program {
             queue_push(scope);
         };
         var space_exp = this.space_exp;
+        var scriptTags = this.scriptTags;
+        var ignoreTags = this.ignoreTags;
         var openTag = function () {
-            queue.inTag = true;
             var m1 = text.slice(start, match.index);
             var s = space_exp.exec(m1);
+
             if (s) var tag = m1.slice(0, s.index);
             else {
                 tag = m1;
             }
             if (queue.tag) {
-                if (queue.last.text === quote.tag[1]) {
-                    while (p && p.tag && p.tag !== p.tag) ps.push(p), p = parents[--pi];
-                    if (p && ps.length) {
-                        var pie = queue.pop();
-                        queue.last = pie.prev;
-                        queue = p;
-                        while (ps.length) queue_push(ps.shift());
-                        queue_push(pie);
-                    }
-                    m = tag;
-                    save(PIECE);
-                    queue.closed = true;
-                    var p = queue;
-                    var pi = parents.length;
-                    var ps = [];
+                if (!quote.end.test(m)) return;
+                var qtag = quote.tag[1];
+                if (queue.tag_entry !== qtag) return;
+                var p = queue;
+                var pi = parents.length;
+                var ps = [];
+                for (var cx = 0, dx = parents.length; cx < dx; cx++) {
+                    if (parents[cx].tag) break;
+                }
+                while (pi >= cx && p.tag !== tag) {
+                    ps.push(p);
+                    p = parents[--pi];
+                }
+                if (!p.tag) {
+                    if (queue.waitTag) return;
+                    pi++;
+                    var scope = [];
+                    scope.entry = queue.tag_entry;
+                    scope.tag_leave = queue.tag_leave;
+                    scope.tag = tag;
+                    scope.inTag = true;
+                    scope.type = ELEMENT;
                 }
+                else {
+                    p.tag_entry = queue.tag_entry;
+                    p.closed = true;
+                    p.inTag = true;
+                }
+                if (pi < parents.length) parents.splice(pi, parents.length - pi);
+                queue = p;
+                while (ps.length) {
+                    var q = ps.pop();
+                    if (q.tag) q.type = ELEMENT;
+                    queue_push(q);
+                }
+                if (scope) queue = scope;
+                return true;
+            }
 
+            queue.inTag = true;
+            queue.tag = tag;
+            var tagName = tag.toUpperCase();
+            if (scriptTags.indexOf(tagName) >= 0) {
+                queue.waitTag = tagName;
+                queue.type = SCOPED;
             }
-            else {
-                queue.tag = tag;
-                m = m1;
-                save(PIECE);
+            else if (ignoreTags.indexOf(tagName) >= 0) {
+                queue.waitTag = tagName;
             }
-            if (queue.closed) {
-                index = match.index;
+            if (s) {
+                m = m1.slice(s[0].length + s.index);
+                if (m) save(PIECE);
             }
+            queue.first = null;
+            queue.last = null;
+            return true;
         };
         var closeTag = function () {
             queue.inTag = false;
             if (queue.closed) return;
+            if (queue.length) queue.attributes = queue.splice(0, queue.length);
+            if (/^\//.test(m)) return queue.short = true, queue.closed = true;
             return false;
         };
         var push_quote = function () {
@@ -278,7 +315,20 @@ class Program {
             queue_push(scope);
             lasttype = scope.type;
         }
-
+        var push_piece = function (index = match.index) {
+            if (index > start) {
+                var piece = queue[queue.length - 1];
+                if (piece && piece.type === PIECE) {
+                    piece.text = text.slice(piece.start, index);
+                    piece.end = match.index;
+                }
+                else {
+                    m = text.slice(start, index);
+                    save(PIECE);
+                }
+            }
+            m = match[0];
+        }
         loop: while (index < text.length) {
             if (queue.type === QUOTED) {
                 var quote = this.quote_map[queue.entry];
@@ -294,16 +344,26 @@ class Program {
                     var m = match[0];
                     index = match.index + m.length;
                     if (quote.tag && queue.inTag === 0) {
-                        openTag();
-                        index = start = match.index;
+                        if (openTag()) {
+                            if (queue.type === ELEMENT) break;
+                            start = index = match.index;
+                        }
+                        else queue.inTag = false;
+
                         continue;
                     }
                     if (quote.end.test(m)) {
                         end = match.index;
-                        if (queue.tag && closeTag() === false) {
-                            save(PIECE);
-                            start = index;
-                            continue loop;
+                        if (queue.tag) {
+                            push_piece();
+                            if (!queue.inTag) continue;
+
+                            if (closeTag() === false) {
+                                start = index;
+                                queue.tag_leave = m;
+                                continue loop;
+                            }
+                            queue.type = ELEMENT;
                         }
                         queue.leave = m;
                         if (start < end) {
@@ -314,8 +374,12 @@ class Program {
                     }
                     a: if (quote.tag) {
                         var mi = quote.tag.indexOf(m);
-                        if (mi < 0) break a;
+                        if (mi < 0) {
+                            break a;
+                        }
                         if (mi === 0) {
+                            if (queue.waitTag) continue;
+                            push_piece();
                             var scope = [];
                             scope.entry = m;
                             scope.type = QUOTED;
@@ -326,20 +390,34 @@ class Program {
                             start = index;
                             continue;
                         }
-                        save(PIECE);
+                        push_piece();
+                        queue.tag_entry = m;
                         queue.inTag = 0;
                         start = index;
                         continue;
                     }
                     if (m in quote.entry) {
+                        if (queue.tag && !queue.inTag && queue.waitTag) {
+                            continue;
+                        }
                         push_quote();
                         continue loop;
                     }
+                    if (m in this.quote_map) {
+                        if (queue.tag && !queue.inTag) continue;
+                        push_piece();
+                        var scope = [];
+                        scope.entry = m;
+                        scope.type = QUOTED;
+                        push_parents(scope);
+                        continue loop;
+                    }
                 }
                 queue.end = match.index;
                 pop_parents();
                 continue;
             }
+
             var reg = this.entry_reg;
             var start = reg.lastIndex = index;
             var match = reg.exec(text);
@@ -349,6 +427,18 @@ class Program {
             var m = match[0];
             test: if (this.quote_map.hasOwnProperty(m)) {
                 var last = queue.last;
+                var quote = this.quote_map[m];
+                if (queue.tag && quote.tag) {
+                    var tagend = end + queue.tag.length
+                    var leavem = quote.entry[m];
+                    if (text.slice(end, tagend) === queue.tag && text.slice(tagend, tagend + leavem.length) === leavem) {
+                        push_piece();
+                        queue.type = QUOTED;
+                        queue.inTag = 0;
+                        queue.tag_entry = m;
+                        break test;
+                    }
+                }
                 if (this.stamp_reg.test(m) && last) {
                     if ((VALUE | EXPRESS) & last.type) break test;
                     if (last.type === QUOTED && !last.tag) break test;
@@ -356,7 +446,6 @@ class Program {
                     if (lasttype === STAMP && m === last.text) break test;
                 }
                 var scope = [];
-                var quote = this.quote_map[m];
                 scope.type = this.comment_entry.test(m) ? COMMENT : QUOTED;
                 scope.isExpress = queue.inExpress;
                 scope.start = start;
@@ -402,7 +491,7 @@ class Program {
                 continue;
             }
             var parent = parents[parents.length - 1];
-            if (parent && this.quote_map[parent.entry] && queue.leave_map[m] === queue.entry) {
+            if (parent && this.quote_map[parent.entry] && queue.leave_map?.[m] === queue.entry) {
                 delete queue.leave_map;
                 queue.end = end;
                 queue.leave = m;
@@ -520,16 +609,32 @@ class Program {
 
                 queue.end = end;
                 queue.leave = m;
+
                 pop_parents();
                 continue;
             }
-            if (this.scope_leave[m]) console.warn(i18n`标记不匹配`, queue.entry, m, "queue:", `${queue.row}:${queue.col}`, "position:", `${row}:${index - colstart}\r\n`, text.slice(queue.start, index));
+            if (this.scope_leave[m]) console.warn(i18n`标记不匹配`, queue.entry, m, "queue-start:", queue.start, "position:", `${row}:${index - colstart}\r\n`, index - queue.start < 200 ? text.slice(queue.start, index) : text.slice(queue.start, queue.start + 100) + "..." + text.slice(index - 97, index));
             if (this.stamp_reg.test(m)) {
                 save(STAMP);
             }
 
         }
-        if (queue !== origin) throw console.log(createString(origin), `\r\n------ deep: ${parents.length} - enrty: ${queue.entry} - length: ${queue.length} - last: ${createString([queue.last])} -----\r\n`, createString([queue])), "代码异常结束";
+        while (queue.tag && parents.length) {
+            for (var cx = 0, dx = parents.length; cx < dx; cx++) {
+                if (parents[cx].tag) break;
+            }
+            var ps = parents.splice(cx, parents.length - cx);
+            ps.push(queue);
+            queue = parents[cx - 1];
+            while (ps.length) {
+                var p = ps.shift();
+                if (p.tag) p.type = ELEMENT;
+                queue_push(p);
+            }
+        };
+        if (queue !== origin) {
+            throw console.log(createString(origin), `\r\n------ deep: ${parents.length}\r\n  --- enrty: ${queue.entry}\r\n  -- length: ${queue.length}\r\n  ---- last: ${createString([queue.last])}\r\n------- end\r\n --parents: ${parents.map(p => p.tag || p.entry || p.text).join('->')}`, createString([queue]).slice(-200)), "代码异常结束";
+        }
         return queue;
     }
     commit() {
@@ -556,8 +661,15 @@ class Program {
                 quote_map[a] = q
                 if (a.length === 1) tokens[a] = true;
             }
+        });
+        quoteslike.forEach(q => {
+            var ts = [];
             var r = q.slice(q[2] ? 2 : 3).concat(q[1]).map(q => {
                 if (q instanceof Array) {
+                    if (q.length > 2) {
+                        ts.push(...q.slice(0, q.length - 2));
+                    }
+                    else if (q.length !== 2) throw new Error("配置错误！");
                     q = q[q.length - 2];
                 }
                 if (q instanceof RegExp) {
@@ -566,7 +678,7 @@ class Program {
                 return this.compile(q);
             });
             if (q.tag) r = r.concat(q.tag.slice().sort(sortRegExpSource));
-            r = r.join("|");
+            r = r.concat(ts.map(this.compile)).join("|");
             q.reg = new RegExp(r, 'g');
             q.end = this.createRegExp([q[1]]);
             if (q.length >= 4) {

package/coms/compile/common.js

@@ -11,6 +11,7 @@ const [
     /* 256 */SCOPED,
     /* 512 */LABEL,
     /*1024 */PROPERTY,
+    /*2048 */ELEMENT,
 ] = new Array(20).fill(0).map((_, a) => 1 << a);
 // --------------//1//2/////////////////////////22/////////////2//2//3//4/////4////////3/////3//////3//3//////3///////211/////////////2//////2//////1///
 var number_reg = /^(?:(?:0x[0-9a-f]+|0b\d+|0o\d+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[mniul]|ll)?$/i;
@@ -486,7 +487,7 @@ var createScoped = function (parsed, wash) {
                     else {
                         var u = o.text;
                         if (/^\.\.\./.test(u)) u = u.slice(3);
-                        var u = u.replace(/^([^\.\[]*)[\s\S]*$/, '$1');
+                        var u = u.replace(/^([^\.\[\?]*)[\s\S]*$/, '$1');
                         if (!u) break;
                         var prev = o.prev;
                         if (prev && prev.type === STAMP && /^(?:\+\+|\-\-)$/.test(prev.text)) {
@@ -1050,12 +1051,14 @@ var createString = function (parsed) {
     var uncomment = parsed.comment === false;
     var result = [], cacheresult, finalresult = result;
     var helpcolor = parsed.keepcolor === false;
+    var intag = false;
     var run = (o, i, a) => {
         var prev = o.prev;
-        if (!((SPACE | COMMENT | STAMP | PIECE | SCOPED) & o.type) && prev && lasttype !== SPACE && patchspace) {
-            if ((QUOTED | SCOPED | STRAP | LABEL | COMMENT) & lasttype
+        a: if (!((SPACE | COMMENT | STAMP | PIECE | SCOPED) & o.type) && prev && lasttype !== SPACE && patchspace) {
+            if ((QUOTED | SCOPED | STRAP | LABEL | COMMENT | ELEMENT) & lasttype
                 || prev.type === STAMP && !prev.unary
             ) {
+                if (intag || prev.type === ELEMENT && o.type === ELEMENT) break a;
                 if (o.type !== EXPRESS || !/^(\.[^\.]|\[)/.test(o.text) && !prev.tag && !o.tag) {
                     result.push(" ");
                     lasttype = SPACE
@@ -1106,8 +1109,46 @@ var createString = function (parsed) {
                 var b = breakSpace(o);
                 if (b) result.push(b);
                 break;
+            case ELEMENT:
+                result.push(o.entry);
+                result.push(o.tag);
+                if (o.attributes) {
+                    intag = 0;
+                    var attributes = o.attributes;
+                    var needvalue = false;
+                    while (intag < attributes.length) {
+                        var a = attributes[intag++];
+                        if (a.type === STAMP && a.text === "=") {
+                            run(a);
+                            needvalue = true;
+                        }
+                        else {
+                            if (a.type === PIECE && !a.text) continue;
+                            if (!needvalue && (a.type !== PIECE || !/^\=/.test(a.text))) result.push(" ");
+                            run(a);
+                            needvalue = a.type === PIECE && /[\=]$/.test(a.text);
+                        }
+                    }
+                    intag = 0;
+                }
+                if (o.closed) {
+                    if (!o.short) {
+                        result.push(o.tag_leave);
+                        if (o.length) {
+                            o.forEach(run);
+                        }
+                        result.push(o.tag_entry);
+                        result.push(o.tag);
+                    }
+                    result.push(o.leave);
+                }
+                else {
+                    result.push(o.tag_leave);
+                    if (o.length) o.forEach(run);
+                }
+                break;
             case QUOTED:
-                if (!o.length) {
+                if (!o.length && o.text) {
                     if (helpcolor) o.text = color.transform(o.text);
                     result.push(o.text);
                     break;
@@ -1119,8 +1160,9 @@ var createString = function (parsed) {
                 )) result.push(" ");
                 result.push(o.entry);
                 if (o.length > 0) {
+                    var fillspace = patchspace && lasttype !== PIECE && !intag;
                     if (o.entry === "{" && o[0].type !== SPACE) {
-                        if (patchspace && lasttype !== PIECE) {
+                        if (fillspace) {
                             result.push(" ");
                         }
                     }
@@ -1138,14 +1180,14 @@ var createString = function (parsed) {
                         }
                     }
                     if (o.leave === "}" && o.entry === "{" && o[o.length - 1].type !== SPACE) {
-                        if (patchspace) result.push(" ");
+                        if (fillspace) result.push(" ");
                     }
                 }
                 result.push(o.leave);
                 break;
             default:
                 if (o && typeof o === "object") {
-                    if (o.prev && o.prev.type === EXPRESS && o.type === EXPRESS && (/^[\.\[]/.test(o.text) || /\.$/.test(o.prev.text)));
+                    if (intag || o.prev && o.prev.type === EXPRESS && o.type === EXPRESS && (/^[\.\[]/.test(o.text) || /\.$/.test(o.prev.text)));
                     else if ((STRAP | EXPRESS | PROPERTY | COMMENT | VALUE) & lasttype && (STRAP | EXPRESS | PROPERTY | VALUE | LABEL) & o.type) {
                         if (autospace) result.push(" ");
                     }
@@ -1380,6 +1422,7 @@ module.exports = {
     /* 256 */SCOPED,
     /* 512 */LABEL,
     /*1024 */PROPERTY,
+    /*2048 */ELEMENT,
     number_reg,
     equal_reg,
     skipAssignment,

package/coms/compile/scanner2.js

@@ -3,17 +3,18 @@ var createNamelist = require("./namelist");
 var Html = require("./Html");
 var Javascript = require("./Javascript");
 const {
-    /*-1 */COMMENT,
-    /* 0 */SPACE,
-    /* 1 */STRAP,
-    /* 2 */STAMP,
-    /* 3 */VALUE,
-    /* 4 */QUOTED,
-    /* 5 */PIECE,
-    /* 6 */EXPRESS,
-    /* 7 */SCOPED,
-    /* 8 */LABEL,
-    /* 9 */PROPERTY,
+    /*    1 */COMMENT,
+    /*    2 */SPACE,
+    /*    4 */STRAP,
+    /*    8 */STAMP,
+    /*   16 */VALUE,
+    /*   32 */QUOTED,
+    /*   64 */PIECE,
+    /*  128 */EXPRESS,
+    /*  256 */SCOPED,
+    /*  512 */LABEL,
+    /* 1024 */PROPERTY,
+    /* 2048 */ELEMENT,
     skipSentenceQueue,
     rename,
     relink,
@@ -65,6 +66,7 @@ class Code extends Array {
     SCOPED = SCOPED
     LABEL = LABEL
     PROPERTY = PROPERTY
+    ELEMENT = ELEMENT
     pressed = false
     _scoped = null;
     helpcode = false;

package/coms/compile/scanner2_test.js

@@ -1,7 +1,7 @@
 var fs = require("fs");
 var path = require("path");
 var esprima// = require("../esprima/index");
-// var typescript = require("../typescript/index");
+var typescript// = require("../typescript/index");
 var console = require("../reptile/colored_console");
 var scanner = require("./scanner2");
 var data //= fs.readFileSync(path.join(__dirname, "../typescript/index.js")).toString();
@@ -98,11 +98,39 @@ function testJsx2() {
 function testJsx3() {
     var m = scanner(`return <a></b></c>`);
 }
-function testJsxOnlyHtml() {
-    var m = scanner(`<!-- angular 1.x -->
-    <component1 ng-bind="expression"><child1></child1></component1>`);
-    console.log(m.toString());
-}
+function testJsxOnlyHtml(html) {
+    var m = scanner(html);
+    assert(m.toString(), html);
+}
+testJsxOnlyHtml(`<!-- angular 1.x --><component1 ng-bind="expression"><child1></child1></component1>`)
+testJsxOnlyHtml(`<a #c>bdf</a>`);
+testJsxOnlyHtml(`<a #c>b<c></c></a>`);
+testJsxOnlyHtml(`<c b=x>d</c>`);
+testJsxOnlyHtml(`<o/>`);
+testJsxOnlyHtml(`<o>`);
+testJsxOnlyHtml(`</o>`);
+testJsxOnlyHtml(`<a></o>`);
+testJsxOnlyHtml(`<a></a></o>`);
+testJsxOnlyHtml(`<o><a><b></o>`);
+testJsxOnlyHtml(`<o><a><b><c></o>`);
+testJsxOnlyHtml(`<a><b><c>`);
+testJsxOnlyHtml(`<a></b><c>`);
+testJsxOnlyHtml(`<a>{aa}</c>`);
+testJsxOnlyHtml(`<a {aa}>a</c>`);
+testJsxOnlyHtml(`Let's Crypt`);
+testJsxOnlyHtml(`<h><a #c>b</a><c b=x>d</c><d/><e>2px</e></h>`)
+testJsxOnlyHtml(`<a {a}=b></a>`);
+// testJsxOnlyHtml(`<script></script>`);
+testJsxOnlyHtml("<script>a=`<v>${version[0]}</v>`</script>");
+testJsxOnlyHtml(`<script>var menu=[{name:'aa'}]</script>`);
+testJsxOnlyHtml(`<script><v></v>;var menu=[{name:i18n\`aa\`}]</script>`);
+testJsxOnlyHtml(`<component1 ng-if="expression"> </component1>`);
+testJsxOnlyHtml(`render(){
+    return <Component1 onClick={expression}> </Component1>
+}`);
+testJsxOnlyHtml(`render(){
+    return expression.map((item,index)=><Copoment1></Component1>)
+}`);
 function testSpaceLess() {
     var m = scanner(`if(n<0)return'_f("'+t+'")('+e+")"`);
     console.log(m.toString());

package/coms/docs/codetext.xht

@@ -3,11 +3,16 @@
         padding: 10px 20px;
         border-radius: 3px;
         display: inline-block;
-        background: #333;
+        background: #2c2c2c;
         color: #d4d4d4;
+        font-family: Consolas, "Courier New", monospace;
         vertical-align: top;
     }
 
+    stamp {
+        color: #808080;
+    }
+
     strap,
     value {
         color: #569cd6;
@@ -92,7 +97,7 @@
         predefs["module.exports"] = true;
         predefs.Promise = true;
         [Boolean, Number, String, Function, Object, Array, Date, RegExp, Error].forEach(p => predefs[p.name] = true);
-        var { STRAP, SCOPED, QUOTED, LABEL, COMMENT, STAMP, VALUE, EXPRESS, PROPERTY, PIECE } = c;
+        var { STRAP, SCOPED, ELEMENT, QUOTED, LABEL, COMMENT, STAMP, VALUE, EXPRESS, PROPERTY, PIECE } = c;
         var deep = 0;
         var setcolor = function (o) {
             var text = o.text;
@@ -102,17 +107,30 @@
                     o.text = `<label>${o.text}</label>`;
                     break;
                 case QUOTED:
-                case PIECE:
-                    if (!o.length) {
-                        if (/^\//.test(o.text)) {
-                            o.text = `<regexp>${encode(o.text)}</regexp>`;
-                        }
-                        else o.text = `<text>${encode(o.text)}</text>`;
+                    if (o.length || !o.text) {
+                        o.forEach(setcolor);
+                        o.entry = "<text>" + o.entry;
+                        o.leave = o.leave + "</text>";
                         break;
                     }
+                case PIECE:
+                    if (o.queue && o.queue.tag) {
+                        o.text = encode(o.text);
+                    }
+                    else if (/^\//.test(o.text)) {
+                        o.text = `<regexp>${encode(o.text)}</regexp>`;
+                    }
+                    else o.text = `<text>${encode(o.text)}</text>`;
+                    break;
+                    break;
+                case ELEMENT:
+                    if (o.attributes) o.attributes.forEach(setcolor);
+                    if (o.tag_entry) o.tag_entry = `<stamp>${encode(o.tag_entry)}</stamp>`;
+                    if (o.tag_leave) o.tag_leave = `<stamp>${encode(o.tag_leave)}</stamp>`;
+                    if (o.entry) o.entry = `<stamp>${encode(o.entry)}</stamp>`;
+                    if (o.leave) o.leave = `<stamp>${encode(o.leave)}</stamp>`;
+                    o.tag = `<label>${o.tag}</label>`;
                     o.forEach(setcolor);
-                    o.entry = "<text>" + o.entry;
-                    o.leave = o.leave + "</text>";
                     break;
                 case SCOPED:
                     deep++;
@@ -154,8 +172,8 @@
                     break;
                 case STAMP:
                     if (/^(=>)$/.test(o.text) || o.text === "*" && o.prev && o.prev.type === c.STRAP) o.text = `<strap>${encode(o.text)}</strap>`;
-                    else if (!/^[<\/>]+$/.test(o.text));
-                    else o.text = `<stamp>${encode(o.text)}</stamp>`;
+                    // else if (!/^[<\/>]+$/.test(o.text));
+                    // else o.text = `<stamp>${encode(o.text)}</stamp>`;
                     break;
                 case COMMENT:
                     o.text = `<comment>${encode(o.text)}</comment>`;
@@ -194,9 +212,9 @@
             codecolor(code);
             backEach(scoped.richNodes, n => {
                 if (n.isScript) {
-                    var js = compile$scanner2(n.innerText);
+                    var js = compile$scanner2(compile$common.createString(n));
                     codecolor(js);
-                    code.splice(n.innerStart, n.innerEnd - n.innerStart, { text: js.toString() });
+                    n.splice(0, n.length, ...js);
                 }
             })
             return code.toString();

package/coms/zimoli/grid.js

@@ -690,6 +690,7 @@ var createPointsFromElements = function (elements, xList, yList) {
             var y1 = yList[cx - 1];
             var y2 = yList[cx];
             var temp = elements.filter(e => e[3] >= y1 && e[4] <= y2);
+            if (temp.length === elements.length) throw new Error("遇到不规则布局，无法自动处理！");
             if (temp.length > 1) {
                 var children = createPointsFromElements(temp, [xList[0], xList[xList.length - 1]], [y1, y2]);
                 if (children.length) {
@@ -710,6 +711,7 @@ var createPointsFromElements = function (elements, xList, yList) {
             var x1 = xList[cx - 1];
             var x2 = xList[cx];
             var temp = elements.filter(e => e[1] >= x1 && e[2] <= x2);
+            if (temp.length === elements.length) throw new Error("遇到不规则布局，无法自动处理！");
             if (temp.length > 1) {
                 var children = createPointsFromElements(temp, [x1, x2], [yList[0], yList[yList.length - 1]]);
                 if (children.length) xList.splice(cx, 0, children);

package/package.json

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