efront 3.4.5 → 3.5.1

package/apps/pivot/api.yml

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

package/apps/pivot/home/welcome.js

@@ -13,12 +13,12 @@ function main() {
             } catch { }
             target.removeAttribute('pending');
         },
-        logout() {
+        async logout() {
             data.setSource('authorization', null);
-            user.logout();
-            location.reload();
+            await user.Logout();
+            zimoli.switch();
+            zimoli();
         }
     });
-    console.log(page)
     return page;
 }

package/apps/pivot/main.js

@@ -1,6 +1,9 @@
 data.loadConfig("api.yml");
 user.loginPath = '/auth/login';
-// user.token = data.getSource('authorization');
+var token = data.getSource('authorization');
+if (token) {
+    user.login({});
+}
 setInterval(function () {
     var auth = data.getSource('authorization');
     if (!auth) return;

package/apps/pivot/main.less

@@ -0,0 +1,3 @@
+>:not([layer]) {
+    padding: 50px 10px 0;
+}

package/apps/pivot/menu.yml

@@ -1,3 +1,5 @@
 首页: /home/welcome
-工作台: /home/short
+共享目录管理: /share/list
+短链接: /home/short
+# 用户: /home/short
 # 用户列表: /user/list

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.html

@@ -0,0 +1 @@
+<table :src=[fields,data]></table>

package/apps/pivot/share/list.js

@@ -0,0 +1,36 @@
+var fields = refilm`
+路径/path
+挂载点/name
+`;
+var options = [
+    {
+        name: "删除",
+        do(e) {
+            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", { opt: 'list' }, a => {
+        if (a) return a.map(b => ({ path: b }));
+    });
+    renderWithDefaults(page, {
+        data: a,
+        fields: fields.concat({
+            name: "操作",
+            type: 'button',
+            options,
+        }),
+    });
+    console.log(a)
+    return page;
+}

package/coms/layer/glance.js

@@ -90,14 +90,14 @@ function main(mainPath, historyName = "") {
         var hook = function () {
             if (--index !== 0) return;
             if (leftPath) {
-                var page = zimoli.go(leftPath, null, leftLayer);
+                var page = zimoli.create(leftPath);
                 page.setAttribute('layer', 'left');
                 appendChild.replace(leftLayer, page);
                 leftLayer = page;
                 dragview({ page: layer, toLeft: layer.closeLeft, toRight: layer.openLeft, menu: leftLayer });
             }
             if (topPath) {
-                var page = zimoli.go(topPath, null, topLayer);
+                var page = zimoli.create(topPath);
                 page.setAttribute('layer', 'top');
                 appendChild.replace(topLayer, page);
                 topLayer = page;

package/coms/zimoli/alert.js

@@ -1,13 +1,14 @@
 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;
 styles.error = styles.danger = styles.red;
 styles.warn = styles.orange;
+styles.default = '#000';
 var alerts = [];
 var clean = Cleanup(alerts);
 var build = function () {
@@ -21,15 +22,15 @@ var build = function () {
 };
 var fontSize = 16;
 var singleHeight = fontSize * 3.125 | 0;
-var _text = function (color, parameters) {
+var _text = function (bgcolor, parameters) {
     var box = div();
     css(box, `top:${fromPixel(alerts.length ? Math.max.apply(Math, alerts.map(e => e.offsetTop + e.children[0].offsetHeight)) : 0)};height:0;line-height:${fromPixel(singleHeight - 20)};left:0;right:0;font-size:${fromPixel(fontSize)}; transition: all 0.2s ease-out;position:absolute;color:#fff;text-align:center;`);
-    box.innerHTML = `<div style='width: 720px;white-space:pre-wrap;max-width:100%;display:inline-block;height:auto;padding:${fromPixel(10)} ${fromPixel(20)};background-color:${color};'>${[].slice.call(parameters, 0).join(", ")}</div>`;
+    box.innerHTML = `<div style='width: 720px;white-space:pre-wrap;max-width:100%;display:inline-block;height:auto;padding:${fromPixel(10)} ${fromPixel(20)};background-color:${bgcolor};color:${color.pair(bgcolor)};'>${[].slice.call(parameters, 0).join(", ")}</div>`;
     box.initialStyle = `margin:-${fromPixel(singleHeight)} auto;opacity:0;`;
     return box;
 };
 function alert() {
-    var color = String(this), text, autoclose = true, onclose;
+    var color = String(isString(this) && this || styles.default), text, autoclose = true, onclose;
     var color_reg = /^#(?:\w{6}|\w{3})$/;
     [].map.call(arguments, function (arg) {
         switch (typeof arg) {

package/coms/zimoli/appendChild.js

@@ -116,6 +116,7 @@ appendChild.insert = function (parent, element, relative = parent.childNodes[0]
     }
 };
 appendChild.replace = function (alreadyMounted, element) {
+    if (alreadyMounted === element) return;
     if (!alreadyMounted || !alreadyMounted.parentNode) return;
     insertBefore(alreadyMounted, element);
     remove(alreadyMounted);

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/checker.html

@@ -1 +1 @@
-▢<s>✓</s>
+<s>✓</s>

package/coms/zimoli/checker.less

@@ -1,13 +1,15 @@
 & {
-    height: 1em;
-    width: 1em;
+    height: .8em;
+    width: .8em;
     position: relative;
-    margin-right: 4px;
+    border: .1em solid;
+    margin-right: .3em;
     font-family: sans-serif;
     display: inline-block;
     line-height: 1;
     text-align: center;
-    padding-top: 1%;
+    margin-top: .15em;
+    border-radius: .12em;
     vertical-align: middle;
 
     >s {
@@ -17,13 +19,13 @@
         font-weight: bold;
         left: 0;
         right: 0;
-        top: -.15em;
+        top: -.4em;
     }
 }
 
 
 &.checked {
     >s {
-        display: inline;
+        display: block;
     }
 }

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/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();