baha/skyline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix: fix table height"

Browse Source
This commit is contained in:
Zuul 2023-09-05 04:21:22 +00:00 committed by Gerrit Code Review
commit de2793ddfb
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/MagicInput/index.jsx
View File

@ -346,7 +346,11 @@ class MagicInput extends PureComponent {
<Menu.Item key={it.name}>{it.label}</Menu.Item> <Menu.Item key={it.name}>{it.label}</Menu.Item>
)); ));
return ( return (
<Menu className={styles.menu} onClick={this.handleSelectFilter}> <Menu
className={styles.menu}
onClick={this.handleSelectFilter}
id="search-items-menu"
>
{this.renderOptionsClose(filters)} {this.renderOptionsClose(filters)}
{menuItems} {menuItems}
</Menu> </Menu>

10
src/containers/List/index.jsx
View File

@ -279,12 +279,18 @@ export default class BaseList extends React.Component {
get tableTopHeight() { get tableTopHeight() {
const tableSearchHeader = document.getElementById('sl-table-header-search'); const tableSearchHeader = document.getElementById('sl-table-header-search');
const tableSearchInputItemMenu =
document.getElementById('search-items-menu');
const tableSearchHeight = tableSearchHeader const tableSearchHeight = tableSearchHeader
? tableSearchHeader.scrollHeight ? tableSearchHeader.scrollHeight
: defaultTableSearchHeight; : defaultTableSearchHeight;
const topTotal = navHeight + breadcrumbHeight + tableSearchHeight + padding; const searchMenuHeight = tableSearchInputItemMenu?.scrollHeight || 0;
const searchHeight = searchMenuHeight
? tableSearchHeight - searchMenuHeight + 10
: tableSearchHeight;
const topTotal = navHeight + breadcrumbHeight + searchHeight + padding;
if (this.hasSubTab) { if (this.hasSubTab) {
return topTotal + tabHeight * 2; return topTotal + tabHeight * 2 + 20;
} }
if (this.hasTab) { if (this.hasTab) {
return topTotal + tabHeight; return topTotal + tabHeight;