Merge pull request #56 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit 'e1fcbf930f423388b80fb023184d314cf1db86a2': 精度
8 years ago · 7d4cc0d2db
3 changed files with 3 additions and 3 deletions
--- a/bi/core.js
+++ b/bi/core.js
@ -6857,7 +6857,7 @@ function accDiv(arg1, arg2) {
    with (Math) {
        r1 = Number(arg1.toString().replace(".", ""));
        r2 = Number(arg2.toString().replace(".", ""));
-        return (r1 / r2) * pow(10, t2 - t1);
+        return (t2 > t1) ? (r1 / r2) * pow(10, t2 - t1) : (r1 / r2) / pow(10, t1 - t2);
    }
 }

--- a/docs/core.js
+++ b/docs/core.js
@ -24390,7 +24390,7 @@ function accDiv(arg1, arg2) {
    with (Math) {
        r1 = Number(arg1.toString().replace(".", ""));
        r2 = Number(arg2.toString().replace(".", ""));
-        return (r1 / r2) * pow(10, t2 - t1);
+        return (t2 > t1) ? (r1 / r2) * pow(10, t2 - t1) : (r1 / r2) / pow(10, t1 - t2);
    }
 }

--- a/src/core/proto/number.js
+++ b/src/core/proto/number.js
@ -259,7 +259,7 @@ function accDiv(arg1, arg2) {
    with (Math) {
        r1 = Number(arg1.toString().replace(".", ""));
        r2 = Number(arg2.toString().replace(".", ""));
-        return (r1 / r2) * pow(10, t2 - t1);
+        return (t2 > t1) ? (r1 / r2) * pow(10, t2 - t1) : (r1 / r2) / pow(10, t1 - t2);
    }
 }