Merge branch 'main' of github.com:layui/layui

pull/1049/head
贤心 2 years ago
commit c49197bb9f

@ -1918,13 +1918,12 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
// 找到它的子列所在cols的下标 // 找到它的子列所在cols的下标
var i2 = i1 + (parseInt(item2.rowspan) || 1); var i2 = i1 + (parseInt(item2.rowspan) || 1);
layui.each(cols[i2], function (i22, item22) { layui.each(cols[i2], function (i22, item22) {
if (item22.hide) return;
//如果子列已经被标注为{PARENT_COL_INDEX},或者子列累计 colspan 数等于父列定义的 colspan则跳出当前子列循环 //如果子列已经被标注为{PARENT_COL_INDEX},或者子列累计 colspan 数等于父列定义的 colspan则跳出当前子列循环
if (item22.PARENT_COL_INDEX || (childIndex >= 1 && childIndex == (item2.colspan || 1))) return; if (item22.PARENT_COL_INDEX || (childIndex >= 1 && childIndex == (item2.colspan || 1))) return;
item22.PARENT_COL_INDEX = index; item22.PARENT_COL_INDEX = index;
item2.CHILD_COLS.push(item22); item2.CHILD_COLS.push(item22);
childIndex = childIndex + parseInt(item22.colspan > 1 ? item22.colspan : 1); childIndex = childIndex + (item22.hide ? 0 : parseInt(item22.colspan > 1 ? item22.colspan : 1));
eachChildCols(index, cols, i2, item22); eachChildCols(index, cols, i2, item22);
}); });
} }

Loading…
Cancel
Save