From 1ecefbabca9bb65bcbe7049a8880cc1bc6472315 Mon Sep 17 00:00:00 2001
From: sunxiaobin89 <285584806@qq.com>
Date: Sat, 6 Aug 2022 02:11:34 +0800
Subject: [PATCH] =?UTF-8?q?table=20=E4=BF=AE=E5=A4=8D=E5=A4=9A=E7=BA=A7?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E9=9A=90=E8=97=8F=E9=83=A8=E5=88=86=E5=88=97?=
 =?UTF-8?q?=E9=87=8D=E8=BD=BD=E4=B9=8B=E5=90=8E=E9=87=8D=E6=96=B0=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E9=9A=90=E8=97=8F=E7=9A=84=E5=88=97=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E9=94=99=E5=88=97=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/modules/table.js b/src/modules/table.js
index 0e301342..fadb6159 100644
--- a/src/modules/table.js
+++ b/src/modules/table.js
@@ -491,8 +491,8 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){
 
       item2.key = i1 + '-' + i2;
       item2.hide = item2.hide || false;
-      item2.colspan = item2.colspan || 1;
-      item2.rowspan = item2.rowspan || 1;
+      item2.colspan = item2.colspan || 0;
+      item2.rowspan = item2.rowspan || 0;
 
       //根据列类型，定制化参数
       that.initOpts(item2);
@@ -2140,8 +2140,8 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){
           
           var row = $.extend({
             title: th.text()
-            ,colspan: th.attr('colspan') || 1 //列单元格
-            ,rowspan: th.attr('rowspan') || 1 //行单元格
+            ,colspan: th.attr('colspan') || 0 //列单元格
+            ,rowspan: th.attr('rowspan') || 0 //行单元格
           }, itemData);
 
           if(row.colspan < 2) cols.push(row);