efront 3.7.5 → 3.7.9

package/apps/kugou/api.js

@@ -12,7 +12,7 @@
         "singer-list": "get:[].singer-img-list>li         singer/list/:id#href=a!href&=a!href\\singer-info&imgurl=img!_src&name=p|innerText",
         "singer-info": "mget:[].singer-songs-list>li       singer/info/:id#hash=!id&singer=.singer-name|innerText&name=.song-name|innerText&data=em/innerText"
     },
-    "https://mobilecdn.kugou.com/": {
+    "http://mobilecdn.kugou.com/": {
         "search?keyword": "get:data.info                            api/v3/search/song?format=json&page=1&pagesize=30&showtype=1"
     }
 })

package/apps/kugou/index.html

@@ -17,6 +17,9 @@
     <script>
         cross_host = 'efront.cc';
     </script>
+    <script deleteoncompile>
+        cross_host = '';
+    </script>
     <style>
         *,
         ::before,

package/apps/pivot/api.yml

@@ -4,5 +4,5 @@
   share: options ::share-:opt?:path
   folder: options ::file-:opt:::path?:to
   cluster: options ::cluster-:opt?:id
-  private-list: options ::private
-  private-edit: options ::private-:key?:value
+  list: options :::type
+  edit: options :::type-:key?:value

package/apps/pivot/auth/login.js

@@ -4,7 +4,6 @@ var fields = refilm`
 服务器地址/host* select?a ${hosts}
 密码/password* password
 `;
-console.log(fields)
 function main() {
     var page = view();
     page.innerHTML = login;

package/apps/pivot/link/list.html

@@ -1,5 +1,5 @@
 <div class="clusters">
-    <a -repeat="(c,i) in clusters" @click="active(i)">
+    <a -repeat="(c,i) in clusters" ng-class="{current:i===index}" @click="active(i,c)">
         <span -text="c"></span>
     </a>
 </div>
@@ -7,6 +7,6 @@
     <padding>
         <span -text=c.id></span>
         <span class="time" -text=filterTime(c.optime)></span>
-        
+
     </padding>
 </lattice>

package/apps/pivot/link/list.js

@@ -3,21 +3,21 @@ function main() {
     page.innerHTML = template;
     renderWithDefaults(page, {
         async load() {
-            var cs = this.clusters = data.from("cluster", { opt: "list" });
-            await cs.loading_promise;
+            this.clusters = data.from("cluster", { opt: "list" });
+            await this.clusters;
             this.active();
         },
-        index: 0,
+        index: data.getInstance("index").index || 0,
         clusters: [],
         filterTime(d) {
             return ((new Date - d) / 1000 | 0) + "秒";
         },
         clients: [],
-        async active() {
-            var index = this.index;
+        active(index = this.index) {
+            data.setInstance('index', { index });
             var clusters = this.clusters;
             if (index >= clusters.length) index = clusters.length - 1;
-            this.clients = data.lazyInstance("cluster", { opt: "list", id: clusters[index] });
+            this.clients = data.from("cluster", { opt: "list", id: clusters[index] });
         },
     });
     page.$scope.load();

package/apps/pivot/link/list.less

@@ -6,4 +6,9 @@
 
 .time {
     color: #bbb;
+}
+
+.button.current {
+    background: #28c;
+    color: #fff;
 }

package/apps/pivot/menu.yml

@@ -1,7 +1,11 @@
 首页: /home/welcome
-共享目录管理: /share/list
-短链接: /home/short
-WEB文件管理: /wow/root
-长连接管理: /link/list
-密钥管理: /token/list
+WEB:
+  共享目录: /share/list
+  短链接: /home/short
+  文件管理: /wow/root
+  长连接管理: /link/list
+任务:
+  密钥管理: /token/list
+  任务建立: /task/list
+  定期执行: /tick/list
 # 用户列表: /user/list

package/apps/pivot/task/edit.js

@@ -0,0 +1 @@
+pedit.bind(null, "任务", "task");

package/apps/pivot/task/list.js

@@ -0,0 +1,6 @@
+plist.bind(null, '任务管理', "task", refilm`
+*任务ID/key 100
+*任务名/name 100
+*启用/status swap [关闭,开启]
+任务代码/code text
+`, '/task/edit');

package/apps/pivot/tick/list.js

@@ -0,0 +1,5 @@
+function main() {
+    var a = div();
+    a.innerHTML = "定时任务管理，敬请期待";
+    return a;
+}

package/apps/pivot/token/edit.js

@@ -1,10 +1 @@
-frame$edit.bind(null, "密钥", {
-    submit(a, fields) {
-        a = submit(fields, a);
-        return data.from("private-edit", {
-            key: encode62.timeencode(a.key),
-            value: encode62.timeencode(JSON.stringify(a)),
-        }).loading_promise;
-    },
-
-});
+pedit.bind(null, "密钥", "private");

package/apps/pivot/token/list.js

@@ -1,13 +1,6 @@
-frame$list.bind(null, "密钥管理", {
-    load() {
-        return data.from("private-list", a => JSAM.parse(encode62.timedecode(a)));
-    },
-    remove(o) {
-        return data.from("private-edit", { key: encode62.timeencode(o.key), value: encode62.timeencode("") }).loading_promise;
-    },
-    fields: refilm`
+plist.bind(null, '密钥管理', "private", refilm`
 *键名/key 100
 显示名/name input/300
 密钥/value text/100
 备注/comment text/200
-`}, "/token/edit");
+`, "/token/edit");

package/coms/crypt/encode62.js

@@ -79,7 +79,7 @@ Object.assign(encode62, {
         for (var cx = 0, dx = data.length; cx < dx; cx++) {
             if (result[cx] < 128) result[cx] = result[cx] ^ sign[cx % sign.length];
             else if (result[cx] < 192) {
-                var c = c << 8 | sign[(delta += 6) / 8 | 0];
+                var c = c << 8 | sign[(delta += 6) / 8 % sign.length | 0];
                 result[cx] = result[cx] ^ (c >> 8 - delta % 8 & 0x3f);
             }
         }

package/coms/frame/list.js

@@ -1,4 +1,4 @@
-function main(title, { fields, load, remove }, edit_ref) {
+function main(title, { fields, options: options0, load, remove }, edit_ref) {
     prepare(edit_ref);
     var page = document.createElement("div");
     var edit = function (o) {
@@ -11,6 +11,40 @@ function main(title, { fields, load, remove }, edit_ref) {
         })
     };
     page.innerHTML = template;
+    var options = [
+        {
+            name: "修改",
+            do(o) {
+                edit(o);
+            },
+        },
+        {
+            type: "danger",
+            name(o) {
+                return this.confirm === o ? "确认删除" : "删除";
+            },
+            type(o) {
+                return this.confirm === o ? "dark" : "danger";
+            },
+            confirm: false,
+            timer: 0,
+            async do(o) {
+                if (this.confirm !== o) {
+                    this.confirm = o;
+                    clearTimeout(this.timer);
+                    var that = this;
+                    this.timer = setTimeout(function () {
+                        that.confirm = null;
+                        render.refresh();
+                    }, 2000);
+                    return;
+                }
+                await remove(o);
+                page.$scope.load();
+            }
+        }
+    ];
+    if (options0) options = options.concat(options0);
     renderWithDefaults(page, {
         title,
         load() {
@@ -18,39 +52,7 @@ function main(title, { fields, load, remove }, edit_ref) {
         },
         fields: fields.concat({
             name: "操作",
-            options: [
-                {
-                    name: "修改",
-                    do(o) {
-                        edit(o);
-                    },
-                },
-                {
-                    type: "danger",
-                    name(o) {
-                        return this.confirm === o ? "确认删除" : "删除";
-                    },
-                    type(o) {
-                        return this.confirm === o ? "dark" : "danger";
-                    },
-                    confirm: false,
-                    timer: 0,
-                    async do(o) {
-                        if (this.confirm !== o) {
-                            this.confirm = o;
-                            clearTimeout(this.timer);
-                            var that = this;
-                            this.timer = setTimeout(function () {
-                                that.confirm = null;
-                                render.refresh();
-                            }, 2000);
-                            return;
-                        }
-                        await remove(o);
-                        page.$scope.load();
-                    }
-                }
-            ]
+            options
         }),
         data: [],
         add() {

package/coms/frame/list.less

@@ -10,7 +10,9 @@ btn {
 table {
 
     td {
-        >span {
+
+        >span,
+        >model {
             white-space: normal;
             word-break: break-all;
             overflow: hidden;

package/coms/kugou/buildScroll.less

@@ -7,6 +7,9 @@
     top: 0;
     height: auto;
 }
+&+.titlebar>back{
+    height: 44px;
+}
 
 >png {
     width: 100%;

package/coms/pivot/pedit.js

@@ -0,0 +1,13 @@
+function main(title, type, params) {
+    return frame$edit(title, {
+        submit(a, fields) {
+            a = submit(fields, a);
+            return data.from("edit", {
+                type,
+                key: encode62.timeencode(a.key),
+                value: encode62.timeencode(JSON.stringify(a)),
+            }).loading_promise;
+        },
+
+    }, params);
+}

package/coms/pivot/plist.js

@@ -0,0 +1,13 @@
+
+function main(title, type, fields, edit_ref, options) {
+    return frame$list(title, {
+        load() {
+            return data.from("list", { type }, a => JSAM.parse(encode62.timedecode(a)));
+        },
+        remove(o) {
+            return data.from("edit", { type, key: encode62.timeencode(o.key), value: encode62.timeencode("") }).loading_promise;
+        },
+        fields,
+        options,
+    }, edit_ref);
+}

package/coms/zimoli/LoadingArray.js

@@ -0,0 +1,27 @@
+// class LoadingArray extends Array {
+//     totalCount = 0;
+//     data = [];
+//     is_errored = null;
+//     error_message = null;
+//     is_loading = true;
+//     is_loaded = false;
+//     is_readonly = null;
+//     loading = null;
+//     loading_promise = null;
+//     then (ok, oh) {
+//         if (this.loading_promise) this.loading_promise.then(ok, oh);
+//     }
+// }
+function LoadingArray() {
+    var this0 = [];
+    this0.totalCount = 0;
+    this0.data = [];
+    this0.is_errored = null;
+    this0.error_message = null;
+    this0.is_loading = true;
+    this0.is_loaded = false;
+    this0.is_readonly = null;
+    this0.loading = null;
+    this0.loading_promise = null;
+    return this0;
+};

package/coms/zimoli/bggrid-func.less

@@ -0,0 +1,16 @@
+.grid() {
+    @mask-color1 : rgba(255, 255, 255, .6);
+    @mask-color2 : rgba(0, 0, 0, 0);
+    @mask-color3 : rgba(0, 0, 0, .1);
+    background-image:
+        linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),
+        linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),
+        linear-gradient(45deg, @mask-color3, 25%, @mask-color3, 25%, @mask-color2, 75%, @mask-color3, 75%, @mask-color3),
+        linear-gradient(45deg, @mask-color3, 25%, @mask-color3, 25%, @mask-color2, 75%, @mask-color3, 75%, @mask-color3);
+    background-size: 20px 20px;
+    background-position: 0 0, 10px 10px, 10px 0, 0 10px;
+    background-repeat: repeat;
+    background-clip: border-box;
+    background-color: #fff;
+
+}

package/coms/zimoli/color.js

@@ -215,14 +215,24 @@ function hsl2rgb([h, s, l]) {
 	var b = h - 1 / 3;
 	return [r, g, b].map(t => t2rgb(t, p, q));
 }
+function percent(a) {
+	if (/%$/.test(a)) {
+		a = a.replace(/%$/, '') / 100;
+	}
+	return +a;
+}
 function parse(color) {
 	if (hslReg.test(color)) {
 		var [_, H, S, L, a] = hslReg.exec(color);
+		H = parseFloat(H);
+		S = percent(S);
+		L = percent(L);
+		a = percent(a);
 		[R, G, B] = hsl2rgb([H, S, L]);
 		return [R, G, B, a || 1];
 	} else if (rgbReg.test(color)) {
 		var [_, R, G, B, a] = rgbReg.exec(color);
-		return [R > 255 ? 255 : R, G > 255 ? 255 : G, B > 255 ? 255 : B, a || 1];
+		return [R > 255 ? 255 : +R, G > 255 ? 255 : +G, B > 255 ? 255 : +B, a ? +a : 1];
 	} else if (rgbHex.test(color)) {
 		var [_, R, G, B, A] = rgbHex.exec(color).map(a => parseInt(a + a, 16));
 		return [R, G, B, A >= 0 ? A / 0xff : 1];
@@ -234,6 +244,10 @@ function parse(color) {
 function stringify(color) {
 	var [R, G, B, a] = color;
 	if (a >= 0 && a < 1) {
+		R = R.toFixed();
+		G = G.toFixed();
+		B = B.toFixed();
+		a = +a.toFixed(3);
 		return `rgba(${R},${G},${B},${a})`;
 	} else {
 		return "#" + [R, G, B].map(hex256).join("");
@@ -291,12 +305,12 @@ function equal(c1, c2) {
 	var [r2, g2, b2, a2] = parse(c2);
 	return abs(r1 - r2) < 1 && abs(g1 - g2) < 1 && abs(b1 - b2) < 1 && abs(a1 - a2) < .01;
 }
-var hslReg = /^hsla?\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)(?:,\s*([\d\.]+))?\)$/i;
-var rgbReg = /^rgba?\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)(?:,\s*([\d\.]+))?\)$/i;
+var hslReg = /^hsla?\s*\(\s*([\d\.]+(?:deg)?)\s*[,\s]\s*([\d\.]+%?)\s*[,\s]\s*([\d\.]+%?)(?:[,\/\s]\s*([\d\.]+%?))?\)$/i;
+var rgbReg = /^rgba?\s*\(\s*([\d\.]+)\s*[,\s]\s*([\d\.]+)\s*[,\s]\s*([\d\.]+)(?:[,\s]\s*([\d\.]+))?\)$/i;
 var rgbHex = /^#([\da-f])([\da-f])([\da-f])([\da-f])?$/i;
 var rgbHex2 = /^#([\da-f]{2})([\da-f]{2})([\da-f]{2})([\da-f]{2})?$/i;
 var rotated_base_color = "#d16969";
-var colorReg = /rgba?\s*\([\,\.\d]+\)|#[\da-f]{3,8}/ig;
+var colorReg = /(?:rgb|hsl)a?\s*\([\,\.\d\s%]+\)|#[\da-f]{3,8}/ig;
 function isColor(text) {
 	return rgbReg.test(text) || rgbHex.test(text) || rgbHex2.test(text) || hslReg.test(text);
 }

package/coms/zimoli/colorlabel.js

@@ -1,6 +1,7 @@
 function main(elem = div()) {
-    care(elem, function (color) {
-        css(this, 'background', color);
+    care(elem, function (c) {
+        css(this, 'background-color', c);
+        css(this, 'color', color.pair(c));
     });
     return elem;
 }

package/coms/zimoli/colorlabel.less

@@ -1,7 +1,28 @@
 & {
-    width: 40px;
+    width: 180px;
     height: 20px;
-    background: #ccc;
     display: inline-block;
+    text-align: center;
+    font-size: 10px;
+    line-height: 20px;
+    position: relative;
+    .grid();
+    background-color: transparent;
 
-}
+    >option {
+        position: relative;
+    }
+
+    &:before {
+        position: absolute;
+        left: 0;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        content: "";
+        display: block;
+        background-color: inherit;
+    }
+}
+
+@import "./bggrid-func.less";

package/coms/zimoli/colorpad.html

@@ -7,6 +7,10 @@
     <canvas></canvas>
     <pointer tabindex="-1"></pointer>
 </div>
+<div class="opa">
+    <canvas></canvas>
+    <pointer tabindex="-1"></pointer>
+</div>
 <div class="val">
     <input class="hex" />
     <input class="rgb" />