From a69102637b1728eef50b070d676577ca71f41e00 Mon Sep 17 00:00:00 2001
From: sunxiaobin89 <285584806@qq.com>
Date: Mon, 20 Jun 2022 20:19:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84reloadData=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=8F=82=E6=95=B0=E7=9A=84=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/modules/table.js b/src/modules/table.js
index a00631b7..60c52d77 100644
--- a/src/modules/table.js
+++ b/src/modules/table.js
@@ -2093,8 +2093,8 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     return thisTable.call(that);
   };
 
-  //需要重新render的参数名单
-  var dataParams = ['data', 'url', 'where', 'page', 'request', 'response', 'parseData'];
+  //reloadData支持的的参数名单
+  var dataParams = ['data', 'url', 'where', 'page', 'request', 'response', 'parseData', 'limit'];
   var dataParamsRegExp = new RegExp('^(' + dataParams.join('|') + ')$')
   //重载数据 options只允许跟数据请求相关的配置信息
   table.reloadData = function(id, options, deep){

From 9d689b3b8971b5cc05f01901cf0ebc9dd79831dd Mon Sep 17 00:00:00 2001
From: sunxiaobin89 <285584806@qq.com>
Date: Mon, 20 Jun 2022 23:58:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=90=E5=88=97?=
 =?UTF-8?q?=E6=9C=89=E9=9A=90=E8=97=8F=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E5=88=97=E5=AE=BD=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E7=9A=84=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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/table.js b/src/modules/table.js
index 60c52d77..36cb72af 100644
--- a/src/modules/table.js
+++ b/src/modules/table.js
@@ -1914,6 +1914,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
       // 找到它的子列所在cols的下标
       var i2 = i1 + (parseInt(item2.rowspan) || 1);
       layui.each(cols[i2], function (i22, item22) {
+        if (item22.hide) return;
         //如果子列已经被标注为{PARENT_COL_INDEX}，或者子列累计 colspan 数等于父列定义的 colspan，则跳出当前子列循环
         if (item22.PARENT_COL_INDEX || (childIndex >= 1 && childIndex == (item2.colspan || 1))) return;
         item22.PARENT_COL_INDEX = index;