From ab16f47dd1bd4460b4171a926d2e726bb8e2a6ab Mon Sep 17 00:00:00 2001
From: sunxiaobin89 <285584806@qq.com>
Date: Fri, 28 Apr 2023 18:05:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20table=20`reload`=20?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=9A=84=E4=B8=AD=E5=AF=B9=20`cols`=20?=
 =?UTF-8?q?=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=87=BA=E9=94=99=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 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/modules/table.js b/src/modules/table.js
index e74bc8b5..451cfada 100644
--- a/src/modules/table.js
+++ b/src/modules/table.js
@@ -872,7 +872,14 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
 
     // 对参数进行深度或浅扩展
     that.config = $.extend(deep, {}, that.config, options);
-
+    if (type !== 'reloadData') {
+      layui.each(that.config.cols, function (i1, item1) {
+        layui.each(item1, function (i2, item2) {
+          delete item2.colspan2;
+        })
+      })
+      delete that.config.HAS_SET_COLS_PATCH;
+    }
     // 执行渲染
     that.render(type);
   };