From 4d400a369db4fe6f94116e4c6a8c079b22f3569e Mon Sep 17 00:00:00 2001
From: bourne7 <lawrencepbr@gmail.com>
Date: Tue, 22 Oct 2019 09:24:04 +0800
Subject: [PATCH] =?UTF-8?q?table=E7=9A=84=E5=90=88=E8=AE=A1=E8=A1=8C?=
 =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=8F=AF=E4=BB=A5=E6=8C=87=E5=AE=9A=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E7=9A=84=E5=B0=8F=E6=95=B0=E7=82=B9=E4=BD=8D=E4=BA=86?=
 =?UTF-8?q?=E3=80=82=E5=A6=82=E6=9E=9C=E4=B8=8D=E6=8C=87=E5=AE=9A=E7=9A=84?=
 =?UTF-8?q?=E8=AF=9D=E5=B0=B1=E6=98=AF=E9=BB=98=E8=AE=A4=E7=9A=842?=
 =?UTF-8?q?=E4=BD=8D=EF=BC=8C=E5=8F=AF=E4=BB=A5=E9=80=9A=E8=BF=87=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=20totalRowDecimalScale=20=E6=9D=A5=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/table.html      | 6 ++++--
 src/lay/modules/table.js | 7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/examples/table.html b/examples/table.html
index 5ce2d02a..d31151a5 100644
--- a/examples/table.html
+++ b/examples/table.html
@@ -177,7 +177,7 @@ body{padding: 20px; /*overflow-y: scroll;*/}
   </table>
 </div>
 
-<script src="../src/layui.js" src="//layui.hcwl520.com.cn/layui-v2.4.5/layui.js" charset="utf-8"></script>
+<script src="../src/layui.js" charset="utf-8"></script>
 <script>
 layui.use('table', function(){
   var table = layui.table;
@@ -397,7 +397,8 @@ layui.use('table', function(){
       ,{field: 'sign', title: '签名', width: 150}
       ,{field: 'sex', title: '性别', width: 80}
       ,{field: 'city', title: '城市', width: 100}
-      ,{field: 'experience', title: '积分', width: 80, sort: true}
+      // ,{field: 'experience', title: '积分', width: 80, sort: true}
+      ,{field: 'experience', title: '积分', width: 80, sort: true, totalRow: true, totalRowDecimalScale: 20}
     ]]
     ,data: [{
       "id": "10001"
@@ -497,6 +498,7 @@ layui.use('table', function(){
     ,page: true //是否显示分页
     ,limits: [3,5,10]
     ,limit: 3 //每页默认显示的数量
+    ,totalRow: true
     //,loading: false //请求数据时，是否显示loading
   });
   
diff --git a/src/lay/modules/table.js b/src/lay/modules/table.js
index a4c5f43d..11c0013f 100644
--- a/src/lay/modules/table.js
+++ b/src/lay/modules/table.js
@@ -951,8 +951,13 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
       
       //td内容
       var content = function(){
+        if( item3.totalRowDecimalScale == null || isNaN(item3.totalRowDecimalScale) || 
+          item3.totalRowDecimalScale < 0  || item3.totalRowDecimalScale > 10 ){
+          // 如果检测到非法值就重设为2。至于非法值的定义这里是我自己定义的。
+          item3.totalRowDecimalScale = 2;
+        }
         var text = item3.totalRowText || ''
-        ,thisTotalNum = parseFloat(totalNums[field]).toFixed(2)
+        ,thisTotalNum = parseFloat(totalNums[field]).toFixed(item3.totalRowDecimalScale)
         ,tplData = {};
         
         tplData[field] = thisTotalNum;