efront 4.0.55 → 4.0.56

package/coms/compile/scanner2.js

@@ -208,6 +208,7 @@ function scan(text, type = "js", lastIndex = 0) {
     program.Code = Code;
     program.lastIndex = lastIndex;
     var res = program.exec(text);
+    res.autospace = !program.keepspace;
     Object.defineProperty(res, "program", { value: program, enumerable: false })
     return res;
 }

package/coms/zimoli/HexEditor.less

@@ -8,9 +8,9 @@
     font-size: 16px;
     position: relative;
     min-height: 100px;
-    padding: 0 0 10px 16px;
+    padding: 0 6px 10px 16px;
     font-family: 宋体;
-    width: 422px;
+    width: 438px;
 
     >a {
         display: inline-block;
@@ -40,7 +40,7 @@
         word-spacing: 2px;
         font-size: inherit;
         line-height: 30px;
-        margin: 0 0 10px -16px;
+        margin: 0 -6px 10px -16px;
         padding: 0 16px 0 16px;
         position: sticky;
         top: 0;

package/coms/zimoli/gallery_test.less

@@ -1,5 +1,5 @@
 & {
-    height: 100%;
+    height: 300px;
 }
 
 &>gallery {

package/coms/zimoli/getGenerator.js

@@ -23,20 +23,22 @@ var getGenerator = function (container, tagName = 'item') {
     if (container.$generator) return container.$generator;
     var template = document.createElement(container.tagName);
     var templates = [];
+    var hasAfter = false;
     for (let a of container.childNodes) {
         if (a.nodeType === 1 && a.hasAttribute('insert')) {
             if (!templates.length) a.$isbefore = true;
-            else a.$isafter = true;
+            else { a.$isafter = true; hasAfter = true; }
         }
-        else {
+        else if (hasAfter);
+        else if (a.nodeType === 1 || templates.length) {
             templates.push(a);
         }
     }
+    while (templates.length > 1 && templates[templates.length - 1].nodeType !== 1) templates.pop();
     if (templates.length < container.childNodes.length && templates.length >= 1) {
-        var c = document.createComment('lattice');
+        var c = document.createComment('generator');
         c.index = null;
         container.insertBefore(c, templates[0]);
-        templates.splice(1, templates.length - 1);
         var paddingCount = [].indexOf.call(container.childNodes, c);
         container.paddingCount = paddingCount;
     }

package/coms/zimoli/lattice_test.less

@@ -4,6 +4,7 @@
 }
 
 >lattice {
+    max-height: 300px;
     height: 100%;
     @mask-color: rgba(0, 0, 0, .4);
     // background: linear-gradient(45deg, @mask-color, 25%, @mask-color, 25%, rgba(0, 0, 0, 0), 75%, rgba(0, 0, 0, 0), 75%, @mask-color), linear-gradient(135deg, @mask-color, 25%, @mask-color, 25%, rgba(0, 0, 0, 0), 75%, rgba(0, 0, 0, 0), 75%, @mask-color);

package/coms/zimoli/list.js

@@ -169,9 +169,9 @@ function ylist(container, generator, $Y) {
                 delete childrenMap[offset];
             }
             if (last_index > offset) {
-                if (item.nextElementSibling !== last_item) list.insertBefore(item, last_item);
+                if (item.nextElementSibling !== last_item) insertBeforeList(item, last_item);
             } else {
-                if (item.previousElementSibling !== item) list.insertBefore(item, getNextSibling(last_item));
+                if (item.previousElementSibling !== item) insertBeforeList(item, getNextSibling(last_item));
             }
             last_index = offset;
             item = getNodeTarget(item);
@@ -229,6 +229,17 @@ function ylist(container, generator, $Y) {
         } while (next.offsetTop === element.offsetTop);
         return next.offsetTop - element.offsetTop;
     };
+    var insertBeforeList = function (elem, flag) {
+        if(flag){
+            var w = elem.with;
+            if (w) {
+                if (w[w.length - 1].nextSibling === flag) return;
+            }
+            else if (elem.nextSibling === flag) return;
+        }
+        list.insertBefore(elem, flag);
+        if (elem.with) for (var w of elem.with) list.insertBefore(w, flag);
+    };
     var patchBottom = function (deltaY = 0) {
         var cache_height = list.offsetHeight;
         var childrenMap = getChildrenMap();
@@ -250,7 +261,7 @@ function ylist(container, generator, $Y) {
                 } else if (!restHeight) {
                     restHeight = cache_height;
                 }
-                list.insertBefore(item, getNextSibling(last_element));
+                insertBeforeList(item, getNextSibling(last_element));
             }
             item = getNodeTarget(item);
             if (!item.offsetHeight) {
@@ -315,7 +326,7 @@ function ylist(container, generator, $Y) {
             if (!item) {
                 item = createItem(offset);
                 if (!item) break;
-                list.insertBefore(item, first_element);
+                insertBeforeList(item, first_element);
                 item = getNodeTarget(item);
                 scrollTop += flag_element.offsetTop - offsetTop;
                 offsetTop = flag_element.offsetTop;
@@ -648,6 +659,7 @@ function list() {
     list.clean = function (src, old) {
         var children = (container || list).childNodes;
         children = Array.prototype.filter.call(children, c => {
+            if (c.index === null) return false;
             if (isFinite(c.index)) return true;
             if (c.nodeType === 1 && c.$comment && isFinite(c.$comment.index)) return true;
             return false;

package/coms/zimoli/mediaDevices.less

@@ -4,10 +4,9 @@
 
 & {
     max-height: 500px;
-    position  : fixed;
+    position  : relative;
     width     : 360px;
     height    : 100%;
-    padding   : 50px 0 0 0;
 }
 
 .device {

package/docs//347/273/204/344/273/266.xht

@@ -225,7 +225,7 @@
             if (envs[templateName]) {
                 delete envs[templateName];
                 var template = await cross("get", './components:' + modName + ".html");
-                codetext = `var ${templateName}={toString(){return \`${template.responseText}\`}};\r\n` + codetext;
+                codetext = `var ${templateName}={toString(){return \`${template.responseText.replace(/>\s+</g, '><')}\`}};\r\n` + codetext;
             }
             initcode(codetext);
         }

package/package.json

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