theluyuan/layui-js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1034 from sunxiaobin89/main

Browse Source 
修复复杂表头的表格表头和字段列错位的问题
This commit is contained in:
贤心 2022-06-08 01:15:09 +08:00 committed by GitHub
commit 0b57b81707
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/modules/table.js
View File

@ -397,7 +397,9 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
//初始化列参数 //初始化列参数
layui.each(options.cols, function(i1, item1){ layui.each(options.cols, function(i1, item1){
layui.each(item1, function(i2, item2){ layui.each(item1, function(i2, item2){
item2.colspan = item2.colspan || 1;
item2.rowspan = item2.rowspan || 1;
//如果列参数为空，则移除 //如果列参数为空，则移除
if(!item2){ if(!item2){
item1.splice(i2, 1); item1.splice(i2, 1);
@ -411,10 +413,10 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
//如果是组合列，则捕获对应的子列 //如果是组合列，则捕获对应的子列
if(item2.colGroup || item2.colspan > 1){ if(item2.colGroup || item2.colspan > 1){
var childIndex = 0; var childIndex = 0;
layui.each(options.cols[i1 + 1], function(i22, item22){ layui.each(options.cols[i1 + item2.rowspan], function(i22, item22){
//如果子列已经被标注为{HAS_PARENT}，或者子列累计 colspan 数等于父列定义的 colspan，则跳出当前子列循环 //如果子列已经被标注为{HAS_PARENT}，或者子列累计 colspan 数等于父列定义的 colspan，则跳出当前子列循环
if(item22.HAS_PARENT || (childIndex > 1 && childIndex == item2.colspan)) return; if(item22.HAS_PARENT || (childIndex >= 1 && childIndex == item2.colspan)) return;
item22.HAS_PARENT = true; item22.HAS_PARENT = true;
item22.parentKey = i1 + '-' + i2; item22.parentKey = i1 + '-' + i2;
@ -1847,8 +1849,8 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
var row = $.extend({ var row = $.extend({
title: th.text() title: th.text()
,colspan: th.attr('colspan') || 0 //列单元格 ,colspan: th.attr('colspan') || 1 //列单元格
,rowspan: th.attr('rowspan') || 0 //行单元格 ,rowspan: th.attr('rowspan') || 1 //行单元格
}, itemData); }, itemData);
if(row.colspan < 2) cols.push(row); if(row.colspan < 2) cols.push(row);
@ -1902,11 +1904,11 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
var childIndex = 0; var childIndex = 0;
index++ index++
item2.CHILD_COLS = []; item2.CHILD_COLS = [];
layui.each(cols[i1 + 1], function(i22, item22){ layui.each(cols[i1 + item2.rowspan], function(i22, item22){
//如果子列已经被标注为{PARENT_COL_INDEX}，或者子列累计 colspan 数等于父列定义的 colspan，则跳出当前子列循环 //如果子列已经被标注为{PARENT_COL_INDEX}，或者子列累计 colspan 数等于父列定义的 colspan，则跳出当前子列循环
if(item22.PARENT_COL_INDEX || (childIndex > 1 && childIndex == item2.colspan)) return; if(item22.PARENT_COL_INDEX || (childIndex >= 1 && childIndex == item2.colspan)) return;
item22.PARENT_COL_INDEX = index; item22.PARENT_COL_INDEX = index;
item2.CHILD_COLS.push(item22); item2.CHILD_COLS.push(item22);