feat(@uform/next): update next features (#439)

* feat(@uform/next): update next features * fix(@uform/antd): fix typings
alibaba · Nov 27, 2019 · 15b6b43 · 15b6b43
1 parent fd93386
commit 15b6b43
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 22 deletions.
diff --git a/docs/Examples/next/Sample.md b/docs/Examples/next/Sample.md
@@ -77,6 +77,14 @@ ReactDOM.render(
         title="TextArea"
         name="textarea"
         x-component="textarea"
+        x-rules={value => {
+          return value > 20
+            ? {
+                type: 'warning',
+                message: '这是个警告信息'
+              }
+            : ''
+        }}
       />
       <Field type="number" title="数字选择" name="number" />
       <Field type="boolean" title="开关选择" name="boolean" />
@@ -115,7 +123,10 @@ ReactDOM.render(
       />
       <Field
         type="transfer"
-        enum={[{ value: 1, label: '选项1' }, { value: 2, label: '选项2' }]}
+        enum={[
+          { value: 1, label: '选项1' },
+          { value: 2, label: '选项2' }
+        ]}
         title="穿梭框"
         name="transfer"
       />

diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "@types/react": "16.8.23"
   },
   "devDependencies": {
-    "@alifd/next": "^1.14.2",
+    "@alifd/next": "^1.19.1",
     "@babel/cli": "^7.2.0",
     "@babel/core": "^7.3.3",
     "@babel/plugin-proposal-class-properties": "^7.2.3",

diff --git a/packages/antd/src/types.ts b/packages/antd/src/types.ts
@@ -45,7 +45,7 @@ export type IFormItemTopProps = React.PropsWithChildren<
 >
 
 export interface ICompatItemProps
-  extends Exclude<ItemProps, 'labelCol' | 'wrapperCol'>,
+  extends Omit<ItemProps, 'labelCol' | 'wrapperCol'>,
     Partial<ISchemaFieldComponentProps> {
   labelCol?: number | { span: number; offset?: number }
   wrapperCol?: number | { span: number; offset?: number }

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -20,7 +20,7 @@
     "build": "ts-node --project ../../tsconfig.build.json build.ts"
   },
   "peerDependencies": {
-    "@alifd/next": "^1.13.1",
+    "@alifd/next": "^1.19.1",
     "@babel/runtime": "^7.4.4",
     "@types/classnames": "^2.2.9",
     "@types/styled-components": "^4.1.19",
@@ -38,7 +38,7 @@
     "styled-components": "^4.1.1"
   },
   "devDependencies": {
-    "@alifd/next": "^1.13.1",
+    "@alifd/next": "^1.19.1",
     "@types/classnames": "^2.2.9",
     "@types/styled-components": "^4.1.19"
   },

diff --git a/packages/next/src/compat/FormItem.tsx b/packages/next/src/compat/FormItem.tsx
@@ -12,10 +12,9 @@ const computeStatus = (props: ICompatItemProps) => {
   if (props.invalid) {
     return 'error'
   }
-  //todo:暂时不支持
-  // if (props.warnings.length) {
-  //   return 'warning'
-  // }
+  if (props.warnings.length) {
+    return 'warning'
+  }
 }
 
 const computeHelp = (props: ICompatItemProps) => {

diff --git a/packages/next/src/shared.ts b/packages/next/src/shared.ts
@@ -49,11 +49,13 @@ export const mapStyledProps = (
   props: IConnectProps,
   fieldProps: MergedFieldComponentProps
 ) => {
-  const { loading, errors } = fieldProps
+  const { loading, errors, warnings } = fieldProps
   if (loading) {
     props.state = props.state || 'loading'
   } else if (errors && errors.length) {
     props.state = 'error'
+  } else if (warnings && warnings.length) {
+    props.state = 'warning'
   }
 }
 

diff --git a/packages/next/src/types.ts b/packages/next/src/types.ts
@@ -50,7 +50,7 @@ export type IFormItemTopProps = React.PropsWithChildren<
 >
 
 export interface ICompatItemProps
-  extends Exclude<ItemProps, 'labelCol' | 'wrapperCol'>,
+  extends Omit<ItemProps, 'labelCol' | 'wrapperCol'>,
     Partial<ISchemaFieldComponentProps> {
   labelCol?: number | { span: number; offset?: number }
   wrapperCol?: number | { span: number; offset?: number }

diff --git a/scripts/doc-renderer.js b/scripts/doc-renderer.js
@@ -1,16 +1,6 @@
 import React from 'react'
 import SiteRenderer from 'react-site-renderer'
 
-;((window.gitter = {}).chat = {}).options = {
-  room: 'alibaba-uform/community'
-}
-
-setTimeout(() => {
-  const script = document.createElement('script')
-  script.src = '//sidecar.gitter.im/dist/sidecar.v1.js'
-  document.body.appendChild(script)
-}, 1000)
-
 export default ({ docs }) => {
   return (
     <SiteRenderer

diff --git a/scripts/docs.js b/scripts/docs.js
@@ -23,7 +23,7 @@ window.codeSandBoxPeerDependencies = {
 const FOOTER_HTML = `
 <script src="//unpkg.com/moment/min/moment-with-locales.js"></script>
 <script src="//unpkg.com/antd/dist/antd.min.js"></script>
-<script src="//unpkg.com/@alifd/next/dist/next.min.js"></script>
+<script src="//unpkg.com/@alifd/next@next/dist/next.min.js"></script>
 `
 
 const createDocs = async () => {