efront 3.4.6 → 3.5.2

package/coms/zimoli/color.js

@@ -3,60 +3,92 @@
  */
 
 var { min, max, sin, cos, round, sqrt, random, PI, abs = a => a < 0 ? -a : a } = Math;
-
+var [v_r, v_g, v_b] = [.299, .587, .114];
 
 var rgb4v = function (r, g, b, v) {
-	v = v - rgb2v(r, g, b);
-	return trim3v(r + v, g + v, b + v);
+	var d = v - rgb2v(r, g, b);
+	return [r + d, g + d, b + d];
 };
 
-var trim3v = function (r, g, b) {
-	do {
-		var rest = 0;
-		var count = 1;
-		if (r >= 255) rest += (r - 255) * .299, r = 255, count -= .299;
-		if (g >= 255) rest += (g - 255) * .587, g = 255, count -= .587;
-		if (b >= 255) rest += (b - 255) * .114, b = 255, count -= .114;
-		if (count > 0.01 && rest > 0) {
-			rest = rest / count;
-			if (r < 255) r += rest;
-			if (g < 255) g += rest;
-			if (b < 255) b += rest;
-		}
-	} while (rest > 0);
-	do {
-		var rest = 0;
-		var count = 1;
-		if (r <= 0) rest += r * .299, r = 0, count -= .299;
-		if (g <= 0) rest += g * .587, g = 0, count -= .587;
-		if (b <= 0) rest += b * .114, b = 0, count -= .114;
-		if (count > 0.01 && rest > 0) {
-			rest = rest / count;
-			if (r > 0) r += rest;
-			if (g > 0) g += rest;
-			if (b > 0) b += rest;
-		}
-	} while (rest > 0);
+
+
+var rgb4h = function (r, g, b, h) {
+	var [p, q, s] = [r, g, b].sort();
+	var m = s - p;
+	h = (h % 360 + 360) % 360;
+	if (h < 60) {
+		r = s;
+		g = p + m * h / 60;
+		b = p;
+	}
+	else if (h < 120) {
+		r = p + m * (120 - h) / 60;
+		g = s;
+		b = p;
+	}
+	else if (h < 180) {
+		r = p;
+		g = s;
+		b = p + m * (h - 120) / 60
+	}
+	else if (h < 240) {
+		r = p;
+		g = p + m * (240 - h) / 60;
+		b = s;
+	}
+	else if (h < 300) {
+		r = p + m * (h - 240) / 60;
+		g = p;
+		b = s;
+	}
+	else {
+		r = s;
+		g = p;
+		b = p + m * (360 - h) / 60;
+	}
 	return [r, g, b];
-}
+};
+
+
+var rgb2h = function (r, g, b) {
+	var m = max(r, g, b);
+	var n = min(r, g, b);
+	var h;
+	if (m === n) h = 0;
+	else if (m === r) {
+		if (g >= b) {
+			h = 60 * (g - b) / (m - n);
+		} else {
+			h = 360 + 60 * (g - b) / (m - n);
+		}
+	}
+	else if (m === g) {
+		h = 120 + 60 * (b - r) / (m - n);
+	}
+	else if (m === b) {
+		h = 240 + 60 * (r - g) / (m - n);
+
+	}
+	return h;
+};
 
 var rgb2s = function (r, g, b) {
-	var m = Math.min(r, g, b);
+	var m = min(r, g, b);
 	if (m) {
 		r -= m;
 		g -= m;
 		b -= m;
 	}
-	return Math.max(r, g, b) / 255;
+	return max(r, g, b) / 255;
 };
 var rgb4s = function (r, g, b, s) {
-	var m = Math.min(r, g, b);
+	var m = min(r, g, b);
 	if (m) {
 		r -= m;
 		g -= m;
 		b -= m;
 	}
-	s = s * 255 / Math.max(r, g, b);
+	s = s * 255 / (max(r, g, b) || 1);
 	if (s) {
 		r *= s;
 		g *= s;
@@ -69,37 +101,45 @@ var rgb4s = function (r, g, b, s) {
 function rotate_rgb(RGBA, theta) {
 	var [r, g, b, a] = RGBA;
 	if (isNaN(theta)) return [r, g, b, a];
+	var h = rgb2h(r, g, b);
 	var s = rgb2s(r, g, b);
 	var v = rgb2v(r, g, b);
-	var u = sqrt(3) / 3;
-	var pu = 1 / 3;
-	var cosa = cos(theta);
-	var sina = sin(theta);
-	var vera = 1 - cosa;
-	var red = (cosa + pu * vera) * r + (pu * vera - u * sina) * g + (pu * vera + u * sina) * b;
-	var green = (pu * vera + u * sina) * r + (cosa + pu * vera) * g + (pu * vera - u * sina) * b;
-	var blue = (pu * vera - u * sina) * r + (pu * vera + u * sina) * g + (cosa + pu * vera) * b;
-	var m = mode([red, green, blue]);
-	var _min = min(red, green, blue);
-	var d = [m - red, m - green, m - blue]
-	if (_min < 0) {
-		var index = red < 0 ? 0 : green < 0 ? 1 : 2;
-		var [dr, dg, db] = single(d, -_min / d[index]);
-	} else {
-		var _max = max(red, green, blue);
-		if (_max > 255) {
-			var index = red > 255 ? 0 : green > 255 ? 1 : 2;
-			var [dr, dg, db] = single(d, (255 - _max) / d[index]);
-		} else {
-			var dr, dg, db = dr = dg = 0;
-		}
-	}
-	red += dr;
-	green += dg;
-	blue += db;
-	[red, green, blue] = rgb4s(red, green, blue, s);
-	[red, green, blue] = rgb4v(red, green, blue, v);
-	return [red, green, blue, a];
+	h += theta * 180 / Math.PI;
+	[r, g, b] = rgb4h(r, g, b, h);
+	[r, g, b] = rgb4s(r, g, b, s);
+	[r, g, b] = rgb4v(r, g, b, v);
+	return [r, g, b];
+	// var s = rgb2s(r, g, b);
+	// var v = rgb2v(r, g, b);
+	// var u = sqrt(3) / 3;
+	// var pu = 1 / 3;
+	// var cosa = cos(theta);
+	// var sina = sin(theta);
+	// var vera = 1 - cosa;
+	// var red = (cosa + pu * vera) * r + (pu * vera - u * sina) * g + (pu * vera + u * sina) * b;
+	// var green = (pu * vera + u * sina) * r + (cosa + pu * vera) * g + (pu * vera - u * sina) * b;
+	// var blue = (pu * vera - u * sina) * r + (pu * vera + u * sina) * g + (cosa + pu * vera) * b;
+	// var m = mode([red, green, blue]);
+	// var _min = min(red, green, blue);
+	// var d = [m - red, m - green, m - blue]
+	// if (_min < 0) {
+	// 	var index = red < 0 ? 0 : green < 0 ? 1 : 2;
+	// 	var [dr, dg, db] = single(d, -_min / d[index]);
+	// } else {
+	// 	var _max = max(red, green, blue);
+	// 	if (_max > 255) {
+	// 		var index = red > 255 ? 0 : green > 255 ? 1 : 2;
+	// 		var [dr, dg, db] = single(d, (255 - _max) / d[index]);
+	// 	} else {
+	// 		var dr, dg, db = dr = dg = 0;
+	// 	}
+	// }
+	// red += dr;
+	// green += dg;
+	// blue += db;
+	// [red, green, blue] = rgb4s(red, green, blue, s);
+	// [red, green, blue] = rgb4v(red, green, blue, v);
+	// return [red, green, blue, a];
 }
 // 对比度
 function contrast_rgb(RGBA, ratio) {
@@ -225,22 +265,24 @@ function single(c, u) {
 	return [r * u, g * u, b * u];
 }
 function angle(c1, c2) {
-	c1 = parse(c1);
-	c2 = parse(c2);
-	c1 = normal(c1);
-	c2 = normal(c2);
-	var [r1, g1, b1] = single(c1);
-	var [r2, g2, b2] = single(c2);
-	var c = [g1 * b2 - g2 * b1, b1 * r2 - b2 * r1, r1 * g2 - r2 * g1];
-	var d = r1 * r2 + g1 * g2 + b1 * b2;
-	var e = c[0] > 0 ? mode(c) : -mode(c);
-	var theta = Math.asin(e > 1 ? 1 : e < -1 ? -1 : e);
-	var phi = Math.acos(d > 1 ? 1 : d < -1 ? -1 : d);
-	if (theta < 0) {
-		theta = Math.PI * 2 - phi;
-	} else {
-		theta = phi;
-	}
+	var theta = rgb2h(c2[0], c2[1], c2[2]) - rgb2h(c1[0], c1[1], c1[2]);
+	if (theta < 0) theta += 360;
+	// c1 = parse(c1);
+	// c2 = parse(c2);
+	// c1 = normal(c1);
+	// c2 = normal(c2);
+	// var [r1, g1, b1] = single(c1);
+	// var [r2, g2, b2] = single(c2);
+	// var c = [g1 * b2 - g2 * b1, b1 * r2 - b2 * r1, r1 * g2 - r2 * g1];
+	// var d = r1 * r2 + g1 * g2 + b1 * b2;
+	// var e = c[0] > 0 ? mode(c) : -mode(c);
+	// var theta = Math.asin(e > 1 ? 1 : e < -1 ? -1 : e);
+	// var phi = Math.acos(d > 1 ? 1 : d < -1 ? -1 : d);
+	// if (theta < 0) {
+	// 	theta = Math.PI * 2 - phi;
+	// } else {
+	// 	theta = phi;
+	// }
 	return theta;
 }
 function equal(c1, c2) {
@@ -273,9 +315,9 @@ var colorDesigner = {
 	contrast: 1
 };
 var rgb2v = function (r, g, b) {
-	r *= .299;
-	g *= .587;
-	b *= .114;
+	r *= v_r;
+	g *= v_g;
+	b *= v_b;
 	return r + g + b;
 };
 var v2rgb = function (v, r, g, b) {
@@ -320,6 +362,9 @@ extend(color, {
 	contrast(color, ratio) {
 		return doWith(contrast_rgb, color, ratio);
 	},
+	rgb2h,
+	rgb4h,
+	rgb4s,
 	rgb2v,
 	rgb4v,
 	rgb2s,

package/coms/zimoli/colorpad.js

@@ -4,9 +4,7 @@ var xy2c = function (a, x, y) {
     return a * x * (1 - y) + (.5 + x / 2) * y * 255;
 };
 var z2rgb = function (z) {
-    var c = color.rotate(sample, z * (Math.PI + Math.PI));
-    var [r, g, b] = color.parse(c);
-    return color.rgb4s(r, g, b, 1);
+    return color.rgb4h(255, 0, 0, z * 360);
 };
 var z2c = function (z) {
     return color.stringify(z2rgb(z));
@@ -87,7 +85,7 @@ var c2xy = function (c1, c2) {
 var getCanvas = function (e) {
     return e.getElementsByTagName('canvas')[0];
 };
-var sample = "#ff4949";
+var sample = "#ff0000";
 var buildpad = function (pad, c = sample) {
     var canvas = getCanvas(pad);
     canvas.width = 256;

package/coms/zimoli/data.js

@@ -310,7 +310,11 @@ var parseData = function (sourceText) {
         sourceText = sourceText.replace(/^[^\(]+\(([\s\S]*)\)[^\)]*$/, "$1");
     }
     try {
-        sourceText = parseYML(sourceText);
+        if (/^[\[\{][\d\:,]+[\}\]],|^(Infinity|''|NaN|\d+|)$|^\/[\s\S]*?\/\w*$/.test(sourceText)) {
+            sourceText = JSAM.parse(sourceText);
+        } else {
+            sourceText = parseYML(sourceText);
+        }
     } catch (e) {
         throw "数据无法解析";
     }
@@ -539,7 +543,8 @@ var privates = {
                     ok(e.response || e.responseText);
                 }).error(xhr => {
                     try {
-                        oh(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
+                        var e = getErrorMessage(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
+                        oh({ status: xhr.status, error: e })
                     } catch (error) {
                         oh(error);
                     }
@@ -608,8 +613,7 @@ function responseCrash(e, data) {
     } else {
         data.error = e;
     }
-    error_report(data.error_message, 'error');
-
+    error_report(data.error_message, e.status < 500 ? 'warn' : 'error');
 }
 
 var data = {

package/coms/zimoli/drag.js

@@ -46,6 +46,8 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
             var [target_left, target_top] = getOffset(target);
             if (abs(target_left - event.screenX - saved_delta.x) < MOVELOCK_DELTA && abs(target_top - event.screenY - saved_delta.y) < MOVELOCK_DELTA) return;
             saved_delta.ing = true;
+            drag.target = target;
+            dispatch("dragstart", target);
             if (isElement(target) && !/absolute|fixed/.test(getComputedStyle(target).position)) {
                 clone = toCloneTarget(target, isMovingSource);
                 appendChild(document.body, clone);
@@ -62,7 +64,6 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
                 clone.style.zIndex = zIndex();
                 extraClones.map(e => e.style.zIndex = clone.style.zIndex);
             }
-            dispatch("dragstart", target);
         }
         drag.target = clone;
         var offsetLeft = saved_delta.x + event.screenX;

package/coms/zimoli/gallery.js

@@ -121,18 +121,8 @@ function main() {
             minWidth = arg;
         }
     });
-    var src = element.getAttribute("src") || element.getAttribute("ng-src") || element.getAttribute("v-src");
-    if (src) {
-        var parsedSrc = render.parseRepeat(src);
-        if (!parsedSrc) {
-            element.setAttribute("ng-src", src);
-            element.removeAttribute("src");
-            var generator = getGenerator(element);
-        } else {
-            element.setAttribute("ng-src", parsedSrc.srcName);
-            element.removeAttribute("src");
-            var generator = getGenerator(element, parsedSrc);
-        }
+    if ("$src" in element) {
+        var generator = getGenerator(element);
         care(element, function () {
             var index = element.index();
             element.clean();

package/coms/zimoli/getGenerator.js

@@ -1,7 +1,12 @@
 
 var _slider = createElement(div);
-var getGenerator = function (container, parsedSrc) {
+var empty = function (index, item) {
+    if (!item) return;
+    return document.createElement('empty');
+};
+var getGenerator = function (container) {
     if (!container) return;
+    if (!container.childNodes.length) return container.$generator || empty;
     var template = document.createElement("div");
     var templates = [].concat.apply([], container.childNodes).filter(a => {
         if (a.hasAttribute('insert')) {
@@ -20,26 +25,27 @@ var getGenerator = function (container, parsedSrc) {
     appendChild(template, templates);
     container.insertBefore = _slider.insertBefore;
     container.appendChild = _slider.appendChild;
-    return function (index, com) {
+    var scopes = container.$parentScopes.concat(container.$scope);
+    return container.$generator = function (index, com) {
         if (!com) {
             if (!container.src || index >= container.src.length) return;
             com = container.src[index];
         }
         if (!com) return;
-        var template1 = template.cloneNode();
-        template1.innerHTML = template.innerHTML;
+        var template1 = template.cloneNode(true);
         if (!template1.childNodes.length) return template1;
         var item = template1.childNodes[0];
         item.with = [].concat.apply([], template1.childNodes).slice(1);
+        var parsedSrc = container.$src;
         if (parsedSrc) {
             var { keyName, itemName, indexName } = parsedSrc;
-            var newScope = extend(Object.create(container.$scope), {
+            var newScope = {
                 [keyName || '$key']: index,
                 [itemName || '$item']: com,
                 [indexName || '$index']: index
-            });
-            var newItem = render(item, newScope);
-            newItem.with = render(item.with, newScope);
+            };
+            var newItem = render(item, newScope, scopes);
+            if (item.with.length) newItem.with = render(item.with, newScope, scopes);
         } else {
             var newScope = container.src[index];
             if (!isObject(newScope)) newScope = {
@@ -59,8 +65,8 @@ var getGenerator = function (container, parsedSrc) {
                     return this.$item;
                 }
             }
-            var newItem = render(item, newScope, [container.$scope]);
-            newItem.with = render(newItem.with = item.with, newScope, [container.$scope]);
+            var newItem = render(item, newScope, scopes);
+            newItem.with = render(newItem.with = item.with, newScope, scopes);
         }
         return newItem;
     };

package/coms/zimoli/image.less

@@ -14,6 +14,10 @@
 
     >.button {
         border: none;
+        width: 100%;
+        cursor: pointer;
+        padding: 0;
+        margin: 0;
 
         >.track {
 

package/coms/zimoli/list.js

@@ -433,18 +433,8 @@ function list() {
         bindSrc = container;
         container = div();
     } else if (container && !generator) {
-        var src = container.getAttribute("src") || container.getAttribute("ng-src") || container.getAttribute("v-src");
-        if (src) {
-            var parsedSrc = render.parseRepeat(src);
-            if (!parsedSrc) {
-                container.setAttribute("ng-src", src);
-                container.removeAttribute("src");
-                var generator = getGenerator(container);
-            } else {
-                container.setAttribute("ng-src", parsedSrc.srcName);
-                container.removeAttribute("src");
-                var generator = getGenerator(container, parsedSrc);
-            }
+        if ("$src" in container) {
+            generator = getGenerator(container);
             care(container, function () {
                 var index = container.index();
                 container.clean();

package/coms/zimoli/menu.js

@@ -110,18 +110,6 @@ function main(elem, mode) {
             }
         }
         mode = mode ? mode.toLowerCase() : "horizonal";
-        var src = elem.getAttribute("src") || elem.getAttribute("ng-src") || elem.getAttribute("v-src");
-        if (src) {
-            var parsedSrc = render.parseRepeat(src);
-            if (!parsedSrc) {
-                elem.removeAttribute("src");
-                var generator = getGenerator(elem);
-            } else {
-                elem.removeAttribute("src");
-                var generator = getGenerator(elem, parsedSrc);
-            }
-            elem.setAttribute("ng-src", parsedSrc ? parsedSrc.srcName : src);
-        }
 
         switch (mode) {
             case "i":
@@ -130,6 +118,7 @@ function main(elem, mode) {
             case "t":
             case "tree":
                 if (elem) {
+                    var generator = getGenerator(elem);
                     tree(elem, function (index, item) {
                         var e = generator(index, item);
                         if (!e || e.children.length) return e;
@@ -165,9 +154,10 @@ function main(elem, mode) {
                 var emit = function (item) {
                     active(elem, item, item.value);
                 };
-                if (src) {
+                if ("$src" in elem) {
+                    getGenerator(elem);
                     care(elem, function (src) {
-                        menuList(elem, getTreeFromData(src), emit, generator, direction);
+                        menuList(elem, getTreeFromData(src), emit, direction);
                     });
                 } else {
                     var nodes = getArrayNodes(elem);

package/coms/zimoli/menuList.js

@@ -8,7 +8,7 @@ var release = function () {
 var clear = function () {
     clearTimeout(releaseTimer);
 };
-function main(page, items, active, generator, direction = 'y') {
+function main(page, items, active, direction = 'y') {
     if (!isNode(page)) {
         var page = div();
     }
@@ -21,7 +21,7 @@ function main(page, items, active, generator, direction = 'y') {
         if (!item.children || !item.children.length) return;
         var clone = template.cloneNode();
         clone.innerHTML = template.innerHTML;
-        var menu = main(clone, item.children, active, generator);
+        var menu = main(clone, item.children, active);
         mounted_menus.push(menu);
 
         page.active = menu;
@@ -46,7 +46,7 @@ function main(page, items, active, generator, direction = 'y') {
         template.innerHTML = page.innerHTML;
         page.tempalte = template;
     }
-    if (!generator || !page.children.length || page.menutype === 1) {
+    if (!page.children.length || page.menutype === 1) {
         page.innerHTML = menuList;
         page.menutype = 1;
         var hasIcon = function () {
@@ -82,6 +82,7 @@ function main(page, items, active, generator, direction = 'y') {
             this.$scope.hasIcon = hasIcon();
         });
     } else {
+        var generator = getGenerator(page);
         list(page, function (index) {
             var elem = generator(index);
             if (!elem) return;

package/coms/zimoli/on.js

@@ -144,6 +144,22 @@ function checkKeyNeed(eventtypes, e) {
     }
     return true;
 }
+function wrapHandler(h) {
+    if (h instanceof Function) {
+        return function () {
+            var res = h.apply(this, arguments);
+            if (res && isFunction(res.then)) {
+                this.setAttribute('pending', '');
+                var removePending = () => {
+                    this.removeAttribute('pending');
+                };
+                res.then(removePending, removePending);
+            }
+            return res;
+        }
+    }
+    return h;
+}
 if (is_addEventListener_enabled) {
     var on = function (k) {
         var on_event_path = "on" + k;
@@ -151,6 +167,7 @@ if (is_addEventListener_enabled) {
         var eventtypes = parseEventTypes(k);
         k = k.replace(eventtypereg, '');
         function addhandler(element, handler, firstmost) {
+            handler = wrapHandler(handler);
             if (eventtypes.capture) firstmost = true;
             if (k === changes_key) {
                 if (!element.needchanges) element.needchanges = 0;
@@ -190,6 +207,7 @@ if (is_addEventListener_enabled) {
 
         if (handlersMap[on_event_path]) return handlersMap[on_event_path];
         function addhandler(element, handler, firstmost = false) {
+            handler = wrapHandler(handler);
             if (eventtypes.capture) {
                 console.warn("当前运行环境不支持事件capture");
                 firstmost = true;