test/amis
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-12-02 20:09:08 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

修复 table 表头分组后, 固定状态宽度如内容不一致问题

Browse Source
This commit is contained in:
liaoxuezhi 2019-05-27 19:29:59 +08:00
parent 1a6b4449e3
commit a3697fb754
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/renderers/Table.tsx
View File

@ -461,9 +461,9 @@ export default class Table extends React.Component<TableProps, object> {
let heights: {
[propName: string]: number;
} = (this.heights = {});
forEach(table.querySelectorAll('thead>tr:first-child>th'), (item: HTMLElement) => {
forEach(table.querySelectorAll('thead>tr:last-child>th'), (item: HTMLElement) => {
heights.header || (heights.header = item.offsetHeight);
widths[item.getAttribute('index') as string] = item.offsetWidth;
widths[item.getAttribute('data-index') as string] = item.offsetWidth;
});
forEach(
table.querySelectorAll('tbody>tr>*:first-child'),
@ -491,8 +491,8 @@ export default class Table extends React.Component<TableProps, object> {
`.${ns}Table-fixedTop table, .${ns}Table-fixedLeft table, .${ns}Table-fixedRight table`
),
table => {
forEach(table.querySelectorAll('thead>tr>th'), (item: HTMLElement) => {
item.style.cssText = `width: ${this.widths[parseInt(item.getAttribute('index') as string, 10)]}px`;
forEach(table.querySelectorAll('thead>tr:last-child>th'), (item: HTMLElement) => {
item.style.cssText = `width: ${this.widths[parseInt(item.getAttribute('data-index') as string, 10)]}px`;
});
forEach(table.querySelectorAll('tbody>tr'), (item: HTMLElement, index) => {
@ -899,7 +899,7 @@ export default class Table extends React.Component<TableProps, object> {
{store.columnGroup.length ? (
<tr>
{store.columnGroup.map((item, index) => (
<th key={index} colSpan={item.colSpan}>{item.label}</th>
<th key={index} data-index={item.index} colSpan={item.colSpan}>{item.label}</th>
))}
</tr>
) : null}
@ -907,7 +907,7 @@ export default class Table extends React.Component<TableProps, object> {
{store.filteredColumns.map(column =>
this.renderHeadCell(column, {
key: column.index,
index: column.index,
'data-index': column.index,
})
)}
</tr>
@ -938,7 +938,7 @@ export default class Table extends React.Component<TableProps, object> {
{store.columnGroup.length ? (
<tr>
{store.columnGroup.map((item, index) => (
<th key={index} colSpan={item.colSpan}>{item.label}</th>
<th key={index} data-index={item.index} colSpan={item.colSpan}>{item.label}</th>
))}
</tr>
) : null}
@ -946,7 +946,7 @@ export default class Table extends React.Component<TableProps, object> {
{columns.map(column =>
this.renderHeadCell(column, {
key: column.index,
index: column.index,
'data-index': column.index,
})
)}
</tr>
@ -1358,14 +1358,14 @@ export default class Table extends React.Component<TableProps, object> {
{store.columnGroup.length ? (
<tr>
{store.columnGroup.map((item, index) => (
<th key={index} colSpan={item.colSpan}>{item.label}</th>
<th key={index} data-index={item.index} colSpan={item.colSpan}>{item.label}</th>
))}
</tr>
) : null}
<tr>
{store.filteredColumns.map(column =>
this.renderHeadCell(column, {
index: column.index,
'data-index': column.index,
key: column.index,
})
)}

8
src/store/table.ts
View File

@ -255,6 +255,7 @@ export const TableStore = iRendererStore
function getColumnGroup():Array<{
label: string,
index: number,
colSpan: number
}> {
const columsn = getFilteredColumns();
@ -266,11 +267,13 @@ export const TableStore = iRendererStore
const result:Array<{
label: string,
index: number,
colSpan: number
}> = [
{
label: columsn[0].groupName,
colSpan: 1
colSpan: 1,
index: columsn[0].index
}
];
@ -288,7 +291,8 @@ export const TableStore = iRendererStore
} else {
result.push({
label: current.groupName,
colSpan: 1
colSpan: 1,
index: current.index
});
}
}