efront 3.5.0 → 3.5.4

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

@@ -86,6 +86,16 @@ var bindTarget = function (index, element) {
 };
 
 var hooka = function (matcher, move, event, targetChild, isMovingSource) {
+    var dragbox = this.dragbox;
+    if (dragbox instanceof Function) {
+        dragbox = dragbox.call(this);
+        if (dragbox && !getTargetIn(dragbox, event.target)) return;
+    }
+    else {
+        dragbox = this;
+    }
+    var that = this;
+
     var draggingSourceOpacity = isMovingSource !== false ? 0 : 1;
 
     var recover = function (element) {
@@ -130,41 +140,89 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
     }
     var targetBox, saved_opacity, saved_filter, moveMargin, moveChildren;
     var previousElements, followedElements, rebuildTargets, scroll;
-    if (getTargetIn(this, targetChild)) {
-        targetBox = targetChild.parentNode;
-        previousElements = getPreviousElementSiblings(targetChild);
-        followedElements = getFollowedElementSiblings(targetChild);
-        saved_filter = targetBox.style.filter;
-        saved_opacity = targetBox.style.opacity;
-        rebuildTargets = function () { };
-        [moveMargin, moveChildren, scroll] = getMoveFuncs(targetChild);
-        moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
-    } else {
-        previousElements = [];
-        followedElements = [];
-        moveChildren = () => { };
-        rebuildTargets = function () {
-            var temp = matcher(drag.target);
-            if (temp === targetBox) return;
-            if (previousElements) previousElements.map(recover);
-            if (followedElements) followedElements.map(recover);
-            if (targetBox) {
-                removeClass(targetBox, "dropping");
-            }
-            targetBox = temp;
-            if (!targetBox) {
-                previousElements = [];
+    var that = this;
+    var draginit = function () {
+        that.setAttribute('dragchildren', '');
+        if (targetBox) addClass(targetBox, 'dropping');
+        if (getTargetIn(dragbox, targetChild)) {
+            targetBox = targetChild.parentNode;
+            previousElements = getPreviousElementSiblings(targetChild);
+            followedElements = getFollowedElementSiblings(targetChild);
+            saved_filter = targetBox.style.filter;
+            saved_opacity = targetBox.style.opacity;
+            rebuildTargets = function () { };
+            [moveMargin, moveChildren, scroll] = getMoveFuncs(targetChild);
+            moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
+        } else {
+            previousElements = [];
+            followedElements = [];
+            moveChildren = () => { };
+            rebuildTargets = function () {
+                var temp = matcher(drag.target);
+                if (temp === targetBox) return;
+                if (previousElements) previousElements.map(recover);
+                if (followedElements) followedElements.map(recover);
+                if (targetBox) {
+                    removeClass(targetBox, "dropping");
+                }
+                targetBox = temp;
+                if (!targetBox) {
+                    previousElements = [];
+                    followedElements = [];
+                    moveChildren = () => { };
+                    return;
+                }
+                addClass(targetBox, "dropping");
+                previousElements = [].slice.call(targetBox.children, 0).reverse();
                 followedElements = [];
-                moveChildren = () => { };
-                return;
+                [moveMargin, moveChildren, scroll] = getMoveFuncs(previousElements[0]);
+                moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
+            };
+        }
+    };
+    var dragfire = function () {
+        that.removeAttribute('dragchildren');
+        removeClass(targetBox, "dropping");
+        var dst, appendSibling, delta;
+        var src = previousElements.length;
+        if (previousElements.length && previousElements[0].moved) for (var cx = 1, dx = previousElements.length + 1; cx < dx; cx++) {
+            if (!previousElements[cx]) {
+                dst = 0;
+                delta = 0;
+                appendSibling = appendChild.before;
+            } else if (!previousElements[cx].moved) {
+                dst = previousElements.length - cx;
+                delta = -1;
+                appendSibling = appendChild.after;
+                break;
             }
-            addClass(targetBox, "dropping");
-            previousElements = [].slice.call(targetBox.children, 0).reverse();
-            followedElements = [];
-            [moveMargin, moveChildren, scroll] = getMoveFuncs(previousElements[0]);
-            moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
-        };
-    }
+        }
+
+        if (followedElements.length && followedElements[0].moved) for (var cx = 1, dx = followedElements.length + 1; cx < dx; cx++) {
+            if (!followedElements[cx]) {
+                dst = followedElements.length + previousElements.length;
+                delta = 0;
+                appendSibling = appendChild.after;
+            } else if (!followedElements[cx].moved) {
+                dst = previousElements.length + cx;
+                delta = 1;
+                appendSibling = appendChild.before;
+                break;
+            }
+        }
+        if (appendSibling) {
+            var children = targetBox.children;
+            var srcElement = children[src];
+            var dstElement = children[dst + delta];
+            src = bindTarget(src, srcElement);
+            dst = bindTarget(dst, dstElement);
+            isFunction(move) && move(src, dst, dst + delta, appendSibling, targetBox);
+            if (srcElement === children[src] && dstElement === children[dst + delta] && srcElement && dstElement) appendSibling(dstElement, srcElement);
+        } else if (isMovingSource === false) {
+            move(previousElements.length, previousElements.length, previousElements.length, null, targetBox);
+        }
+    };
+
     var offall = function () {
         offmousup();
         offtouchend();
@@ -190,8 +248,8 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
 
     // 修改margin无效的情况
     function dragclone() {
+        draginit();
         rebuildTargets();
-        if (targetBox) addClass(targetBox, 'dropping');
         var _previousElements = previousElements.map(cloneCell);
         var _followedElements = followedElements.map(cloneCell);
         previousElements.splice(0, previousElements.length);
@@ -204,109 +262,33 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
         var offall = function () {
             offdragmove();
             offdragend();
-            removeClass(targetBox, "dropping");
         };
         var offdragend = on("dragend")(targetChild, function () {
             offall();
+            dragfire();
             css(targetBox, { opacity: saved_opacity, filter: saved_filter });
             remove(previousElements);
             remove(followedElements);
-            var dst, appendSibling, delta;
-            var src = previousElements.length;
-            if (previousElements.length && previousElements[0].moved) for (var cx = 1, dx = previousElements.length + 1; cx < dx; cx++) {
-                if (!previousElements[cx]) {
-                    dst = 0;
-                    delta = 0;
-                    appendSibling = appendChild.before;
-                } else if (!previousElements[cx].moved) {
-                    dst = previousElements.length - cx;
-                    delta = -1;
-                    appendSibling = appendChild.after;
-                    break;
-                }
-            }
-
-            if (followedElements.length && followedElements[0].moved) for (var cx = 1, dx = followedElements.length + 1; cx < dx; cx++) {
-                if (!followedElements[cx]) {
-                    dst = followedElements.length + previousElements.length;
-                    delta = 0;
-                    appendSibling = appendChild.after;
-                } else if (!followedElements[cx].moved) {
-                    dst = previousElements.length + cx;
-                    delta = 1;
-                    appendSibling = appendChild.before;
-                    break;
-                }
-            }
             previousElements.map(recover);
             followedElements.map(recover);
-            if (appendSibling) {
-                var children = targetBox.children;
-                var srcElement = children[src];
-                var dstElement = children[dst + delta];
-                src = bindTarget(src, srcElement);
-                dst = bindTarget(dst, dstElement);
-                isFunction(move) && move(src, dst, dst + delta, appendSibling, targetBox);
-                if (srcElement === children[src] && dstElement === children[dst + delta] && srcElement && dstElement) appendSibling(dstElement, srcElement);
-            } else if (isMovingSource === false) {
-                move(previousElements.length, previousElements.length, previousElements.length, null, targetBox);
-            }
         });
         var offdragmove = on("dragmove")(targetChild, dragmove);
     }
     // 仅修改Margin就可以实现拖拽效果
     function draglist() {
+        draginit();
         rebuildTargets();
-        if (targetBox) addClass(targetBox, 'dropping');
         autoScroll();
         var offall = function () {
             cancelScroll();
             offdragmove();
             offdragend();
-            if (targetBox) removeClass(targetBox, "dropping");
         };
         var offdragend = on("dragend")(targetChild, function () {
             offall();
-            var dst, appendSibling, delta;
-            var src = previousElements.length;
-            if (previousElements.length && previousElements[0].moved) for (var cx = 1, dx = previousElements.length + 1; cx < dx; cx++) {
-                if (!previousElements[cx]) {
-                    dst = 0;
-                    delta = 0;
-                    appendSibling = appendChild.before;
-                } else if (!previousElements[cx].moved) {
-                    dst = previousElements.length - cx;
-                    delta = -1;
-                    appendSibling = appendChild.after;
-                    break;
-                }
-            }
-
-            if (followedElements.length && followedElements[0].moved) for (var cx = 1, dx = followedElements.length + 1; cx < dx; cx++) {
-                if (!followedElements[cx]) {
-                    dst = followedElements.length + previousElements.length;
-                    delta = 0;
-                    appendSibling = appendChild.after;
-                } else if (!followedElements[cx].moved) {
-                    dst = previousElements.length + cx;
-                    delta = 1;
-                    appendSibling = appendChild.before;
-                    break;
-                }
-            }
+            dragfire();
             previousElements.map(e => moveMargin(e, false));
             followedElements.map(e => moveMargin(e, false));
-            if (appendSibling) {
-                var children = targetBox.children;
-                var srcElement = children[src];
-                var dstElement = children[dst + delta];
-                src = bindTarget(src, srcElement);
-                dst = bindTarget(dst, dstElement);
-                isFunction(move) && move(src, dst, dst + delta, appendSibling, targetBox);
-                if (srcElement === children[src] && dstElement === children[dst + delta] && srcElement && dstElement) appendSibling(dstElement, srcElement);
-            } else if (isMovingSource === false) {
-                move(previousElements.length, previousElements.length, previousElements.length, null, targetBox);
-            }
         });
         var offdragmove = on("dragmove")(targetChild, dragmove);
     }
@@ -320,9 +302,7 @@ var hookEvent = function (matcher, move, event) {
     if (event.target === this) return;
     var targetChild = getTargetIn(matcher, event.target, false);
     if (!targetChild) return;
-    var dragbox = this.dragbox;
-    if (dragbox instanceof Function) dragbox = dragbox.call(this);
-    hooka.call(dragbox || this, matcher, move, event, targetChild);
+    hooka.call(this, matcher, move, event, targetChild);
 };
 function addhook() {
     var mousedownEvent, targetElement, callback, matcher, dropid, allowdrops;

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,