fix(react/vue): fix onChange can not pass to voidField's component pr…

…ops. (#1264)
alibaba · Apr 21, 2021 · 1764f6e · 1764f6e
1 parent 01f38c7
commit 1764f6e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/packages/react/src/components/ReactiveField.tsx b/packages/react/src/components/ReactiveField.tsx
@@ -50,19 +50,19 @@ const ReactiveInternal: React.FC<IReactiveFieldProps> = (props) => {
           field.onInput(...args)
           field.component[1]?.onChange?.(...args)
         }
-      : undefined
+      : field.component[1]?.onChange
     const onFocus = !isVoidField(field)
       ? (...args: any[]) => {
           field.onFocus(...args)
           field.component[1]?.onFocus?.(...args)
         }
-      : undefined
+      : field.component[1]?.onFocus
     const onBlur = !isVoidField(field)
       ? (...args: any[]) => {
           field.onBlur(...args)
           field.component[1]?.onBlur?.(...args)
         }
-      : undefined
+      : field.component[1]?.onBlur
     const disabled = !isVoidField(field)
       ? field.pattern === 'disabled' || field.pattern === 'readPretty'
       : undefined

diff --git a/packages/vue/src/components/ReactiveField.ts b/packages/vue/src/components/ReactiveField.ts
@@ -53,19 +53,17 @@ export default observer<IReactiveFieldProps>(defineComponent<IReactiveFieldProps
             })
           }
           const events = {} as Record<string, any>
-          if (!isVoidField(field)) {
-            events.change = (...args: any[]) => {
-              field.onInput(...args)
-              field.component[1]?.onChange?.(...args)
-            }
-            events.focus = (...args: any[]) => {
-              field.onFocus(...args)
-              field.component[1]?.onFocus?.(...args)
-            }
-            events.blur = (...args: any[]) => {
-              field.onBlur(...args)
-              field.component[1]?.onBlur?.(...args)
-            }
+          events.change = (...args: any[]) => {
+            if (!isVoidField(field)) field.onInput(...args)
+            field.component[1]?.onChange?.(...args)
+          }
+          events.focus = (...args: any[]) => {
+            if (!isVoidField(field)) field.onFocus(...args)
+            field.component[1]?.onFocus?.(...args)
+          }
+          events.blur = (...args: any[]) => {
+            if (!isVoidField(field)) field.onBlur(...args)
+            field.component[1]?.onBlur?.(...args)
           }
           const component = field.component[0] as VueComponent
           const originData = field.component[1] || {}