efront 2.44.8 → 2.46.0

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/cross.js

@@ -323,7 +323,7 @@ function addDirect(a) {
     if (typeof a === 'string' || a instanceof RegExp) cors_hosts.push(a);
 }
 function notCross(domain) {
-    if (location_host === domain.slice(0, location_host.length)) return true;
+    if (location_host === domain.slice(0, location_host.length) || !/^https?\:\/\/|^s?\/\//.test(domain)) return true;
     for (var cx = 0, dx = cors_hosts.length; cx < dx; cx++) {
         var host = cors_hosts[cx];
         if (host instanceof RegExp) {

package/coms/zimoli/css.js

@@ -166,6 +166,7 @@ function cssTargetStyleSheet(stylesheet, innerCss) {
  * @param {|string} oValue 
  */
 var css = function (target, oStyle, oValue) {
+    if (!oStyle) return;
     if (isElement(target)) {
         if (/^style$/i.test(target.tagName)) {
             cssTargetStyleSheet(target, oStyle, oValue);

package/coms/zimoli/data.js

@@ -269,9 +269,9 @@ function parseConfig(api) {
         });
         return '';
     });
-    url.replace(/[\?\#][\s\S]*$/, '').replace(/\:\w+/g, function (p) {
+    url.replace(/[\?\#][\s\S]*$/, '').replace(/([\:\\]\:|\:\w+)/g, function (p) {
         p = p.slice(1);
-        if (!required[p]) {
+        if (!required[p] && p !== ':') {
             required.push(p);
             required[p] = p;
         }
@@ -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 "数据无法解析";
     }
@@ -495,8 +499,9 @@ var privates = {
         var coinmethod = method.slice(0, spliterIndex).toLowerCase();
         var realmethod = coinmethod.replace(/\W+$/g, '');
         var rest = [];
-        var uri = url.replace(/#[\s\S]*$/, "").replace(/\:[a-z\_][\w]*/gi, function (d) {
+        var uri = url.replace(/#[\s\S]*$/, "").replace(/[\\\:]\:|\:[a-z\_][\w]*/gi, function (d) {
             d = d.slice(1);
+            if (d === ":") return d;
             rest.push(d);
             return seekResponse(params, d) || '';
         });
@@ -538,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);
                     }
@@ -607,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 = {
@@ -829,7 +834,6 @@ var data = {
             this.responseLoading(instance);
             var params = privates.pack(sid, params1);
             if (!privates.validApi(api, params)) throw aborted;
-
             var { method, uri, params, selector } = privates.prepare(api.method, api.url, params);
             var promise = new Promise(function (ok, oh) {
                 var headers = api.headers;
@@ -850,7 +854,6 @@ var data = {
                     }
                 });
             }).then(function (response) {
-
                 return transpile(seekResponse(parseData(response), selector), api.transpile, api.root);
             });
             return promise;
@@ -914,6 +917,10 @@ var data = {
             localStorage.setItem(sourceDataId, JSAM.stringify(dataSourceMap));
         }
     },
+    getSource(sourceid) {
+        if (sourceid) return dataSourceMap[sourceid];
+        return dataSourceMap;
+    },
     clearSource() {
         localStorage.removeItem(sourceDataId);
         sessionStorage.removeItem(sourceDataId);

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/encode62.js

@@ -5,6 +5,19 @@ var encode62 = {
     src,
     map,
     time_delta: parseInt("zzzzz", 36),
+    geta(string) {
+        string = String(string)
+        string = string.length + string + "2017-08-19";
+        var buff = src.split('');
+        for (var cx = 0, dx = buff.length + src.length, sl = string.length, cl = buff.length; cx < dx; cx++) {
+            var s1 = string.charCodeAt(cx % sl) % cl;
+            var s2 = cx % cl;
+            var btemp = buff[s1];
+            buff[s1] = buff[s2];
+            buff[s2] = btemp;
+        }
+        return buff.join('');
+    },
     timedecode(string) {
         var { time_delta } = this;
         var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);

package/coms/zimoli/field.html

@@ -1,8 +1,10 @@
 <div class="head">
     <span ng-bind=field.name></span>
+    <span class="required" ng-if="field.required">*</span>
 </div>
 <div class="body">
     <model _data=data _field=field></model>
+    <span class="error" ng-bind="error"></span>
 </div>
 <div class="foot" ng-if="field.msg">
     <span ng-bind=field.msg></span>

package/coms/zimoli/field.js

@@ -1,19 +1,43 @@
 function main(elem) {
-    var result = elem;
-    if (isElement(elem) && elem.hasAttribute("ng-src")) {
-        elem = option(elem);
-        care(elem, function (p) {
-            var [f, data] = p;
-            elem.innerHTML = field;
-            render(elem, {
-                model,
-                data,
-                field: f
-            });
-        }, false);
-    } else {
-        result = option.apply(null, arguments);
-    }
-    result.removeAttribute("tabindex");
-    return result;
+    elem = option.apply(null, arguments);
+    var scope = {};
+    care(elem, function (p) {
+        if (elem.childNodes.length) return;
+        var [f, data] = p;
+        elem.innerHTML = field;
+        render(elem, scope = {
+            model,
+            data,
+            error: null,
+            field: f
+        });
+        elem.oldValue = data[f.key];
+        elem.setAttribute("field", f.key);
+    }, false);
+    elem.setAttribute("field", '');
+    elem.renders = [function () {
+        if (!this.src) return;
+        var [f, data] = this.src;
+        if (!f || !data) return;
+        var v = data[f.key];
+        if (!this.checked) if (v === this.oldValue || isEmpty(this.oldValue) && isEmpty(v)) return;
+        this.checked = false;
+        this.setAttribute("dirty", '');
+        var error = valid(f, data);
+        if (error) {
+            this.setAttribute("error", error);
+            switch (error) {
+                case "empty":
+                    scope.error = `${f.name}是必填字段！`;
+                    break;
+            }
+        }
+        else {
+            this.removeAttribute('error');
+            scope.error = null;
+        }
+        this.oldValue = data[f.key];
+    }]
+    elem.removeAttribute("tabindex");
+    return elem;
 }

package/coms/zimoli/field.less

@@ -32,4 +32,23 @@
 
 .input {
     width: 100%;
+}
+
+.required {
+    color: #c24;
+    display: inline-block;
+}
+
+&.error,
+&[error] {
+    background: #f322;
+
+    model>* {
+        background: #f322;
+        border-color: #f32;
+        outline: 1px solid #f32;
+    }
+    .error{
+        color:#c32;
+    }
 }

package/coms/zimoli/form.js

@@ -2,5 +2,13 @@ function form(elem) {
     if (!elem) {
         elem = document.createElement("form");
     }
+    if (/form/i.test(elem.tagName)) {
+        on("submit")(elem, function (event) {
+            event.preventDefault();
+            var fields = elem.querySelectorAll(".field");
+            for (var f of fields) f.checked = true;
+            render.refresh();
+        });
+    }
     return elem;
 }

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/getTreeFromData.js

@@ -29,15 +29,21 @@ function getTreeFromData(array) {
     var tab = 0;
     var run = function (item, parent) {
         item.tab = tab;
-        var total = 0;
+        var count = 0, total = 0;
         item.parent = parent;
         item.root = root;
         if (item.length) {
             tab++;
-            item.forEach(item => total += run(item, parent));
+            for (var cx = 0, dx = item.length; cx < dx; cx++) {
+                var i = item[cx];
+                run(i, parent);
+                count += i.count || 1;
+                total += i.total;
+            }
             tab--;
         }
-        return item.total = total || 1;
+        item.total = total + item.length;
+        return item.count = count;
     };
     run(root);
     return root;

package/coms/zimoli/image.less

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