From 7076f801f7e878f4cd2c21731e2def496da2bde5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
 <3277200+sentsim@users.noreply.github.com>
Date: Tue, 21 Jun 2022 00:02:39 +0800
Subject: [PATCH] update

---
 examples/json/table/demo1.json |  4 ++--
 examples/json/table/demo3.json |  2 +-
 examples/table.html            |  4 ++--
 package.json                   |  2 +-
 src/css/layui.css              |  2 +-
 src/layui.js                   |  2 +-
 src/modules/table.js           | 10 +++-------
 7 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/examples/json/table/demo1.json b/examples/json/table/demo1.json
index 4032e702..1657c779 100644
--- a/examples/json/table/demo1.json
+++ b/examples/json/table/demo1.json
@@ -3,7 +3,7 @@
   ,"msg": ""
   ,"count": 3000000
   ,"totalRow": {
-    "experience": "666"
+    "experience": "777"
   }
   ,"data": [{
     "id": "10001"
@@ -34,7 +34,7 @@
     ,"email": "test3@email.com"
     ,"sex": "男"
     ,"city": "浙江杭州"
-    ,"sign": "人生恰似一场修行"
+    ,"sign": "人生恰似一场修行<br>1<br>1<br>1<br>1<br>1<br>1"
     ,"experience": 8
     ,"ip": "192.168.0.8"
     ,"logins": null
diff --git a/examples/json/table/demo3.json b/examples/json/table/demo3.json
index dbd785b5..981f046b 100644
--- a/examples/json/table/demo3.json
+++ b/examples/json/table/demo3.json
@@ -1,7 +1,7 @@
 {
   "status": 200
   ,"message": ""
-  ,"total": 3000000
+  ,"total": 333333
   ,"data": {
     "list": [{
       "id": "10001"
diff --git a/examples/table.html b/examples/table.html
index 5b847ec6..d2db47da 100644
--- a/examples/table.html
+++ b/examples/table.html
@@ -182,7 +182,7 @@
   </table>
 </div>
 
-<script src="../src/layui.js" src1="//www.layuicdn.com/layui-v2.0.1/layui.js" charset="utf-8"></script>
+<script src="../src/layui.js" src1="https://cdn.staticfile.org/layui/2.6.13/layui.js"></script>
 <script>
 layui.use(['table', 'dropdown'], function(){
   var table = layui.table
@@ -303,7 +303,7 @@ layui.use(['table', 'dropdown'], function(){
       ,{field: 'sex', title: '性别', width: 80}
       ,{field: 'city', title: '城市', width: 100}
       // ,{field: 'experience', title: '积分', width: 80, sort: true}
-      ,{field: 'experience', title: '积分', width: 80, sort: true, totalRow: true, totalRowDecimalScale: 20}
+      ,{field: 'experience', title: '积分', width: 80, sort: true, totalRow: true, totalRowDecimals: 3}
     ]]
     ,data: [{
       "id": "10001"
diff --git a/package.json b/package.json
index 4b0e3e5c..b6705ec1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "layui",
   "realname": "layui",
-  "version": "2.6.13",
+  "version": "2.7.0-rc1",
   "description": "Classic modular Front-End UI library",
   "main": "dist/layui.js",
   "license": "MIT",
diff --git a/src/css/layui.css b/src/css/layui.css
index efe51710..30210f35 100644
--- a/src/css/layui.css
+++ b/src/css/layui.css
@@ -983,7 +983,7 @@ a cite{font-style: normal; *cursor:pointer;}
 
 .layui-table-patch .layui-table-cell{padding: 0; width: 30px;}
 
-.layui-table-edit{position: absolute; left: 0; top: 0; width: 100%; height: 100%; padding: 0 14px 1px; border-radius: 0; box-shadow: 1px 1px 20px rgba(0,0,0,.15)}
+.layui-table-edit{position: absolute; left: 0; top: 0; z-index: 900; width: 100%; height: 100%; padding: 0 14px 1px; border-radius: 0; box-shadow: 1px 1px 20px rgba(0,0,0,.15); background-color: #fff;}
 .layui-table-edit:focus{border-color: #5FB878!important;}
 select.layui-table-edit{padding: 0 0 0 10px; border-color: #d2d2d2;}
 .layui-table-view .layui-form-switch,
diff --git a/src/layui.js b/src/layui.js
index 24d6307b..23e64bc8 100644
--- a/src/layui.js
+++ b/src/layui.js
@@ -15,7 +15,7 @@
   }
 
   ,Layui = function(){
-    this.v = '2.6.13'; // layui 版本号
+    this.v = '2.7.0-rc1'; // layui 版本号
   }
   
   //识别预先可能定义的指定全局对象
diff --git a/src/modules/table.js b/src/modules/table.js
index d77eaaca..4ce70ffa 100644
--- a/src/modules/table.js
+++ b/src/modules/table.js
@@ -1008,13 +1008,9 @@ 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(item3.totalRowDecimalScale)
+        ,decimals = item3.totalRowDecimals || 2
+        ,thisTotalNum = parseFloat(totalNums[field]).toFixed(decimals)
         ,tplData = {}
         ,getContent;
         
@@ -2168,4 +2164,4 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
   exports(MOD_NAME, table);
 });
 
- 
+