efront 3.7.3 → 3.7.8

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,9 +1 @@
-frame$edit.bind(null, "密钥", {
-    submit(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`
-显示名/name input
-*键名/key
-密钥/value
-备注/comment
-`}, "/token/edit");
+plist.bind(null, '密钥管理', "private", refilm`
+*键名/key 100
+显示名/name input/300
+密钥/value text/100
+备注/comment text/200
+`, "/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/edit.js

@@ -18,7 +18,7 @@ function main(title, { submit }, { data: origin, fields, }) {
     });
     on('submit')(page, async function (e) {
         e.preventDefault();
-        await submit(item);
+        await submit(item, fields);
         dispatch(this, 'submited');
         remove(this);
     });

package/coms/frame/edit.less

@@ -0,0 +1,3 @@
+&{
+    width: 600px;
+}

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

@@ -1,3 +1,25 @@
-btn{
+btn {
     padding: 0 16px;
+}
+
+& {
+    height: 100%;
+    overflow: auto;
+}
+
+table {
+
+    td {
+
+        >span,
+        >model {
+            white-space: normal;
+            word-break: break-all;
+            overflow: hidden;
+            display: -webkit-box;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+            text-overflow: ellipsis;
+        }
+    }
 }

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

@@ -155,6 +155,7 @@ function getUrlParamsForApi(api, url) {
             cap.push(a.slice(1));
             return r;
         });
+    if (api.base) base = api.base + base;
     var params = {};
     url = url.replace(/[\?#]*$/g, function (match) {
         match.split(/[&#\?]+/).forEach(function (s) {
@@ -402,6 +403,12 @@ function createApiMap(data) {
 }
 var _configfileurl;
 var configPormise;
+function LoadingArray_then(ok, oh) {
+    if (this.loading_promise) this.loading_promise.then(ok, oh);
+    else if (this.is_errored) oh(this.error_message);
+    else ok();
+}
+
 var privates = {
     loadAfterConfig(serviceId, params) {
         var promise = this.getApi(serviceId).then((api) => {
@@ -622,6 +629,7 @@ var data = {
         if (isObject(response)) {
             response.is_loaded = true;
             response.is_loading = false;
+            if (response.then === LoadingArray_then) delete response.then;
         }
         this.loading_count--;
     },
@@ -630,6 +638,7 @@ var data = {
         if (isObject(response)) {
             response.is_loaded = false;
             response.is_loading = true;
+            response.then = LoadingArray_then;
         }
         this.loading_count++;
     },
@@ -836,7 +845,10 @@ 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);
+            let url = api.url;
+            var base = api.base;
+            if (base) url = base + api.path;
+            var { method, uri, params, selector } = privates.prepare(api.method, url, params);
             var promise = new Promise(function (ok, oh) {
                 var headers = api.headers;
                 if (headers) {

package/coms/zimoli/model.js

@@ -37,6 +37,17 @@ var renderModel = function (field, data) {
 var constructors = {
     input,
     raw: input,
+    swap(e) {
+        var { field } = e;
+        e = swap(e);
+        if (field.options) {
+            e.getValue = function () {
+                return field.options[+this.checked].value;
+            };
+        }
+        return e;
+    },
+    switch: swap,
     row: textarea,
     password,
     text: textarea,
@@ -134,8 +145,18 @@ var readonly_types = {
     "size"({ field }, data) {
         var f = data[field.key];
         return size(f);
-    }
+    },
+    swap(e, data) {
+        var { field } = e;
+        var v = data[field.key];
+        if (field.options) {
+            var o = field.options[v];
+            if (o) return o.name;
+        }
+        return v;
+    },
 };
+readonly_types.select = readonly_types.swap;
 function main(elem) {
     var build = function () {
         var { data, readonly, field } = elem;
@@ -222,7 +243,6 @@ function main(elem) {
         }
     };
     on("changes")(elem, function ({ changes }) {
-
         if (changes.data || changes.field || changes.readonly) {
             build();
         }

package/coms/zimoli/render.js

@@ -90,7 +90,7 @@ var initialComment = function (renders, type, expression) {
 var parseRepeat = function (expression) {
     var reg =
         // /////////////////////////////////////////// i //       r       /////////////////////////  o  ///// a ///////////////////// t /////
-        /^(?:let\b|var\b|const\b)?\s*(?:[\(\{\[]\s*)?(.+?)((?:\s*,\s*.+?)*)?(?:\s*[\)\}\]]\s*|\s+)(in|of)\s+(.+?)(\s+?:track\s*by\s+(.+?))?$/i;
+        /^(?:let\b|var\b|const\b)?\s*(?:[\(\{\[]\s*)?(.+?)((?:\s*,\s*.+?)*)?(?:\s*[\)\}\]]\s*|\s+)(in|of)\s+(.+?)(?:\s+track\s*by\s+(.+?))?$/i;
     var res = reg.exec(expression);
     if (!res) return res;
     var [_, i, k, r, s, t] = res;
@@ -125,7 +125,7 @@ var createRepeat = function (search, id = 0) {
     var [context, expression] = search;
     var res = parseRepeat(expression);
     if (!res) throw new Error(`不能识别循环表达式: ${expression} `);
-    var { keyName, itemName, indexName, srcName } = res;
+    var { keyName, itemName, indexName, srcName, trackBy } = res;
     // 懒渲染
     var getter = createGetter([context, srcName]).bind(this);
     var element = this, clonedElements = [], savedValue, savedOrigin;
@@ -151,17 +151,26 @@ var createRepeat = function (search, id = 0) {
         var clonedElements1 = Object.create(null);
         var cloned = keys.map(function (key, cx) {
             var k = isArrayResult ? cx : key;
-            var c = changes[k];
-            if (clonedElements[k]) if (!c || !isObject(c.previous) && !isObject(c.current)) return clonedElements1[k] = clonedElements[k];
-            var clone = element.cloneNode();
-            clone.innerHTML = element.innerHTML;
-            clone.renderid = id;
-            clone.$parentScopes = $parentScopes;
             var $scope = {
                 [keyName || '$key']: k,
                 [itemName || '$item']: result[k],
                 [indexName || '$index']: cx
             };
+            if (trackBy) {
+                k = seek($scope, trackBy);
+                if (clonedElements[k]) {
+                    clonedElements[k].$scope = $scope;
+                    return clonedElements1[k] = clonedElements[k];
+                }
+            }
+            else {
+                var c = changes[k];
+                if (clonedElements[k]) if (!c || !isObject(c.previous) && !isObject(c.current)) return clonedElements1[k] = clonedElements[k];
+            }
+            var clone = element.cloneNode();
+            clone.innerHTML = element.innerHTML;
+            clone.renderid = id;
+            clone.$parentScopes = $parentScopes;
             clone.$scope = $scope;
             clone.$parentScopes = $parentScopes;
             clone.$struct = $struct;
@@ -556,7 +565,8 @@ function getFromScopes(key, scope, parentScopes) {
     if (key in scope) {
         return scope[key];
     }
-    if (parentScopes) for (var o of parentScopes) {
+    if (parentScopes) for (var cx = parentScopes.length - 1; cx >= 0; cx--) {
+        var o = parentScopes[cx];
         if (key in o) {
             return o[key];
         }

package/coms/zimoli/swap.less

@@ -30,7 +30,7 @@
     -o-appearance: none;
     appearance: none;
     &:before {
-        background-color: #26f;
+        background-color: #28c;
         transition: all .1s ease-out;
         left: 50%;
         top: 50%;

package/coms/zimoli/table.html

@@ -1,14 +1,15 @@
 <thead>
     <tr>
-        <td -repeat="f in fields"><i -if="f.icon" -class="f.icon"></i></span><span -if="f.name" -html="f.name"></span>
+        <td -repeat="f in fields track by f.id" :style="{width:f.width}"><i -if="f.icon"
+                -class="f.icon"></i></span><span -if="f.name" -html="f.name"></span>
         </td>
     </tr>
 </thead>
 <tbody -src="d in data">
     <tr>
         <td -repeat="f in fields">
-            <span -if="f.key" -text="d[f.key]"></span>
-            <a on-click="o.do(d)" -if="f.options" _type="o.type instanceof Function?o.type(d):o.type"
+            <model -if="f.key" :field=f :data=d readonly ></model>
+            <a on-click="o.do(d)" -if="!f.key&&f.options" _type="o.type instanceof Function?o.type(d):o.type"
                 -repeat="o in f.options">
                 <span -text="o.name instanceof Function?o.name(d):o.name"></span>
             </a>

package/coms/zimoli/table.js

@@ -95,7 +95,7 @@ var adaptTarget = function (event) {
                     target = this;
                     return;
                 }
-                css(this, { 'cursor': 'e-resize' });
+                css(document.body, { 'cursor': 'col-resize' });
                 result = {
                     target,
                     restX: event.clientX - target.offsetWidth
@@ -106,18 +106,66 @@ var adaptTarget = function (event) {
     }
     if (!result) {
         this.resizing = false;
-        css(this, { 'cursor': 'default' });
+        css(document.body, { 'cursor': '' });
     }
 };
 var tdElementReg = /^t[hd]$/i;
 var trElementReg = /^tr$/i;
+var id = 0;
+function enrichField(f) {
+    if (!f.id) f.id = ++id;
+    if (f.width) return;
+    var width;
+    if (f.size) {
+        width = f.size;
+        if (width < 40) width = width * 16;
+    }
+    else switch (f.type) {
+        case "text":
+            width = 30;
+            break;
+        case "input":
+            width = 200;
+            break;
+        case "date":
+            width = 180;
+        case "datetime":
+            width = 200;
+            break;
+        case "time":
+            width = 120;
+            break;
+        default:
+            if (f.options) {
+                width = f.options.map(o => o.name instanceof Function ? o.name() : o.name).join(" ").length * 20;
+            } else {
+                width = String(f.name || f.key).length * 16;
+            }
+    }
+    if (width > 600) width = 600;
+    f.width = width + 60;
+}
+
 
 function table(elem) {
     var tableElement = isElement(elem) ? elem : document.createElement("table");
     var activeCols = [];
-    onmousemove(tableElement, adaptTarget);
+    var adaptCursor = adaptTarget.bind(tableElement);
+    var off;
+    tableElement.init = function () {
+        off = on("mousemove")(window, adaptCursor);
+    };
+    tableElement.dispose = tableElement.destroy = function () {
+        off();
+    };
+    on("append")(tableElement, tableElement.init);
+    on("remove")(tableElement, tableElement.destroy);
+    if (isMounted(tableElement)) tableElement.init();
+
     moveupon(tableElement, {
-        start() { },
+        start(event) {
+            if (this.resizing) event.preventDefault();
+        },
         move: resizeTarget,
     });
     onmousemove(tableElement, function (event) {
@@ -142,7 +190,7 @@ function table(elem) {
             removeClass(td, "y-ing");
         });
     });
-    var table = tableElement.hasAttribute("ng-src") || tableElement.hasAttribute("src") ? list(tableElement) : tableElement;
+    var table = tableElement;
     var thead;
     var cellMatchManager = function (element) {
         if (!thead) [thead] = table.getElementsByTagName("thead");
@@ -162,10 +210,15 @@ function table(elem) {
     care(table, function ([fields, data]) {
         thead = null;
         this.innerHTML = template;
+        fields.forEach(enrichField);
         render(this, {
             fields,
             tbody: list,
             data,
+            model,
+            setWidth(target, f) {
+                css(target, { width: f.width });
+            },
             a: button,
         }, this.$parentScopes.concat(this.$scope));
     })