fix(fr):修复setSchema&表单联动&Select组件的bug

Author: siyi98

packages/form-render/src/form-render-core/src/createWidget.js

@@ -48,6 +48,7 @@ export const transformProps = props => {
     onChange(newValue);
   };
   if (trigger && typeof trigger === 'string') {
+    controlProps.onChange = _onChange;
     controlProps[trigger] = _onChange;
   } else {
     controlProps.onChange = _onChange;

packages/form-render/src/form-render-core/src/useForm.js

@@ -229,12 +229,12 @@ const useForm = props => {
   // ]
 
   const syncStuff = ({
-                       schema,
-                       locale,
-                       validateMessages,
-                       beforeFinish,
-                       removeHiddenData,
-                     }) => {
+    schema,
+    locale,
+    validateMessages,
+    beforeFinish,
+    removeHiddenData,
+  }) => {
     schemaRef.current = schema;
     localeRef.current = locale;
     validateMessagesRef.current = validateMessages;
@@ -315,7 +315,11 @@ const useForm = props => {
     let newError = _errorFields.current.filter(item => {
       return item.name.indexOf(path) === -1;
     });
-    setState({ outErrorFields: newError });
+
+    let newOutError = _outErrorFields.current.filter(item => {
+      return item.name.indexOf(path) === -1;
+    });
+    setState({ errorFields: newError, outErrorFields: newOutError });
   };
 
   const getValues = () => {

packages/form-render/src/index.d.ts

@@ -1,7 +1,51 @@
 import * as React from 'react';
-import Schema from './schema';
+import { RuleItem } from 'async-validator';
 
-export { Schema };
+interface SchemaBase {
+  type: 'string' | 'number' | 'boolean' | 'array' | 'object' | 'range' | 'html';
+  title: string;
+  description: string;
+  descType: 'text' | 'icon';
+  format:
+    | 'image'
+    | 'textarea'
+    | 'color'
+    | 'email'
+    | 'url'
+    | 'dateTime'
+    | 'date'
+    | 'time'
+    | 'upload';
+  default: any;
+  /** 是否必填，支持 `'{{ formData.xxx === "" }}'` 形式的表达式 */
+  required: boolean | string;
+  placeholder: string;
+  bind: false | string | string[];
+  dependencies: string[];
+  min: number;
+  max: number;
+  /** 是否禁用，支持 `'{{ formData.xxx === "" }}'` 形式的表达式 */
+  disabled: boolean | string;
+  /** 是否只读，支持 `'{{ formData.xxx === "" }}'` 形式的表达式 */
+  readOnly: boolean | string;
+  /** 是否隐藏，隐藏的字段不会在 formData 里透出，支持 `'{{ formData.xxx === "" }}'` 形式的表达式 */
+  hidden: boolean | string;
+  displayType: 'row' | 'column';
+  width: string;
+  labelWidth: number | string;
+  className: string;
+  widget: string;
+  readOnlyWidget: string;
+  extra: string;
+  properties: Record<string, Schema>;
+  items: Schema;
+  enum: Array<string | number>;
+  enumNames: Array<string | number>;
+  rules: RuleItem | RuleItem[];
+  props: Record<string, any>;
+}
+
+type Schema = Partial<SchemaBase>;
 
 export interface Error {
   /** 错误的数据路径 */

packages/form-render/src/schema.d.ts

@@ -46,4 +46,6 @@ interface SchemaBase {
 
 type Schema = Partial<SchemaBase>;
 
-export default Schema;
+export = Schema;
+
+export as namespace ISchema;

packages/form-render/src/widgets/antd/select.js

@@ -1,9 +1,18 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { Select } from 'antd';
 import { getArray } from '../../utils';
+import { isUndefined } from 'lodash-es';
 
-const FrSelect = ({ schema, style, options: _options, ...rest }) => {
+const FrSelect = ({
+  schema,
+  style,
+  value,
+  onChange,
+  options: _options,
+  ...rest
+}) => {
   let options;
+
   // 如果已经有外部注入的options了，内部的schema就会被忽略
   if (_options && Array.isArray(_options)) {
     options = _options;
@@ -19,12 +28,22 @@ const FrSelect = ({ schema, style, options: _options, ...rest }) => {
     });
   }
 
+  const handleChange = val => {
+    let _val = !isUndefined(val) ? val : null;
+    onChange(_val);
+  };
+
   const finalProps = {
     options,
     style: { width: '100%', ...style },
+    onChange: handleChange,
     ...rest,
   };
-  return <Select {...finalProps} />;
+  return (
+    <>
+      <Select defaultValue={value} {...finalProps} />
+    </>
+  );
 };
 
 export default FrSelect;