efront 3.5.0 → 3.5.1

package/apps/pivot/api.yml

@@ -1,4 +1,4 @@
 ./aapi/ authorization: 
   login: options /::login-:a
   run: options /:::run
-  share: options /::share
+  share: options /::share-:opt

package/apps/pivot/share/edit.html

@@ -0,0 +1,10 @@
+<div head>修改</div>
+<div body>
+    <form>
+        <field -repeat="f in fields" -src="[f,data]"></field>
+    </form>
+</div>
+<div foot>
+    <button white @click="close()">取消</button>
+    <button @click="save()"> 保存 </button>
+</div>

package/apps/pivot/share/edit.js

@@ -0,0 +1,16 @@
+function main({ fields, item }) {
+    var page = view();
+    page.innerHTML = edit;
+    renderWithDefaults(page, {
+        fields,
+        close() {
+            return remove(page);
+        },
+        save() {
+            return data.from("share", { opt: item ? 'update' : 'create', data: this.data }).loading_promise;
+        },
+        data: Object.assign({}, item)
+    });
+    drag.on(page.firstChild, page);
+    return page;
+}

package/apps/pivot/share/list.js

@@ -1,23 +1,35 @@
 var fields = refilm`
 路径/path
-操作 btn ${[{
+挂载点/name
+`;
+var options = [
+    {
         name: "删除",
         do(e) {
-            console.log(e)
-            alert("暂不支持删除！");
+            data.from('share', { opt: 'delete', item: e });
         }
-    }]}
-`;
+    },
+    {
+        name: "修改",
+        do(e) {
+            popup('/share/edit', { fields, item: e });
+        }
+    }
+];
 console.log(fields)
 function main() {
     var page = div();
     page.innerHTML = list;
-    var a = data.from("share", a => {
+    var a = data.from("share", { opt: 'list' }, a => {
         if (a) return a.map(b => ({ path: b }));
     });
     renderWithDefaults(page, {
         data: a,
-        fields,
+        fields: fields.concat({
+            name: "操作",
+            type: 'button',
+            options,
+        }),
     });
     console.log(a)
     return page;

package/coms/zimoli/alert.js

@@ -1,8 +1,8 @@
 var styles = {
-    blue: "#2a53cd",
+    blue: "#2a83cd",
     green: "#228B22",
-    orange: "#dd6a16",
-    red: "#dc352e"
+    orange: "#fdca86",
+    red: "#cc352e"
 };
 styles.success = styles.pass = styles.green;
 styles.info = styles.blue;

package/coms/zimoli/button.js

@@ -95,6 +95,11 @@ function button(texter, type) {
         if (_texter.tagName) {
             var button = _texter;
             if (button.childNodes.length) {
+                if (button.childNodes.length === 1 && button.childNodes[0].nodeType !== 1) {
+                    _texter = createElement(_label);
+                    _texter.appendChild(button.childNodes[0]);
+                    button.appendChild(_texter);
+                }
                 appendChild.before(button.childNodes[0], tracker);
             } else {
                 appendChild(button, tracker);

package/coms/zimoli/button.less

@@ -18,7 +18,9 @@
     overflow: hidden;
     outline: none;
 }
-
+>.label{
+    position: relative;
+}
 
 @keyframes busy-loading {
     0% {
@@ -139,9 +141,11 @@
         margin-left: -2px;
         height: 200%;
         background: #fff9;
+        background: inherit;
+        opacity: 0.9;
         border-left: 1px #fff3 solid;
         border-right: 3px #fff6 solid;
-        animation: ltr 3s linear 1s infinite;
+        animation: ltr 2s linear 0s infinite;
     }
 
 }

package/coms/zimoli/color.js

@@ -3,61 +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) || 1);
+	s = s * 255 / (max(r, g, b) || 1);
 	if (s) {
 		r *= s;
 		g *= s;
@@ -70,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) {
@@ -226,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) {
@@ -274,10 +315,10 @@ var colorDesigner = {
 	contrast: 1
 };
 var rgb2v = function (r, g, b) {
-	r *= .299;
-	g *= .587;
-	b *= .114;
-	return Math.max(r, g, b) / .587;
+	r *= v_r;
+	g *= v_g;
+	b *= v_b;
+	return r + g + b;
 };
 var v2rgb = function (v, r, g, b) {
 	var t = r + g + b || 1;
@@ -321,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

@@ -543,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);
                     }
@@ -612,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/getGenerator.js

@@ -1,7 +1,12 @@
 
 var _slider = createElement(div);
+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')) {
@@ -21,7 +26,7 @@ var getGenerator = function (container) {
     container.insertBefore = _slider.insertBefore;
     container.appendChild = _slider.appendChild;
     var scopes = container.$parentScopes.concat(container.$scope);
-    return function (index, com) {
+    return container.$generator = function (index, com) {
         if (!com) {
             if (!container.src || index >= container.src.length) return;
             com = container.src[index];

package/coms/zimoli/image.less

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

package/coms/zimoli/menu.js

@@ -155,6 +155,7 @@ function main(elem, mode) {
                     active(elem, item, item.value);
                 };
                 if ("$src" in elem) {
+                    getGenerator(elem);
                     care(elem, function (src) {
                         menuList(elem, getTreeFromData(src), emit, direction);
                     });

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;

package/coms/zimoli/render.js

@@ -55,7 +55,7 @@ var variableReg = /([^\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\s]|\?\s*\.(?=[^\d])
 var createGetter = function (search, isprop = true) {
     var [withContext, searchContext] = search;
     if (!searchContext) return function () { };
-    var ret = /\;|(\d\.|[^\{\.\+\:\?\-\=\*\/\?\\,~!<>%\^&\}\s])\s*([\r\n\u2028\u2029])\s*(\.\d|[^\.\+\-\=\*\/\?\\,~!<>%\^&\[\}\(\?\:\s])/.test(searchContext) ? "" : "return ";
+    var ret = /\;/.test(searchContext) ? "" : "return ";
     if (/\?\s*\.(?=[^\d])/.test(searchContext)) {
         searchContext = searchContext.replace(variableReg, function (context) {
             var dist;
@@ -384,7 +384,7 @@ var src2 = function (search) {
             temp = "";
         }
         var changes = getChanges(temp, savedValue);
-        if (!changes) return;
+        if (!changes || isEmpty(origin) && isEmpty(this.src)) return;
         savedValue = temp;
         this.src = origin;
         cast(this, origin);
@@ -537,6 +537,7 @@ var emiters = {
             var res = getter.call(this, e);
             if (res && isFunction(res.then)) res.then(digest, digest);
             digest();
+            return res;
         });
     },
     once(key, search) {
@@ -545,6 +546,7 @@ var emiters = {
             var res = getter.call(this, e);
             if (res && isFunction(res.then)) res.then(digest, digest);
             digest();
+            return res;
         });
     }
 };

package/coms/zimoli/table.html

@@ -8,7 +8,7 @@
     <tr>
         <td -repeat="f in fields">
             <span -if="f.key" -text="d[f.key]"></span>
-            <a on-click="o.do(d)" -if="f.type==='btn'" -repeat="o in f.options">
+            <a on-click="o.do(d)" -if="f.options" -repeat="o in f.options">
                 <span -text=o.name></span>
             </a>
         </td>

package/coms/zimoli/table.js

@@ -142,6 +142,7 @@ function table(elem) {
     var cellMatchManager = function (element) {
         if (!thead) [thead] = table.getElementsByTagName("thead");
         if (table.resizing) return false;
+        if (!getTargetIn(thead, element)) return false;
         if (!tdElementReg.test(element.tagName)) return false;
         var savedRowDeltas = [];
         [].map.call(thead.children, function (tr) {

package/coms/zimoli/table.less

@@ -1,13 +1,14 @@
-&.dragging {
-    box-shadow: 0 0 20px -6px #00000033;
-
+& {
+    
     >thead,
     >tbody,
     & {
         >tr {
-
+            
             >th,
-            >td {}
+            >td {
+                box-shadow: 0 0 20px -6px #00000033;
+            }
         }
     }
 }
@@ -17,10 +18,15 @@ tbody,
 th,
 td,
 tr,
-table {
+table,
+& {
     box-sizing: border-box;
 }
 
+& {
+    outline: 1px solid #0006;
+}
+
 .y-ing {
     &:before {
         content: "";
@@ -78,7 +84,7 @@ table {
             position: relative;
         }
 
-        &:nth-child(even) {
+        &:nth-of-type(even) {
 
             >td,
             >th {
@@ -86,7 +92,7 @@ table {
             }
         }
 
-        &:nth-child(odd) {
+        &:nth-of-type(odd) {
 
             >td,
             >th {
@@ -103,7 +109,8 @@ table {
         }
     }
 }
-.button{
+
+.button {
     margin-right: 10px;
     vertical-align: middle;
     display: inline-block;

package/coms/zimoli/view.less

@@ -22,7 +22,8 @@ body>& {
 
 &>.body,
 >[body] {
-    padding: 6px 0;
+    padding: 6px 20px 6px 6px;
+    margin-right: -20px;
     background: #f2f4f6;
     display: block;
     width: auto;
@@ -109,14 +110,14 @@ body>& {
 }
 
 .button {
-    min-width: 60px;
     vertical-align: middle;
-    margin-right: 10px;
 }
 
 >.foot,
 >[foot] {
     .button {
+        min-width: 60px;
         padding: 0 20px;
+        margin-right: 10px;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {