efront 4.35.7 → 4.36.0

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -40,6 +40,9 @@
 - zh-CN: 禁用
   en:    Disable
 
+- zh-CN: "不要在后端代码中使用相对路径\r\n    文件：$1"
+  en:    "Do not use relative paths in backend code\nFile: $1"
+
 - zh-CN: 代码结构错误
   en:    Code structure error
 

package/coms/basic/ASN1.js

@@ -4,7 +4,7 @@ var ASN1 = function (tag) { // tag=tagClass|type|composed_flag
     for (var cx = 1, dx = arguments.length; cx < dx; cx++) {
         var bytes = arguments[cx];
         if (bytes.constructor !== Array) {
-            bytes = Array.apply(null, bytes);
+            bytes = bytes.length !== 1 ? Array.apply(null, bytes) : [bytes[0]];
         }
         bytesarr.push(bytes);
         length += bytes.length;

package/coms/basic/JSAM.js

@@ -104,7 +104,7 @@ function stringify(memery, preload, hasDulp = true) {
     noDulp = preload === false || hasDulp === false;
     if (isArrayLike(hasDulp)) preload = hasDulp;
     if (isArrayLike(preload)) {
-        preload = Array.apply(null, preload);
+        preload = preload.length !== 1 ? Array.apply(null, preload) : [preload[0]];
         var i = preload.indexOf(memery) + 1;
         if (i > 0) return i + ',';
         preload.unshift(memery);
@@ -244,7 +244,7 @@ function scanblock(string, index, preload, obj) {
     return reg.lastIndex;
 }
 function parse(string, preload) {
-    if (isArrayLike(preload)) preload = Array.apply(null, preload);
+    if (isArrayLike(preload)) preload = preload.length !== 1 ? Array.apply(null, preload) : [preload[0]];
     else preload = [];
     isjsam = false;
     preload.unshift(void 0);

package/coms/basic/Matrix.js

@@ -237,7 +237,7 @@ class Matrix extends Array {
     }
     toDOMString() {
         if (this.size()[1] === 2) return `matrix(${this.getTransform()})`;
-        return `matrix(${this})`;
+        return `matrix3d(${this})`;
     }
 }
 

package/coms/basic/decodeLZW.js

@@ -2,10 +2,12 @@ var _dict = [];
 var _prefix = [];
 var _buff = [];
 var _bitDeep = 9;
+var _bitInit = 9;
+var _dictSize = 258;
 var _half = 0;
 var _addLength = 0;
 function _clear() {
-    _bitDeep = 9;
+    _bitDeep = _bitInit;
     _dict = [];
 }
 
@@ -57,9 +59,9 @@ function _readFrom1(buff, cx) {
 function _addDict(d) {
     if (d.length > 1) {
         var dict = _dict;
-        d.index = dict.length + 258;
+        d.index = dict.length + _dictSize;
         dict.push(d);
-        if (1 << _bitDeep <= dict.length + 258 + _addLength) {
+        if (1 << _bitDeep <= dict.length + _dictSize + _addLength) {
             if (!_addLength && _bitDeep >= 12) return;
             _bitDeep++;
         }
@@ -69,12 +71,12 @@ function _writeTo(dist, b) {
     var prefix = _prefix;
     var dict = _dict;
     var end = false;
-    if (b < 256) {
+    if (b < _dictSize - 2) {
         prefix.push(b);
         _addDict(prefix);
         prefix = [b];
-    } else if (b >= 258) {
-        var d = dict[b - 258];
+    } else if (b >= _dictSize) {
+        var d = dict[b - _dictSize];
         if (!d) {
             prefix.push(prefix[0]);
             _addDict(prefix);
@@ -84,10 +86,10 @@ function _writeTo(dist, b) {
             _addDict(prefix);
             prefix = d.slice(0);
         }
-    } else if (b === 256) {
+    } else if (b === _dictSize - 2) {
         _clear();
         prefix = [];
-    } else if (b === 257) {
+    } else if (b === _dictSize - 1) {
         end = true;
         prefix = [];
     }
@@ -100,16 +102,18 @@ function _pass(buff) {
     var dict = _dict;
     var half = _half;
     var end = false;
-    if (dict.length) {
-        var dist = [];
-        if (half) {
-            var [b, cx] = _readFrom(_buff.concat(buff[0], buff[1]), 0);
-            if (_writeTo(dist, b)) end = true;
-        }
-        cx = cx - 1;
-    } else {
-        cx = 0;
-        var dist = [];
+    var dist = [];
+    var cx = 0;
+    if (_buff.length) {
+        var bl = _buff.length;
+        do {
+            var [b, cx] = _readFrom(_buff.concat(buff[0], buff[1]), cx);
+            if (_writeTo(dist, b)) {
+                end = true;
+                break;
+            }
+        } while (cx < bl);
+        cx = cx - bl;
     }
     if (!end) while (cx + 1 < buff.length) {
         if (cx + 2 === buff.length) {
@@ -119,6 +123,8 @@ function _pass(buff) {
         if (_writeTo(dist, b)) break;
     }
     _buff = buff.slice(cx);
+    if (_buff.length === 1) _buff = [_buff[0]];
+    else _buff = Array.apply(null, _buff);
     return dist;
 }
 function _end() {
@@ -127,15 +133,22 @@ function _end() {
     _buff = [];
     _half = 0;
     _bitDeep = 9;
+    _bitInit = 9;
     return [];
 }
 
-function decodeLZW(buff, isBigEndStart) {
-    if (isBigEndStart !== false) _readFrom = _readFrom1, _addLength = 1;
-    else _readFrom = _readFrom2, _addLength = 0;
+function decodeLZW(buff, isBigEndStart, lzw_size) {
+    open(isBigEndStart, lzw_size);
     var decoded = _pass(buff);
     _end();
     return decoded;
 }
-
+var open = decodeLZW.open = function (isBigEndStart, lzw_size = 8) {
+    if (isBigEndStart !== false) _readFrom = _readFrom1, _addLength = 1;
+    else _readFrom = _readFrom2, _addLength = 0;
+    _dictSize = (1 << lzw_size) + 2;
+    _bitDeep = _bitInit = lzw_size + 1;
+};
+decodeLZW.pass = _pass;
+decodeLZW.close = _end;
 module.exports = decodeLZW;

package/coms/basic/math.js

@@ -8,7 +8,7 @@ var mi = s => `<mi>${s}</mi>`;
 var mn = s => `<mn>${s}</mn>`;
 var mi2 = (s, a, n) => {
     s = n ? `<msup><mi>${s}</mi>${n}</msup>` : `<mi>${s}</mi>`;
-    return s + `<ms>&thinsp;</ms>` + a;
+    return s + `<ms>&thinsp;</ms>` + a + `<ms>&thinsp;</ms>`;
 }
 var mrow = (a, quote, deep) => {
     if (deep === 2) var tag = 'mtd';
@@ -19,7 +19,9 @@ var mrow = (a, quote, deep) => {
     return a;
 }
 var series =/*级数*/(通项, neq, to) =>
-    `<munderover><mo>∑</mo>${neq}${to}</munderover>${通项}`;
+    `<munderover><mo movablelimits=false>∑</mo>${neq}${to}</munderover>${通项}`;
+var Series =/*级数*/(通项, neq, to) =>
+    `<math display="block"><munderover><mo>∑</mo>${neq}${to}</munderover>${通项}</math>`;
 var msub = (a, n) => `<msub>${a}${n}</msub>`;
 var qt = (t, a, args) => {
     var b = args.shift();
@@ -34,6 +36,9 @@ var qt = (t, a, args) => {
 
 var 三角函数 = {
     "sin"(a, n) {
+        if (!a && n instanceof Array) {
+            [a, n] = n;
+        }
         return mi2("sin", a, n);
     },
     "cos"(a, n) {
@@ -82,7 +87,7 @@ var toRoman = function (n) {
     d = ["", "M", "MM", "MMM"][d];
     return d + c + b + a;
 };
-var circles = "①②③④⑤⑥⑦⑧⑨⑩";
+var circles = "①②③④⑤⑥⑦⑧⑨⑩⑪⑫⑬⑭⑮⑯⑰⑱⑲⑳㉑㉒㉓㉔㉕㉖㉗㉘㉙㉚㉛㉜㉝㉞㉟㊱㊲㊳㊴㊵㊶㊷㊸㊹㊺㊻㊼㊽㊾㊿";
 
 var tabs = {
     roman(...args) {
@@ -94,12 +99,22 @@ var tabs = {
     circle(...args) {
         return args.map(n => circles.charAt(n - 1)).map(a => `<mn>${a}</mn>`).join('');
     }
+};
+tabs["@"] = tabs.circle;
+tabs["$"] = tabs.roman;
+var mtable = function (args, prefix, postfix) {
+    if (prefix) prefix = `<mo>${prefix}</mo>`;
+    if (postfix) postfix = `<mo>${postfix}</mo>`;
+    if (args.length === 1) return [prefix, args[0], postfix].join('');
+    return `${prefix}<mtable><mtr>${args.join("</mtr><mtr>")}</mtr></mtable>${postfix}`;
 }
-
 var funcmap = {
     "+"(...args) {
         return mo3("+", args);
     },
+    "+."(a, ...args) {
+        return a + args.join('<mo>+</mo>');
+    },
     "-"(...args) {
         return mo3("–", args);
     },
@@ -134,8 +149,17 @@ var funcmap = {
     Mul(...args) {
         return mo3("·", args);
     },
-    abs(a) {
-        return `<mo>|</mo>${a}<mo>|</mo>`;
+    conj(A) {
+        var m = document.createElementNS('http://www.w3.org/1998/Math/MathML', 'math');
+        m.innerHTML = A;
+        css(m, 'opacition:0;position:absolute:left-10px;top:-10px;pointer-events:none;z-index:-10');
+        document.documentElement.appendChild(m);
+        var sp = Array(2 + (m.clientWidth / 6 | 0)).join("\u23bc");
+        remove(m);
+        return `<mover>${A}<mo stretchy=true symmetric=true fence=true accent=true>${sp}</mo></mover>`
+    },
+    abs(...args) {
+        return mtable(args, "|", "|");
     },
     log(x, n) {
         return `<msub><mo>log</mo>${n}</msub>${x}`
@@ -159,9 +183,16 @@ var funcmap = {
         return `<munder><ms>limit</ms><mrow>${x}<mo>→</mo>${n}</mrow></munder>${a}`
     },
     sigma: series,
+    Sigma: Series,
+    Series,
     series,
-    group(...args) {
-        return `<mo>{</mo><mtable><mtr><mtd>${args.join("</mtd></mtr><mtr><mtd>")}</mtd></mtr></mtable>`
+    "{"(...args) {
+        return mtable(args, '{', '');
+        // return `<mo>{</mo><mtable columnalign="left"><mtr><mtd>${args.join("</mtd></mtr><mtr><mtd>")}</mtd></mtr></mtable>`
+    },
+    "["(...args) {
+        return mtable(args, '[', ']');
+        // return `<mo>[</mo><mtable><mtr>${args.join("</mtr><mtr>")}</mtr></mtable><mo>]</mo>`;
     },
     '!='(...args) {
         return mo3("≉", args);
@@ -172,19 +203,23 @@ var funcmap = {
     "~="(...args) {
         return mo3("≈", args);
     },
-    "integral"(a, b = '', c = '') {
+    integral(a, b = '', c = '') {
         return `<msubsup><mo>∫</mo>${b}${c}</msubsup>${a}`;
     },
+    Integral(a, b = '', c = '') {
+        return `<math display="block"><msubsup><mo>∫</mo>${b}${c}</msubsup>${a}</math>`;
+    },
     "'"(...args) {
         var b = args.pop();
-        if (!args.length) return `<msup>${b}<mo>'</mo></msup>`;// 转置
+        if (!args.length) return `<msup>${b}<mo>T</mo></msup>`;
         // 导数
-        return args.map((a) => `${a}<mo>'</mo>`).join('') + `<mi>(</mi>${b}<mi>)</mi>`;
+        return args.map((a) => `${a}<mo>&apos;</mo>`).join('') + `<mi>(</mi>${b}<mi>)</mi>`;
     },
     "!"(...args) {
         return args.map(a => a + `<mo>!</mo>`).join('');
     }
 };
+funcmap["^|"] = funcmap.abs;
 var unary = (u, a) => `<ms>${u}</ms>${a}`;
 var unarymap = {
     "+"(a) {
@@ -250,6 +285,7 @@ var puncmap = {
     // ">=": "≥",
     // "<=": '≤',
 };
+puncmap["^*"] = puncmap["**"];
 var pmap = {};
 
 [
@@ -298,23 +334,30 @@ var br = function () {
     lineBroken = true;
     return '</mtd></mtr><mtr><mtd>';
 };
+var Number_isFinite = Number.isFinite;
+var isPostFinite = function (n) {
+    return /[^\d]$/.test(n[n.length - 1]);
+}
+var isFinite = function (n, post) {
+    if (Number_isFinite(n)) return true;
+    if (!n) return false;
+    if (n["/"]) return true;
+    if (n["+."]) return true;
+    if (n["."]) return !post || isPostFinite(n);
+    if (n[".."]) return !post || isPostFinite(n);
+    return false;
+}
 function toString(obj, p, deep) {
     if (obj instanceof Array) {
-        if (deep == 1 && obj.length === 2 && obj[1].tab) {
-            return toString(obj[0], 0, deep) + "</mtd><mtd>" + obj.slice(1, obj.length).map(a => toString(a, 0, 0)).join("</mtd><mtd>");
-        }
         deep++;
         var args = obj.map(a => toString(a, deep > 1 ? 0 : p, deep));
         deep--;
         if (args instanceof Array) {
-            if (deep > 2) {
+            if (deep >= 2) {
                 if (args.length > 1) args = `<mrow><mo>(</mo>${args.join('<mo>,</mo>')}<mo>)</mo></mrow>`;
             }
-            else if (deep === 2) {
-                args = `<mtd>${args.join('</mtd><mtd>')}</mtd>`;
-            }
             else if (deep === 1) {
-                args = `<mrow><mo>[</mo><mtable><mtr>${args.join("</mtr><mtr>")}</mtr></mtable><mo>]</mo></mrow>`;
+                args = args.join('');
             }
         }
         return args;
@@ -324,8 +367,12 @@ function toString(obj, p, deep) {
         for (var k in obj) break;
         if (!k) return '';
         var origin = obj[k];
-        if (k === '..') {
-            var [prefix, rep, dots, e] = origin;
+        if (k === '.' || k === '..') {
+            if (k === '.') {
+                var [prefix, e, s] = origin;
+                if (/[^\d]$/.test(e)) s = e, e = '';
+            }
+            else var [prefix, rep, dots, e, s] = origin;
             prefix = String(prefix).replace(/^\-/, '–');
             if (typeof rep === 'number') rep = String(rep);
             if (rep && !/\./.test(prefix)) prefix += '.';
@@ -342,8 +389,25 @@ function toString(obj, p, deep) {
             else dots = '';
             if (e) e = `<mo>×</mo><msup><mn>10</mn><mn>${String(e).replace(/^\-/, '–')}</mn></msup>`;
             else e = '';
+            if (s) s = `<mi>${s}</mi>`;
+            else s = '';
             prefix = mn(prefix);
-            return mrow([prefix, rep, dots, e].join(''), e ? p >= pmap["*"] : false, deep);
+            return mrow([prefix, rep, dots, e, s].join(''), e ? p >= pmap["*"] : false, deep);
+        }
+        if (k === '**') {
+            if (origin instanceof Array) {
+                var [left, right] = origin;
+                if (left instanceof Object && !(left instanceof Array)) {
+                    for (var k1 in left) break;
+                    if (!(left[k1] instanceof Array)) {
+                        var obj = mi2(k1, toString(left[k1], pmap["*"], 0), toString(right));
+                        return mrow(obj, p >= pmap["**"], deep);
+                    }
+                }
+            }
+        }
+        if (k === '@' || k === '$') {
+            return mrow(tabs[k](origin), -1, deep);
         }
         if (k === 'tab') {
             k = origin.shift();
@@ -354,13 +418,24 @@ function toString(obj, p, deep) {
             return mrow(tabs[k](...origin), -1, deep);
         }
         if (k in 三角函数) {
-            var args = origin.map(a => toString(a, pmap["*"], 0));
-            obj = 三角函数[k](...args);
-            return mrow(三角函数[k](...args), p >= pmap["**"], deep);
+            if (origin instanceof Array) {
+                var args = origin.map(a => toString(a, pmap["*"], 0));
+                obj = 三角函数[k](...args);
+            }
+            else {
+                obj = 三角函数[k](toString(origin, pmap["*"], 0));
+            }
+            return mrow(obj, p >= pmap["**"], deep);
+        }
+        if (k === '+.') {
+            var args = toString(origin, pmap[k], -1);
         }
-        var args = toString(origin, pmap[k], 0);
+        else var args = toString(origin, k === '/' ? 0 : pmap[k], 0);
         var addqt = pmap[k] < p && p < pmap["**"];
         if (args instanceof Array) {
+            if (k === "'" && args.length === 1 && !origin[0]["["]) {
+                return mrow(args[0] + `<mo>&apos;</mo>`, p > pmap["**"], 0);
+            }
             var f = funcmap[k];
             if (!f) {
                 addqt = -1;
@@ -372,14 +447,16 @@ function toString(obj, p, deep) {
             return mrow(`<mi>${希腊[k] || k}</mi>${mrow(args instanceof Array ? args.join('<mo>,</mo>') : args, true)}`, false, deep);
         }
         if (args instanceof Array) {
-
             if (k === '*') {
-                var allnum = true;
-                var bx = 1;
+                var bx = 0;
                 var simple = true;
-                for (var cx = 0, dx = args.length; cx < dx; cx++) {
-                    if (typeof origin[cx] !== 'number') {
-                        allnum = false;
+                var pisnum = isFinite(origin[0], true);
+                var allnum = pisnum;
+                for (var cx = 1, dx = args.length; cx < dx; cx++) {
+                    var o = origin[cx];
+                    var isnum = isFinite(o);
+                    if (!isnum) allnum = false;
+                    if (!pisnum && isnum) {
                         if (cx > bx) {
                             while (bx < cx) {
                                 args[bx] = args[bx] + "<mo>·</mo>";
@@ -388,6 +465,7 @@ function toString(obj, p, deep) {
                         }
                         bx = cx;
                     }
+                    pisnum = isnum && isPostFinite(o);
                 }
                 if (allnum) {
                     return mrow(funcmap.mul(...args), false, deep);