@gm-pc/react 1.17.0-beta.4 → 1.17.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/react",
-  "version": "1.17.0-beta.4",
+  "version": "1.17.0-beta.8",
   "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.4",
+    "@gm-pc/locales": "^1.17.0-beta.8",
     "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": "9a9c98bba54ce73bdc07dc3023a5fece1980f8ea"
+  "gitHead": "8a04790de682b7a6ef9187d8434c8c8a535bea63"
 }

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,21 @@ const AutoComplete = forwardRef<AutoCompleteRef, AutoCompleteProps>((props, ref)
   }, [value, options])
 
   const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
-    if (!popoverVisible.current) {
+    if (event.key === 'Enter') {
+      triggerPopover(false)
+      if (willActiveIndex >= 0) {
+        const val = options[willActiveIndex]?.value
+        if (!_.isNil(val) && value !== val) {
+          onChange && onChange(val)
+          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)
@@ -177,9 +186,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) => {