Commit 106adc73446f1bbb06ffaacc2661e3d099e92dfc
1 parent
bc4d3184
弹窗样式调整
Showing
2 changed files
with
4 additions
and
3 deletions
src/components/Common/SearchComponent/index.js
| @@ -1224,15 +1224,16 @@ export default class SearchComponent extends Component { | @@ -1224,15 +1224,16 @@ export default class SearchComponent extends Component { | ||
| 1224 | </div> | 1224 | </div> |
| 1225 | </AntdDraggableModal> | 1225 | </AntdDraggableModal> |
| 1226 | ); | 1226 | ); |
| 1227 | + | ||
| 1227 | return ( | 1228 | return ( |
| 1228 | <div style={{ overFlow: 'hidden', maxHeight: '100%' }}> | 1229 | <div style={{ overFlow: 'hidden', maxHeight: '100%' }}> |
| 1229 | {commonUtils.isEmptyArr(searchColumns) ? '' : | 1230 | {commonUtils.isEmptyArr(searchColumns) ? '' : |
| 1230 | - <div className={`${styles.fastFilter} searchComponentContainer_${app.currentPane.key || 0}`}> | 1231 | + <div className={`${styles.fastFilter} searchComponentContainer_${app.currentPane.key || 0}`} style={{ height: this.handleFields(searchColumns).length ? this.handleFields(searchColumns).length * 60 : 60 }}> |
| 1231 | <div className={styles.solutionList} > | 1232 | <div className={styles.solutionList} > |
| 1232 | <ShowType {...showTypeSearchSolutionProps} placeholder={commonFunc.showMessage(app.commonConst, 'pleaseChooseSolution')} /> | 1233 | <ShowType {...showTypeSearchSolutionProps} placeholder={commonFunc.showMessage(app.commonConst, 'pleaseChooseSolution')} /> |
| 1233 | </div> | 1234 | </div> |
| 1234 | <div className={`${styles.advRow} ${expand ? styles.advRowActive : ''}`}> | 1235 | <div className={`${styles.advRow} ${expand ? styles.advRowActive : ''}`}> |
| 1235 | - <div className={styles.filterList}> | 1236 | + <div className={styles.filterList} > |
| 1236 | {this.handleFields(searchColumns)} | 1237 | {this.handleFields(searchColumns)} |
| 1237 | <div className={styles.filterBtn}> | 1238 | <div className={styles.filterBtn}> |
| 1238 | { | 1239 | { |
src/components/Common/SearchComponent/index.less
| @@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
| 29 | float: left; | 29 | float: left; |
| 30 | width: 600px; | 30 | width: 600px; |
| 31 | min-height: 50px; | 31 | min-height: 50px; |
| 32 | - overflow: hidden; | 32 | + // overflow: hidden; |
| 33 | position: relative; | 33 | position: relative; |
| 34 | :global { | 34 | :global { |
| 35 | .ant-select-selector { | 35 | .ant-select-selector { |