Showing
4 changed files
with
26 additions
and
23 deletions
| @@ -66,7 +66,6 @@ const FormSelectMain: React.FC<FormSelectProps>= (props)=> { | @@ -66,7 +66,6 @@ const FormSelectMain: React.FC<FormSelectProps>= (props)=> { | ||
| 66 | dropdownProps={{ | 66 | dropdownProps={{ |
| 67 | showSearch: true, | 67 | showSearch: true, |
| 68 | loading, | 68 | loading, |
| 69 | - listHeight: 160, | ||
| 70 | renderBottom: ( | 69 | renderBottom: ( |
| 71 | <Button | 70 | <Button |
| 72 | className={`${prefix}__dropdown-bottom`} | 71 | className={`${prefix}__dropdown-bottom`} |
| @@ -11,21 +11,21 @@ | @@ -11,21 +11,21 @@ | ||
| 11 | background-color: #fff !important; | 11 | background-color: #fff !important; |
| 12 | border-top: 1px solid @N4 !important; | 12 | border-top: 1px solid @N4 !important; |
| 13 | } | 13 | } |
| 14 | - .qx-input-select-dropdown__list { | ||
| 15 | - max-height: 160px; | ||
| 16 | - min-height: unset; | ||
| 17 | - height: unset !important; | ||
| 18 | - .ant-dropdown-menu { | ||
| 19 | - box-shadow: none; | ||
| 20 | - } | ||
| 21 | - .qx-input-select-dropdown__list-empty { | ||
| 22 | - display: flex; | ||
| 23 | - align-items: center; | ||
| 24 | - justify-content: center; | ||
| 25 | - flex-direction: column; | ||
| 26 | - overflow: hidden; | ||
| 27 | - height: 100px; | ||
| 28 | - margin: 0; | ||
| 29 | - } | ||
| 30 | - } | 14 | + //.qx-input-select-dropdown__list { |
| 15 | + // max-height: 160px; | ||
| 16 | + // min-height: unset; | ||
| 17 | + // height: unset !important; | ||
| 18 | + // .ant-dropdown-menu { | ||
| 19 | + // box-shadow: none; | ||
| 20 | + // } | ||
| 21 | + // .qx-input-select-dropdown__list-empty { | ||
| 22 | + // display: flex; | ||
| 23 | + // align-items: center; | ||
| 24 | + // justify-content: center; | ||
| 25 | + // flex-direction: column; | ||
| 26 | + // overflow: hidden; | ||
| 27 | + // height: 100px; | ||
| 28 | + // margin: 0; | ||
| 29 | + // } | ||
| 30 | + //} | ||
| 31 | } | 31 | } |
| @@ -36,7 +36,7 @@ const DropdownContent = React.forwardRef<any, DropdownContentProps>( | @@ -36,7 +36,7 @@ const DropdownContent = React.forwardRef<any, DropdownContentProps>( | ||
| 36 | showSearch = false, | 36 | showSearch = false, |
| 37 | onSearch: parentSearch, | 37 | onSearch: parentSearch, |
| 38 | placeholder, | 38 | placeholder, |
| 39 | - listHeight = 260, | 39 | + listHeight = 192, |
| 40 | loading, | 40 | loading, |
| 41 | } = props; | 41 | } = props; |
| 42 | 42 | ||
| @@ -128,7 +128,7 @@ const DropdownContent = React.forwardRef<any, DropdownContentProps>( | @@ -128,7 +128,7 @@ const DropdownContent = React.forwardRef<any, DropdownContentProps>( | ||
| 128 | <div | 128 | <div |
| 129 | ref={ref} | 129 | ref={ref} |
| 130 | className={`${prefix}__list`} | 130 | className={`${prefix}__list`} |
| 131 | - style={{ height: listHeight }} | 131 | + style={{ maxHeight: listHeight }} |
| 132 | > | 132 | > |
| 133 | {isEmpty ? ( | 133 | {isEmpty ? ( |
| 134 | <Empty | 134 | <Empty |
| @@ -13,8 +13,7 @@ | @@ -13,8 +13,7 @@ | ||
| 13 | 0 6px 16px 0 rgba(0, 0, 0, 8%), 0 9px 28px 8px rgba(0, 0, 0, 5%); | 13 | 0 6px 16px 0 rgba(0, 0, 0, 8%), 0 9px 28px 8px rgba(0, 0, 0, 5%); |
| 14 | 14 | ||
| 15 | &__list { | 15 | &__list { |
| 16 | - min-height: 150px; | ||
| 17 | - max-height: 260px; | 16 | + max-height: 192px; |
| 18 | margin-top: 5px; | 17 | margin-top: 5px; |
| 19 | overflow-y: auto; | 18 | overflow-y: auto; |
| 20 | .ant-dropdown-menu { | 19 | .ant-dropdown-menu { |
| @@ -23,7 +22,12 @@ | @@ -23,7 +22,12 @@ | ||
| 23 | } | 22 | } |
| 24 | 23 | ||
| 25 | &__list-empty { | 24 | &__list-empty { |
| 26 | - margin-top: 15%; | 25 | + display: flex; |
| 26 | + align-items: center; | ||
| 27 | + justify-content: center; | ||
| 28 | + flex-direction: column; | ||
| 29 | + overflow: hidden; | ||
| 30 | + height: 100px; | ||
| 27 | } | 31 | } |
| 28 | 32 | ||
| 29 | &__list-content { | 33 | &__list-content { |