test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-11-29 18:48:45 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: 弹窗中的 table, fixed 列高度不准确 (#5175)

Browse Source 
* fix: 弹窗中的 table, fixed 列高度不准确

* chore: table update snapshot
This commit is contained in:
meerkat 2022-08-19 12:46:18 +08:00 committed by GitHub
parent 8db4dc703a
commit aacfb535e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/amis/__tests__/renderers/__snapshots__/Table.test.tsx.snap
View File

@ -2172,7 +2172,6 @@ exports[`Renderer:table column head style className 1`] = `
class="cxd-Table-tr--odd cxd-Table-tr--1th"
data-id="1"
data-index="0"
style="height: 0px;"
>
<td
class=""
@ -2188,7 +2187,6 @@ exports[`Renderer:table column head style className 1`] = `
class="cxd-Table-tr--even cxd-Table-tr--1th"
data-id="2"
data-index="1"
style="height: 0px;"
>
<td
class=""
@ -2204,7 +2202,6 @@ exports[`Renderer:table column head style className 1`] = `
class="cxd-Table-tr--odd cxd-Table-tr--1th"
data-id="3"
data-index="2"
style="height: 0px;"
>
<td
class=""
@ -2220,7 +2217,6 @@ exports[`Renderer:table column head style className 1`] = `
class="cxd-Table-tr--even cxd-Table-tr--1th"
data-id="4"
data-index="3"
style="height: 0px;"
>
<td
class=""
@ -2236,7 +2232,6 @@ exports[`Renderer:table column head style className 1`] = `
class="cxd-Table-tr--odd cxd-Table-tr--1th"
data-id="5"
data-index="4"
style="height: 0px;"
>
<td
class=""
@ -2252,7 +2247,6 @@ exports[`Renderer:table column head style className 1`] = `
class="cxd-Table-tr--even cxd-Table-tr--1th"
data-id="6"
data-index="5"
style="height: 0px;"
>
<td
class=""
@ -2268,7 +2262,6 @@ exports[`Renderer:table column head style className 1`] = `
class="cxd-Table-tr--odd cxd-Table-tr--1th"
data-id="7"
data-index="6"
style="height: 0px;"
>
<td
class=""
@ -2284,7 +2277,6 @@ exports[`Renderer:table column head style className 1`] = `
class="cxd-Table-tr--even cxd-Table-tr--1th"
data-id="8"
data-index="7"
style="height: 0px;"
>
<td
class=""
@ -2300,7 +2292,6 @@ exports[`Renderer:table column head style className 1`] = `
class="cxd-Table-tr--odd cxd-Table-tr--1th"
data-id="9"
data-index="8"
style="height: 0px;"
>
<td
class=""
@ -2316,7 +2307,6 @@ exports[`Renderer:table column head style className 1`] = `
class="cxd-Table-tr--even cxd-Table-tr--1th"
data-id="10"
data-index="9"
style="height: 0px;"
>
<td
class=""
@ -8135,7 +8125,6 @@ exports[`Renderer:table isHead fixed 1`] = `
class="cxd-Table-tr--odd cxd-Table-tr--1th"
data-id="1"
data-index="0"
style="height: 0px;"
>
<td
class=""
@ -8151,7 +8140,6 @@ exports[`Renderer:table isHead fixed 1`] = `
class="cxd-Table-tr--even cxd-Table-tr--1th"
data-id="2"
data-index="1"
style="height: 0px;"
>
<td
class=""
@ -8167,7 +8155,6 @@ exports[`Renderer:table isHead fixed 1`] = `
class="cxd-Table-tr--odd cxd-Table-tr--1th"
data-id="3"
data-index="2"
style="height: 0px;"
>
<td
class=""
@ -8183,7 +8170,6 @@ exports[`Renderer:table isHead fixed 1`] = `
class="cxd-Table-tr--even cxd-Table-tr--1th"
data-id="4"
data-index="3"
style="height: 0px;"
>
<td
class=""
@ -8199,7 +8185,6 @@ exports[`Renderer:table isHead fixed 1`] = `
class="cxd-Table-tr--odd cxd-Table-tr--1th"
data-id="5"
data-index="4"
style="height: 0px;"
>
<td
class=""
@ -8215,7 +8200,6 @@ exports[`Renderer:table isHead fixed 1`] = `
class="cxd-Table-tr--even cxd-Table-tr--1th"
data-id="6"
data-index="5"
style="height: 0px;"
>
<td
class=""
@ -8231,7 +8215,6 @@ exports[`Renderer:table isHead fixed 1`] = `
class="cxd-Table-tr--odd cxd-Table-tr--1th"
data-id="7"
data-index="6"
style="height: 0px;"
>
<td
class=""
@ -8247,7 +8230,6 @@ exports[`Renderer:table isHead fixed 1`] = `
class="cxd-Table-tr--even cxd-Table-tr--1th"
data-id="8"
data-index="7"
style="height: 0px;"
>
<td
class=""
@ -8263,7 +8245,6 @@ exports[`Renderer:table isHead fixed 1`] = `
class="cxd-Table-tr--odd cxd-Table-tr--1th"
data-id="9"
data-index="8"
style="height: 0px;"
>
<td
class=""
@ -8279,7 +8260,6 @@ exports[`Renderer:table isHead fixed 1`] = `
class="cxd-Table-tr--even cxd-Table-tr--1th"
data-id="10"
data-index="9"
style="height: 0px;"
>
<td
class=""

11
packages/amis/src/renderers/Table/index.tsx
View File

@ -1138,7 +1138,7 @@ export default class Table extends React.Component<TableProps, object> {
[propName: string]: number;
} = (this.widths2 = {});
let heights: {
[propName: string]: number;
[propName: string]: number | string;
} = (this.heights = {});
heights.header = table
@ -1166,8 +1166,13 @@ export default class Table extends React.Component<TableProps, object> {
forEach(
table.querySelectorAll('tbody>tr>*:last-child'),
/**
* ! 弹窗中的特殊说明
* ! 在弹窗中，modal 有一个 scale 的动画，导致 getBoundingClientRect 获取的高度不准确
* ! width 准确是因为 table-layout: auto 导致
*/
(item: HTMLElement, index: number) =>
(heights[index] = item.getBoundingClientRect().height)
(heights[index] = getComputedStyle(item).height)
);
// 让 react 去更新非常慢，还是手动更新吧。
@ -1206,7 +1211,7 @@ export default class Table extends React.Component<TableProps, object> {
forEach(
table.querySelectorAll('tbody>tr'),
(item: HTMLElement, index) => {
item.style.cssText += `height: ${heights[index]}px`;
item.style.cssText += `height: ${heights[index]}`;
}
);