efront 4.36.1 → 4.36.3

package/coms/basic/enrich.js

@@ -1,4 +1,5 @@
 "use strict";
+var document = this.document;
 var bindObjK = function (obj, k, resolve, _object) {
     Object.defineProperty(_object, k, {
         get() {
@@ -38,4 +39,4 @@ var enrich = function enrich(obj) {
     for (var k in obj) bindObjK(obj, k, resolve, _object);
     return _object;
 };
-module.exports = enrich;
+return enrich;

package/coms/basic/i18n.js

@@ -7,7 +7,10 @@ var languageMap = {};
 var languageIndex = 0;
 function i18n() {
     var [arg] = arguments;
-    if (typeof arg === 'string' || !isArrayLike(arg)) arg = arguments;
+    if (arg.raw) return arg[0] + arg.slice(1).map((a, i) => {
+        return arguments[i + 1] + a;
+    }).join('');
+    if (typeof arg === 'string' || typeof arg === 'function') arg = arguments;
     return isFinite(this) ? arg[this] : arg[languageIndex];
 };
 
@@ -66,4 +69,5 @@ var { localStorage } = this;
 var i = +localStorage?.getItem('language-index');
 if (i >= 0) i18n.setIndex(i);
 else i18n.setIndex(languageIndex);
-var supports;
+var supports;
+module.exports = i18n;

package/coms/basic/math.js

@@ -106,7 +106,7 @@ 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}`;
+    return `${prefix}<mtable>${args.join("")}</mtable>${postfix}`;
 }
 var funcmap = {
     "+"(...args) {
@@ -158,8 +158,8 @@ var funcmap = {
         remove(m);
         return `<mover>${A}<mo stretchy=true symmetric=true fence=true accent=true>${sp}</mo></mover>`
     },
-    abs(...args) {
-        return mtable(args, "|", "|");
+    abs(a) {
+        return `<mo>|</mo>${a}<mo>|</mo>`;
     },
     log(x, n) {
         return `<msub><mo>log</mo>${n}</msub>${x}`
@@ -186,14 +186,6 @@ var funcmap = {
     Sigma: Series,
     Series,
     series,
-    "{"(...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);
     },
@@ -219,7 +211,7 @@ var funcmap = {
         return args.map(a => a + `<mo>!</mo>`).join('');
     }
 };
-funcmap["^|"] = funcmap.abs;
+funcmap["&|"] = funcmap.abs;
 var unary = (u, a) => `<ms>${u}</ms>${a}`;
 var unarymap = {
     "+"(a) {
@@ -332,7 +324,7 @@ var 希腊 = {
 var lineBroken = false;
 var br = function () {
     lineBroken = true;
-    return '</mtd></mtr><mtr><mtd>';
+    return '</mtd></mtr><mtr><mtd style="text-align:left">';
 };
 var Number_isFinite = Number.isFinite;
 var isPostFinite = function (n) {
@@ -347,6 +339,96 @@ var isFinite = function (n, post) {
     if (n[".."]) return !post || isPostFinite(n);
     return false;
 }
+var toCell = function (eq, k) {
+    var left, right;
+    var res = [];
+    if (eq instanceof Array) {
+        left = toString(eq[0], 0, 0);
+        right = toString(eq.slice(1), 0, 0);
+    }
+    else left = ``, right = toString(eq);
+    if (left instanceof Array) left = left.join("&ensp;&ensp;");
+    else if (right instanceof Array) right = right.join(`<mi>${k}</mi>`);
+    res.push(
+        `<mtd style="text-align:right;text-align:-webkit-right;padding-right:0;">`,
+        left,
+        `</mtd><mtd><mi>${k}</mi></mtd><mtd style="text-align:left;padding-left:0;">`,
+        right,
+        '</mtd>',
+    );
+    return res.join("");
+};
+var num = function (prefix, rep, dots, e, s, p, deep) {
+    prefix = String(prefix).replace(/^\-/, '–');
+    if (typeof rep === 'number') rep = String(rep);
+    if (rep && !/\./.test(prefix)) prefix += '.';
+    if (typeof e === 'number') e = String(e);
+    if (!rep) rep = '';
+    else if (rep.length === 1) {
+        rep = mdot(rep);
+    }
+    else if (rep.length >= 2) {
+        rep = mdot(rep.charAt(0)) + mn(rep.slice(1, rep.length - 1)) + mdot(rep.charAt(rep.length - 1));
+    }
+    else rep = mn(rep);
+    if (dots) dots = mn(dots);
+    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, s].join(''), e ? p >= pmap["*"] : false, deep);
+
+}
+var makemap = {
+    ".."(origin, p, deep) {
+        var [prefix, rep, dots, e, s] = origin;
+        return num(prefix, rep, dots, e, s, p, deep);
+    },
+    "."(origin, p, deep) {
+        var [prefix, e, s] = origin;
+        if (/[^\d]$/.test(e)) s = e, e = '';
+        return num(prefix, '', '', e, s, p, deep);
+    },
+    "@"(origin, p, deep) {
+        return mrow(tabs.circle(origin), -1, deep);
+    },
+    "$"(origin, p, deep) {
+        return mrow(tabs.roman(origin), -1, deep);
+    },
+    tab(origin, p, deep) {
+        var k = origin.shift();
+        if (!origin.length || !(k in tabs)) {
+            var args = origin.map(a => toString(a, 0, deep));
+            return mrow(`<ms>(</ms>${k}${args.length ? "<ms>,</ms>" + args.join('<ms>,</ms>') : ''}<ms>)</ms>`, -1, deep);
+        }
+        return mrow(tabs[k](...origin), -1, deep);
+    },
+    "{"(origin, p, deep) {
+        return mrow(mtable(origin.map(toRows), "{", ''), false, 0);
+    },
+    "^:"(origin, p, deep) {
+        return `<ms style="font-weight:bolder">${origin}</ms>`;
+    },
+    "["(origin, p, deep) {
+        return toMatrix(origin, '[', ']');
+    },
+    "^|"(origin, p, deep) {
+        console.log(origin);
+        if (origin instanceof Array) return toMatrix(origin, '|', '|');
+        return mrow(funcmap.abs(toString(origin[0])), false, 0);
+    },
+};
+var toMatrix = function (origin, prev, post) {
+    var res = origin.map(o => {
+        if (o instanceof Array) return `<mtr><mtd>${o.map(a => {
+            return toString(a);
+        }).join('</mtd><mtd>')}</mtd></mtr>`
+        return `<mtr><mtd>${toString(o)}</mtd></mtr>`;
+    });
+    return mrow(mtable(res, prev, post), false, 0);
+}
 function toString(obj, p, deep) {
     if (obj instanceof Array) {
         deep++;
@@ -367,32 +449,8 @@ function toString(obj, p, deep) {
         for (var k in obj) break;
         if (!k) return '';
         var origin = obj[k];
-        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 += '.';
-            if (typeof e === 'number') e = String(e);
-            if (!rep) rep = '';
-            else if (rep.length === 1) {
-                rep = mdot(rep);
-            }
-            else if (rep.length >= 2) {
-                rep = mdot(rep.charAt(0)) + mn(rep.slice(1, rep.length - 1)) + mdot(rep.charAt(rep.length - 1));
-            }
-            else rep = mn(rep);
-            if (dots) dots = mn(dots);
-            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, s].join(''), e ? p >= pmap["*"] : false, deep);
+        if (k in makemap) {
+            return makemap[k](origin, p, deep);
         }
         if (k === '**') {
             if (origin instanceof Array) {
@@ -406,17 +464,7 @@ function toString(obj, p, deep) {
                 }
             }
         }
-        if (k === '@' || k === '$') {
-            return mrow(tabs[k](origin), -1, deep);
-        }
-        if (k === 'tab') {
-            k = origin.shift();
-            if (!origin.length || !(k in tabs)) {
-                var args = origin.map(a => toString(a, 0, deep));
-                return mrow(`<ms>(</ms>${k}${args.length ? "<ms>,</ms>" + args.join('<ms>,</ms>') : ''}<ms>)</ms>`, -1, deep);
-            }
-            return mrow(tabs[k](...origin), -1, deep);
-        }
+
         if (k in 三角函数) {
             if (origin instanceof Array) {
                 var args = origin.map(a => toString(a, pmap["*"], 0));
@@ -483,25 +531,94 @@ function toString(obj, p, deep) {
         return mrow(mn(obj), -1, deep);
     }
     if (/^[\s,;]+$/.test(obj)) {
-        obj = obj.replace(/(\r\n|\r|\n)/g, br)
+        obj = obj.replace(/(\r\n|\r|\n)\s*/g, br);
         if (lineBroken) return obj;
         obj = obj.replace(/\s/g, '&ensp;');
-        return `<mtext>${obj}</mtext>`;
+        return `<ms>${obj}</ms>`;
     }
     if (isCap && obj.length === 1) return mrow(ms(obj), -1, deep);
     obj = String(obj).replace(/\-/g, '–');
     return mrow(obj ? mi(obj) : '', -1, deep);
 }
-function math(mathObj) {
-    if (mathObj.tagName) return mathObj;
-    lineBroken = false;
+function toRows(args) {
     var res = [];
-    for (var a of arguments) {
-        res.push(toString(a, 0, 1));
+    var row = [];
+    var q = true;
+    var br = lineBroken;
+    lineBroken = false;
+    var inBlock = false;
+    var inLine = false;
+    var prevIsEqual = false;
+    var prevIsBroken = false;
+    for (var a of args) {
+        if (a instanceof Object && !(a instanceof Array)) {
+            for (var k in a) break;
+            if (pmap[k] === pmap['=']) {
+                if (row.length) {
+                    if (prevIsBroken) {
+                        var row1 = row.pop();
+                        res.push(`<mtd style="text-align:left">`, row.join(''));
+                        row1 = row1.replace(/\<mtd[^\>]*\>$/, '');
+                        res.push(row1);
+                    }
+                    else {
+                        res.push('<mtd style="text-align:left">', row.join(''), '</mtd>');
+                    }
+                    if (!prevIsEqual) {
+                        res.push('<mtable><mtr>');
+                        inBlock = true;
+                    }
+                }
+                prevIsEqual = true;
+                row = [];
+                var r = toCell(a[k], k);
+                res.push(r);
+                q = true;
+                continue;
+            }
+        }
+
+        if (a instanceof Object) {
+            if (!q) row.push('<ms>&ensp;</ms>');
+            if (inBlock) {
+                row.push("</mtr></mtable>");
+                inBlock = false;
+            }
+            q = false;
+            prevIsEqual = false;
+            var r = toString(a, 0, 1);
+            row.push(r);
+        }
+        else if (/^,/.test(a)) {
+            row.push('<ms>,&ensp;</ms>'), q = true;
+        }
+        else if (a === ' ') {
+            row.push(`<ms>&ensp;</ms>`), q = true;
+        }
+        else {
+            if (!q) row.push('<ms>&ensp;</ms>');
+            var r = toString(a, 0, 1);
+            row.push(r);
+            var prevIsBroken = lineBroken && /<mtd[^\>]*>$/i.test(r);
+            if (prevIsBroken) q = true;
+        }
     }
-    res = res.join('');
-    if (lineBroken) {
-        res = `<mtable style="text-align:justify"><mtr><mtd>${res}</mtd></mtr></mtable>`;
+    if (inBlock) {
+        row.push('</mtr></mtable>');
     }
+    if (!res.length && !lineBroken) {
+        res = row.join('');
+    }
+    else {
+        if (row.length) res.push(`<mtd style="text-align:left">`, row.join(""), `</mtd>`);
+        res = `<mtr>${res.join('')}</mtr>`;
+    }
+    lineBroken = br;
+    return res;
+};
+function math(mathObj) {
+    if (mathObj.tagName) return mathObj;
+    var res = toRows(arguments);
+    if (/^\<mtr/.test(res)) res = `<mtable>${res}</mtable>`;
     return `<math>${res}</math>`;
 }

package/coms/basic/math.md

@@ -64,20 +64,14 @@ math`S=sqrt(p*(p-a)*(p-b)*(p-c))`
 * 加减，正负，
 ```mathscript
     a +- 2;
-    a -+ 2;
     +-a;
-    -+a;
     // 分开写将识别为运算符加正负号
     a + -2;
-    a - +2;
 ```
 ```math
     a +- 2;
-    a -+ 2;
     +-a;
-    -+a;
     a + -2;
-    a - +2;
 ```
 * 乘法
 ```mathscript
@@ -105,12 +99,20 @@ mul(a,b),Mul(a,b),MUL(a,b)
 ```
 * 分数
 ```mathscript
- 分子/分母
- 1/(2/3),1/2/3;
+    分子/分母
+    1/(2/3),1/2/3;
+    例: 计算 1/2+(1/3)*(3/4);
+    解: 原式=1/2+1/4;
+    = 2/4+1/4;
+    = 3/4;
 ```
 ```math
     分子/分母
- 1/(2/3),1/2/3;
+    1/(2/3),1/2/3;
+    例: 计算 1/2+(1/3)*(3/4);
+    解: 原式=1/2+1/4;
+    = 2/4+1/4;
+    = 3/4;
 ```
 * 以除号表示除法
 ```mathscript
@@ -121,6 +123,7 @@ mul(a,b),Mul(a,b),MUL(a,b)
 ```
 * 绝对值
 ```mathscript
+    // 内部是数值或运算结果为数值
     |a|;
     |1+|a||*2;
 ```
@@ -130,10 +133,20 @@ mul(a,b),Mul(a,b),MUL(a,b)
 ```
 * 行列式
 ```mathscript
+    |[1,2,3,4;5,6,7,8]|;
     |1,2,3,4;5,6,7,8|;
+    // 一阶行列式不可去掉中括号，否则识别为绝对值
+    |[1]|;// 这种写法识别为一阶行列式
+    一阶行列式与绝对值对比:
+    |[1]|,|1|;
 ```
 ```math
+    |[1,2,3,4;5,6,7,8]|;
     |1,2,3,4;5,6,7,8|;
+    // 一阶行列式不可去掉中括号，否则识别为绝对值
+    |[1]|;// 这种写法识别为一阶行列式
+    一阶行列式与绝对值对比:
+    |[1]|,|1|;
 ```
 * 阶乘： n!
 ```mathscript
@@ -355,13 +368,14 @@ Series(公式主体,n=1,+Infinity)
     {
         a+1=b;
         a+b**2=3;
-    }
+    };
+
 ```
 * 标号
 ```mathscript
     tab(1); // 带小括号的数字
     @1,@2,@3,@4,@20,@50; // 带圆圈的数字
-    $1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$3888; //罗马数字
+    $1,$2,$3,$4,$5,$38; //罗马数字
     {// 方程组中使用
         x+y=10, @1;
         x*y=25, @2;
@@ -370,7 +384,7 @@ Series(公式主体,n=1,+Infinity)
 ```math
     tab(1); // 带小括号的数字
     @1,@2,@3,@4,@20,@50; // 带圆圈的数字
-    $1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$3888; //罗马数字
+    $1,$2,$3,$4,$5,$38; //罗马数字
     {// 方程组中使用
         x+y=10, @1;
         x*y=25, @2;

package/coms/basic/str2array.js

@@ -1,4 +1,4 @@
-var spliter = /\s*[,;\|]\s*/
+var spliter = /\s*[,;\|\r\n]\s*/
 module.exports = function (names) {
     if (typeof names === 'string') names = names.split(spliter);
     return names;

package/coms/basic_/Promise.js

@@ -17,7 +17,7 @@ if (!Promise) {
     };
     var thro = function (error) {
         // <!--
-        console.error(i18n`在异步过程中发现未处理的异常：`, error);
+        console.error(i18n`在异步过程中发现未处理的异常\r\n`, error);
         // -->
     };
     var queue = [];

package/coms/compile/Html.js

@@ -238,6 +238,7 @@ Html.prototype.createScoped = function (code) {
                 break;
             case QUOTED:
             case PIECE:
+            case SCOPED:
                 if (c.length) {
                     c.forEach(run);
                     break;

package/coms/compile/Html_test.js

@@ -46,4 +46,12 @@ test(`<meta charset="utf-8" />`);
 test('a><a></a>', 'a > <a></a>');
 test('X', 'X');
 test('<input -class="{actived:actived===f}"/>', 'scoped.envs.actived', true);
-test('<i>>_</i>', '<i>>_</i>');
+test('<i>>_</i>', '<i>>_</i>');
+test('<i -src="[f,data]"></i>', 'scoped.envs', {
+    f: true,
+    data: true
+});
+test('<i -src=[f,data]></i>', 'scoped.envs', {
+    f: true,
+    data: true
+});

package/coms/compile/Program.js

@@ -1086,7 +1086,7 @@ class Program {
                         push_stamp();
                     }
                     var last = queue.last;
-                    if (last && last.type & ~(STAMP | STRAP) && !last.ion) {
+                    if (last && last.type & ~(STAMP | STRAP | LABEL | PROPERTY) && !last.ion) {
                         if (last.isExpress && !last.istype) break scope;
                     }
                 }

package/coms/compile/common.js

@@ -1844,6 +1844,7 @@ var pickAssignment = function (n) {
     return values;
 }
 var insertBefore = function () {
+    "use strict";
     var [o] = arguments;
     var queue = this || o.queue;
     var index = queue.indexOf(o);

package/coms/compile/polyfill.js

@@ -1,13 +1,12 @@
 var { SCOPED } = require("./common");
 var backEach = require("../basic/backEach");
-
-var polyfills = Object.assign(Object.create(null), {
+var Object_polyfills = Object.assign(Object.create(null), {
     "Object.assign": '&extend'
 });
-var polyfill = function (o, i, used) {
+var Object_polyfill = function (o, i, used) {
     var v = o.text;
-    if (v in polyfills) {
-        var p = polyfills[v];
+    if (v in Object_polyfills) {
+        var p = Object_polyfills[v];
         var n = o.next;
         if (n && n.type === SCOPED && n.entry === '(') {
             if (!this.used[p]) {
@@ -20,12 +19,30 @@ var polyfill = function (o, i, used) {
         }
     }
 };
+var Date_polyfill = function (o, i, used) {
+    var v = o.text;
+    if (v !== 'Date') return
+    var n = o.next;
+    if (!n || n.type !== SCOPED || n.entry !== "(") return;
+    var f = n.first;
+    if (!f || f !== n.last || f.type !== QUOTED || f.length) return;
+    var dateString = strings.decode(f.text);
+    var dateTime = +new Date(dateString);
+    if (Number.isFinite(dateTime)) {
+        f.type = VALUE;
+        f.isdigit = true;
+        f.text = String(dateTime);
+    }
+}
 
 module.exports = function (body) {
     var envs = body.envs;
     if (envs.Object) {
-        backEach(body.used.Object, polyfill, body);
+        backEach(body.used.Object, Object_polyfill, body);
         if (!body.used.Object.length) delete body.used.Object, delete body.envs.Object;
     }
+    if (envs.Date) {
+        backEach(body.used.Date, Date_polyfill, body);
+    }
     return body;
 }

package/coms/compile//347/256/227/345/274/217.js

@@ -261,7 +261,19 @@ var toFlat = function (exp) {
                 left.push(make("{", null, getRows(e)));
             }
             else if (e.entry === '|') {
-                left.push(make("^|", getRows(e)));
+                var f = e.first;
+                if (f.type === SCOPED && f === e.last) {
+                    left.push({ "^|": getRows(f) });
+                }
+                else {
+                    var args = getRows(e);
+                    if (args.length === 1 && !(args[0] instanceof Array)) {
+                        left.push(make("&|", args[0]));
+                    }
+                    else {
+                        left.push(make("^|", args));
+                    }
+                }
             }
         }
         else {
@@ -323,6 +335,10 @@ var toFlat = function (exp) {
             if (e.type === QUOTED) {
                 text = strings.decode(text);
             }
+            if (e.type === LABEL) {
+                left.push({ "^:": text });
+                continue;
+            }
             left.push(text);
         }
     }

package/coms/docs/helps.js

@@ -1,5 +1,5 @@
 // <!--
-if (typeof i18n === "undefined") i18n = (a, ...b) => a[0] + b.map((c, i) => c + a[i + 1]).join(',');
+if (typeof i18n === "undefined") i18n = require("../basic/i18n");
 // -->
 var helps = [
     ["f", i18n`显示版本号`, "version", "-v", "--version"],

package/coms/frame/top.html

@@ -12,7 +12,7 @@
         ↻
     </btn>
     <btn class="menu-item" @title="option.name" ng-click="open(option)" ng-repeat="option in options" pop>
-        <i class="fa" ng-class="option.icon"></i>
+        <i class="fa" ng-class="option.icon" -bind="option.sign"></i>
         <span class="badge" ng-if="option.tip" ng-bind="option.tip"></span>
     </btn>
 </div>

package/coms/pivot/DB.js

@@ -0,0 +1,51 @@
+var bind = function (hostname) {
+    var host = parseURL(hostname);
+    var obj = parseURL(location.href);
+    host = (host.protocol || obj.protocol) + '//' + (host.host || obj.host) + "/";
+    var dbbase = k => host + k;
+    // <!--
+    dbbase = k => host + k;
+    // -->
+    var api = {
+        headers: {
+            authorization: ''
+        },
+        base: host,
+    };
+    host += '/';
+    var cross = data.cross;
+    var DB = function (type, id) {
+        var url = dbbase(type);
+        if (id) url += '/' + id;
+        return cross("get", url, null, api);
+    };
+    DB.load = function (type, size, idstart) {
+        return DB(`${idstart || ''},${size},`);
+    };
+    DB.info = function (type) {
+        return DB(type);
+    };
+    DB.save = function (type, data) {
+        return data.id ? DB.update(type, data) : DB.create(type, data);
+    }
+    DB.create = function (type, data) {
+        return cross("put", dbbase(type) + "/", data, api);
+    };
+    DB.update = function (type, data) {
+        return cross("post", dbbase(type) + "/" + data.id, data, api);
+    };
+    DB.delete = function (type, data) {
+        return cross('delete', dbbase(type) + '/' + data.id, data, api);
+    };
+    DB.search = function (type, searchObj, size = 20, searchtext, searchstart) {
+        if (searchObj) searchObj = "?" + serialize(searchObj);
+        return DB(type, `${searchstart || ''},${size},${searchtext}${searchObj || ''}`);
+    };
+    DB.query = function (type, queryObj, size = 100, queryStart) {
+        return DB.search(type, queryObj, size, '', queryStart);
+    };
+    return DB;
+};
+var db = bind(location.host || location.href);
+db.rebind = bind;
+return db;