forgetest5
/
bee-table7
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: 单元格增加mergeEndIndex属性

This commit is contained in:
yangchch6 2020-03-12 17:03:00 +08:00
parent 04fd93bc4b
commit 3d3585f217
7 changed files with 79142 additions and 81869 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/TableCell.js
View File

@ -107,6 +107,10 @@ var TableCell = function (_Component) {
if (rowSpan === 0 || colSpan === 0) {
return null;
}
if (tdProps && tdProps.mergeEndIndex && index < tdProps.mergeEndIndex && rowSpan === 0) {
rowSpan = tdProps.mergeEndIndex - index;
text = '';
}
//不是固定表格并且当前列是固定，则隐藏当前列
if (column.fixed && !fixed) {
className = className + (' ' + clsPrefix + '-fixed-columns-in-body');

2
demo/index.js
View File

File diff suppressed because one or more lines are too long

2
dist/demo.css vendored
View File

@ -280,7 +280,6 @@
line-height: 16px;
border: 1px solid rgb(193, 199, 208);
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
background: #fff;
@ -363,7 +362,6 @@
background: rgb(241, 242, 245);
color: rgb(33, 33, 33);
background-clip: padding-box;
-moz-user-select: -moz-none;
-webkit-user-select: none;
/*
Introduced in IE 10.

2
dist/demo.css.map vendored
View File

File diff suppressed because one or more lines are too long

160995
dist/demo.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
src/TableCell.js
View File

@ -64,6 +64,10 @@ class TableCell extends Component{
if (rowSpan === 0 || colSpan === 0) {
return null;
}
if(tdProps && tdProps.mergeEndIndex && index<tdProps.mergeEndIndex && rowSpan === 0){
rowSpan = tdProps.mergeEndIndex - index;
text = ''
}
//不是固定表格并且当前列是固定，则隐藏当前列
if(column.fixed && !fixed){
className = className+` ${clsPrefix}-fixed-columns-in-body`;