efront 3.15.7 → 3.17.1

package/apps/pivot/log/boot.js

@@ -1,3 +1,4 @@
+cross.addDirect(/^https?\:\/\/([[a-z\.\d\:\/%]+\]|[\d\.]+)(\:\d+)?\//);
 var fields = refilm`
 地址/ip
 地理位置/ip ${function (e) {
@@ -10,9 +11,9 @@ var fields = refilm`
                 appendChild(e, l);
             };
             if (e.data.address) setAddress(e.data.address);
-            else data.from("iplocation", { ip: m[0] }, function (a) {
-                e.data.address = a.address;
+            else e.data.address = data.from("iplocation", { ip: m[0] }, function (a) {
                 setAddress(a.address);
+                return a.address;
             });
         }
         return e;
@@ -20,8 +21,39 @@ var fields = refilm`
 启动时间/time ${function (e) {
         e.innerHTML = filterTime(e.data[e.field.key]);
     }}
-端口/port input
-版本/version
+端口/port ${async function (e) {
+        var { data, field } = e;
+        var ports = data[field.key].split(/,/);
+        var loaded = data.loaded || ports;
+        data.loaded = loaded;
+        e.innerHTML = loaded.join(' ');
+        if (data.loaded === ports) for (let cx = 0, dx = ports.length; cx < dx; cx++) {
+            var p = ports[cx];
+            var p0 = p;
+            var protocol = /^https/.test(p) ? "https://" : "http://";
+            p = p.replace(/[^\d]+/g, '');
+            if (p) p = ":" + p;
+            try {
+                var ip = data.ip;
+                if (/^::ffff:\d+\.\d+\.\d+\.\d+$/i.test(ip)) {
+                    ip = ip.slice(7);
+                }
+                else {
+                    ip = `[${ip}]`;
+                }
+                var xhr = await cross("options", `${protocol}${ip}${p}/:version`);
+                if (xhr.responseText === 'efront ' + data.version) {
+                    loaded[cx] = (`<span style="color:green">${p0}</span>`);
+                } else {
+                    loaded[cx] = (`<span style="color:red">${p0}</span>`);
+                }
+            } catch (e) {
+                loaded[cx] = (`<span style="color:gray">${p0}</span>`);
+            }
+            e.innerHTML = loaded.join(' ');
+        }
+    }}
+版本/version input
 进程/pid
     `;
 function main() {

package/apps/pivot/main.less

@@ -1,4 +1,5 @@
 >:not([layer]) {
     padding: 50px 10px 0;
     min-height: 100%;
+    display: block;
 }

package/coms/basic/JSAM.js

@@ -1,3 +1,4 @@
+var isEmpty = require("./isEmpty");
 var convertReg = /^(?:object|function)$/;
 var check = function (o) {
     return o === null || typeof o === 'bigint' || o instanceof BigInt || typeof o === 'number' || typeof o === "boolean";
@@ -24,16 +25,28 @@ var join = function (o) {
     if (o instanceof RegExp) return regexp(o);
     var arr = o[""];
     delete o[""];
+    var typeid = o._;
+    delete o._;
     var pairs = [].concat(arr);
     for (var k in o) {
         pairs.push(k + ':' + o[k]);
     }
+    var s;
     if (o instanceof Array) {
-        return `[${pairs.join(',')}]`;
+        s = `[${pairs.join(',')}]`;
+    }
+    else {
+        s = `{${pairs.join(',')}}`;
+    }
+    if (typeid > 0) s = typeid + s;
+    return s;
+};
+function stringify(memery, preload) {
+    if (!isEmpty(preload)) {
+        preload = [].concat(preload);
+        var i = preload.indexOf(memery) + 1;
+        if (i > 0) return i + ',';
     }
-    return `{${pairs.join(',')}}`;
-}
-function stringify(memery) {
     if (memery === undefined) return '';
     if (check(memery)) return String(memery);
     if (typeof memery === 'symbol') return symbol(memery);
@@ -48,15 +61,23 @@ function stringify(memery) {
     var rest = [memery];
     var trimed = [memery instanceof Array ? [] : {}];
     var objects = [trimed[0]];
+    if (!isEmpty(preload)) dist = dist.concat(preload);
+    var preload_used = false;
     while (rest.length) {
         var memery = rest.shift();
         var o = objects.shift();
         var inc = 0, arr = [];
         o[""] = arr;
+        o._ = dist.indexOf(memery.constructor);
+        if (o._ > 0) preload_used = true;
         for (var k in memery) {
             var m = memery[k];
             f: if (typeof m === 'function') {
                 for (var k in m) break f;
+                if (dist.indexOf(m) >= 0) {
+                    preload_used = true;
+                    break f;
+                }
                 continue;
             }
             if (inc === +k && k !== '') {
@@ -101,7 +122,9 @@ function stringify(memery) {
             }
         }
     }
-    return trimed.map(join).join(',');
+    var result = trimed.map(join).join(',');
+    if (trimed.length === 1 && preload_used) result += ',';
+    return result;
 }
 var create = function (a, dst) {
     if (!a) return;
@@ -117,9 +140,10 @@ var create = function (a, dst) {
     }
     dst[""] = rest;
 };
-function parse(string) {
+function parse(string, preload) {
     string = String(string);
     var trimed = [];
+    var reg0 = /\d+/g;
     var reg1 = /\}/g;
     var reg2 = /\]/g;
     var reg3 = /\\[\s\S]|"/g;
@@ -130,6 +154,18 @@ function parse(string) {
     for (var cx = 0, dx = string.length; cx < dx; cx++) {
         var s = string.charAt(cx);
         var reg = null, o = null;
+        reg0.lastIndex = 0;
+        var typeid = 0;
+        var m = reg0.test(string.charAt(cx));
+        if (m) {
+            reg0.lastIndex = cx;
+            var m = reg0.exec(string);
+            if (/^[\[\{]$/.test(string.charAt(reg0.lastIndex))) {
+                typeid = +m[0];
+                cx = reg0.lastIndex;
+                s = string.charAt(reg0.lastIndex);
+            }
+        }
         switch (s) {
             case ",":
                 trimed.push(undefined);
@@ -148,6 +184,15 @@ function parse(string) {
                 marked.push(trimed.length);
                 trimed.push(o);
                 cx = reg.lastIndex;
+                if (typeid) {
+                    o._ = typeid;
+                }
+                if (/\d/.test(string.charAt(cx))) {
+                    reg4.lastIndex = cx;
+                    var m = reg4.exec(string);
+                    o._ = typeid || string.slice(cx, m.index);
+                    cx = m.index;
+                }
                 break;
             case "/":
                 reg = reg5;
@@ -176,15 +221,11 @@ function parse(string) {
                 }
                 trimed.push(s);
                 break;
-            case "/":
-                break;
             default:
-                reg4.lastIndex = cx + 1;
+                reg4.lastIndex = cx;
                 var match = reg4.exec(string);
                 var index = match.index;
-
                 var s = string.slice(cx, index);
-                cx = index;
                 switch (s) {
                     case "null":
                         s = null;
@@ -211,21 +252,30 @@ function parse(string) {
 
                 }
                 trimed.push(s);
+                cx = index;
         }
     }
-    var dist = trimed.slice(0, trimed.length);
+    if (string.charAt(string.length - 1) === ',') trimed.push(undefined);
+    var dist = [trimed[0]];
+    if (!isEmpty(preload)) dist = dist.concat(preload);
+    var preloads_length = dist.length - 1;
+    dist = dist.concat(trimed.slice(1, trimed.length));
     for (var cx = 0, dx = marked.length; cx < dx; cx++) {
         var index = marked[cx];
         var o = trimed[index];
-        dist[index] = o instanceof Array ? [] : {};
+        if (index > 0) index += preloads_length;
+        if (o._ > 0) dist[index] = Object.create(dist[o._].prototype);
+        else dist[index] = o instanceof Array ? [] : {};
     }
     for (var cx = 0, dx = marked.length; cx < dx; cx++) {
         var index = marked[cx];
         var o = trimed[index];
+        if (index > 0) index += preloads_length;
         var t = dist[index];
         var arr = o[""];
         delete o[""];
-        for (var k in arr) {
+        delete o._;
+        if (arr) for (var k in arr) {
             t[k] = dist[arr[k]];
         }
         for (var k in o) {
@@ -233,14 +283,17 @@ function parse(string) {
             t[dist[k]] = dist[v];
         }
     }
+    if (trimed.length > 1 && typeof trimed[0] === 'number') {
+        return dist[trimed[0]];
+    }
     return dist[0];
 }
 module.exports = {
     stringify,
-    parse(data) {
-        if (!/^\s*([\[\{]|\[\s*\]|\{\s*\})/.test(data)) return parse(data);
-        if (/^\s*\{[\d\,\:\s]*\}\s*,/.test(data)) return parse(data);
-        if (/^\s*\[[\d\,\:\s]*\]\s*,/.test(data)) return parse(data);
-        return JSON.parse(data);
+    parse(data, preload) {
+        if (!/^\s*([\[\{]|\[\s*\]|\{\s*\})$/.test(data)) return parse(data, preload);
+        if (/^\s*\{[\d\,\:\s]*\}\s*,/.test(data)) return parse(data, preload);
+        if (/^\s*\[[\d\,\:\s]*\]\s*,/.test(data)) return parse(data, preload);
+        return JSON.parse(data, preload);
     }
 };

package/coms/basic/Speed.js

@@ -22,12 +22,12 @@ function inertia(gun) {
     }
     var smooth = function () {
         var args = spd.read();
-        if (decrease && args.filter(a => Math.abs(a) > .5).length === 0) {
+        if (decrease && args.filter(a => Math.abs(a) > 2).length === 0) {
             spd.reset();
             _decrease();
             return;
         }
-        if (args.filter(a => Math.abs(a) > .1).length === 0) {
+        if (args.filter(a => Math.abs(a) > .5).length === 0) {
             spd.reset();
             return;
         }

package/coms/basic/cross_.js

@@ -114,7 +114,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     else {
         var nocross = notCross(url);
         var callback = function () {
-            var exposeHeaders = xhr.getResponseHeader("access-control-expose-headers");
+            var exposeHeaders = !nocross && xhr.getResponseHeader("access-control-expose-headers");
             var exposeMap = {};
             if (exposeHeaders) exposeHeaders.split(",").forEach(h => exposeMap[h.toLowerCase()] = true);
             if (xhr.getResponseHeader) {

package/coms/basic/lazy.js

@@ -8,9 +8,13 @@ function lazy(run, time = false) {
     var fire = function () {
         if (time >= 0) {
             if (ing === true) {
-                ing = wait(fire, +time);
+                ing = wait(fire, +time / 2);
             }
-            else if (isFinite(ing)) {
+            else if (isFinite(ing) && ing !== 0) {
+                wait(fire, +time);
+                ing = 0;
+            }
+            else if (ing === 0) {
                 ing = run.apply(that, args);
             }
             else {

package/coms/basic/loader.js

@@ -230,7 +230,7 @@ var killCircle = function () {
 var hasOwnProperty = {}.hasOwnProperty;
 var loadModule = function (name, then, prebuilds = {}) {
     if (/^(?:module|exports|define|require|window|global|undefined|__dirname|__filename)$/.test(name)) return then();
-    if ((name in prebuilds) || hasOwnProperty.call(modules, name) || (window[name] !== null && window[name] !== void 0 && !hasOwnProperty.call(forceRequest, name))
+    if ((name in prebuilds) || hasOwnProperty.call(modules, name) || (!/^on/.test(name) && window[name] !== null && window[name] !== void 0 && !hasOwnProperty.call(forceRequest, name))
     ) return then();
     preLoad(name);
     var key = keyprefix + name;
@@ -545,7 +545,7 @@ var init = function (name, then, prebuilds) {
         if (then) then(modules[name]);
         return modules[name];
     }
-    if (window[name] !== null && window[name] !== void 0 && !hasOwnProperty.call(forceRequest, name)) {
+    if (!/^on/.test(name) && window[name] !== null && window[name] !== void 0 && !hasOwnProperty.call(forceRequest, name)) {
         modules[name] = window[name]
         if (then) then(modules[name]);
         return modules[name];

package/coms/basic/parseYML.js

@@ -119,7 +119,7 @@ var scan = function (text) {
         }
 
         if (/^\-(\s|$)/.test(row)) {
-            if (data || span >= spacesize) push();
+            if (data || span && span >= spacesize) push();
             if (!parents[spacesize]) {
                 var obj = [];
                 push(obj);

package/coms/basic/renderExpress.js

@@ -11,8 +11,8 @@ function createSeek(express) {
     return dist;
 }
 function main(express) {
-    if (!/\?\s*\.(?=[^\d])/.test(express)) return express;
-    var reg = /\\[\s\S]|\?\s*(\.(?!\d))|[\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\[\]\(\)'"`\s]/g;
+    if (!/\?\s*\.(?=[^\d])|\?$/.test(express)) return express;
+    var reg = /\\[\s\S]|\?\s*(\.(?!\d)|\s*$)|[\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\[\]\(\)'"`\s]/g;
     var cache = [], queue = [];
     var exp = [];
     var instr = false;
@@ -81,7 +81,7 @@ function main(express) {
             add_exp(str);
         }
         lastIndex = match.index + m.length;
-        if (match[1]) {
+        if (match[1] !== undefined) {
             exp.push(match[1]);
         }
         else if (/[\[\{\(]/.test(m)) {

package/coms/frame/route.js

@@ -3,6 +3,50 @@
     var menuid = 0;
     var savedChildren = Object.create(null);
     var savedMenus = Object.create(null);
+    var keymap = {};
+    var parseName = function (k) {
+        var icon, name, hotkey;
+        if (/(^|\s+)\./.test(k)) {
+            k = k.replace(/(?:^|\s+)\.([^\s,"'`]+)/, (_, m) => {
+                icon = m;
+                return '';
+            });
+        }
+        if (/(^|\s+)[\/\\]/.test(k)) {
+            k = k.replace(/(?:^|\s+)[\/\\]([\s\S]+)$/, (_, m) => {
+                hotkey = m;
+                return '';
+            });
+        }
+        if (/^(["'`])[\s\S]*\1/.test(k)) {
+            k = k.replace(/(['"`])[\s\S]\1/, (m) => {
+                name = strings.decode(m);
+                return '';
+            });
+        }
+        if (/,/.test(k)) {
+            var [k, ...roles] = k.split(',');
+        }
+        if (!icon && /\s+|\./.test(k)) {
+            [icon] = k.split(/\s+/);
+            k = k.slice(icon.length).trim();
+        }
+        if (!name) name = k;
+        var item = {};
+        if (icon) item.icon = icon.replace(/\./g, ' ');
+        if (name) item.name = name;
+        if (hotkey) {
+            hotkey = hotkey.split(',');
+            for (var k of hotkey) {
+                k = k.trim().toLowerCase().replace(/[\+\_\s]+/g, '.');
+                if (keymap[k]) console.warn("检查到两个项菜单使用了相同的快捷键", item, keymap[k]);
+                keymap[k] = item;
+            }
+            item.hotkey = hotkey;
+        }
+        if (roles) item.roles = roles;
+        return item;
+    }
     var getChildren = function (menu) {
         if (!menu.id) {
             menu.id = ++menuid;
@@ -52,29 +96,17 @@
 
             items = keys.map(k => {
                 var c = items[k];
-                var item = {};
+                var item = parseName(k);
                 if (c instanceof Object) {
                     item.children = parseMenuList(c);
                 }
                 else if (typeof c === 'string') {
                     var [path, data] = c.split(/\?/);
+                    if (data) data = data.trim();
                 }
-                var [icon] = k.split(/\s+/);
-                if (icon.length < k.length) {
-                    item.icon = icon;
-                    var name = k.slice(icon.length).trim();
-                } else name = k;
-                if (/,/.test(name)) {
-                    var [name, ...roles] = name.split(',');
-                }
-                if (/^\-+$/.test(name)) item.line = true;
-                else item.name = name;
-                if (roles) item.roles = roles;
+                if (/^\-+$/.test(item.name)) item.line = true;
                 if (path) item.path = path;
                 if (data) item.params = parseKV(data);
-                if (/,/.test(name)) {
-
-                }
                 item.closed = true;
                 return item;
             });
@@ -85,7 +117,7 @@
     result.update = function (items) {
         delete result.loading_promise;
         delete result.then;
-        items = parseMenuList(items);
+        items = result.parse(items);
         items.map(getChildren);
         var opened = data.getInstance("menu-opened");
         var historys = zimoli.getCurrentHistory();
@@ -198,7 +230,12 @@
         result.then = then;
         return result;
     };
-    result.parse = parseMenuList;
+    result.parse = function (items) {
+        keymap = {};
+        items = parseMenuList(items);
+        items.keymap = keymap;
+        return items;
+    };
     var then = function (ok, oh) {
         if (this.loading_promise) {
             return this.loading_promise.then(ok, oh);

package/coms/kugou/song.js

@@ -1,15 +1,14 @@
 function main(elem) {
     elem = elem || document.createElement("song");
-    if (!elem.innerHTML) elem.innerHTML = song;
     var $scope = {
         filterTime,
         png: img,
         playState: kugou$playState,
         song: {},
-        musicList:kugou$musicList,
+        musicList: kugou$musicList,
     };
-    render(elem, $scope);
     care(elem, function (item) {
+        if (!elem.innerHTML) elem.innerHTML = song;
         var songName = String(item.name || item.songName || item.songname_original || '');
         var singerName = String(item.singer || item.singerName || item.singername || '');
         if (~songName.indexOf(singerName)) {
@@ -24,6 +23,7 @@ function main(elem) {
             songMarked: mark(songName, elem.mark),
             singerMarked: mark(singerName, elem.mark)
         };
+        render(elem.children, $scope);
     });
     return block(elem);
 }

package/coms/zimoli/Item.js

@@ -1,32 +1,39 @@
 var id = 0;
 function Item(value) {
-    this.value = isObject(value) ? value : Object.create(value);
-    this.valueOf = function () {
-        return value;
-    };
-    this.toString = function () {
-        return String(value);
-    };
     this.children = this;
-    if (value.children instanceof Array) {
-        var children = value.children.map(item => new Item(item));
-        children.forEach(item => item.parent = item);
-        this.push.apply(this, children);
-    }
-    if (isObject(value)) {
-        this.name = value.name;
-        this.tab = value.tab;
-        this.icon = value.icon;
-        this.color = value.color;
-        this.test = value.test;
-        this.line = value.line;
-    }
     this.count = 0;//子项中的叶子节点数
     this.total = 0;//子项中的节点数
     this.crack = 0;
     this.id = ++id;
+    this.extends(value);
 }
 Item.prototype = extend([], {
+    extends(value) {
+        this.value = value;
+        if (value.children instanceof Array) {
+            var children = value.children.map(item => new Item(item));
+            children.forEach(item => item.parent = item);
+            this.push.apply(this, children);
+        }
+        if (isObject(value)) {
+            this.name = value.name;
+            this.tab = value.tab;
+            this.icon = value.icon;
+            this.color = value.color;
+            this.test = value.test;
+            this.line = value.line;
+        }
+        else {
+            this.name = value;
+        }
+    },
+
+    valueOf() {
+        return this.value;
+    },
+    toString() {
+        return String(this.value);
+    },
     isClosed() {
         return !!this.value.closed;
     },
@@ -34,14 +41,21 @@ Item.prototype = extend([], {
         this.value.closed = value;
     },
     isActive() {
-        return !!(this.value.active || this.value.actived);
+        if (isObject(this.value)) {
+            if ("active" in this.value) return this.value.active;
+            if ('actived' in this.value) return this.value.actived;
+        }
+        return !!this.actived;
     },
     setActive(value) {
-        if ('active' in this.value) {
-            this.value.active = value;
-        } else {
-            this.value.actived = value;
+        if (isObject(this.value)) {
+            if ('active' in this.value) {
+                this.value.active = value;
+            } else {
+                this.value.actived = value;
+            }
         }
+        this.actived = value;
     },
     isSelected() {
         return !!this.value.selected;
@@ -53,3 +67,4 @@ Item.prototype = extend([], {
         return !!this.value.class;
     }
 });
+Item.prototype.isActived = Item.prototype.isActive;

package/coms/zimoli/appendChild.js

@@ -11,26 +11,24 @@ function hasEnterStyle(e) {
     return e.initialStyle || e.enterStyle || e.leavingStyle || e.leaveStyle;
 }
 
-function _onappend(node, event) {
+function _onappend(node, append = createEvent("append"), mount = createEvent("mounted")) {
     if (node.isMounted) return;
     if (node.nodeType === 1 || node.nodeType === 8) node.isMounted = true;
-    if (!event) {
-        event = createEvent("append");
-    }
-    dispatch(node, event);
+    dispatch(node, append);
     var onappend = node.onappend;
     if (isArray(onappend)) {
         onappend.map(function (append_handler) {
-            append_handler.call(this, event);
+            append_handler.call(this, append);
         }, node);
     }
     if (isFunction(onappend)) {
-        onappend.call(node, event);
+        onappend.call(node, append);
     }
     var children = [].concat.apply([], node.childNodes);
     if (children) for (var cx = 0, dx = children.length; cx < dx; cx++) {
-        _onappend(children[cx], event);
+        _onappend(children[cx], append, mount);
     }
+    dispatch(node, mount);
 }
 function appendChild(parent, obj, transition) {
     if (transition === false) {

package/coms/zimoli/container.js

@@ -1,7 +1,17 @@
 var change = function (data) {
     zimoli.go(data, this.params, this);
 };
+var gosrc = function () {
+    if (this.hasAttribute('src')) {
+        var src = this.getAttribute('src');
+        if (src !== this.src) {
+            this.src = src;
+            if (src) cast(this, this.getAttribute('src'));
+        }
+    }
+};
 function container(element) {
     care(element, change);
+    element.renders = [gosrc];
     return element;
 }

package/coms/zimoli/data.js

@@ -571,10 +571,8 @@ var privates = {
                     headers = seekFromSource(headers, api.base);
                 }
                 cross(realmethod, uri, headers).send(params).done(e => {
-                    updateLoadingCount();
                     ok(e.response || e.responseText);
                 }).error(xhr => {
-                    updateLoadingCount();
                     try {
                         var e = getErrorMessage(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
                         oh({ status: xhr.status, api, params: params1, error: e, toString: getErrorMessage })
@@ -582,7 +580,6 @@ var privates = {
                         oh(error);
                     }
                 });
-                updateLoadingCount();
             });
             promise.search = search;
             promise.params = temp;
@@ -652,6 +649,7 @@ var getData = function () { return this.data };
 var updateLoadingCount = function () {
     data.loading_count = cross.requests.length;
 };
+on('render')(window, updateLoadingCount, true);
 var data = {
     decodeStructure,
     encodeStructure,
@@ -883,12 +881,10 @@ var data = {
                     headers = seekFromSource(headers, api.base);
                 }
                 instance.loading = cross(method, uri, headers).send(params).done(xhr => {
-                    updateLoadingCount();
                     if (instance.loading !== xhr) return oh(aborted);
                     instance.loading = null;
                     ok(xhr.responseText || xhr.response);
                 }).error(xhr => {
-                    updateLoadingCount();
                     if (instance.loading !== xhr) return oh(aborted);
                     instance.loading = null;
                     try {
@@ -898,7 +894,6 @@ var data = {
                         oh(error);
                     }
                 });
-                updateLoadingCount();
             }).then(function (response) {
                 return transpile(seekResponse(parseData(response), selector), api.transpile, api.root);
             });