From a4a6a57dc25652365fd8e188ea7e1b52318d1ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
 <3277200+sentsim@users.noreply.github.com>
Date: Mon, 29 May 2023 11:11:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20table=20=E5=A4=96=E5=B1=82?=
 =?UTF-8?q?=E5=AE=B9=E5=99=A8=E7=9A=84=E9=AB=98=E5=BA=A6=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E8=AE=BE=E7=BD=AE=E4=B8=80=E4=B8=AA=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E5=80=BC=EF=BC=8C=E5=86=85=E9=83=A8=E5=85=83=E7=B4=A0=E5=B0=86?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=20`height`=20=E5=B1=9E=E6=80=A7=E5=80=BC?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=92=91=E6=BB=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/table.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/table.js b/src/modules/table.js
index 1712f5d7..92d6e2bf 100644
--- a/src/modules/table.js
+++ b/src/modules/table.js
@@ -404,7 +404,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
       ,'style': function(){
         var arr = [];
         if(options.width) arr.push('width:'+ options.width + 'px;');
-        if(options.height) arr.push('height:'+ options.height + 'px;');
+        // if(options.height) arr.push('height:'+ options.height + 'px;');
         return arr.join('')
       }()
     }).html(laytpl(TPL_MAIN, {
@@ -1653,11 +1653,11 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
     if(that.fullHeightGap){
       height = _WIN.height() - that.fullHeightGap;
       if(height < 135) height = 135;
-      that.elem.css('height', height);
+      // that.elem.css('height', height);
     } else if (that.parentDiv && that.parentHeightGap) {
       height = $(that.parentDiv).height() - that.parentHeightGap;
       if (height < 135) height = 135;
-      that.elem.css("height", height);
+      // that.elem.css("height", height);
     }
 
     // 如果多级表头，则填补表头高度