efront 3.7.6 → 3.8.2

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/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/basic/strings.js

@@ -25,7 +25,7 @@ function encode(str) {
     }) + "\"";
 }
 function decode(s) {
-    var r = /^(['"])([\s\S]*)\1$/.exec(s);
+    var r = /^(['"`])([\s\S]*)\1$/.exec(s);
     if (!r) return s;
     return r[2].replace(/\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\([\s\S])/ig, (a, b) => {
         if (!b) {

package/coms/compile/common.js

@@ -118,6 +118,7 @@ var createScoped = function (parsed) {
             var isFunction = false;
             var isScope = false;
             var isArrow = false;
+            var isDeclare = false;
             switch (o.type) {
                 case QUOTED:
                     if (o.length) {
@@ -130,13 +131,18 @@ var createScoped = function (parsed) {
                     if (o.next) {
                         if (o.next.type !== STAMP || o.next.text !== ",") break;
                     }
+                    if (o.prev && o.prev.type === STRAP && o.prev.text === 'as') {
+                        break;
+                    }
                 case VALUE:
                     if (number_reg.test(o.text)) break;
                 case EXPRESS:
                     if (o.prev && o.prev.type === EXPRESS) {
                         if (/\.$/.test(o.prev.text)) break;
                     }
-                    var u = o.text.replace(/^([^\.\[]*)[\s\S]*$/, '$1');
+                    var u = o.text;
+                    if (/^\.\.\./.test(u)) u = u.slice(3);
+                    var u = u.replace(/^([^\.\[]*)[\s\S]*$/, '$1');
                     if (!u) break;
                     if (o.next && o.next.type === STAMP && o.next.text === "=>") {
                         isScope = true;
@@ -157,6 +163,9 @@ var createScoped = function (parsed) {
                 case STRAP:
                     var s = o.text;
                     switch (s) {
+                        case "as":
+                        case "from":
+                            break;
                         case "var":
                         case "import":
                             var m = vars;
@@ -184,6 +193,7 @@ var createScoped = function (parsed) {
 
                                 if (o.type === EXPRESS) {
                                     vars[o.text] = true;
+                                    isDeclare = true;
                                     o.kind = isFunction ? 'function' : 'class';
                                     saveTo(used, o.text, o);
 
@@ -237,7 +247,7 @@ var createScoped = function (parsed) {
                     scoped.used = used;
                 }
                 if (isArrow);
-                else if (o.isExpress && o.type !== SCOPED) {
+                else if (o.isExpress && o.type !== SCOPED && !isDeclare) {
                     o = o.next;
                     if (o.type === EXPRESS) {
                         vars[o.text] = true;
@@ -358,10 +368,19 @@ var getDeclared = function (o, kind) {
             }
         }
         switch (o.type) {
+            case STAMP:
+                if (o.text === "*" && o.next) {
+                    if (o.next.type === STRAP && o.next.text === 'as') {
+                        o = o.next.next;
+                        continue;
+                    }
+                }
             case PROPERTY:
-                if (o.next && o.next.type === STAMP && o.next.text === ":") {
-                    o = o.next.next;
-                    continue;
+                if (o.next) {
+                    if (o.next.type === STAMP && o.next.text === ":") {
+                        o = o.next.next;
+                        continue;
+                    }
                 }
             case STRAP:
             case VALUE:
@@ -379,7 +398,6 @@ var getDeclared = function (o, kind) {
                 Object.assign(declared, d);
                 o = o.next;
                 break;
-
             default:
                 console.log(o);
                 throw new Error("代码结构异常");

package/coms/compile/scanner2.js

@@ -95,8 +95,8 @@ var compress = function (scoped, maped) {
 
 var strings = require("../basic/strings");
 
-var insertAfter = function (o,) {
-    var queue = o.queue;
+var insertAfter = function (o) {
+    var queue = o.queue || this;
     var index = queue.indexOf(o) + 1;
     var os = [].slice.call(arguments, 1);
     queue.splice.apply(queue, [index, 0].concat(os));
@@ -111,6 +111,20 @@ var insertAfter = function (o,) {
         next.prev = o;
     }
 };
+var detourTemplate = function (raw, params) {
+    var spliter = { text: ",", type: STAMP };
+    var template = scan(`extend([],{["raw"]:[]})`);
+    var str0 = template[1].first;
+    var str1 = template[1][2][2];
+    for (var r of raw) {
+        str0.push({ text: strings.encode(strings.decode("`" + r.text + "`")), type: QUOTED }, spliter);
+        str1.push({ text: strings.encode(r.text), type: QUOTED }, spliter);
+    }
+    str0.pop();
+    str1.pop();
+    for (var p of params) template.push(spliter, p);
+    return template;
+};
 
 var detour = function (o, ie) {
     while (o) {
@@ -121,31 +135,103 @@ var detour = function (o, ie) {
             case EXPRESS:
                 if (!/^\.\.\.|\.\.\.$/.test(o.text)) {
                     var ot = o.text;
-                    o.text = o.text.replace(/\.([^\.\[]+)/g, (_, a) => !ie || program.strap_reg.test(a) ? `[${strings.encode(strings.decode(a))}]` : _);
+                    o.text = o.text.replace(/\.([^\.\[]+)/g, (_, a) => ie === undefined || program.strap_reg.test(a) ? `[${strings.encode(strings.decode(a))}]` : _);
                 }
                 break;
             case QUOTED:
                 if (o.length) {
-                    detour(o.first, ie);
+                    if (!o.prev || o.prev.type === STAMP || o.prev.type === STRAP) {
+                        o.type = SCOPED;
+                        o.entry = '[';
+                        o.leave = `]["join"]('')`;
+                        for (var cx = o.length - 1; cx >= 0; cx--) {
+                            var c = o[cx];
+                            if (c.type === PIECE) {
+                                c.type = QUOTED;
+                                c.text = strings.encode(strings.decode("`" + c.text + "`"));
+                            }
+                            else {
+                                insertAfter.call(o, c.prev, { type: STAMP, text: ',' });
+                                c.entry = "(";
+                                c.leave = ")";
+                                insertAfter.call(o, c, { type: STAMP, text: ',' });
+                                detour(c.first, ie);
+                            }
+                        }
+                    }
+                    else {
+                        var raw = [];
+                        var params = [];
+
+                        for (var c of o) {
+                            if (c.type === PIECE) {
+                                raw.push(c);
+                            } else {
+                                c.entry = '(';
+                                c.leave = ")";
+                                detour(c, ie);
+                                params.push(c.length === 1 ? c[0] : c);
+                            }
+                        }
+                        o.type = SCOPED;
+                        o.entry = "(";
+                        o.leave = ")";
+                        var temp = detourTemplate(raw, params);
+                        o.splice(0, o.length);
+                        o.push.apply(o, temp);
+                    }
                     break;
                 }
+                else if (!o.prev || o.prev.type === STAMP || o.prev.type === STRAP) {
+                    if (/^[`]/.test(o.text)) {
+                        o.text = strings.encode(strings.decode(o.text));
+                    }
+                }
+                else {
+                    if (/^`/.test(o.text)) {
+                        o.text = o.text.replace(/^`|`$/g, '');
+                        var template = detourTemplate([o], []);
+                        o.type = SCOPED;
+                        o.entry = "(";
+                        o.leave = ")";
+                        delete o.text;
+                        o.push.apply(o, template);
+                    }
+                }
                 if (!o.isprop) break;
             case PROPERTY:
                 if (/^(get|set|async|static)$/.test(o.text) && o.next && (o.next.type === PROPERTY || o.next.isprop)) break;
                 if (o.text === 'static' && o.next && o.next.type === SCOPED && o.next.entry === '{') break;
-                if (!ie || program.strap_reg.test(o.text)) {
+                if (ie === undefined || program.strap_reg.test(o.text)) {
                     if (!/^\[/.test(o.text) && o.queue.isObject) {
                         if (o.short) {
                             insertAfter(o, { text: ':', type: STAMP }, { text: o.text, type: EXPRESS, isExpress: true });
                             o.short = false;
                         }
                         var text = strings.encode(strings.decode(o.text));
-                        o.text = ie ? text : `[${text}]`;
+                        o.text = ie !== undefined ? text : `[${text}]`;
+                    }
+                    if (!/^\[/.test(o.text) && o.queue.isClass) {
+                        if (o.text === 'constructor') break;
+                        if (o.text === 'get') console.log(o.text, o.type, o.next);
+                        var text = strings.encode(strings.decode(o.text));
+                        if (o.prev) {
+                            var prev = o.prev;
+                            if (prev && prev.type === PROPERTY && /^(get|set|static|async)$/.test(prev.text)) {
+                                prev = prev.prev;
+                            }
+                            if (prev && (prev.type !== STAMP || prev.text !== ';')) insertAfter(prev, { text: ';', type: STAMP });
+                        }
+                        o.text = `[${text}]`;
+                        if (o.next && o.next.type === SCOPED && o.next.entry === "(") { }
+                        else if (!o.next || o.next.type !== STAMP || o.next.text !== "=") {
+                            insertAfter(o, { text: "=", type: STAMP }, { text: "undefined", type: VALUE, isExpress: true });
+                        }
                     }
                 }
                 break;
         }
-        o = o.next;
+        if (o) o = o.next;
     }
 };
 
@@ -215,7 +301,7 @@ class Program extends Array {
                         break;
                     }
                 case SCOPED:
-                    if (!this.pressed && (lasttype === STRAP || lasttype === SCOPED && o.entry === "{") && o.type !== QUOTED) result.push(" ");
+                    if (!this.pressed && (lasttype === STRAP || lasttype === STAMP || lasttype === SCOPED && o.entry === "{") && o.type !== QUOTED) result.push(" ");
                     result.push(o.entry);
                     if (o.length > 0) {
                         if (o.entry === "{" && result[0].type !== SPACE) {
@@ -290,8 +376,8 @@ class Program extends Array {
         return this;
     }
     // 绕开低版本ie的异常属性
-    detour() {
-        detour(this.first, true);
+    detour(ie) {
+        detour(this.first, !!ie);
         return this;
     }
     // 压缩
@@ -319,7 +405,7 @@ class Javascript {
         ["{", "}"],
     ]
     stamps = "/=+;|:?<>-!~@#%^&*,".split("")
-    value_reg = /^(false|true|null|Infinity|NaN|undefined|arguments|this|eval)$/
+    value_reg = /^(false|true|null|Infinity|NaN|undefined|arguments|this|eval|super)$/
     number_reg = number_reg;
     transive = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|export|default|instanceof|throw|extends|import|from)$/
     straps = `if,in,do,as,of
@@ -364,15 +450,15 @@ class Javascript {
                 scope.isprop = isProperty();
             }
             else if (scope.type === SCOPED && scope.entry === '[') {
-                if (queue.isObject) {
-                    scope.isprop = !last || last.type === STAMP && last.text === ','
-                }
-                else if (queue.isClass) {
-                    scope.isprop = !last || last.type === STAMP && /^(\+\+|\-\-|;)$/.test(last.text)
-                }
+                if (queue.isObject) scope.isprop = isProperty();
+                if (queue.isClass) scope.isprop = !last || last.isprop || last.type === STAMP && last.text === ';';
+            }
+            else if (scope.type === PROPERTY) {
+                scope.isprop = true;
             }
             if (scope.type !== COMMENT && scope.type !== SPACE) {
-                if (scope.type === PROPERTY || scope.isprop) scope.queue = queue;
+                Object.defineProperty(scope, 'queue', { value: queue });
+                if (scope.type === PROPERTY || scope.isprop);
                 else if (scope.type === STRAP && /^(get|set|static)$/.test(scope.text)) {
                     scope.type = EXPRESS;
                 }
@@ -395,8 +481,11 @@ class Javascript {
             else {
                 scope.prev = last;
             }
+            scope.row = row;
+            scope.col = scope.start - colstart;
             queue.push(scope);
         };
+        var row = 1, colstart = -1;
         var save = (type) => {
             if (lasttype === STAMP && type === STAMP && !/[,;\:\?]/.test(m)) {
                 var scope = queue[queue.length - 1];
@@ -437,19 +526,26 @@ class Javascript {
                     }
                     else if (isProperty()) type = PROPERTY;
                     else if (m === 'from') {
-                        if (!last || last.type === STRAP && last.text !== 'import') {
+                        if (!last || last.type === STRAP && !/^(im|ex)port$/.test(last.text)) {
                             type = EXPRESS;
                             break;
                         }
                         var temp = last;
-                        while (temp.type === EXPRESS || temp.type === VALUE || temp.type === SCOPED) {
-                            var prev = last.prev;
+                        while (temp.type === STAMP && temp.text === "*" || temp.type === EXPRESS || temp.type === VALUE || temp.type === SCOPED) {
+                            var prev = temp.prev;
                             if (!prev) break;
-                            if (prev.type !== STAMP || prev.text !== ',') break;
+                            if (prev.type === STRAP && prev.text === "as") {
+                                temp = prev.prev;
+                                continue;
+                            }
+                            if (prev.type !== STAMP || prev.text !== ',' && (prev.text !== "*" || !prev.prev || !~[STRAP, STAMP].indexOf(prev.prev.type))) {
+                                temp = prev;
+                                break;
+                            }
                             temp = prev.prev;
                             if (!temp) break;
                         }
-                        if (temp.type !== STRAP || temp.text !== 'import') {
+                        if (!temp || temp.type !== STRAP || !/^(im|ex)port$/.test(temp.text)) {
                             type = EXPRESS;
                         }
                     }
@@ -458,9 +554,9 @@ class Javascript {
                             type = EXPRESS;
                             break;
                         }
-                        if (~[EXPRESS, VALUE].indexOf(last.type)) {
-                            last.type = PROPERTY;
-                            last.queue = queue;
+                        if (~[PROPERTY, EXPRESS, VALUE].indexOf(last.type)
+                            || last.type === STAMP && last.text === "*" && last.prev && ~[STRAP, STAMP].indexOf(last.prev.type)) {
+                            Object.defineProperty(last, 'queue', { value: queue });
                         } else {
                             type = EXPRESS;
                         }
@@ -570,6 +666,9 @@ class Javascript {
             if (prev.type === PROPERTY && /^(get|set|async|static)$/.test(prev.text)) {
                 return true;
             }
+            if (queue.prev && queue.prev.type === STRAP && queue.prev.text === 'export') {
+                if (prev.type === STRAP && prev.text === "as") return true;
+            }
             return false;
         };
 
@@ -671,7 +770,9 @@ class Javascript {
             }
             if (this.space_reg.test(m)) {
                 if (/[\r\n\u2028\u2029]/.test(m)) {
-                    m = m.replace(/^[^\r\n\u2028\u2029]+/, '').replace(/\r\n|\r|\n/g, "\r\n");
+                    colstart = match.index + m.length - 1;
+                    m = m.replace(/^[^\r\n\u2028\u2029]+/, '').replace(/\r\n|\r|\n|\u2028|\u2029/g, "\r\n");
+                    row += m.replace(/[^\r\n]+/, '').length >> 1;
                     save(SPACE);
                 }
                 lasttype = SPACE;
@@ -727,7 +828,7 @@ class Javascript {
                         else scope.isObject = !/^(;|\+\+|\-\-|=>)$/.test(last.text);
                     }
                     else if (last.type === STRAP) {
-                        if (queue[queue.length - 1].type === SPACE && last.text === 'return');
+                        if (queue[queue.length - 1].type === SPACE && /^(return|export)$/.test(last.text));
                         else scope.isObject = queue.inExpress;
                     }
                 }

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/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;
+
+}