@zat-design/sisyphus-react 3.0.16-beta.2 → 3.1.4

package/es/ProForm/components/render/RenderFields.js

@@ -1,12 +1,13 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "disabled", "equalWith", "clearNotShow"];
+var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "disabled", "equalWith", "clearNotShow", "required"];
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
-import { cloneDeep, isFunction, union } from 'lodash';
+import { isFunction, union } from 'lodash';
 import Render from './Render';
-import { filterInternalFields } from '../../utils/index';
 import * as componentMap from '../index';
 import { isSelect } from '../../utils';
+import { FieldProvider } from '../../utils/useFieldProps';
 var RenderFields = function RenderFields(props) {
   var isView = props.isView,
     _props$columns = props.columns,
@@ -20,7 +21,9 @@ var RenderFields = function RenderFields(props) {
     openState = props.openState,
     labelWidth = props.labelWidth,
     originalValues = props.originalValues,
-    outerClearNotShow = props.clearNotShow;
+    outerClearNotShow = props.clearNotShow,
+    requiredOnView = props.requiredOnView,
+    required = props.required;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
     return Array.isArray(item.hiddenNames);
@@ -39,8 +42,14 @@ var RenderFields = function RenderFields(props) {
     });
   }
   var comList = columns.flatMap(function (column, index) {
-    if (!!expand && !openState && index >= expand) {
-      return [];
+    if (!!expand && !openState) {
+      // expand为Number时 过滤掉大于expand 且 非fixed的column
+      if (typeof expand === 'number') {
+        if (index >= expand && column.fixed !== true) return [];
+      } else if (column.fixed !== true) {
+        // 否则只过滤非fixed的column
+        return [];
+      }
     }
     var show = column.show,
       type = column.type,
@@ -60,10 +69,13 @@ var RenderFields = function RenderFields(props) {
       equalWith = column.equalWith,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
+      columnRequired = column.required,
       otherFormItemProps = _objectWithoutProperties(column, _excluded);
     var component = column.component;
+    var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
     // 允许formItem的属性放在column最外层 并优先级高于 formItemProps 内部参数
     var _formItemProps = _objectSpread(_objectSpread(_objectSpread({}, formItemProps), otherFormItemProps), {}, {
+      required: columnRequired !== null && columnRequired !== void 0 ? columnRequired : required,
       clearNotShow: clearNotShow
     });
     _formItemProps.labelWidth = _formItemProps.labelWidth || labelWidth; // 接收Form中的labelWidth
@@ -80,8 +92,9 @@ var RenderFields = function RenderFields(props) {
       var index;
       // FormList场景
       if (Array.isArray(column === null || column === void 0 ? void 0 : column.namePath) && (column === null || column === void 0 ? void 0 : (_column$namePath = column.namePath) === null || _column$namePath === void 0 ? void 0 : _column$namePath.length)) {
+        // @ts-ignore
         value = form.getFieldValue(union(column.namePath, (column === null || column === void 0 ? void 0 : column.name) || []));
-        record = filterInternalFields(cloneDeep(form.getFieldValue(column.namePath)));
+        record = form.getFieldValue(column.namePath);
         index = column === null || column === void 0 ? void 0 : column.index;
       }
       return viewRender ? viewRender(value, record, {
@@ -91,16 +104,16 @@ var RenderFields = function RenderFields(props) {
       }) || null : null;
     };
     if (typeof _type === 'string') {
-      TargetComponent = isView && viewRender ? viewRenderHandle : componentMap[_type];
+      TargetComponent = _isView && viewRender ? viewRenderHandle : componentMap[_type];
     }
     if (component && /*#__PURE__*/React.isValidElement(component)) {
       var _newComponent$props;
       var newComponent = component;
       var isProEditTable = (newComponent === null || newComponent === void 0 ? void 0 : (_newComponent$props = newComponent.props) === null || _newComponent$props === void 0 ? void 0 : _newComponent$props.onlyOneLineMsg) === '请先保存数据';
-      TargetComponent = isView ? viewRenderHandle || '' : component;
+      TargetComponent = _isView ? viewRenderHandle || '' : component;
       // 可编辑表格内部支持
       if (isProEditTable) {
-        TargetComponent = isView ? viewRenderHandle || component : component;
+        TargetComponent = _isView ? viewRenderHandle || component : component;
       }
     }
     var label = formItemChildProps.label,
@@ -143,7 +156,7 @@ var RenderFields = function RenderFields(props) {
       label: _formItemProps.label,
       name: _formItemProps.name,
       disabled: formDisabled,
-      isView: isView || column.isView,
+      isView: _isView,
       viewEmpty: viewEmpty,
       valueType: valueType,
       viewType: viewType,
@@ -153,24 +166,36 @@ var RenderFields = function RenderFields(props) {
       hiddenNames: column.hiddenNames,
       colProps: _colProps
     };
-    return /*#__PURE__*/React.createElement(Render, {
-      key: "".concat(_formItemProps.name || _formItemProps.label).concat(index),
-      show: show,
-      disabled: formDisabled,
-      form: form,
-      type: _type,
-      originComponent: component,
-      component: TargetComponent,
-      formItemProps: _formItemProps,
-      colProps: _colProps,
-      componentProps: componentProps,
-      otherProps: otherProps,
-      fieldProps: isFunction(fieldProps) ? fieldProps : null,
-      isSelect: _isSelect,
-      originalValues: originalValues,
-      equalWith: equalWith
-    });
+    if (outerClearNotShow !== false && show === false && (column === null || column === void 0 ? void 0 : column.name) && form.getFieldValue(column === null || column === void 0 ? void 0 : column.name)) {
+      setTimeout(function () {
+        form.resetFields([column === null || column === void 0 ? void 0 : column.name]);
+      }, 200);
+      return null;
+    }
+    return _jsx(FieldProvider, {
+      value: otherProps,
+      children: _jsx(Render, {
+        show: show,
+        disabled: formDisabled,
+        form: form,
+        type: _type,
+        originComponent: component,
+        component: TargetComponent,
+        // @ts-ignore
+        formItemProps: _formItemProps,
+        colProps: _colProps,
+        componentProps: componentProps,
+        otherProps: otherProps,
+        fieldProps: isFunction(fieldProps) ? fieldProps : null,
+        isSelect: _isSelect,
+        originalValues: originalValues,
+        equalWith: equalWith,
+        requiredOnView: requiredOnView
+      })
+    }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
+  });
+  return _jsx(_Fragment, {
+    children: comList
   });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, comList);
 };
 export default RenderFields;

package/es/ProForm/components/render/propsType.d.ts

@@ -1,8 +1,8 @@
 import { ColProps, FormInstance, FormItemProps } from 'antd';
-import { NamePath } from 'antd/lib/form/interface';
+import { NamePath } from 'antd/es/form/interface';
 import React from 'react';
-import { validate, regExp } from '@zat-design-pro-component/utils';
-import { Rule } from 'antd/lib/form';
+import { validate, regExp } from '@zat-design/utils';
+import { Rule } from 'antd/es/form';
 import * as componentMap from '../index';
 import { IProps as InputProps } from '../base/Input/propsType';
 import { Props as InputNumberProps } from '../base/InputNumber';
@@ -10,11 +10,13 @@ import { Props as RadioProps } from '../base/Radio';
 import { Props as CheckboxProps } from '../base/Checkbox';
 import { Props as DatePickerProps } from '../base/DatePicker';
 import { Props as RangePickerProps } from '../base/RangePicker';
-import { Props as FormListProps } from '../base/FormList';
+import { PropsWithRef as FormListProps } from '../combination/FormList/propsType';
 import { Props as SelectProps } from '../base/Select';
+import { Props as TimePickerProps } from '../base/TimePicker';
 import { Props as SwitchProps } from '../base/Switch';
 import { Props as SwitchCheckboxProps } from '../base/SwitchCheckbox';
 import { Props as TextAreaProps } from '../base/TextArea';
+import { Props as ProCascaderProps } from '../base/ProCascader';
 import { AddressProps } from '../combination/ProAddressBar/propsType';
 import { ProCombinationProps } from '../combination/ProCombination/propsType';
 import { ProModalSelectPropsType as ProModalSelectProps } from '../combination/ProModalSelect/propsType';
@@ -24,11 +26,17 @@ import { CheckboxPropsMap, ProEnum, PropProSelectsMap, PropRadioPropsMap } from
 import { PropSelectProps as ProSelectProps } from '../../../ProSelect/propsType';
 import { ProEditTableProps } from '../../../ProEditTable/propsType';
 import { PropTreeSelectProps } from '../../../ProTreeSelect/propsType';
+import { ProTreeModalProps } from '../../../ProTreeModal/propsType';
+import { ProUploadProps } from '../../../ProUpload/propsType';
+import { ProTreeProps } from '../../../ProTree/propsType';
+import { GroupProps } from '../combination/Group/propsType';
+import { ProCollapseProps } from '../../../ProLayout/components/ProCollapse/PropTypes';
 export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;
 interface ExtendType {
     type?: ValidateKey | RegExpKey;
+    message?: string;
 }
 export type ProRule = Rule | ExtendType;
 /**
@@ -57,6 +65,9 @@ type TransformToFormField<T extends ControlProps, Values> = Omit<T, 'onChange' |
     /** ProForm disable时，是否完全受控 */
     disabledStrictly?: boolean;
 };
+type ProEnumFormProps<Values> = TransformToFormField<ProEnum, Values> | TransformToFormField<ProEnum & PropProSelectsMap, Values> | TransformToFormField<ProEnum & PropRadioPropsMap, Values> | TransformToFormField<ProEnum & CheckboxPropsMap, Values>;
+type ProEnumTableProps<Values> = TransformToTableField<ProEnum, Values> | TransformToTableField<ProEnum & PropProSelectsMap, Values> | TransformToTableField<ProEnum & PropRadioPropsMap, Values> | TransformToTableField<ProEnum & CheckboxPropsMap, Values>;
+type ProEnumFieldProps<Values, TT> = TT extends 'ProForm' ? ProEnumFormProps<Values> | ReactiveFunction<Values, ProEnumFormProps<Values>> : ProEnumTableProps<Values> | ((text: any, values: Values, index: number) => ProEnumTableProps<Values>);
 type TransformToTableField<T extends ControlProps, Values> = Omit<T, 'onChange' | 'value' | 'onBlur'> & {
     value?: T['value'];
     onChange?: (value: Parameters<T['onChange']>[0], options: Parameters<T['onChange']>[1], record: any, index: number, form: FormInstance<Values>) => void;
@@ -69,9 +80,7 @@ export type ReactiveFunction<Values, R> = (values: Values, { form, index, namePa
     namePath?: NamePath;
     [key: string]: any;
 }) => R;
-type FieldProps<T extends {
-    onChange?: (...args: any[]) => void;
-}, Values, TT> = TT extends 'ProForm' ? TransformToFormField<T, Values> | ReactiveFunction<Values, TransformToFormField<T, Values>> : TT extends 'ProEditTable' ? TransformToTableField<T, Values> | ((text: any, values: Values, index: number) => TransformToTableField<T, Values>) : any;
+type FieldProps<T extends ControlProps, Values, TT> = TT extends 'ProForm' ? TransformToFormField<T, Values> | ReactiveFunction<Values, TransformToFormField<T, Values>> : TransformToTableField<T, Values> | ((text: any, values: Values, index: number) => TransformToTableField<T, Values>);
 /**
  * 值转换
  */
@@ -100,6 +109,9 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
 } | {
     type?: 'Select';
     fieldProps?: FieldProps<SelectProps, Values, T>;
+} | {
+    type?: 'TimePicker';
+    fieldProps?: FieldProps<TimePickerProps, Values, T>;
 } | {
     type?: 'Switch';
     fieldProps?: FieldProps<SwitchProps, Values, T>;
@@ -129,7 +141,7 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
     fieldProps?: FieldProps<ProTimeLimitProps, Values, T>;
 } | {
     type?: 'ProEnum';
-    fieldProps?: FieldProps<ProEnum, Values, T> & (PropProSelectsMap | PropRadioPropsMap | CheckboxPropsMap);
+    fieldProps?: ProEnumFieldProps<Values, T>;
 } | {
     type?: 'ProSelect';
     fieldProps?: FieldProps<ProSelectProps, Values, T>;
@@ -139,12 +151,35 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
 } | {
     type?: 'ProTreeSelect';
     fieldProps?: FieldProps<PropTreeSelectProps, Values, T>;
+} | {
+    type?: 'ProTreeModal';
+    fieldProps?: FieldProps<ProTreeModalProps, Values, T>;
+} | {
+    type?: 'ProUpload';
+    fieldProps?: FieldProps<ProUploadProps, Values, T>;
+} | {
+    type?: 'ProCascader';
+    fieldProps?: FieldProps<ProCascaderProps<any, any[], any>, Values, T>;
+} | {
+    type?: 'ProTree';
+    fieldProps?: FieldProps<ProTreeProps, Values, T>;
+} | {
+    type?: 'Group';
+    fieldProps?: GroupProps | ReactiveFunction<Values, GroupProps>;
+} | {
+    type?: 'ProCollapse';
+    fieldProps?: ProCollapseProps | ReactiveFunction<Values, ProCollapseProps>;
+} | {
+    type?: 'Container';
+    fieldProps?: any;
 };
 interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Values>, 'rules' | 'required'> {
     component?: React.ReactNode | ReactiveFunction<Values, React.ReactNode>;
     names?: NamePath[];
     show?: boolean | ReactiveFunction<Values, boolean>;
     valueType?: ProFormValueType;
+    switchValue?: [any, any];
+    isView?: boolean;
     viewRender?: (value: any, record: Values, { form, index, namePath, }: {
         form: FormInstance<Values>;
         index?: number | undefined;
@@ -168,6 +203,8 @@ interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Values>, '
      */
     labelWidth?: string | number;
     disabled?: boolean | ReactiveFunction<Values, boolean>;
+    trim?: boolean;
+    upperCase?: boolean;
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
     equalWith?: (originValue: any, currentValue: any) => boolean;
@@ -177,6 +214,14 @@ interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Values>, '
     clearNotShow?: boolean;
     index?: number;
     namePath?: NamePath;
+    /** 表单前缀信息 */
+    before?: string | React.ReactNode;
+    /** 表单后缀信息 */
+    after?: string | React.ReactNode;
+    /** 表单下方辅助信息 */
+    extra?: string | React.ReactNode;
+    /** 是否固定字段, 不隐藏 */
+    fixed?: boolean;
 }
 export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
 /**
@@ -189,10 +234,20 @@ export interface RenderProps<Values = any> {
         disabled?: boolean;
         hiddenNames?: string[];
         trim?: boolean;
+        upperCase?: boolean;
         rules?: ProRule[];
         labelRequired?: boolean;
         tooltip?: any;
+        isView?: boolean;
         disabledStrictly?: boolean;
+        /** 表单前缀信息 */
+        before?: string | React.ReactNode;
+        /** 表单后缀信息 */
+        after?: string | React.ReactNode;
+        /** 表单下方辅助信息 */
+        extra?: string | React.ReactNode;
+        parentNames?: string;
+        names?: NamePath[];
     };
     colProps: ColProps;
     componentProps: {
@@ -209,6 +264,7 @@ export interface RenderProps<Values = any> {
     fieldProps?: ReactiveFunction<Values, React.ReactNode>;
     isSelect: boolean;
     originalValues?: Values;
+    requiredOnView?: boolean;
     [name: string]: any;
 }
 export {};

package/es/ProForm/components/render/propsType.js

@@ -1,7 +1 @@
-var a = {
-  type: 'DatePicker',
-  fieldProps: {
-    showTime: true
-  }
-};
 export {};

package/es/ProForm/index.js

@@ -3,25 +3,27 @@ import "antd/es/row/style";
 import _Row from "antd/es/row";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/col/style";
 import _Col from "antd/es/col";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required"];
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
-import React, { forwardRef, useImperativeHandle, useEffect } from 'react';
+import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
 import { isObject, isString, merge } from 'lodash';
-import { useProConfig } from 'zat-design-pro-component';
-import { CertNo, EnumSelect, FormFooter, InputRange, InputWithSuffix, ProAddress, ProAddressBar, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeSelect, ProTreeModal } from './components';
+import { FormFooter, InputRange, ProAddress, ProAddressBar, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeSelect, ProTreeModal, ProTree, EnumSelect } from './components';
 import RenderFields from './components/render/RenderFields';
+import { useProConfig } from '../ProConfigProvider';
 import { getLayout, splitNameStr, useControlled, initialValuesToNames } from './utils/index';
 import { useForm } from './utils/useForm';
+import { useFieldProps } from './utils/useFieldProps';
 var ProForm = function ProForm(props, ref) {
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
@@ -54,6 +56,11 @@ var ProForm = function ProForm(props, ref) {
     submitOnEnter = props.submitOnEnter,
     _props$clearNotShow = props.clearNotShow,
     clearNotShow = _props$clearNotShow === void 0 ? true : _props$clearNotShow,
+    initialValues = props.initialValues,
+    _props$requiredOnView = props.requiredOnView,
+    requiredOnView = _props$requiredOnView === void 0 ? true : _props$requiredOnView,
+    formId = props.formId,
+    required = props.required,
     otherProps = _objectWithoutProperties(props, _excluded);
   var _useForm = useForm(originForm),
     _useForm2 = _slicedToArray(_useForm, 1),
@@ -66,28 +73,18 @@ var ProForm = function ProForm(props, ref) {
     openState = _useControlled2[0],
     setOpenState = _useControlled2[1];
   var config = useProConfig('ProForm');
-  var cls = classnames(_defineProperty({
-    'pro-form': true,
-    'pro-form-view': isView
-  }, className, className));
   var _getLayout = getLayout({
       span: span,
-      mode: mode,
       form: form
     }),
     formProps = _getLayout.formProps,
     colProps = _getLayout.colProps,
-    modeFooter = _getLayout.modeFooter,
     _onOk = _getLayout.onOk,
     _onCancel = _getLayout.onCancel;
-  var _footer = footer !== null && footer !== void 0 ? footer : modeFooter;
-  useEffect(function () {
-    // 初始化处理initialValues中包含names的场景
-    if (isObject(otherProps === null || otherProps === void 0 ? void 0 : otherProps.initialValues) && Object.keys(otherProps === null || otherProps === void 0 ? void 0 : otherProps.initialValues).length) {
-      var values = initialValuesToNames(otherProps === null || otherProps === void 0 ? void 0 : otherProps.initialValues, columns);
-      var formValues = form.getFieldsValue();
-      form.setFieldsValue(merge(values, formValues));
-    }
+  // 初始值names转换
+  var _initialValues = useMemo(function () {
+    var values = initialValuesToNames(initialValues, columns);
+    return values;
   }, []);
   /**
    * 展开&收起函数
@@ -96,30 +93,33 @@ var ProForm = function ProForm(props, ref) {
     setOpenState === null || setOpenState === void 0 ? void 0 : setOpenState(!openState);
   };
   var expandRender = function expandRender() {
-    return !!expand && columns.length > Number(expand) && /*#__PURE__*/React.createElement("div", {
+    return !!expand && columns.length > Number(expand) && _jsx("div", {
       className: "expand-button",
-      onClick: expandHandle
-    }, !openState ? /*#__PURE__*/React.createElement(_Space, null, "\u5C55\u5F00", /*#__PURE__*/React.createElement(DoubleLeftOutlined, {
-      className: "rotate-to-bottom"
-    })) : /*#__PURE__*/React.createElement(_Space, null, "\u6536\u8D77", /*#__PURE__*/React.createElement(DoubleLeftOutlined, {
-      className: "rotate-to-top"
-    })));
+      onClick: expandHandle,
+      children: !openState ? _jsxs(_Space, {
+        align: "center",
+        children: ["\u5C55\u5F00", _jsx(DoubleLeftOutlined, {
+          className: "rotate-to-bottom"
+        })]
+      }) : _jsxs(_Space, {
+        align: "center",
+        children: ["\u6536\u8D77", _jsx(DoubleLeftOutlined, {
+          className: "rotate-to-top"
+        })]
+      })
+    });
   };
-  var defaultFooter = function defaultFooter() {
-    // 查看和disabled状态，footer不可见
-    if (isView || disabled) {
-      return null;
-    }
-    if (_footer !== false) {
-      return /*#__PURE__*/React.createElement(_Col, _objectSpread({}, colProps), /*#__PURE__*/React.createElement(FormFooter, {
-        onOk: onOk || _onOk,
-        okText: okText,
-        confirmLoading: confirmLoading,
-        onCancel: onCancel || _onCancel,
-        cancelText: cancelText,
-        footer: _footer === true ? {} : _footer
-      }, expandRender()));
-    }
+  var defaultFooter = function defaultFooter(footerConfig) {
+    return _jsx(FormFooter, {
+      formId: formId,
+      onOk: onOk || _onOk,
+      okText: okText,
+      confirmLoading: confirmLoading,
+      onCancel: onCancel || _onCancel,
+      cancelText: cancelText,
+      footer: footerConfig,
+      form: form
+    });
   };
   // 暴露form出去给类组件使用
   useImperativeHandle(ref, function () {
@@ -149,7 +149,37 @@ var ProForm = function ProForm(props, ref) {
   var handleFinish = function handleFinish() {
     onFinish === null || onFinish === void 0 ? void 0 : onFinish(form.getFieldsValue());
   };
-  return /*#__PURE__*/React.createElement(_Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  var cls = classnames(_defineProperty({
+    'pro-form': true,
+    'pro-form-view': isView
+  }, className, className));
+  var footerCls = classnames({
+    'pro-form-custom-footer': true
+  });
+  var footerRender = function footerRender() {
+    var footerEle = null;
+    if (isView || disabled) {
+      // 查看或禁用模式
+      footerEle = null;
+    } else if ( /*#__PURE__*/React.isValidElement(footer)) {
+      // 传入组件渲染组件
+      footerEle = footer;
+    } else if (footer === undefined || footer || isObject(footer)) {
+      // 不传或者传入对象 渲染默认
+      footerEle = defaultFooter(footer);
+    }
+    // 展开折叠按钮
+    var expandEle = expandRender();
+    var hasElement = footerEle || expandEle;
+    return hasElement ? _jsx(_Col, _objectSpread(_objectSpread({}, colProps), {}, {
+      className: footerCls,
+      children: _jsxs(_Space, {
+        align: "center",
+        children: [footerEle, expandEle]
+      })
+    })) : null;
+  };
+  return _jsx(_Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     onKeyPress: function onKeyPress(event) {
       if (!submitOnEnter) return;
       if (event.key === 'Enter') {
@@ -161,24 +191,28 @@ var ProForm = function ProForm(props, ref) {
     labelAlign: labelAlign
   }, formProps), config), otherProps), {}, {
     onValuesChange: handleValuesChange,
-    onFinish: handleFinish
-  }), /*#__PURE__*/React.createElement(_Row, _objectSpread({
-    gutter: 24
-  }, rowProps), /*#__PURE__*/React.createElement(RenderFields, {
-    form: form,
-    isView: isView,
-    columns: columns,
-    disabled: disabled,
-    expand: expand,
-    openState: openState,
-    colProps: colProps,
-    viewEmpty: viewEmpty,
-    labelWidth: labelWidth,
-    originalValues: originalValues,
-    clearNotShow: clearNotShow
-  }), children, /*#__PURE__*/React.isValidElement(_footer) ? expand ? /*#__PURE__*/React.createElement(_Space, {
-    className: "pro-form-custom-footer"
-  }, _footer, expandRender()) : _footer : defaultFooter(), _footer === false || disabled || isView ? /*#__PURE__*/React.createElement(_Col, _objectSpread({}, colProps), expandRender()) : null));
+    onFinish: handleFinish,
+    initialValues: _initialValues,
+    children: _jsxs(_Row, _objectSpread(_objectSpread({
+      gutter: 24
+    }, rowProps), {}, {
+      children: [_jsx(RenderFields, {
+        form: form,
+        isView: isView,
+        columns: columns,
+        disabled: disabled,
+        expand: expand,
+        openState: openState,
+        colProps: colProps,
+        viewEmpty: viewEmpty,
+        labelWidth: labelWidth,
+        originalValues: originalValues,
+        clearNotShow: clearNotShow,
+        requiredOnView: requiredOnView,
+        required: required
+      }), children, footerRender()]
+    }))
+  }));
 };
 // @ts-ignore
 var ProFormForward = /*#__PURE__*/forwardRef(ProForm);
@@ -221,14 +255,17 @@ var ProFormProvider = function ProFormProvider(props) {
       });
     });
     info.changedFields = _changedFields;
+    // @ts-ignore
     onFormChange(name, info);
   };
-  return /*#__PURE__*/React.createElement(_Form.Provider, {
+  return _jsx(_Form.Provider, {
     onFormChange: onFormChange ? handleFormChange : undefined,
-    onFormFinish: onFormFinish
-  }, children);
+    onFormFinish: onFormFinish,
+    children: children
+  });
 };
 ProFormForward.Provider = ProFormProvider; // 包装Provider
+ProFormForward.useFieldProps = useFieldProps; // 获取每个字段的其他参数  -otherProps
 // 内置组合
 ProFormForward.ProAddressBar = ProAddressBar;
 ProFormForward.ProCombination = ProCombination;
@@ -238,13 +275,12 @@ ProFormForward.ProTimeLimit = ProTimeLimit;
 ProFormForward.ProUpload = ProUpload;
 ProFormForward.ProTreeSelect = ProTreeSelect;
 ProFormForward.ProTreeModal = ProTreeModal;
+ProFormForward.ProTree = ProTree;
 // 待废弃
 ProFormForward.EnumSelect = EnumSelect;
 ProFormForward.ProAddress = ProAddress;
 ProFormForward.InputRange = InputRange;
-ProFormForward.InputWithSuffix = InputWithSuffix;
 ProFormForward.ProRangeBox = ProRangeBox;
-ProFormForward.CertNo = CertNo;
 ProFormForward.ProCertValidity = ProCertValidity;
 ProFormForward.ProCertNo = ProCertNo;
 ProFormForward.transferAddressInfoToRegion = transferAddressInfoToRegion;

package/es/ProForm/propsType.d.ts

@@ -1,6 +1,6 @@
 import { ButtonProps, ColProps, RowProps } from 'antd';
 import { FormProps, FormInstance } from 'antd/es/form/Form';
-import { NamePath } from 'antd/lib/form/interface';
+import { NamePath } from 'antd/es/form/interface';
 import { StoreValue, Store } from 'rc-field-form/es/interface.d';
 import { ShouldUpdate } from 'rc-field-form/es/Field.d';
 import React, { ReactNode } from 'react';
@@ -37,6 +37,8 @@ export interface ProFormOtherProps {
     hiddenNames?: string[] | any[];
     colProps: ColProps;
     disabled: boolean;
+    show?: boolean | (() => boolean);
+    required?: boolean | (() => boolean);
 }
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
@@ -47,7 +49,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     columns?: ProColumnProps<Values>[];
     rowProps?: RowProps;
     footer?: FooterType;
-    expand?: number;
+    expand?: boolean | number;
     expandOpen?: boolean;
     expandOpenChange?: (open: boolean) => void;
     onOk?: () => void;
@@ -61,6 +63,9 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     /** 是否回车提交 */
     submitOnEnter?: boolean;
     clearNotShow?: boolean;
+    requiredOnView?: boolean;
+    formId?: string;
+    required?: boolean;
 }
 export interface Transform<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;