Fix text box (#553)

alibaba · Dec 27, 2019 · d957567 · d957567
1 parent 9c513d0
commit d957567
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 13 deletions.
diff --git a/packages/antd/src/components/FormTextBox.tsx b/packages/antd/src/components/FormTextBox.tsx
@@ -1,5 +1,5 @@
 import React, { useRef, useLayoutEffect } from 'react'
-import { createControllerBox } from '@uform/react-schema-renderer'
+import { createControllerBox, Schema } from '@uform/react-schema-renderer'
 import { IFormTextBox } from '../types'
 import { toArr } from '@uform/shared'
 import { CompatAntdFormItem } from '../compat/FormItem'
@@ -8,6 +8,7 @@ import styled from 'styled-components'
 export const FormTextBox = createControllerBox<IFormTextBox>(
   'text-box',
   styled(({ props, className, children }) => {
+    const schema = new Schema(props)
     const {
       title,
       help,
@@ -21,7 +22,7 @@ export const FormTextBox = createControllerBox<IFormTextBox>(
       {
         gutter: 5
       },
-      props['x-component-props']
+      schema.getExtendsComponentProps()
     )
     const ref: React.RefObject<HTMLDivElement> = useRef()
     const arrChildren = toArr(children)

diff --git a/packages/core/README.md b/packages/core/README.md
@@ -717,7 +717,7 @@ interface IMutators {
 ```typescript
 type CustomValidator = (
   value: any,
-  rescription?: ValidateDescription
+  description?: ValidateDescription
 ) => ValidateResponse
 type SyncValidateResponse =
   | null

diff --git a/packages/core/README.zh-cn.md b/packages/core/README.zh-cn.md
@@ -742,7 +742,7 @@ interface IMutators {
 ```typescript
 type CustomValidator = (
   value: any,
-  rescription?: ValidateDescription
+  description?: ValidateDescription
 ) => ValidateResponse
 type SyncValidateResponse =
   | null

diff --git a/packages/next/src/components/FormTextBox.tsx b/packages/next/src/components/FormTextBox.tsx
@@ -1,5 +1,5 @@
 import React, { useRef, useLayoutEffect } from 'react'
-import { createControllerBox } from '@uform/react-schema-renderer'
+import { createControllerBox, Schema } from '@uform/react-schema-renderer'
 import { IFormTextBox } from '../types'
 import { toArr } from '@uform/shared'
 import { CompatNextFormItem } from '../compat/FormItem'
@@ -8,6 +8,7 @@ import styled from 'styled-components'
 export const FormTextBox = createControllerBox<IFormTextBox>(
   'text-box',
   styled(({ props, className, children }) => {
+    const schema = new Schema(props)
     const {
       title,
       help,
@@ -21,7 +22,7 @@ export const FormTextBox = createControllerBox<IFormTextBox>(
       {
         gutter: 5
       },
-      props['x-component-props']
+      schema.getExtendsComponentProps()
     )
     const ref: React.RefObject<HTMLDivElement> = useRef()
     const arrChildren = toArr(children)

diff --git a/packages/react-schema-renderer/README.md b/packages/react-schema-renderer/README.md
@@ -1901,7 +1901,7 @@ type ValidateResponse = SyncValidateResponse | AsyncValidateResponse
 ```typescript
 type CustomValidator = (
   value: any,
-  rescription?: ValidateDescription
+  description?: ValidateDescription
 ) => ValidateResponse
 ```
 

diff --git a/packages/react-schema-renderer/README.zh-cn.md b/packages/react-schema-renderer/README.zh-cn.md
@@ -1907,7 +1907,7 @@ type ValidateResponse = SyncValidateResponse | AsyncValidateResponse
 ```typescript
 type CustomValidator = (
   value: any,
-  rescription?: ValidateDescription
+  description?: ValidateDescription
 ) => ValidateResponse
 ```
 

diff --git a/packages/react/README.md b/packages/react/README.md
@@ -3149,7 +3149,7 @@ type InternalFormats =
 ```typescript
 declare type CustomValidator = (
   value: any,
-  rescription?: ValidateDescription
+  description?: ValidateDescription
 ) => ValidateResponse
 ```
 

diff --git a/packages/react/README.zh-cn.md b/packages/react/README.zh-cn.md
@@ -3194,7 +3194,7 @@ type InternalFormats =
 ```typescript
 declare type CustomValidator = (
   value: any,
-  rescription?: ValidateDescription
+  description?: ValidateDescription
 ) => ValidateResponse
 ```
 

diff --git a/packages/validator/src/rules.ts b/packages/validator/src/rules.ts
@@ -3,16 +3,16 @@ import {
   isEmpty,
   stringLength,
   isStr,
+  isArr,
   isFn,
   toArr,
-  isArr,
   isBool
 } from '@uform/shared'
 import { ValidateDescription } from './types'
 const isValidateEmpty = (value: any) => {
   if (isArr(value)) {
     for (let i = 0; i < value.length; i++) {
-      if (!isValidateEmpty(value[i])) return false
+      if (value[i] !== undefined) return false
     }
     return true
   } else {

diff --git a/packages/validator/src/types.ts b/packages/validator/src/types.ts
@@ -67,7 +67,7 @@ export type ValidatePatternRules =
 
 export type CustomValidator = (
   value: any,
-  rescription?: ValidateDescription
+  description?: ValidateDescription
 ) => ValidateResponse
 
 export type SyncValidateResponse =