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

package/lib/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/lib/ProForm/components/render/propsType.js

@@ -2,10 +2,4 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
-var a = {
-  type: 'DatePicker',
-  fieldProps: {
-    showTime: true
-  }
-};
+});

package/lib/ProForm/index.js

@@ -7,22 +7,24 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _icons = require("@ant-design/icons");
 var _antd = require("antd");
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
 var _lodash = require("lodash");
-var _zatDesignProComponent = require("zat-design-pro-component");
 var _components = require("./components");
 var _RenderFields = _interopRequireDefault(require("./components/render/RenderFields"));
+var _ProConfigProvider = require("../ProConfigProvider");
 var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
-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 _useFieldProps = require("./utils/useFieldProps");
+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"];
 var ProForm = function ProForm(props, ref) {
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
@@ -55,6 +57,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 = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useForm = (0, _useForm3.useForm)(originForm),
     _useForm2 = (0, _slicedToArray2.default)(_useForm, 1),
@@ -66,29 +73,19 @@ var ProForm = function ProForm(props, ref) {
     _useControlled2 = (0, _slicedToArray2.default)(_useControlled, 2),
     openState = _useControlled2[0],
     setOpenState = _useControlled2[1];
-  var config = (0, _zatDesignProComponent.useProConfig)('ProForm');
-  var cls = (0, _classnames2.default)((0, _defineProperty2.default)({
-    'pro-form': true,
-    'pro-form-view': isView
-  }, className, className));
+  var config = (0, _ProConfigProvider.useProConfig)('ProForm');
   var _getLayout = (0, _index.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;
-  (0, _react.useEffect)(function () {
-    // 初始化处理initialValues中包含names的场景
-    if ((0, _lodash.isObject)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.initialValues) && Object.keys(otherProps === null || otherProps === void 0 ? void 0 : otherProps.initialValues).length) {
-      var values = (0, _index.initialValuesToNames)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.initialValues, columns);
-      var formValues = form.getFieldsValue();
-      form.setFieldsValue((0, _lodash.merge)(values, formValues));
-    }
+  // 初始值names转换
+  var _initialValues = (0, _react.useMemo)(function () {
+    var values = (0, _index.initialValuesToNames)(initialValues, columns);
+    return values;
   }, []);
   /**
    * 展开&收起函数
@@ -97,30 +94,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.default.createElement("div", {
+    return !!expand && columns.length > Number(expand) && (0, _jsxRuntime.jsx)("div", {
       className: "expand-button",
-      onClick: expandHandle
-    }, !openState ? /*#__PURE__*/_react.default.createElement(_antd.Space, null, "\u5C55\u5F00", /*#__PURE__*/_react.default.createElement(_icons.DoubleLeftOutlined, {
-      className: "rotate-to-bottom"
-    })) : /*#__PURE__*/_react.default.createElement(_antd.Space, null, "\u6536\u8D77", /*#__PURE__*/_react.default.createElement(_icons.DoubleLeftOutlined, {
-      className: "rotate-to-top"
-    })));
+      onClick: expandHandle,
+      children: !openState ? (0, _jsxRuntime.jsxs)(_antd.Space, {
+        align: "center",
+        children: ["\u5C55\u5F00", (0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
+          className: "rotate-to-bottom"
+        })]
+      }) : (0, _jsxRuntime.jsxs)(_antd.Space, {
+        align: "center",
+        children: ["\u6536\u8D77", (0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
+          className: "rotate-to-top"
+        })]
+      })
+    });
   };
-  var defaultFooter = function defaultFooter() {
-    // 查看和disabled状态，footer不可见
-    if (isView || disabled) {
-      return null;
-    }
-    if (_footer !== false) {
-      return /*#__PURE__*/_react.default.createElement(_antd.Col, (0, _objectSpread2.default)({}, colProps), /*#__PURE__*/_react.default.createElement(_components.FormFooter, {
-        onOk: onOk || _onOk,
-        okText: okText,
-        confirmLoading: confirmLoading,
-        onCancel: onCancel || _onCancel,
-        cancelText: cancelText,
-        footer: _footer === true ? {} : _footer
-      }, expandRender()));
-    }
+  var defaultFooter = function defaultFooter(footerConfig) {
+    return (0, _jsxRuntime.jsx)(_components.FormFooter, {
+      formId: formId,
+      onOk: onOk || _onOk,
+      okText: okText,
+      confirmLoading: confirmLoading,
+      onCancel: onCancel || _onCancel,
+      cancelText: cancelText,
+      footer: footerConfig,
+      form: form
+    });
   };
   // 暴露form出去给类组件使用
   (0, _react.useImperativeHandle)(ref, function () {
@@ -150,7 +150,37 @@ var ProForm = function ProForm(props, ref) {
   var handleFinish = function handleFinish() {
     onFinish === null || onFinish === void 0 ? void 0 : onFinish(form.getFieldsValue());
   };
-  return /*#__PURE__*/_react.default.createElement(_antd.Form, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  var cls = (0, _classnames2.default)((0, _defineProperty2.default)({
+    'pro-form': true,
+    'pro-form-view': isView
+  }, className, className));
+  var footerCls = (0, _classnames2.default)({
+    'pro-form-custom-footer': true
+  });
+  var footerRender = function footerRender() {
+    var footerEle = null;
+    if (isView || disabled) {
+      // 查看或禁用模式
+      footerEle = null;
+    } else if ( /*#__PURE__*/_react.default.isValidElement(footer)) {
+      // 传入组件渲染组件
+      footerEle = footer;
+    } else if (footer === undefined || footer || (0, _lodash.isObject)(footer)) {
+      // 不传或者传入对象 渲染默认
+      footerEle = defaultFooter(footer);
+    }
+    // 展开折叠按钮
+    var expandEle = expandRender();
+    var hasElement = footerEle || expandEle;
+    return hasElement ? (0, _jsxRuntime.jsx)(_antd.Col, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+      className: footerCls,
+      children: (0, _jsxRuntime.jsxs)(_antd.Space, {
+        align: "center",
+        children: [footerEle, expandEle]
+      })
+    })) : null;
+  };
+  return (0, _jsxRuntime.jsx)(_antd.Form, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     onKeyPress: function onKeyPress(event) {
       if (!submitOnEnter) return;
       if (event.key === 'Enter') {
@@ -162,24 +192,28 @@ var ProForm = function ProForm(props, ref) {
     labelAlign: labelAlign
   }, formProps), config), otherProps), {}, {
     onValuesChange: handleValuesChange,
-    onFinish: handleFinish
-  }), /*#__PURE__*/_react.default.createElement(_antd.Row, (0, _objectSpread2.default)({
-    gutter: 24
-  }, rowProps), /*#__PURE__*/_react.default.createElement(_RenderFields.default, {
-    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.default.isValidElement(_footer) ? expand ? /*#__PURE__*/_react.default.createElement(_antd.Space, {
-    className: "pro-form-custom-footer"
-  }, _footer, expandRender()) : _footer : defaultFooter(), _footer === false || disabled || isView ? /*#__PURE__*/_react.default.createElement(_antd.Col, (0, _objectSpread2.default)({}, colProps), expandRender()) : null));
+    onFinish: handleFinish,
+    initialValues: _initialValues,
+    children: (0, _jsxRuntime.jsxs)(_antd.Row, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      gutter: 24
+    }, rowProps), {}, {
+      children: [(0, _jsxRuntime.jsx)(_RenderFields.default, {
+        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__*/(0, _react.forwardRef)(ProForm);
@@ -222,14 +256,17 @@ var ProFormProvider = function ProFormProvider(props) {
       });
     });
     info.changedFields = _changedFields;
+    // @ts-ignore
     onFormChange(name, info);
   };
-  return /*#__PURE__*/_react.default.createElement(_antd.Form.Provider, {
+  return (0, _jsxRuntime.jsx)(_antd.Form.Provider, {
     onFormChange: onFormChange ? handleFormChange : undefined,
-    onFormFinish: onFormFinish
-  }, children);
+    onFormFinish: onFormFinish,
+    children: children
+  });
 };
 ProFormForward.Provider = ProFormProvider; // 包装Provider
+ProFormForward.useFieldProps = _useFieldProps.useFieldProps; // 获取每个字段的其他参数  -otherProps
 // 内置组合
 ProFormForward.ProAddressBar = _components.ProAddressBar;
 ProFormForward.ProCombination = _components.ProCombination;
@@ -239,15 +276,13 @@ ProFormForward.ProTimeLimit = _components.ProTimeLimit;
 ProFormForward.ProUpload = _components.ProUpload;
 ProFormForward.ProTreeSelect = _components.ProTreeSelect;
 ProFormForward.ProTreeModal = _components.ProTreeModal;
+ProFormForward.ProTree = _components.ProTree;
 // 待废弃
 ProFormForward.EnumSelect = _components.EnumSelect;
 ProFormForward.ProAddress = _components.ProAddress;
 ProFormForward.InputRange = _components.InputRange;
-ProFormForward.InputWithSuffix = _components.InputWithSuffix;
 ProFormForward.ProRangeBox = _components.ProRangeBox;
-ProFormForward.CertNo = _components.CertNo;
 ProFormForward.ProCertValidity = _components.ProCertValidity;
 ProFormForward.ProCertNo = _components.ProCertNo;
 ProFormForward.transferAddressInfoToRegion = _components.transferAddressInfoToRegion;
-var _default = ProFormForward;
-exports.default = _default;
+var _default = exports.default = ProFormForward;

package/lib/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;

package/lib/ProForm/propsType.js

@@ -19,5 +19,4 @@ Object.keys(_propsType).forEach(function (key) {
     }
   });
 });
-var otherKeys = ['isView', 'viewEmpty', 'label', 'valueType', 'viewType', 'name', 'names', 'form', 'type', 'hiddenNames'];
-exports.otherKeys = otherKeys;
+var otherKeys = exports.otherKeys = ['isView', 'viewEmpty', 'label', 'valueType', 'viewType', 'name', 'names', 'form', 'type', 'hiddenNames'];