efront 4.3.7 → 4.3.8

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

@@ -1,3 +1,9 @@
+- zh-CN: 翻译工具
+  en:    translation tool
+
+- zh-CN: 数值过大易造成页面卡死！
+  en:    Too large a value can easily cause the page to freeze!
+
 - zh-CN: 服务异常
   en:    Service exception
 

package/coms/basic/BigNumber.js

@@ -68,20 +68,74 @@ var adds = function (s, c) {
 }
 adds("0123456789", 0);
 adds("abcdefghijklmnopqrstuvwxyz", 10);
+var 缩放到1附近 = function (bign, scale, 有效数字位数) {
+    var scale = scale.toString();
+    var 用乘法 = /^0\./.test(bign);
+    var targetSize;
+    if (用乘法) {
+        targetSize = /^0\.0*/.exec(bign)[0].length;
+    }
+    else {
+        targetSize = bign.toString().replace(/\.[\s\S]+$/, '').length;
+    }
+    var system = [scale];
+    var halfSize = targetSize >> 1;
+    while (scale.length <= halfSize) {
+        scale = BigNumber.prd(scale, scale);
+        system.push(scale);
+    }
+    scale = system.pop();
+    var zerocount = 1 << system.length;
+    while (system.length > 1) {
+        var s = system.pop();
+        if (s.length + scale.length > targetSize) continue;
+        s = BigNumber.prd(scale, s);
+        if (s.length < targetSize) {
+            scale = s;
+            zerocount += 1 << system.length;
+        }
+    }
+    if (用乘法) bign = BigNumber.prd(bign, scale);
+    else {
+        bign = BigNumber.div(bign, scale, BigNumber.DECIMAL_DIGIT);
+    }
+    return [bign, 用乘法 ? -zerocount : zerocount];
+};
 class BigNumber {
     constructor(value, system_scale) {
         if (!this || this.constructor !== BigNumber) {
             return new BigNumber(value, system_scale);
         }
+        value = String(value || 0);
         system_scale = system_scale | 0;
-        if (!system_scale) system_scale = 10;
-        if (system_scale <= 1 || system_scale > 36) throw new Error("进制错误！");
+        if (!system_scale) {
+            system_scale = 10;
+        }
+        if (system_scale === 1) throw new Error("不支持半年级数数进制！");
+        if (system_scale < 1) throw new Error("不支持小于1的进位方针！");
+        var BACK_DIGIT = BigNumber.DECIMAL_DIGIT;
+        var digit = value.indexOf('.');
+        if (digit < 0) digit = 0;
+        else digit = value.length - digit;
+        if (system_scale === 10 && value.indexOf('e') > 0) {
+            var [value, ratio] = value.split('e');
+            if (/^\-/.test(ratio)) digit += ratio - ratio.length, ratio = "0." + Array(+ratio.slice(1)).join('0') + "1";
+            else {
+                if (/^\+/.test(ratio)) ratio = ratio.slice(1);
+                ratio = "1" + Array(+ratio + 1).join('0');
+            }
+        }
+        if (digit > 1) digit += 6;
+        digit = Math.ceil(digit * Math.log10(system_scale));
+        if (digit > BACK_DIGIT) BigNumber.DECIMAL_DIGIT = digit;
         var num = '0';
         var dotOccurs;
         var scale = system_scale;
         if (system_scale <= 36) {
             value = value.toLowerCase();
         }
+        value = value.replace(/^\[|\]$/g, '').split(/[,:;、；。，]|\]\[/);
+        if (value.length === 1) value = value[0];
         var sign = false;
         for (var v of value) {
             if (v === "-") {
@@ -95,41 +149,102 @@ class BigNumber {
             }
             if (v === '_') continue;
             if (v === ',') continue;
+            if (!(v in vmap)) {
+                v = +v;
+            }
+            else v = vmap[v];
+            if (Number.isNaN(v) || v >= system_scale || v !== +v) throw new Error("数据错误！");
+
             if (dotOccurs) {
-                num = BigNumber.add(num, BigNumber.div(vmap[v], scale, BigNumber.DECIMAL_DIGIT))
+                num = BigNumber.add(num, BigNumber.div(v, scale, BigNumber.DECIMAL_DIGIT))
                 scale = BigNumber.prd(scale, system_scale);
             }
             else {
-                num = BigNumber.add(BigNumber.prd(num, scale), vmap[v]);
+                num = BigNumber.add(BigNumber.prd(num, scale), v);
             }
         }
         if (sign) num = '-' + num;
+        if (ratio) num = BigNumber.prd(num, ratio);
         this.value = num;
+        if (digit > BACK_DIGIT) {
+            this.digit = digit;
+        }
+        BigNumber.DECIMAL_DIGIT = BACK_DIGIT;
     }
-    static DECIMAL_DIGIT = 120;
-    toString(system_scale) {
+    static DECIMAL_DIGIT = 324;
+    toString(system_scale, 有效数字位数) {
         system_scale |= 0;
-        if (!system_scale || system_scale === 10) return this.value || "0";
-        if (system_scale <= 1 || system_scale > 36) throw new Error("进制错误！");
-        var [s, n, m] = prepare(this.value);
+        var 收起零 = 有效数字位数 < 0;
+        if (收起零) 有效数字位数 = -有效数字位数;
+        var zero = system_scale <= 36 ? '0' : '[0]';
+        if (!system_scale || system_scale === 10) return this.value || zero;
+        if (system_scale <= 1) throw new Error("进制错误！");
+        var BACK_DIGIT = BigNumber.DECIMAL_DIGIT;
+        if (!有效数字位数) 有效数字位数 = Math.ceil((this.digit || BigNumber.DECIMAL_DIGIT) / Math.log10(system_scale));
+        BigNumber.DECIMAL_DIGIT = 有效数字位数 + 10 + system_scale;
+        var [value, zerocount] = 缩放到1附近(this.value, system_scale, 有效数字位数);
+        var [s, n, m] = prepare(value);
         var dist = [];
         while (n && n !== "0") {
             var n0 = BigNumber.div(n, system_scale, 0);
             var a = BigNumber.sub(n, BigNumber.prd(n0, system_scale));
             n = n0;
-            dist.unshift(vsrc[+a]);
+            dist.unshift(+a);
         }
-        if (m && m !== "0") {
-            var c = 0;
+        var c = dist.length;
+        var mid = (system_scale - 1) / 2 | 0;
+        var end = system_scale - 1;
+        if (m && m !== "0" && c <= 有效数字位数) {
             dist.push('.');
             while (m !== "0") {
                 [a, m = '0'] = BigNumber.prd("0." + m, system_scale).split('.');
-                dist.push(vsrc[+a]);
-                if (++c > BigNumber.DECIMAL_DIGIT || !m) break;
+                dist.push(+a);
+                if (c > 0 || +a > 0) {
+                    if (c++ >= 有效数字位数 || !m) break;
+                }
             }
+            if (c > 有效数字位数) {
+                if (dist[dist.length - 1] > mid) {
+                    dist.pop();
+                    while (dist[dist.length - 1] === end) dist.pop();
+                    if (dist[dist.length - 1] === ".") dist.pop();
+                    c = dist.length - 1;
+                    while (dist[c] === end) dist[c--] = 0;
+                    if (c < 0) dist.unshift(1);
+                    else dist[c] = dist[c] + 1;
+                }
+                else dist.pop();
+            }
+        } else if (c > 有效数字位数) {
+            if (dist[有效数字位数] > mid) {
+                var c = 有效数字位数 - 1;
+                while (dist[c] === end) dist[c--] = 0;
+                if (c < 0) dist.unshift(1);
+                else dist[c] = dist[c] + 1;
+            }
+            while (有效数字位数 < dist.length) dist[有效数字位数++] = 0;
+        }
+        var i = dist.indexOf('.');
+        if (i >= 0) dist.splice(i, 1);
+        else i = dist.length;
+        i += zerocount;
+        if (i <= 0) {
+            if (收起零 && i <= -30) dist.unshift(`${zero}.(${- i}个${zero})`);
+            else dist.unshift(zero + "." + Array(1 - i).join(zero));
+        }
+        else if (i === dist.length);
+        else if (i < dist.length) dist.splice(i, 0, '.');
+        else if (i > dist.length) {
+            if (收起零 && i >= dist.length + 30) dist.push(`(还有${i - dist.length}位)`);
+            else dist.push(Array(i - dist.length + 1).join(zero));
         }
-        if (!dist.length) dist.push("0");
+        while (dist[0] === 0) dist.shift();
+        if (dist[0] === '.') dist.unshift(0);
+        else if (!dist.length) dist.push(0);
         if (s) dist.unshift('-');
+        BigNumber.DECIMAL_DIGIT = BACK_DIGIT;
+        if (system_scale <= 36) dist = dist.map(d => Number.isFinite(d) ? vsrc[d] : d);
+        else dist = dist.map(d => Number.isFinite(d) ? '[' + d + ']' : d);
         return dist.join('');
     };
     add(bignumber) {
@@ -189,7 +304,7 @@ class BigNumber {
             var neg = neg1 && neg2;
         }
         var res = [];
-        var end = (numstr1.length / 15 | 0) * 15;
+        var end = ((numstr1.length - 1) / 15 | 0) * 15;
         var rest = 0;
         while (end >= 0) {
             var s1 = numstr1.slice(end, end + 15);
@@ -262,7 +377,7 @@ class BigNumber {
         var [neg1, s11, s12] = prepare(numstr1);
         var [neg2, s21, s22] = prepare(numstr2);
         var d = s12.length + decimal - s22.length;
-        decimal = (decimal | 0) + 1;
+        decimal = (decimal & 0x7fffffff) + 1;
         numstr1 = s11 + s12;
         numstr2 = s21 + s22;
         numstr1 = numstr1.replace(/^0+/, '');

package/coms/basic/BigNumber_test.js

@@ -8,6 +8,7 @@ testAdd(0x1fffffffffffff, 1, '9007199254740992');
 testAdd(0x1fffffffffffff, 2, '9007199254740993');
 testAdd(0x1fffffffffffff, 3, '9007199254740994');
 testAdd(0x1fffffffffffff, 3, '9007199254740994');
+testAdd("562949953421296", 15, '562949953421311');
 testAdd("900719925474099.2", 0.1, '900719925474099.3');
 testAdd("900719925474099.2", 0.1, '900719925474099.3');
 testAdd("900719925474099.3", -0.2, '900719925474099.1');
@@ -68,5 +69,15 @@ assert(BigNumber.div("9007199254740992.2345678901", "9007199254740992.2345678901
 assert(BigNumber.div("9007199254740992.2345678901", "90071992547409922345678.901", 6), "0.000000");
 assert(BigNumber.div("9007199254740992.2345678901", "900719925474099223456.78901", 6), "0.000010");
 assert(BigNumber.div("99999", "9", 6), "11111.000000");
-assert(new BigNumber("1.23",  8).toString(), "1.296875");
-assert(new BigNumber("1.23",  8).toString(8), "1.23");
+assert(new BigNumber("1.23", 8).toString(), "1.296875");
+assert(new BigNumber("1.23", 8).toString(8), "1.23");
+assert(new BigNumber("17", 8).toString(), "15");
+assert(new BigNumber("17", 8).toString(8), "17");
+assert(new BigNumber("1fffffffffffff", 16).toString(), '9007199254740991');
+assert(new BigNumber("1fffffffffffff", 16).toString(16), '1fffffffffffff');
+BigNumber.DECIMAL_DIGIT = 500;
+[2, 4, 8, 16, 32].forEach(cx => {
+    var number = BigNumber.div(new BigNumber("5"), new BigNumber((10n ** 324n).toString()), 500);
+    assert(new BigNumber(number).toString(cx).slice(0, 5e-324 .toString(cx).length), 5e-324 .toString(cx));
+    assert(new BigNumber("-" + number).toString(cx).slice(0, (-5e-324).toString(cx).length), (-5e-324).toString(cx));
+});

package/coms/compile/autoeval.js

@@ -1,5 +1,13 @@
-var { skipAssignment, createString, QUOTED, STAMP, SCOPED, VALUE, SPACE, COMMENT, relink } = require("./common");
+var { skipAssignment, createString, QUOTED, STAMP, SCOPED, VALUE, SPACE, COMMENT, EXPRESS, relink } = require("./common");
 
+var eval2 = function (v) {
+    v = eval(v);
+    if (typeof v === 'bigint') return String(v) + "n";
+    return String(v);
+};
+var canbeunbrace = function () {
+
+}
 var calculate = function (body) {
     for (var cx = 0; cx < body.length; cx) {
         var o = body[cx];
@@ -16,16 +24,27 @@ var calculate = function (body) {
                 if (o.type === SCOPED && o.entry === '(') {
                     var p = o.prev;
                     if (!p || p.type === STAMP || p.type === VALUE && p.isdigit) {
-                        if (o.last.type === VALUE && o.last.isdigit) {
-                            if ((o.first === o.last)) {
-                                o.type = VALUE;
-                                o.text = o.last.text;
-                                o.isdigit = true;
+                        var last = o.last, first = o.first;
+                        if (last.type === VALUE && last.isdigit) {
+                            var text = null;
+                            if ((first === last)) {
+                                text = last.text;
+                            }
+                            else if (first.next === last && first.type === STAMP && /^[+-~]+$/.test(first.text)) {
+                                text = eval2(first.text + last.text);
+                                last.text = text;
+                                o.splice(0, o.length);
+                                o.push(last);
+                                o.first = o.last = last;
                             }
-                            else if (o.first.next === o.last && o.first.type === STAMP && /^[+-~]+$/.test(o.first.text)) {
-                                o.type = VALUE;
-                                o.text = eval(o.first.text + o.last.text);
-                                o.isdigit = true;
+                            var next = o.next;
+                            if (text) {
+                                if (/^\-/.test(text) && next && next.type === EXPRESS && /^[\.\[]/.test(next.text));
+                                else {
+                                    o.type = VALUE;
+                                    o.text = text;
+                                    o.isdigit = true;
+                                }
                             }
                         }
                     }
@@ -36,7 +55,9 @@ var calculate = function (body) {
         }
         if (ignore || ex - ox < 3) continue;
         var o = body[ox];
-        o.text = eval(createString(body.slice(ox, ex)));
+        o.text = eval2(createString(body.slice(ox, ex)));
+        o.type = VALUE;
+        o.isdigit = true;
         cx = ox + 1;
         body.splice(cx, ex - cx);
     }

package/coms/compile/autoeval_test.js

@@ -17,7 +17,7 @@ t("1+1", "2");
 t("1+3", "4");
 t("(1+3)", "4");
 t("(-1)*(1+3)", "-4");
-t("(-+-+-1)*(1+3)", "-4");
+t("(-+-+-2)*(1+3)", "-8");
 t("(~1)*(1+3)", "-8");
 t("(1*-1)+(1+3)", "3");
 t("1+(1+3)", "5");
@@ -25,4 +25,8 @@ t("a(1+3)", "a(4)");
 t("(1+3,5,3+4)", "(4, 5, 7)");
 t("(1>>3,5,3+4)", "(0, 5, 7)");
 t("a=1,b=2;(a|b)&c", "a = 1, b = 2; 3 & c");
+t("(1+2).toString()", "3 .toString()");
+t("(1n+2n).toString()", "3n .toString()");
+t("(-1).toString()", "(-1).toString()");
+t("(-(2n*324n)).toString()", "(-648n).toString()");
 // tf(path.join(__dirname, "../zimoli/spacechar_test.js"))

package/coms/kugou/player.js

@@ -425,7 +425,6 @@ var createControls = function () {
     });
     return player;
 };
-var ns = document.addEventListener && new thirdParty$NoSleep;
 
 var player = function (player) {
     render(player, $scope);

package/docs//345/267/245/345/205/267//346/225/260/345/200/274/346/215/242/347/256/227.xht

@@ -1,11 +1,25 @@
-<style></style>
+<style>
+    h4 {
+        text-align: center;
+        font-size: 16px;
+        color: #822;
+        /* background: #fc2; */
+        margin: 0;
+        padding: 20px 0;
+        font-family: 'Times New Roman', Times, serif;
+    }
+</style>
 <div>
+    <h4>${i18n`数值过大易造成页面卡死！`}</h4>
     <field -repeat="f in formats" -src="[f,value]"></field>
 </div>
 <script>
-    var _value = 0;
+    var _value = null;
+    BigNumber.DECIMAL_DIGIT = 500;
     var parseFloat = (a, b) => new BigNumber(a, b);
-    var value = {
+    var value0 = Object.create(null);
+
+    var value1 = {
         get [i18n`十进制`]() {
             return _value;
         },
@@ -13,29 +27,35 @@
             _value = parseFloat(v)
         },
         get [i18n`十六进制`]() {
-            return _value.toString(16);
+            return _value.toString(16, -73);
         },
         set [i18n`十六进制`](v) {
             _value = parseFloat(v, 16);
         },
         get [i18n`二进制`]() {
-            return _value.toString(2);
+            return _value.toString(2, -73);
         },
         set [i18n`二进制`](v) {
             _value = parseFloat(v, 2);
         },
         get [i18n`八进制`]() {
-            return _value.toString(8)
+            return _value.toString(8, -53)
         },
         set [i18n`八进制`](v) {
             _value = parseFloat(v, 8)
         },
         get [i18n`三十六进制`]() {
-            return _value.toString(36);
+            return _value.toString(36, -73);
         },
         set [i18n`三十六进制`](v) {
             _value = parseFloat(v, 36);
         },
+        get [i18n`六十进制`]() {
+            return _value.toString(60, -73);
+        },
+        set [i18n`六十进制`](v) {
+            _value = parseFloat(v, 60);
+        },
         get [i18n`浮点数机器码`]() {
             var v = +_value;
             var s = /^-/.test(v);
@@ -60,8 +80,7 @@
             var s = /^-/.test(_value);
             var v = window.parseFloat(_value);
             if (s) v = -v;
-            var i = Math.log2(v) | 0;
-            if (i < 0) i--;
+            var i = Math.floor(Math.log2(v));
             if (!v) i = 0;
             else v = (v * Math.pow(2, -i) - 1) * Math.pow(2, 52), i += 1023;
             return [
@@ -78,15 +97,59 @@
             var i = parseInt(v.slice(0, 3), 16) & 0x7ff;
             v = parseInt(v.slice(3), 16);
             if (i === 0 && v === 0) v = 0;
-            else if (i < 1023) v = (v + Math.pow(2, 52)) * Math.pow(2, i - 1022 - 53);
+            else if (i < 1023) v = (v + Math.pow(2, 52)) * Math.pow(2, i - 1023 - 52);
             else v = (v + Math.pow(2, 53)) * Math.pow(2, i - 1023 - 53);
             if (s) v = -v;
             _value = v;
         },
+        get [i18n`双精度机器码`]() {
+            var v = _value.toString(2, 53);
+            var s = /^-/.test(v) ? "1" : '0';
+            if (+s) v = v.slice(1);
+            var i = v.indexOf('.');
+            if (i < 0) i = v.length;
+            else v = v.slice(0, i) + v.slice(i + 1);
+            if (/^0/.test(v)) {
+                var e = v.indexOf("1");
+                v = v.slice(e);
+                i -= e;
+            }
+            i--;
+            if (v === '0' || i < -1078) {
+                i = Array(12).join("0");
+                v = Array(53).join('0');
+            }
+            else if (i > 1023) {
+                v = "0";
+                i = Array(12).join('1');
+            }
+            else {
+                i += 1023;
+                if (i < 0) v = Array(2 - i).join('0') + v, i = 0;
+                v = v.slice(1, 53);
+                i = i.toString(2);
+            }
+            if (i.length < 11) i = Array(12 - i.length).join('0') + i;
+            if (v.length < 52) v += Array(53 - v.length).join("0");
+            v = (s + i + v).replace(/[01]{4}/g, a => parseInt(a, 2).toString(16));
+            return v;
+        },
 
     };
     var hex = a => a < 0x10 ? "0" + a.toString(16) : a.toString(16);
-    var formats = Object.getOwnPropertyNames(value).map(k => {
+    var value = Object.create(null);
+    var 进制 = Object.getOwnPropertyNames(value1);
+    var formats = 进制.map(k => {
+        Object.defineProperty(value, k, {
+            get() {
+                return value0[k];
+            },
+            set(v) {
+                if (v === value0[k]) return;
+                value1[k] = v;
+                进制.forEach(k => value0[k] = value1[k]);
+            },
+        })
         return { name: k, key: k };
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.3.7",
+    "version": "4.3.8",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {