@gm-pc/react 1.17.0-beta.1 → 1.17.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/react",
-  "version": "1.17.0-beta.1",
+  "version": "1.17.0-beta.10",
   "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.17.0-beta.1",
+    "@gm-pc/locales": "^1.17.0-beta.10",
     "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": "1781bbccfc4d5ebcddad1572fcec3f855d19b9f5"
+  "gitHead": "b7017b352488f540d5108043888c7bea8d2c499a"
 }

package/src/component/auto_complete/auto_complete.tsx

@@ -82,6 +82,7 @@ const AutoComplete = forwardRef<AutoCompleteRef, AutoCompleteProps>((props, ref)
   const inputNode = useRef<HTMLInputElement | null>(null)
 
   const triggerPopover = (value: boolean) => {
+    if (value === true && options.length <= 0) return
     popoverNode.current && popoverNode.current.apiDoSetActive(value)
   }
 
@@ -97,13 +98,25 @@ const AutoComplete = forwardRef<AutoCompleteRef, AutoCompleteProps>((props, ref)
   }, [value, options])
 
   const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
-    if (!popoverVisible.current) {
+    if (event.key === 'Enter') {
+      if (willActiveIndex >= 0) {
+        const val = options[willActiveIndex]?.value
+        if (!_.isNil(val) && value !== val) {
+          onChange && onChange(val)
+          triggerPopover(false)
+          return
+        }
+        if (popoverVisible.current) {
+          triggerPopover(false)
+          return
+        }
+      }
       onKeyDown && onKeyDown(event)
       return
     }
-    if (event.key === 'Enter') {
-      onChange && onChange(options[willActiveIndex].value)
-      triggerPopover(false)
+    if (!popoverVisible.current) {
+      onKeyDown && onKeyDown(event)
+      return
     }
     if (event.key === 'Escape') {
       triggerPopover(false)
@@ -113,26 +126,15 @@ const AutoComplete = forwardRef<AutoCompleteRef, AutoCompleteProps>((props, ref)
       return
     }
     let index = willActiveIndex
-    if (event.key === 'ArrowUp' && index === 0) {
-      event.preventDefault()
-      onKeyDown && onKeyDown(event)
-      return
-    }
-    if (event.key === 'ArrowDown' && index === options.length - 1) {
-      event.preventDefault()
-      onKeyDown && onKeyDown(event)
-      return
-    }
-    event.preventDefault()
     if (event.key === 'ArrowUp') {
-      index -= 1
+      index--
     } else if (event.key === 'ArrowDown') {
-      index += 1
+      index++
     }
     if (index < 0) {
-      index = 0
-    } else if (index > options.length - 1) {
       index = options.length - 1
+    } else if (index > options.length - 1) {
+      index = 0
     }
     setWillActiveIndex(index)
   }
@@ -188,9 +190,7 @@ const AutoComplete = forwardRef<AutoCompleteRef, AutoCompleteProps>((props, ref)
         value={value}
         onChange={(e) => {
           const val = e.target.value
-          if (val.length === 0) {
-            triggerPopover(true)
-          }
+          triggerPopover(val.length === 0)
           onChange && onChange(val)
         }}
         onBlur={(e) => {

package/src/component/more_select/base.tsx

@@ -46,6 +46,8 @@ class MoreSelectBase<V extends string | number = string> extends Component<
   private _baseRef = createRef<HTMLDivElement>()
   private _selectionRef = createRef<HTMLDivElement>()
   private _popoverRef = createRef<Popover>()
+  private _inputRef = createRef<HTMLInputElement>()
+
   private _filterData: MoreSelectGroupDataItem<V>[] | undefined
 
   constructor(props: MoreSelectBaseProps<V>) {
@@ -123,10 +125,18 @@ class MoreSelectBase<V extends string | number = string> extends Component<
     }
   }
 
-  public _handleChange = (event: ChangeEvent<HTMLInputElement>): void => {
+  public _handleChange = (
+    event: ChangeEvent<HTMLInputElement>,
+    isInitSearch?: boolean
+  ): void => {
     const searchValue = event.target.value
     this.setState({ searchValue })
     this._debounceDoSearch(searchValue)
+    console.log(this._inputRef.current, this._baseRef, 'this._inputRef.current')
+    setTimeout(() => {
+      // eslint-disable-next-line no-unused-expressions
+      isInitSearch && this._inputRef.current?.select()
+    }, 100)
   }
 
   private _doSearch = (query: string): void => {
@@ -239,6 +249,7 @@ class MoreSelectBase<V extends string | number = string> extends Component<
       >
         <div className='gm-more-select-popup-input'>
           <Input
+            ref={this._inputRef}
             autoFocus
             value={searchValue}
             onChange={this._handleChange}

package/src/component/more_select/more_select.tsx

@@ -53,9 +53,12 @@ class MoreSelect<V = any> extends Component<MoreSelectProps<V>> {
 
   public _handleInitSearch = (q?: string) => {
     // eslint-disable-next-line no-unused-expressions
-    this._moreSelectBaseRef?.current?._handleChange({
-      target: { value: q },
-    } as ChangeEvent<HTMLInputElement>)
+    this._moreSelectBaseRef?.current?._handleChange(
+      {
+        target: { value: q },
+      } as ChangeEvent<HTMLInputElement>,
+      true
+    )
   }
 
   _renderListFilter = (data: MoreSelectGroupDataItem<V>[], searchValue: string) => {