efront 4.35.4 → 4.35.6

package/coms/basic/crc.js

@@ -1,40 +1,40 @@
-"use strict";
-function table(sign, table = new Array(256)) {
-    var c;
-    for (var n = 0; n < 256; n++) {
-        c = n;
-        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
-        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
-        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
-        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
-        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
-        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
-        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
-        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
-        table[n] = c;
-    }
-    return table;
-}
-
-function crc(bstr, seed) {
-    var C = seed ^ -1,
-        L = bstr.length - 1;
-    for (var i = 0; i < L;) {
-        C = C >>> 8 ^ T[(C ^ bstr[i++]) & 0xFF];
-        C = C >>> 8 ^ T[(C ^ bstr[i++]) & 0xFF];
-    }
-    if (i === L) C = C >>> 8 ^ T[(C ^ bstr[i]) & 0xFF];
-    return C ^ -1;
-}
-crc.string = function (str) {
-    var sum = [];
-    for (var i in str) sum[i] = str.charCodeAt(i);
-    return crc(sum);
-}
-var sign = parseInt("-52l3vk", 36);
-var T = table(sign);
-crc.table = T;
-crc.init = function (sign) {
-    table(sign, T);
-};
+"use strict";
+function table(sign, table = new Array(256)) {
+    var c;
+    for (var n = 0; n < 256; n++) {
+        c = n;
+        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
+        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
+        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
+        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
+        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
+        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
+        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
+        c = c & 1 ? sign ^ c >>> 1 : c >>> 1;
+        table[n] = c;
+    }
+    return table;
+}
+
+function crc(bstr, seed) {
+    var C = seed ^ -1,
+        L = bstr.length - 1;
+    for (var i = 0; i < L;) {
+        C = C >>> 8 ^ T[(C ^ bstr[i++]) & 0xFF];
+        C = C >>> 8 ^ T[(C ^ bstr[i++]) & 0xFF];
+    }
+    if (i === L) C = C >>> 8 ^ T[(C ^ bstr[i]) & 0xFF];
+    return C ^ -1;
+}
+crc.string = function (str) {
+    var sum = [];
+    for (var i in str) sum[i] = str.charCodeAt(i);
+    return crc(sum);
+}
+var sign = parseInt("-52l3vk", 36);
+var T = table(sign);
+crc.table = T;
+crc.init = function (sign) {
+    table(sign, T);
+};
 module.exports = crc;

package/coms/basic/getIndexFromOrderedArray.js

@@ -1,39 +1,39 @@
-
-var getValue = function (o) {
-    return isObject(o) && "value" in o ? o.value : o
-};
-var arrayIsLE = function (a, b) {
-    var a_length = a.length, b_length = b.length;
-    var total = a_length < b_length ? a_length : b_length;
-    for (var cx = 0, dx = total; cx < dx; cx++) {
-        var a0 = a[cx];
-        var b0 = b[cx];
-        if (a0 !== b0) return a0 <= b0;
-    }
-    return a_length <= b_length;
-};
-var isArray = Array.isArray || (a => a instanceof Array);
-var defaultIsLE = (sample, search) => isArray(sample) && isArray(search) ? arrayIsLE(sample, search) : getValue(sample) <= getValue(search);
-/**
- * 读取元素在有序数组中的位置
- * @param {Array} orderArray 
- * @param {string|number} searchItem 
- */
-module.exports = function (orderArray, searchItem, isLE = typeof searchItem === "function" ? searchItem : defaultIsLE, findEqual = true) {
-    for (var cx = 0, dx = orderArray.length, ci = cx + dx >>> 1; cx < dx; ci = cx + dx >>> 1) {
-        var orderItem = orderArray[ci];
-        if (isLE(orderItem, searchItem)) {
-            cx = ci + 1;
-        } else {
-            dx = ci;
-        }
-    }
-    if (findEqual && dx <= orderArray.length) {
-        var index = dx - 1;
-        while (index >= 0 && isLE(searchItem, orderArray[index])) {
-            if (orderArray[index] === searchItem) return index;
-            index--;
-        }
-    }
-    return dx - 1;
-};
+
+var getValue = function (o) {
+    return isObject(o) && "value" in o ? o.value : o
+};
+var arrayIsLE = function (a, b) {
+    var a_length = a.length, b_length = b.length;
+    var total = a_length < b_length ? a_length : b_length;
+    for (var cx = 0, dx = total; cx < dx; cx++) {
+        var a0 = a[cx];
+        var b0 = b[cx];
+        if (a0 !== b0) return a0 <= b0;
+    }
+    return a_length <= b_length;
+};
+var isArray = Array.isArray || (a => a instanceof Array);
+var defaultIsLE = (sample, search) => isArray(sample) && isArray(search) ? arrayIsLE(sample, search) : getValue(sample) <= getValue(search);
+/**
+ * 读取元素在有序数组中的位置
+ * @param {Array} orderArray 
+ * @param {string|number} searchItem 
+ */
+module.exports = function (orderArray, searchItem, isLE = typeof searchItem === "function" ? searchItem : defaultIsLE, findEqual = true) {
+    for (var cx = 0, dx = orderArray.length, ci = cx + dx >>> 1; cx < dx; ci = cx + dx >>> 1) {
+        var orderItem = orderArray[ci];
+        if (isLE(orderItem, searchItem)) {
+            cx = ci + 1;
+        } else {
+            dx = ci;
+        }
+    }
+    if (findEqual && dx <= orderArray.length) {
+        var index = dx - 1;
+        while (index >= 0 && isLE(searchItem, orderArray[index])) {
+            if (orderArray[index] === searchItem) return index;
+            index--;
+        }
+    }
+    return dx - 1;
+};

package/coms/basic/isObject.js

@@ -1,4 +1,4 @@
-// 用Object.create(null)创建的对象不继承Object，所以用 o instanceof Object可能会出错
-module.exports = function isObject(o) {
-    return o !== null && typeof o === 'object';
+// 用Object.create(null)创建的对象不继承Object，所以用 o instanceof Object可能会出错
+module.exports = function isObject(o) {
+    return o !== null && typeof o === 'object';
 }

package/coms/basic/keys.js

@@ -1,5 +1,5 @@
-function keysFrom() {
-    var args = Array.prototype.slice.call(arguments, 0, arguments.length);
-    args.unshift(Object.create(null));
-    return Object.keys(extendIfNeeded.apply(null, args));
+function keysFrom() {
+    var args = Array.prototype.slice.call(arguments, 0, arguments.length);
+    args.unshift(Object.create(null));
+    return Object.keys(extendIfNeeded.apply(null, args));
 }

package/coms/basic/lazy.js

@@ -1,79 +1,79 @@
-// 1.如果time大于0，传的和函数会延迟time执行，如果期间有新的调用，前一个调用会被忽略
-// 2.如果time小于0，传入的函数会立即执行，并忽略-time内的连续调用，time时间后触发最后一次调用
-// 如果time传false或0 使用requestAnimationFrame代替setTimeout按第1步执行
-// 如果time传null或undefined或NaN使用requestAnimationFrame代替setTimeout按第2步执行
-
-/**
- * @param {Function} run 主程序
- * @param {number|undefined} time 间隔
- * @param {any} ret 指定调用结束后返回的结果
- */
-
-function lazy(run, time, ret) {
-    var wait = +time ? setTimeout : requestAnimationFrame;
-    var quit = wait === setTimeout ? clearTimeout : cancelAnimationFrame;
-    var ing, args, that, id;
-    var hire = function () {
-        if (!ing) return;
-        if (time >= 0) {
-            if (ing === true) id = ing = wait(fire, +time / 2);
-            else id = wait(fire, +time / 2), ing = -2;
-        }
-        else {
-            id = wait(fire, -time);
-        }
-    };
-    var fire = function () {
-        if (!ing) return;
-        if (time >= 0) {
-            if (ing === true) {
-                id = ing = wait(fire, +time / 2);
-            }
-            else if (ing > 0) {
-                id = wait(fire, +time / 2);
-                ing = -1;
-            }
-            else if (ing === -1) {
-                ing = run.apply(that, args);
-                if (ing instanceof Promise) ing.then(hire, hire);
-                else ing = false;
-            }
-            else {
-                ing = false;
-            }
-        }
-        else {
-            if (ing === true) {
-                ing = run.apply(that, args);
-                if (ing instanceof Promise) ing.then(hire, hire);
-                else id = ing = wait(fire, -time);
-            } else {
-                ing = false;
-            }
-        }
-    };
-    var exec = function () {
-        args = arguments;
-        that = this;
-        if (ing) return ing = true;
-        if (time >= 0) {
-            id = ing = wait(fire, +time);
-        }
-        else if (time < 0) {
-            ing = run.apply(that, args);
-            if (ing instanceof Promise) ing.then(hire, hire);
-            else id = ing = wait(fire, -time);
-        }
-        else {
-            ing = true; id = wait(fire);
-        }
-        return ret;
-    };
-    exec.cancel = function () {
-        quit(id);
-        ing = false;
-        id = 0;
-    };
-    return exec;
-}
+// 1.如果time大于0，传的和函数会延迟time执行，如果期间有新的调用，前一个调用会被忽略
+// 2.如果time小于0，传入的函数会立即执行，并忽略-time内的连续调用，time时间后触发最后一次调用
+// 如果time传false或0 使用requestAnimationFrame代替setTimeout按第1步执行
+// 如果time传null或undefined或NaN使用requestAnimationFrame代替setTimeout按第2步执行
+
+/**
+ * @param {Function} run 主程序
+ * @param {number|undefined} time 间隔
+ * @param {any} ret 指定调用结束后返回的结果
+ */
+
+function lazy(run, time, ret) {
+    var wait = +time ? setTimeout : requestAnimationFrame;
+    var quit = wait === setTimeout ? clearTimeout : cancelAnimationFrame;
+    var ing, args, that, id;
+    var hire = function () {
+        if (!ing) return;
+        if (time >= 0) {
+            if (ing === true) id = ing = wait(fire, +time / 2);
+            else id = wait(fire, +time / 2), ing = -2;
+        }
+        else {
+            id = wait(fire, -time);
+        }
+    };
+    var fire = function () {
+        if (!ing) return;
+        if (time >= 0) {
+            if (ing === true) {
+                id = ing = wait(fire, +time / 2);
+            }
+            else if (ing > 0) {
+                id = wait(fire, +time / 2);
+                ing = -1;
+            }
+            else if (ing === -1) {
+                ing = run.apply(that, args);
+                if (ing instanceof Promise) ing.then(hire, hire);
+                else ing = false;
+            }
+            else {
+                ing = false;
+            }
+        }
+        else {
+            if (ing === true) {
+                ing = run.apply(that, args);
+                if (ing instanceof Promise) ing.then(hire, hire);
+                else id = ing = wait(fire, -time);
+            } else {
+                ing = false;
+            }
+        }
+    };
+    var exec = function () {
+        args = arguments;
+        that = this;
+        if (ing) return ing = true;
+        if (time >= 0) {
+            id = ing = wait(fire, +time);
+        }
+        else if (time < 0) {
+            ing = run.apply(that, args);
+            if (ing instanceof Promise) ing.then(hire, hire);
+            else id = ing = wait(fire, -time);
+        }
+        else {
+            ing = true; id = wait(fire);
+        }
+        return ret;
+    };
+    exec.cancel = function () {
+        quit(id);
+        ing = false;
+        id = 0;
+    };
+    return exec;
+}
 module.exports = lazy;

package/coms/basic/math.js

@@ -137,6 +137,12 @@ var funcmap = {
     abs(a) {
         return `<mo>|</mo>${a}<mo>|</mo>`;
     },
+    log(x, n) {
+        return `<msub><mo>log</mo>${n}</msub>${x}`
+    },
+    ln(x){
+        return `<mo>ln</mo>${x}`
+    },
     "div"(...args) {
         return mo3("÷", args);
     },
@@ -295,7 +301,7 @@ var br = function () {
 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>");
+            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));

package/coms/basic/math.md

@@ -337,6 +337,17 @@ series(公式主体,n=1,+Infinity)
     corner(A);
     corner(BAC);
 ```
+* 对数
+```mathscript
+    log(x,2);
+    log(x,e);
+    ln(x);
+```
+```math
+    log(x,2);
+    log(x,e);
+    ln(x);
+```
 
 ## 希腊字母对照表如下
 按此表中的英文单词命名的变量将自动转换为希腊字母

package/coms/basic/refilm.js

@@ -1,97 +1,97 @@
-function refilm() {
-    var [str] = arguments;
-    if (str.raw) str = str.raw;
-    return refilm_decode.apply(null, [str].concat([].slice.call(arguments, 1)));
-}
-var patchOffset = refilm.patchOffset = function (fields, offset = fields.offset || 0) {
-    fields.offset = offset;
-    fields.forEach(f => {
-        f.offset = offset;
-        fields[f.key] = f;
-        offset += f.size * f.ratio;
-    });
-    fields.size = offset - fields.offset;
-    return offset;
-};
-refilm.createFromFields = function (fields, values) {
-    if (!fields.size) patchOffset(fields);
-    var size = fields.size;
-    var data = new Uint8Array(size);
-    if (!values) values = Object.create(null);
-    for (var f of fields) {
-        if (f.key in values || !f.value) continue;
-        values[f.key] = f.value;
-    }
-    writeFields(data, fields, values, 0);
-    return data;
-}
-var writeField = refilm.writeField = function (data, field, value, offset = field.offset, byteLimit = field.size * field.ratio) {
-    if (isArrayLike(value));
-    else if (typeof value === "string") {
-        value = encodeUTF8(value);
-    }
-    else if (typeof value === "number") {
-        var v = [];
-        var limit = byteLimit;
-        while (limit-- > 0) {
-            v.push(value & 0xff);
-            if (limit >= 4) {
-                value = value / 256;
-            }
-            else value = value >>> 8;
-        }
-        if (value) throw new Error(i18n`数据过大`);
-        value = v;
-    }
-    else value = [value | 0];
-    if (value.length > byteLimit) {
-        throw new Error(i18n`数据超出大小限制！`);
-    }
-    var offset = field.offset;
-    while (value.length) data[offset++] = value.shift();
-};
-var writeFields = refilm.writeFields = function (data, fields, values, offset = fields.offset) {
-    for (var f of fields) {
-        var size = f.size * f.ratio;
-        if (f.key in values) writeField(data, f, values[f.key], offset, size);
-        offset += size;
-    }
-};
-var toint = function (buf) {
-    var n = 0;
-    if (buf.length >= 7 && (buf[7] || buf[6] > 0x1f)) return buf;
-    switch (buf.length) {
-        default:
-        case 3:
-            n |= buf[2] << 16;
-        case 2:
-            n |= buf[1] << 8;
-        case 1:
-            n |= buf[0];
-        case 0:
-    }
-    for (var cx = 3, dx = buf.length; cx < dx; cx++) {
-        n += buf[cx] * 2 ** (cx << 3);
-    }
-    return n;
-};
-var readBuffer = refilm.readBuffer = function (data, field, offset = field.offset, size = field.size * field.ratio) {
-    return data.slice(offset, offset + size);
-};
-
-var readField = refilm.readField = function (data, field, offset, size) {
-    var v = readBuffer(data, field, offset, size);
-    if (/^([us]?int|byte|word|dword|qword|long)/i.test(field.type)) v = toint(v);
-    return v;
-};
-
-refilm.readFields = function (data, fields, offset = fields.offset || 0) {
-    var res = Object.create(null);
-    for (var f of fields) {
-        var size = f.size * f.ratio;
-        var v = readField(data, f, offset, size);
-        res[f.key] = v;
-        offset += size;
-    }
-    return res;
+function refilm() {
+    var [str] = arguments;
+    if (str.raw) str = str.raw;
+    return refilm_decode.apply(null, [str].concat([].slice.call(arguments, 1)));
+}
+var patchOffset = refilm.patchOffset = function (fields, offset = fields.offset || 0) {
+    fields.offset = offset;
+    fields.forEach(f => {
+        f.offset = offset;
+        fields[f.key] = f;
+        offset += f.size * f.ratio;
+    });
+    fields.size = offset - fields.offset;
+    return offset;
+};
+refilm.createFromFields = function (fields, values) {
+    if (!fields.size) patchOffset(fields);
+    var size = fields.size;
+    var data = new Uint8Array(size);
+    if (!values) values = Object.create(null);
+    for (var f of fields) {
+        if (f.key in values || !f.value) continue;
+        values[f.key] = f.value;
+    }
+    writeFields(data, fields, values, 0);
+    return data;
+}
+var writeField = refilm.writeField = function (data, field, value, offset = field.offset, byteLimit = field.size * field.ratio) {
+    if (isArrayLike(value));
+    else if (typeof value === "string") {
+        value = encodeUTF8(value);
+    }
+    else if (typeof value === "number") {
+        var v = [];
+        var limit = byteLimit;
+        while (limit-- > 0) {
+            v.push(value & 0xff);
+            if (limit >= 4) {
+                value = value / 256;
+            }
+            else value = value >>> 8;
+        }
+        if (value) throw new Error(i18n`数据过大`);
+        value = v;
+    }
+    else value = [value | 0];
+    if (value.length > byteLimit) {
+        throw new Error(i18n`数据超出大小限制！`);
+    }
+    var offset = field.offset;
+    while (value.length) data[offset++] = value.shift();
+};
+var writeFields = refilm.writeFields = function (data, fields, values, offset = fields.offset) {
+    for (var f of fields) {
+        var size = f.size * f.ratio;
+        if (f.key in values) writeField(data, f, values[f.key], offset, size);
+        offset += size;
+    }
+};
+var toint = function (buf) {
+    var n = 0;
+    if (buf.length >= 7 && (buf[7] || buf[6] > 0x1f)) return buf;
+    switch (buf.length) {
+        default:
+        case 3:
+            n |= buf[2] << 16;
+        case 2:
+            n |= buf[1] << 8;
+        case 1:
+            n |= buf[0];
+        case 0:
+    }
+    for (var cx = 3, dx = buf.length; cx < dx; cx++) {
+        n += buf[cx] * 2 ** (cx << 3);
+    }
+    return n;
+};
+var readBuffer = refilm.readBuffer = function (data, field, offset = field.offset, size = field.size * field.ratio) {
+    return data.slice(offset, offset + size);
+};
+
+var readField = refilm.readField = function (data, field, offset, size) {
+    var v = readBuffer(data, field, offset, size);
+    if (/^([us]?int|byte|word|dword|qword|long)/i.test(field.type)) v = toint(v);
+    return v;
+};
+
+refilm.readFields = function (data, fields, offset = fields.offset || 0) {
+    var res = Object.create(null);
+    for (var f of fields) {
+        var size = f.size * f.ratio;
+        var v = readField(data, f, offset, size);
+        res[f.key] = v;
+        offset += size;
+    }
+    return res;
 };

package/coms/basic/saveToOrderedArray.js

@@ -1,12 +1,12 @@
-var getIndexFromOrderedArray = require("./getIndexFromOrderedArray");
-/**
- * 保存数据到有序数组
- * @param {Array} orderArray 
- * @param {string|number} newItem 
- */
-module.exports = function (orderArray, newItem, isLE) {
-    var cx = getIndexFromOrderedArray(orderArray, newItem, isLE);
-    var keep = orderArray[cx] === newItem;
-    if (!keep) orderArray.splice(cx + 1, 0, newItem);
-    return cx + 1 - keep;
+var getIndexFromOrderedArray = require("./getIndexFromOrderedArray");
+/**
+ * 保存数据到有序数组
+ * @param {Array} orderArray 
+ * @param {string|number} newItem 
+ */
+module.exports = function (orderArray, newItem, isLE) {
+    var cx = getIndexFromOrderedArray(orderArray, newItem, isLE);
+    var keep = orderArray[cx] === newItem;
+    if (!keep) orderArray.splice(cx + 1, 0, newItem);
+    return cx + 1 - keep;
 };

package/coms/basic/strings.js

@@ -44,7 +44,7 @@ var esc = function (a) {
 function uncode(s) {
     return s.replace(/\\u(?:\{[0-9a-f]+\}|[0-9a-f]{4})/ig, esc);
 }
-function kicode(s) {
+function kicode(s, singleSlash = false) {
     var t = [];
     return s.replace(/\\(?:u\{[0-9a-f]+\}|u[0-9a-f]{4}|x[0-9a-f]{2}|([0-7]{1,3}|[\s\S]))/ig, (a, b, i) => {
         if (!b) {
@@ -63,17 +63,19 @@ function kicode(s) {
         }
         if (unescapeMap.hasOwnProperty(a)) return unescapeMap[a];
         if (/^[0-7]+$/.test(b)) return String.fromCharCode(parseInt(b, 8));
+        if (b === singleSlash) return b;
+        if (singleSlash) return '\\' + b;
         return b;
     });
 }
-function decode(s) {
+function decode(s, singleSlash) {
     var r = /^(['"`])([\s\S]*)\1$/.exec(s);
     if (!r) return s;
-    return kicode(r[2]);
+    return kicode(r[2], singleSlash ? r[1] : null);
 }
 
-function recode(s) {
-    s = decode(s);
+function recode(s, singleSlash) {
+    s = decode(s, singleSlash);
     s = encode(s);
     return s;
 }

package/coms/basic_/&pget.js

@@ -0,0 +1 @@
+Reflect.get;

package/coms/basic_/&pset.js

@@ -0,0 +1 @@
+Reflect.set;

package/coms/basic_/Proxy.js

@@ -0,0 +1,6 @@
+this.Proxy || class Proxy {
+    constructor(target, handler) {
+        this.handler = handler;
+        this.target = target;
+    }
+}