@gm-pc/react 1.18.0-beta.0 → 1.19.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/react",
-  "version": "1.18.0-beta.0",
+  "version": "1.19.0-beta.0",
   "description": "观麦前端基础组件库",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gm-pc#readme",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@gm-common/hooks": "^2.10.0",
     "@gm-common/tool": "^2.10.0",
-    "@gm-pc/locales": "^1.18.0-beta.0",
+    "@gm-pc/locales": "^1.19.0-beta.0",
     "big.js": "^6.0.1",
     "classnames": "^2.2.5",
     "lodash": "^4.17.19",
@@ -48,5 +48,5 @@
     "react-router-dom": "^5.2.0",
     "react-window": "^1.8.5"
   },
-  "gitHead": "558b652c8c55d7d2955d85fb509fb6a7202a0b74"
+  "gitHead": "7fcfe9f207184dd5979ca1ca75db81f6022047af"
 }

package/src/component/more_select/base.tsx

@@ -135,7 +135,7 @@ class MoreSelectBase<V extends string | number = string> extends Component<
     setTimeout(() => {
       // eslint-disable-next-line no-unused-expressions
       isInitSearch && this._inputRef.current?.select()
-      if (this.props.searchWhenActive) {
+      if (this.props.searchOnActive) {
         localStorage.setItem('_GM-PC_MORESELECT_SEARCHVALUE', this.state.searchValue)
       }
     }, 100)
@@ -289,7 +289,14 @@ class MoreSelectBase<V extends string | number = string> extends Component<
   }
 
   private _handleMoreSelectClick = () => {
-    if (this.props.searchWhenActive) {
+    const { onClick, selected } = this.props
+    if (typeof onClick === 'function') {
+      return onClick(selected)
+    }
+  }
+
+  private _handlePopoverVisibleChange = (active: boolean) => {
+    if (active && this.props.searchOnActive) {
       const searchValue = localStorage.getItem('_GM-PC_MORESELECT_SEARCHVALUE')
       if (searchValue) {
         this.setState({ searchValue })
@@ -300,10 +307,6 @@ class MoreSelectBase<V extends string | number = string> extends Component<
         }, 0)
       }
     }
-    const { onClick, selected } = this.props
-    if (typeof onClick === 'function') {
-      return onClick(selected)
-    }
   }
 
   render() {
@@ -340,6 +343,7 @@ class MoreSelectBase<V extends string | number = string> extends Component<
           popup={this._renderList}
           disabled={disabled}
           isInPopup={isInPopup}
+          onVisibleChange={this._handlePopoverVisibleChange}
         >
           {children ?? (
             <Flex

package/src/component/more_select/types.ts

@@ -79,7 +79,7 @@ interface MoreSelectBaseProps<V extends string | number = string>
     searchValue: string
   ): MoreSelectGroupDataItem<V>[]
   /** 是否在active的时候搜索，订单业务相关，searchValue放在localstorage */
-  searchWhenActive?: boolean
+  searchOnActive?: boolean
 }
 
 type MoreSelectData<V extends string | number = string> =
@@ -91,7 +91,7 @@ type MoreSelectSelected<V extends string | number = string> =
 
 interface MoreSelectProps<V extends string | number = string>
   extends MoreSelectCommonProps<V>,
-    Pick<MoreSelectBaseProps, 'searchWhenActive'> {
+    Pick<MoreSelectBaseProps, 'searchOnActive'> {
   data?: MoreSelectData<V>
   selected?: MoreSelectSelected<V>
   value?: V | V[]

package/src/component/popover/popover.tsx

@@ -102,7 +102,7 @@ class Popover extends Component<PopoverProps, PopoverState> {
   private _debounceHandleTableScroll = _.debounce(this._handleTableScroll, 200)
 
   private _setActive = (active: boolean): void => {
-    if (this._isUnmounted) {
+    if (this._isUnmounted || this.state.active === active) {
       return
     }
     const { onVisibleChange } = this.props