efront 4.0.37 → 4.0.38

package/coms/basic/BigNumber.js

@@ -26,7 +26,10 @@ var split = function (s, n) {
     return r;
 };
 var fixme = function (neg, res, nl) {
-    if (nl > 0) res = res.slice(0, res.length - nl) + "." + res.slice(res.length - nl).replace(/0+$/, '');
+    if (nl > 0) {
+        if (res.length < nl) res = repeat0(nl - res.length) + res;
+        res = res.slice(0, res.length - nl) + "." + res.slice(res.length - nl).replace(/0+$/, '');
+    }
     res = res.replace(/^0+(?!\.)/, '');
     if (/^\./.test(res)) res = '0' + res;
     if (neg) res = '-' + res;
@@ -55,15 +58,71 @@ var fixde = function (numstr, fractionDigits, compare) {
     if (neg) res = '-' + res;
     return res;
 };
+var vmap = Object.create(null);
+var vsrc = [];
+var adds = function (s, c) {
+    for (var cx = 0, dx = s.length; cx < dx; cx++) {
+        vmap[s.charAt(cx)] = c + cx;
+        vsrc[c + cx] = s.charAt(cx);
+    }
+}
+adds("0123456789", 0);
+adds("abcdefghijklmnopqrstuvwxyz", 10);
 class BigNumber {
-    constructor(value) {
+    constructor(value, system_scale) {
         if (!this || this.constructor !== BigNumber) {
-            return new BigNumber(value);
+            return new BigNumber(value, system_scale);
+        }
+        system_scale = system_scale | 0;
+        if (!system_scale) system_scale = 10;
+        if (system_scale <= 1 || system_scale > 36) throw new Error("进制错误！");
+        var num = '0';
+        var dotOccurs;
+        var scale = system_scale;
+        if (system_scale <= 36) {
+            value = value.toLowerCase();
         }
-        this.value = value;
+        for (var v of value) {
+            if (v === '.') {
+                dotOccurs = true;
+                continue;
+            }
+            if (v === '_') continue;
+            if (v === ',') continue;
+            if (dotOccurs) {
+                num = BigNumber.add(num, BigNumber.div(vmap[v], scale, BigNumber.DECIMAL_DIGIT))
+                scale = BigNumber.prd(scale, system_scale);
+            }
+            else {
+                num = BigNumber.add(BigNumber.prd(num, scale), vmap[v]);
+            }
+        }
+        this.value = num;
     }
-    toString() {
-        return this.value;
+    static DECIMAL_DIGIT = 120;
+    toString(system_scale) {
+        system_scale |= 0;
+        if (!system_scale || system_scale === 10) return this.value;
+        if (system_scale <= 1 || system_scale > 36) throw new Error("进制错误！");
+        var [s, n, m] = prepare(this.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]);
+        }
+        if (m && m !== "0") {
+            var c = 0;
+            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;
+            }
+        }
+        if (s) dist.unshift('-');
+        return dist.join('');
     };
     add(bignumber) {
         return new BigNumber(BigNumber.add(this.value, bignumber));
@@ -79,8 +138,8 @@ class BigNumber {
     }
     static fix(numstr, fractionDigits) {
         fractionDigits = +fractionDigits || 0;
-        if (fractionDigits < 0 || fractionDigits > 100) {
-            throw new Error("小数位数只能是0和100之间的数字");
+        if (fractionDigits < 0 || fractionDigits > BigNumber.DECIMAL_DIGIT) {
+            throw new Error(`小数位数只能是0和${BigNumber.DECIMAL_DIGIT}之间的数字`);
         }
         return fixde(numstr, fractionDigits, 4);
     }

package/coms/basic/BigNumber_test.js

@@ -67,4 +67,6 @@ assert(BigNumber.div("9007199254740992.2345678901", 0.001, 6), "9007199254740992
 assert(BigNumber.div("9007199254740992.2345678901", "9007199254740992.2345678901", 6), "1.000000");
 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(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");

package/coms/zimoli/zimoli.js

@@ -58,7 +58,7 @@ if (/MSIE\s*[2-7]/.test(navigator.userAgent)) {
             if (currentHash && currentHash === targetHash) return;
             var targetHashIndex = targetHash.indexOf("#" + current_history);
             if (targetHashIndex < 0) return;
-            var targetpath = targetHash.slice(targetHashIndex + current_history.length + 1);
+            var targetpath = targetHash.slice(targetHashIndex + current_history.replace(/\/$/, '').length + 1);
             targetpath = decodeURI(targetpath);
             go(targetpath);
             return;

package/docs/main.xht

@@ -111,7 +111,8 @@
             closed: true,
             children: [
                 { name: i18n`字符集检查`, path: "/工具/字符集检查" },
-                { name: i18n`国际化`, path: "/工具/国际化" }
+                { name: i18n`国际化`, path: "/工具/国际化" },
+                { name: i18n`数值换算`, path: "/工具/数值换算" },
             ]
         }
     ];

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

@@ -0,0 +1,45 @@
+<style></style>
+<div>
+    <field -repeat="f in formats" -src="[f,value]"></field>
+</div>
+<script>
+    var _value = 0;
+    var parseFloat = (a, b) => new BigNumber(a, b);
+    var value = {
+        get 十进制() {
+            return _value;
+        },
+        set 十进制(v) {
+            _value = parseFloat(v)
+        },
+        get 十六进制() {
+            return _value.toString(16);
+        },
+        set 十六进制(v) {
+            _value = parseFloat(v, 16);
+        },
+        get 二进制() {
+            return _value.toString(2);
+        },
+        set 二进制(v) {
+            _value = parseFloat(v, 2);
+        },
+        get 八进制() {
+            return _value.toString(8)
+        },
+        set 八进制(v) {
+            _value = parseFloat(v, 8)
+        },
+        get 三十六进制() {
+            return _value.toString(36);
+        },
+        set 三十六进制(v) {
+            _value = parseFloat(v, 36);
+        },
+
+    };
+    var formats = Object.getOwnPropertyNames(value).map(k => {
+        return { name: k, key: k };
+    });
+
+</script>

package/package.json

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