efront 3.15.2 → 3.16.0

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) {
@@ -20,9 +21,37 @@ var fields = refilm`
 启动时间/time ${function (e) {
         e.innerHTML = filterTime(e.data[e.field.key]);
     }}
-端口/port input
-版本/version
-进程/pid
+端口/port ${async function (e) {
+        var { data, field } = e;
+        var ports = data[field.key].split(/,/);
+        var loaded = [];
+        for (var p of ports) {
+            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.push(`<span style="color:green">${p0}</span>`);
+                } else {
+                    loaded.push(`<span style="color:red">${p0}</span>`);
+                }
+            } catch (e) {
+                loaded.push(`<span style="color:gray">${p0}</span>`);
+            }
+            e.innerHTML = loaded.join('');
+        }
+    }}
+版本 / version text
+进程 / pid
     `;
 function main() {
     var page = div();

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,23 @@ 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(',')}]`;
     }
-    return `{${pairs.join(',')}}`;
-}
-function stringify(memery) {
+    else {
+        s = `{${pairs.join(',')}}`;
+    }
+    if (typeid > 0) s = typeid + s;
+    return s;
+};
+function stringify(memery, preload) {
     if (memery === undefined) return '';
     if (check(memery)) return String(memery);
     if (typeof memery === 'symbol') return symbol(memery);
@@ -48,15 +56,18 @@ function stringify(memery) {
     var rest = [memery];
     var trimed = [memery instanceof Array ? [] : {}];
     var objects = [trimed[0]];
+    if (!isEmpty(preload)) dist = dist.concat(preload);
     while (rest.length) {
         var memery = rest.shift();
         var o = objects.shift();
         var inc = 0, arr = [];
         o[""] = arr;
+        o._ = dist.indexOf(memery.constructor);
         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) break f;
                 continue;
             }
             if (inc === +k && k !== '') {
@@ -101,7 +112,9 @@ function stringify(memery) {
             }
         }
     }
-    return trimed.map(join).join(',');
+    var result = trimed.map(join).join(',');
+    if (trimed.length === 1) result += ',';
+    return result;
 }
 var create = function (a, dst) {
     if (!a) return;
@@ -117,9 +130,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 +144,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 +174,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 = reg4.lastIndex;
+                }
                 break;
             case "/":
                 reg = reg5;
@@ -176,8 +211,6 @@ function parse(string) {
                 }
                 trimed.push(s);
                 break;
-            case "/":
-                break;
             default:
                 reg4.lastIndex = cx + 1;
                 var match = reg4.exec(string);
@@ -213,15 +246,21 @@ function parse(string) {
                 trimed.push(s);
         }
     }
-    var dist = trimed.slice(0, trimed.length);
+    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[""];
@@ -237,10 +276,10 @@ function parse(string) {
 }
 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/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) {
@@ -132,6 +132,11 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                     }
                 case 200:
                 case 201:
+                case 202:
+                case 203:
+                case 204:
+                case 205:
+                case 206:
                 case 304:
                     onload(xhr);
                     break;

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

@@ -32,9 +32,9 @@
 // end
 // end
 "use strict";
-
 var notMatchLength = new Error("矩阵长度不一致");
-function transform(dots, B) {
+
+function transform(B, dots) {
     var dimention = Math.sqrt(B.length - 1) | 0;
     if (dots.length % dimention !== 0) throw notMatchLength;
     if (dots === B) B = B.slice(0);
@@ -43,10 +43,11 @@ function transform(dots, B) {
     for (var cx = 0, dx = dots.length; cx < dx; cx += dimention) {
         for (var cy = 0, dy = dimention; cy < dy; cy++) {
             var sum = 0;
+            var start = dim2 * cy;
             for (var ct = 0, dt = dimention; ct < dt; ct++) {
-                sum += ds[cx + ct] * B[ct * dim2 + cy];
+                sum += ds[cx + ct] * B[start + ct];
             }
-            sum += B[dimention * dim2 + cy];
+            sum += B[start + dimention];
             dots[cx + cy] = sum;
         }
     }
@@ -56,13 +57,12 @@ function transform(dots, B) {
 function translate(A, delta) {
     var [dim2, dim] = size(A);
     var inc = 0;
-    for (var cx = dim * dim2, dx = cx + dim; cx < dx; cx++) {
+    for (var cx = dim, dx = dim * dim2; cx < dx; cx += dim2) {
         A[cx] = (A[cx] || 0) + delta[inc++];
     }
     return A;
 }
 
-
 function 负(a) {
     return -a;
 }
@@ -76,7 +76,7 @@ function multiply(A, B) {
         for (var cy = 0, dy = dim; cy < dy; cy++) {
             var sum = 0;
             for (var ct = 0, dt = dim; ct < dt; ct++) {
-                sum += X[cx + ct] * B[ct * dim + cy];
+                sum += B[cx + ct] * X[ct * dim + cy];
             }
             A[cx + cy] = sum;
         }
@@ -132,15 +132,17 @@ function olinde(v, vector) {
     }
     return v;
 }
+
 function matrix2d(theta) {
     var cosa = Math.cos(theta);
     var sina = Math.sin(theta);
     return new Matrix(
-        cosa, sina, 0,
-        -sina, cosa, 0,
+        cosa, -sina, 0,
+        sina, cosa, 0,
         0, 0, 1
     );
-};
+}
+
 function matrix3d(factor) {
     var theta = norm(factor);
     var vec = times(factor, 1 / theta);
@@ -150,9 +152,9 @@ function matrix3d(factor) {
     var [x_u, y_u, z_u] = factor ? [0, 0, 1] : vec;
 
     return new Matrix(
-        cosa + x_u * x_u * vera, x_u * y_u * vera - z_u * sina, x_u * z_u * vera + y_u * sina, 0,
-        x_u * y_u * vera + z_u * sina, cosa + y_u * y_u * vera, y_u * z_u * vera - x_u * sina, 0,
-        x_u * z_u * vera - y_u * sina, y_u * z_u * vera + x_u * sina, cosa + z_u * z_u * vera, 0,
+        cosa + x_u * x_u * vera, x_u * y_u * vera + z_u * sina, x_u * z_u * vera - y_u * sina, 0,
+        x_u * y_u * vera - z_u * sina, cosa + y_u * y_u * vera, y_u * z_u * vera + x_u * sina, 0,
+        x_u * z_u * vera + y_u * sina, y_u * z_u * vera - x_u * sina, cosa + z_u * z_u * vera, 0,
         0, 0, 0, 1
     );
 }
@@ -173,42 +175,47 @@ var 逆 = function (A) {
     A.push.apply(A, E);
     for (var cx = 0, dx = dim; cx < dx; cx++) {
         var start = cx * dim + cx;
-        for (var ct = start, dt = X.length; ct < dt; ct += dim) {
-            if (X[ct] !== 0) break;
+        var max_ct, v = 0;
+        for (var ct = start, dt = cx * dim + dim; ct < dt; ct++) {
+            var v0 = Math.abs(X[ct]);
+            if (v0 > v) {
+                max_ct = ct;
+                v = v0;
+            }
         }
+        ct = max_ct;
         if (ct !== start) {
             var delta = ct - start;
-            var ratio = 1 / X[ct];
-            for (var cy = cx * dim, dy = cy + dim; cy < dy; cy++) {
+            var ratio = (1 - X[start]) / X[ct];
+            for (var cy = cx, dy = X.length; cy < dy; cy += dim) {
                 X[cy] += X[cy + delta] * ratio;
                 A[cy] += A[cy + delta] * ratio;
             }
         }
         if (X[start] !== 1) {
-            var delta = ct - start;
             var ratio = 1 / X[start];
-            for (var cy = cx * dim, dy = cy + dim; cy < dy; cy++) {
+            for (var cy = cx, dy = X.length; cy < dy; cy += dim) {
                 X[cy] *= ratio;
                 A[cy] *= ratio;
             }
         }
-        for (var ct = start + dim, dt = X.length; ct < dt; ct += dim) {
+        for (var ct = start + 1, dt = start + dim - cx; ct < dt; ct++) {
             if (X[ct] === 0) continue;
             var ratio = -X[ct];
             var delta = start - ct;
-            for (var cy = ct - cx, dy = cy + dim; cy < dy; cy++) {
+            for (var cy = cx + ct - start, dy = X.length; cy < dy; cy += dim) {
                 X[cy] += X[cy + delta] * ratio;
                 A[cy] += A[cy + delta] * ratio;
             }
         }
     }
-    for (var cx = dim - 2; cx >= 0; cx--) {
-        var start = cx * dim + cx + 1;
-        for (var ct = start; ct >= 0; ct -= dim) {
+    for (var cx = dim - 1; cx >= 0; cx--) {
+        var start = cx * dim + cx;
+        for (var ct = start - 1, dt = start - cx; ct >= dt; ct--) {
             if (X[ct] === 0) continue;
             var ratio = -X[ct];
-            var delta = dim + start - ct;
-            for (var cy = cx * dim, dy = cy + dim; cy < dy; cy++) {
+            var delta = start - ct;
+            for (var cy = cx + ct - start, dy = X.length; cy < dy; cy += dim) {
                 X[cy] += X[cy + delta] * ratio;
                 A[cy] += A[cy + delta] * ratio;
             }
@@ -245,6 +252,19 @@ class Matrix extends Array {
         if (this._invert) return this._invert;
         return this._invert = this.slice().inverse();
     }
+    transpose() {
+        var [size] = this.size();
+        for (var cx = 0, dx = size; cx < dx; cx++) {
+            for (var cy = cx + 1, dy = dx; cy < dy; cy++) {
+                var i = cx * size + cy;
+                var j = cy * size + cx;
+                var tmp = this[i];
+                this[i] = this[j];
+                this[j] = tmp;
+            }
+        }
+        return this;
+    }
     inverse() {
         this.dirty();
         return 逆(this);
@@ -276,8 +296,11 @@ class Matrix extends Array {
         return multiply(this, a);
     }
     transform(dots) {
-        if (dots instanceof Array) return transform(dots, this);
-        if (isFinite(dots)) return dots * this[this.length - 1];
+        if (dots instanceof Array) return transform(this, dots);
+        if (arguments.length > 1) {
+            var a = Array.prototype.slice.apply(arguments, 0);
+            return transform(this, a);
+        }
         return dots;
     }
 }

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

package/coms/zimoli/dispatch.js

@@ -8,6 +8,18 @@ var dispatch = "dispatchEvent" in document ? function dispatchEvent(target, even
         return target[fire] && target[fire](event);
     }
 };
+/**
+ * @param {Event} e 
+ */
+function dispatch2(t, e) {
+    var on = 'on' + e.type;
+    var f = t[on];
+    var res = dispatch(t, e);
+    if (f && (t.nodeType !== 1 || t.constructor === window.HTMLUnknownElement)) {
+        return f.call(t, e) !== false;
+    }
+    return res;
+}
 function main() {
     var target, event, value;
     for (var cx = 0, dx = arguments.length; cx < dx; cx++) {
@@ -27,7 +39,7 @@ function main() {
             event.value = arg;
         }
     }
-    if (dispatch(target || window, event)) {
+    if (dispatch2(target || window, event)) {
         return event;
     };
     return false;

package/coms/zimoli/getValue.js

@@ -1,6 +1,6 @@
 var hasOwnProperty = {}.hasOwnProperty;
 function getValue(o = this) {
-    if (!o) return o;
+    if (!isObject(o) && !isFunction(o)) return o;
     if (isFunction(o.getValue)) return o.getValue();
     if (hasOwnProperty.call(o, 'valueOf')) return o.valueOf();
     if ("key" in o) return o.key;