efront 4.12.0 → 4.12.1

package/coms/compile//347/264/240/351/246/250.js

@@ -156,7 +156,7 @@ macros.calc = function (a) {
 };
 macros.range = function () {
     if (arguments.length === 1) {
-        return ArrayFill(arguments[0], 0).map((a, i) => i + 1);
+        return ArrayFill(arguments[0], 0).map((a, i) => i + 1).join(' ');
     }
     if (arguments.length === 3) {
         var [start, end, step] = arguments;
@@ -173,22 +173,26 @@ macros.range = function () {
         end = parseFloat(end);
         step = parseFloat(step) || 1;
         var result = [];
-        for (var temp = start; temp < end; temp += step) {
-            result.push(temp.toFixed(fixed) + unit);
+        for (var temp = start; temp <= end; temp += step) {
+            result.push(+temp.toFixed(fixed) + unit);
         }
-        return result;
+        return result.join(' ');
     }
     throw new Error(i18n`range参数错误:` + arguments);
 };
-macros.extract = function (list, index) {
-    if (typeof list === 'string') list = list.split(',');
+macros.extract = function () {
+    if (arguments.length === 2) var [list, index] = arguments;
+    else var index = arguments[arguments.length - 1], list = Array.prototype.slice.call(arguments, 0, arguments.length - 1);
+    index -= 1;
+    if (typeof list === 'string') list = getList(list);
     else if (list instanceof Array) {
-        list = createArgMap(list.concat(list.rest).join(''), ';');
+        list = list.concat(list.rest);
     }
     return list[index];
 };
 macros.length = function (list) {
-    if (typeof list === 'string') return list.split(',').length;
+    if (arguments.length !== 1) return arguments.length;
+    if (typeof list === 'string') return getList(list).length;
     else if (list instanceof Array) {
         return createArgMap(list.concat(list.rest).join(''), ';').length;
     }
@@ -202,6 +206,7 @@ macros.escape = function (a) {
 macros.e = function (a) {
     return strings.decode(a);
 };
+
 var wrapColor = function (k) {
     var f = color[k];
     macros[k] = function (c) {
@@ -231,6 +236,11 @@ macros[""] = function (a) {
     return a;
 };
 
+var getList = function (list) {
+    list = splitParams(list);
+    if (list.length === 1) list = list[0].split(/\s+/);
+    return list;
+};
 macros.each = function () {
     if (arguments.length !== 2) {
         body = arguments[arguments.length - 1];
@@ -248,7 +258,7 @@ macros.each = function () {
     if (args.length < 1) args.push("@value");
     if (args.length < 2) args.push("@key");
     if (args.length < 3) args.push("@index");
-    if (typeof list === "string") list = splitParams(list);
+    if (typeof list === "string") list = getList(list);
     else if (list instanceof Array) {
         list = createArgMap(list.concat(list.rest).join(""), ';');
     }

package/coms/compile//347/264/240/351/246/250_test.js

@@ -78,6 +78,14 @@ assert(素馨(`a{filter:grayscale(.9)}`), `a{filter:grayscale(.9);}`);
 assert(素馨(`a{each(1,2,3,4,5,(@a){a:@a})}`), `a{a:1;a:2;a:3;a:4;a:5;}`);
 assert(素馨(`each(1,(@a){a{a:@a}})a>b{b:2}`), `a{a:1;}\r\na>b{b:2;}`);
 assert(素馨(`each(2,(@a){@b:1/@a;a{a:@b}})`), `a{a:0.5;}`);
+assert(素馨(`each(2,.(@a){@b:1/@a;a{a:@b}})`), `a{a:0.5;}`);
+assert(素馨(`a{a:length(2)}`), `a{a:1;}`);
+assert(素馨(`a{b:length(2,3)}`), `a{b:2;}`);
+assert(素馨(`a{a:extract(2,1)}`), `a{a:2;}`);
+assert(素馨(`a{a:extract(2,3,2)}`), `a{a:3;}`);
+assert(素馨(`a{a:extract(2 3,2)}`), `a{a:3;}`);
+assert(素馨(`value: range(10px, 30px, 10);`, '', true), `value:10px 20px 30px;`);
+assert(素馨(`value: range(4);`, '', true), `value:1 2 3 4;`);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].text, '-0.2em');
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].isdigit, true);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[2].text, ".3em");

package/coms/zimoli/render.js

@@ -41,6 +41,7 @@ presets.template = function (t) {
     var comment = document.createComment('template');
     comment.$scope = t.$scope;
     comment.$parentScopes = t.$parentScopes;
+    t.$comment = comment;
     if (t.$struct.binds.src) {
         care(comment, createTemplateNodes)
     }
@@ -274,7 +275,9 @@ var createRepeat = function (search, id = 0) {
         for (var k in clonedElements) {
             if (clonedElements1[k] !== clonedElements[k]) {
                 var selected = clonedElements[k].selected;
-                remove(clonedElements[k]);
+                var c = clonedElements[k];
+                if (!c.parentNode && c.$comment) remove(c.$comment);
+                else remove(clonedElements[k]);
                 if (selected) { clonedElements1[k].selected = true; }
             }
         }

package/package.json

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