@zat-design/sisyphus-react 3.3.3-beta.4 → 3.3.3-beta.6

package/dist/index.esm.css

@@ -1941,6 +1941,9 @@ div.pro-textarea-view::after {
   display: none;
   padding-bottom: 12px;
 }
+.pro-textarea .ant-input {
+  resize: auto !important;
+}
 .pro-form-list-block-title {
   height: 14px;
   margin: calc(var(--zaui-space-size-xs, 4px) * var(--zaui-size, 1)) 0;
@@ -2233,10 +2236,12 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-group {
   width: unset !important;
 }
-.pro-group.pro-group-diy-width .ant-space .ant-space-item {
+.pro-group.pro-group-diy-width .ant-space .ant-space-item,
+.pro-group.pro-group-width-auto .ant-space .ant-space-item {
   width: auto;
 }
-.pro-group.pro-group-diy-width .ant-space .ant-space-item .ant-space-item {
+.pro-group.pro-group-diy-width .ant-space .ant-space-item .ant-space-item,
+.pro-group.pro-group-width-auto .ant-space .ant-space-item .ant-space-item {
   width: auto;
 }
 .pro-group .ant-space {

package/es/ProConfigProvider/index.d.ts

@@ -1,4 +1,5 @@
 import React, { FC } from 'react';
+import { FormInstance } from 'antd';
 import { PropSelectProps } from '../ProSelect/propsType';
 import { ProModalSelectPropsType } from '../ProForm/components/combination/ProModalSelect/propsType';
 import { AddressProps } from '../ProForm/components/combination/ProAddressBar/propsType';
@@ -9,17 +10,24 @@ export interface ProConfigState {
     ProSelect?: Partial<PropSelectProps> & Record<string, any>;
     ProModalSelect?: Partial<ProModalSelectPropsType> & Record<string, any>;
     ProAddressBar?: Partial<AddressProps> & Record<string, any>;
+    forms: Record<string, FormInstance | undefined>;
     [key: string]: any;
 }
 interface ConfigContext {
     state: ProConfigState;
-    dispatch: React.Dispatch<ProConfigState>;
+    dispatch: React.Dispatch<Actions>;
 }
 export declare const ProConfigContext: React.Context<ConfigContext>;
 export declare function useProConfig(): ConfigContext;
 export declare function useProConfig(name: keyof ConfigContext['state']): ConfigContext['state'][keyof ConfigContext['state']];
+export declare function useContextForm(): Record<string, FormInstance<any>>;
+type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic';
+interface Actions {
+    type: ActionsType;
+    payload: any;
+}
 export declare const ProConfigProvider: FC<{
-    value: ProConfigState;
+    value?: ProConfigState;
     locale?: string;
 }>;
 export default ProConfigProvider;

package/es/ProConfigProvider/index.js

@@ -9,12 +9,14 @@ import enUS from 'antd/es/locale/en_US';
 import merge from 'lodash/merge';
 import useEnumRequest from '../ProEnum/hooks/useEnumRequest';
 import { setLanguage } from '../locale';
-export var ProConfigContext = /*#__PURE__*/React.createContext({
-  state: {
-    ProEnum: {
-      dics: {}
-    }
+var initialState = {
+  ProEnum: {
+    dics: {}
   },
+  forms: {}
+};
+export var ProConfigContext = /*#__PURE__*/React.createContext({
+  state: initialState,
   dispatch: function dispatch() {}
 });
 // eslint-disable-next-line no-redeclare
@@ -22,6 +24,11 @@ export function useProConfig(name) {
   var config = useContext(ProConfigContext);
   return name ? config.state[name] : config;
 }
+export function useContextForm() {
+  var _config$state;
+  var config = useContext(ProConfigContext);
+  return (_config$state = config.state) === null || _config$state === void 0 ? void 0 : _config$state.forms;
+}
 var antdLangMap = {
   'zh-CN': zhCN,
   'en-US': enUS // en-US
@@ -47,7 +54,7 @@ var reducer = function reducer(state, action) {
 };
 export var ProConfigProvider = function ProConfigProvider(props) {
   var _props$value, _props$value2;
-  var _useReducer = useReducer(reducer, {}),
+  var _useReducer = useReducer(reducer, initialState),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];

package/es/ProForm/components/base/TextArea/index.js

@@ -40,9 +40,7 @@ var TextAreaDef = function TextAreaDef(props) {
     showCount: true,
     autoComplete: "off",
     placeholder: placeholder || "".concat(locale.ProForm.inputPlaceholder).concat(label || ''),
-    autoSize: {
-      minRows: 4
-    }
+    autoSize: true
   }, omit(initialConfig, ['trim'])), rest), {}, {
     className: _className
   }));

package/es/ProForm/components/base/TextArea/index.less

@@ -10,3 +10,10 @@ div.pro-textarea-view {
     padding-bottom: 12px;
   }
 }
+
+// input-textarea级联选择
+.pro-textarea {
+  .@{ant-prefix}-input {
+    resize: auto !important;
+  }
+}

package/es/ProForm/components/combination/Group/index.js

@@ -51,6 +51,9 @@ var Group = function Group(props) {
     'pro-group-diy-width': columns.some(function (item) {
       var _item$fieldProps, _item$fieldProps$styl;
       return item === null || item === void 0 ? void 0 : (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : (_item$fieldProps$styl = _item$fieldProps.style) === null || _item$fieldProps$styl === void 0 ? void 0 : _item$fieldProps$styl.width;
+    }),
+    'pro-group-width-auto': columns.some(function (item) {
+      return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
     })
   }, "".concat(className), className));
   return _jsx("div", {
@@ -60,7 +63,9 @@ var Group = function Group(props) {
         columns: data.columns,
         form: form
       }, omit(otherProps, ['colProps'])))
-    }) : _jsx(_Space, _objectSpread(_objectSpread({}, omit(space, ['separator', 'compact'])), {}, {
+    }) : _jsx(_Space, _objectSpread(_objectSpread({
+      align: "start"
+    }, omit(space, ['separator', 'compact'])), {}, {
       children: data.columns.map(function (column, index) {
         return _jsx(RenderFields, _objectSpread({
           columns: [column],

package/es/ProForm/components/combination/Group/style/index.less

@@ -20,8 +20,9 @@
 
 .pro-group {
   width: unset !important;
+  
 
-  &.pro-group-diy-width {
+  &.pro-group-diy-width, &.pro-group-width-auto {
     .@{ant-prefix}-space .@{ant-prefix}-space-item {
       width: auto;
 

package/es/ProForm/index.js

@@ -1,33 +1,32 @@
 import _toArray from "@babel/runtime/helpers/esm/toArray";
 import "antd/es/row/style";
 import _Row from "antd/es/row";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
 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 "antd/es/form/style";
-import _Form from "antd/es/form";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 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", "initialValues", "requiredOnView", "formId", "required", "originalTip", "groupName"];
+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", "originalTip", "formKey"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
-import React, { forwardRef, useContext, useImperativeHandle, useMemo } from 'react';
+import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
 import { isObject, isString, merge } from 'lodash';
 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 { useProConfig, useContextForm } from '../ProConfigProvider';
 import { getLayout, splitNameStr, useControlled, initialValuesToNames } from './utils/index';
 import { useForm } from './utils/useForm';
 import { useFieldProps } from './utils/useFieldProps';
 import locale from '../locale';
-import { groupContext } from './components/ProFormGroup';
 var ProForm = function ProForm(props, ref) {
-  var _groupForm$groupName, _localStorage;
+  var _forms$formKey, _localStorage;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -66,13 +65,14 @@ var ProForm = function ProForm(props, ref) {
     required = props.required,
     _props$originalTip = props.originalTip,
     originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
-    groupName = props.groupName,
+    formKey = props.formKey,
     otherProps = _objectWithoutProperties(props, _excluded);
-  var _ref = useContext(groupContext) || [],
-    _ref2 = _slicedToArray(_ref, 2),
-    groupForm = _ref2[0],
-    setGroupForm = _ref2[1];
-  var _useForm = useForm((_groupForm$groupName = groupForm[groupName]) !== null && _groupForm$groupName !== void 0 ? _groupForm$groupName : originForm),
+  var _useProConfig = useProConfig(),
+    state = _useProConfig.state,
+    dispatch = _useProConfig.dispatch;
+  var config = state.ProForm,
+    forms = state.forms;
+  var _useForm = useForm((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm),
     _useForm2 = _slicedToArray(_useForm, 1),
     form = _useForm2[0];
   var _useControlled = useControlled({
@@ -82,21 +82,30 @@ var ProForm = function ProForm(props, ref) {
     _useControlled2 = _slicedToArray(_useControlled, 2),
     openState = _useControlled2[0],
     setOpenState = _useControlled2[1];
-  var config = useProConfig('ProForm');
   // 把表单实例存入表单组
   useMemo(function () {
-    if (groupName && groupForm[groupName] !== form) {
-      groupForm[groupName] = form;
-      setGroupForm(_objectSpread({}, groupForm));
+    if (formKey && forms[formKey] !== form) {
+      forms[formKey] = form;
+      dispatch({
+        type: 'set',
+        payload: {
+          forms: _objectSpread({}, forms)
+        }
+      });
     }
     // 销毁
     return function () {
-      if (groupName && groupForm[groupName]) {
-        delete _Form[groupName];
-        setGroupForm(_objectSpread({}, groupForm));
+      if (formKey && forms[formKey]) {
+        delete forms[formKey];
+        dispatch({
+          type: 'set',
+          payload: {
+            forms: _objectSpread({}, forms)
+          }
+        });
       }
     };
-  }, [groupName, form]);
+  }, [formKey, form]);
   var _getLayout = getLayout({
       span: span,
       form: form
@@ -301,6 +310,7 @@ var ProFormProvider = function ProFormProvider(props) {
 };
 ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = useFieldProps; // 获取每个字段的其他参数  -otherProps
+ProFormForward.useContextForm = useContextForm; // 获取 ProConfigProvider中的表单实例map
 // 内置组合
 ProFormForward.ProAddressBar = ProAddressBar;
 ProFormForward.ProCombination = ProCombination;

package/es/ProForm/propsType.d.ts

@@ -43,7 +43,7 @@ export interface ProFormOtherProps {
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
     mode?: ModeEnum;
-    groupName?: string;
+    formKey?: string;
     /** 是否查看 */
     isView?: boolean;
     span?: number;

package/es/ProForm/utils/useRules.js

@@ -46,7 +46,7 @@ var useRules = function useRules(props) {
   internalRule.rules = internalRule.rules && rulesCreator(internalRule.rules, _label, isSelect);
   useEffect(function () {
     // 添加完整性校验
-    if (names && !isBoolean(labelRequired) || type === 'Group' && Array.isArray(names) && required) {
+    if (names && !isBoolean(labelRequired)) {
       var customRequired = {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
@@ -56,6 +56,9 @@ var useRules = function useRules(props) {
           return Promise.resolve();
         }
       };
+      if (type === 'Group' && Array.isArray(names) && !required) {
+        customRequired = null;
+      }
       internalRule.rules.push(customRequired);
     }
   }, [internalRule]);

package/es/index.d.ts

@@ -8,7 +8,6 @@ export { default as ProViewer } from './ProViewer';
 export { default as ProEditTable } from './ProEditTable';
 export { default as ProDrawerForm } from './ProDrawerForm';
 export { default as ProEditLabel } from './ProEditLabel';
-export { ProFormGroup, useProFormGroup } from './ProForm/components/ProFormGroup';
 export { default as ProForm } from './ProForm';
 export * from './ProForm';
 export * from './ProForm/components';

package/es/index.js

@@ -12,7 +12,6 @@ export { default as ProEditTable } from './ProEditTable';
 export { default as ProDrawerForm } from './ProDrawerForm';
 export { default as ProEditLabel } from './ProEditLabel';
 // 表单
-export { ProFormGroup, useProFormGroup } from './ProForm/components/ProFormGroup';
 export { default as ProForm } from './ProForm';
 export * from './ProForm';
 export * from './ProForm/components'; // ProForm 中组件导出

package/lib/ProConfigProvider/index.d.ts

@@ -1,4 +1,5 @@
 import React, { FC } from 'react';
+import { FormInstance } from 'antd';
 import { PropSelectProps } from '../ProSelect/propsType';
 import { ProModalSelectPropsType } from '../ProForm/components/combination/ProModalSelect/propsType';
 import { AddressProps } from '../ProForm/components/combination/ProAddressBar/propsType';
@@ -9,17 +10,24 @@ export interface ProConfigState {
     ProSelect?: Partial<PropSelectProps> & Record<string, any>;
     ProModalSelect?: Partial<ProModalSelectPropsType> & Record<string, any>;
     ProAddressBar?: Partial<AddressProps> & Record<string, any>;
+    forms: Record<string, FormInstance | undefined>;
     [key: string]: any;
 }
 interface ConfigContext {
     state: ProConfigState;
-    dispatch: React.Dispatch<ProConfigState>;
+    dispatch: React.Dispatch<Actions>;
 }
 export declare const ProConfigContext: React.Context<ConfigContext>;
 export declare function useProConfig(): ConfigContext;
 export declare function useProConfig(name: keyof ConfigContext['state']): ConfigContext['state'][keyof ConfigContext['state']];
+export declare function useContextForm(): Record<string, FormInstance<any>>;
+type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic';
+interface Actions {
+    type: ActionsType;
+    payload: any;
+}
 export declare const ProConfigProvider: FC<{
-    value: ProConfigState;
+    value?: ProConfigState;
     locale?: string;
 }>;
 export default ProConfigProvider;

package/lib/ProConfigProvider/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProConfigProvider = exports.ProConfigContext = void 0;
+exports.useContextForm = useContextForm;
 exports.useProConfig = useProConfig;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -17,12 +18,14 @@ var _en_US = _interopRequireDefault(require("antd/es/locale/en_US"));
 var _merge = _interopRequireDefault(require("lodash/merge"));
 var _useEnumRequest = _interopRequireDefault(require("../ProEnum/hooks/useEnumRequest"));
 var _locale = require("../locale");
-var ProConfigContext = exports.ProConfigContext = /*#__PURE__*/_react.default.createContext({
-  state: {
-    ProEnum: {
-      dics: {}
-    }
+var initialState = {
+  ProEnum: {
+    dics: {}
   },
+  forms: {}
+};
+var ProConfigContext = exports.ProConfigContext = /*#__PURE__*/_react.default.createContext({
+  state: initialState,
   dispatch: function dispatch() {}
 });
 // eslint-disable-next-line no-redeclare
@@ -30,6 +33,11 @@ function useProConfig(name) {
   var config = (0, _react.useContext)(ProConfigContext);
   return name ? config.state[name] : config;
 }
+function useContextForm() {
+  var _config$state;
+  var config = (0, _react.useContext)(ProConfigContext);
+  return (_config$state = config.state) === null || _config$state === void 0 ? void 0 : _config$state.forms;
+}
 var antdLangMap = {
   'zh-CN': _zh_CN.default,
   'en-US': _en_US.default // en-US
@@ -55,7 +63,7 @@ var reducer = function reducer(state, action) {
 };
 var ProConfigProvider = exports.ProConfigProvider = function ProConfigProvider(props) {
   var _props$value, _props$value2;
-  var _useReducer = (0, _react.useReducer)(reducer, {}),
+  var _useReducer = (0, _react.useReducer)(reducer, initialState),
     _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];

package/lib/ProForm/components/base/TextArea/index.js

@@ -46,9 +46,7 @@ var TextAreaDef = function TextAreaDef(props) {
     showCount: true,
     autoComplete: "off",
     placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder).concat(label || ''),
-    autoSize: {
-      minRows: 4
-    }
+    autoSize: true
   }, (0, _lodash.omit)(initialConfig, ['trim'])), rest), {}, {
     className: _className
   }));

package/lib/ProForm/components/base/TextArea/index.less

@@ -10,3 +10,10 @@ div.pro-textarea-view {
     padding-bottom: 12px;
   }
 }
+
+// input-textarea级联选择
+.pro-textarea {
+  .@{ant-prefix}-input {
+    resize: auto !important;
+  }
+}

package/lib/ProForm/components/combination/Group/index.js

@@ -55,6 +55,9 @@ var Group = function Group(props) {
     'pro-group-diy-width': columns.some(function (item) {
       var _item$fieldProps, _item$fieldProps$styl;
       return item === null || item === void 0 ? void 0 : (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : (_item$fieldProps$styl = _item$fieldProps.style) === null || _item$fieldProps$styl === void 0 ? void 0 : _item$fieldProps$styl.width;
+    }),
+    'pro-group-width-auto': columns.some(function (item) {
+      return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
     })
   }, "".concat(className), className));
   return (0, _jsxRuntime.jsx)("div", {
@@ -64,7 +67,9 @@ var Group = function Group(props) {
         columns: data.columns,
         form: form
       }, (0, _lodash.omit)(otherProps, ['colProps'])))
-    }) : (0, _jsxRuntime.jsx)(_antd.Space, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(space, ['separator', 'compact'])), {}, {
+    }) : (0, _jsxRuntime.jsx)(_antd.Space, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      align: "start"
+    }, (0, _lodash.omit)(space, ['separator', 'compact'])), {}, {
       children: data.columns.map(function (column, index) {
         return (0, _jsxRuntime.jsx)(_RenderFields.default, (0, _objectSpread2.default)({
           columns: [column],

package/lib/ProForm/components/combination/Group/style/index.less

@@ -20,8 +20,9 @@
 
 .pro-group {
   width: unset !important;
+  
 
-  &.pro-group-diy-width {
+  &.pro-group-diy-width, &.pro-group-width-auto {
     .@{ant-prefix}-space .@{ant-prefix}-space-item {
       width: auto;
 

package/lib/ProForm/index.js

@@ -25,10 +25,9 @@ var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
-var _ProFormGroup = require("./components/ProFormGroup");
-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", "originalTip", "groupName"];
+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", "originalTip", "formKey"];
 var ProForm = function ProForm(props, ref) {
-  var _groupForm$groupName, _localStorage;
+  var _forms$formKey, _localStorage;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -67,13 +66,14 @@ var ProForm = function ProForm(props, ref) {
     required = props.required,
     _props$originalTip = props.originalTip,
     originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
-    groupName = props.groupName,
+    formKey = props.formKey,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = (0, _react.useContext)(_ProFormGroup.groupContext) || [],
-    _ref2 = (0, _slicedToArray2.default)(_ref, 2),
-    groupForm = _ref2[0],
-    setGroupForm = _ref2[1];
-  var _useForm = (0, _useForm3.useForm)((_groupForm$groupName = groupForm[groupName]) !== null && _groupForm$groupName !== void 0 ? _groupForm$groupName : originForm),
+  var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
+    state = _useProConfig.state,
+    dispatch = _useProConfig.dispatch;
+  var config = state.ProForm,
+    forms = state.forms;
+  var _useForm = (0, _useForm3.useForm)((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm),
     _useForm2 = (0, _slicedToArray2.default)(_useForm, 1),
     form = _useForm2[0];
   var _useControlled = (0, _index.useControlled)({
@@ -83,21 +83,30 @@ var ProForm = function ProForm(props, ref) {
     _useControlled2 = (0, _slicedToArray2.default)(_useControlled, 2),
     openState = _useControlled2[0],
     setOpenState = _useControlled2[1];
-  var config = (0, _ProConfigProvider.useProConfig)('ProForm');
   // 把表单实例存入表单组
   (0, _react.useMemo)(function () {
-    if (groupName && groupForm[groupName] !== form) {
-      groupForm[groupName] = form;
-      setGroupForm((0, _objectSpread2.default)({}, groupForm));
+    if (formKey && forms[formKey] !== form) {
+      forms[formKey] = form;
+      dispatch({
+        type: 'set',
+        payload: {
+          forms: (0, _objectSpread2.default)({}, forms)
+        }
+      });
     }
     // 销毁
     return function () {
-      if (groupName && groupForm[groupName]) {
-        delete _antd.Form[groupName];
-        setGroupForm((0, _objectSpread2.default)({}, groupForm));
+      if (formKey && forms[formKey]) {
+        delete forms[formKey];
+        dispatch({
+          type: 'set',
+          payload: {
+            forms: (0, _objectSpread2.default)({}, forms)
+          }
+        });
       }
     };
-  }, [groupName, form]);
+  }, [formKey, form]);
   var _getLayout = (0, _index.getLayout)({
       span: span,
       form: form
@@ -302,6 +311,7 @@ var ProFormProvider = function ProFormProvider(props) {
 };
 ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = _useFieldProps.useFieldProps; // 获取每个字段的其他参数  -otherProps
+ProFormForward.useContextForm = _ProConfigProvider.useContextForm; // 获取 ProConfigProvider中的表单实例map
 // 内置组合
 ProFormForward.ProAddressBar = _components.ProAddressBar;
 ProFormForward.ProCombination = _components.ProCombination;

package/lib/ProForm/propsType.d.ts

@@ -43,7 +43,7 @@ export interface ProFormOtherProps {
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
     mode?: ModeEnum;
-    groupName?: string;
+    formKey?: string;
     /** 是否查看 */
     isView?: boolean;
     span?: number;

package/lib/ProForm/utils/useRules.js

@@ -53,7 +53,7 @@ var useRules = function useRules(props) {
   internalRule.rules = internalRule.rules && (0, _rulesCreator.rulesCreator)(internalRule.rules, _label, isSelect);
   (0, _react.useEffect)(function () {
     // 添加完整性校验
-    if (names && !(0, _lodash.isBoolean)(labelRequired) || type === 'Group' && Array.isArray(names) && required) {
+    if (names && !(0, _lodash.isBoolean)(labelRequired)) {
       var customRequired = {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
@@ -63,6 +63,9 @@ var useRules = function useRules(props) {
           return Promise.resolve();
         }
       };
+      if (type === 'Group' && Array.isArray(names) && !required) {
+        customRequired = null;
+      }
       internalRule.rules.push(customRequired);
     }
   }, [internalRule]);

package/lib/index.d.ts

@@ -8,7 +8,6 @@ export { default as ProViewer } from './ProViewer';
 export { default as ProEditTable } from './ProEditTable';
 export { default as ProDrawerForm } from './ProDrawerForm';
 export { default as ProEditLabel } from './ProEditLabel';
-export { ProFormGroup, useProFormGroup } from './ProForm/components/ProFormGroup';
 export { default as ProForm } from './ProForm';
 export * from './ProForm';
 export * from './ProForm/components';

package/lib/index.js

@@ -15,8 +15,6 @@ var _exportNames = {
   ProEditTable: true,
   ProDrawerForm: true,
   ProEditLabel: true,
-  ProFormGroup: true,
-  useProFormGroup: true,
   ProForm: true,
   ProSelect: true,
   ProEnum: true,
@@ -97,12 +95,6 @@ Object.defineProperty(exports, "ProForm", {
     return _ProForm.default;
   }
 });
-Object.defineProperty(exports, "ProFormGroup", {
-  enumerable: true,
-  get: function get() {
-    return _ProFormGroup.ProFormGroup;
-  }
-});
 Object.defineProperty(exports, "ProIcon", {
   enumerable: true,
   get: function get() {
@@ -169,12 +161,6 @@ Object.defineProperty(exports, "ProWaterMark", {
     return _ProWaterMark.default;
   }
 });
-Object.defineProperty(exports, "useProFormGroup", {
-  enumerable: true,
-  get: function get() {
-    return _ProFormGroup.useProFormGroup;
-  }
-});
 var _ProLayout = _interopRequireDefault(require("./ProLayout"));
 var _ProStep = _interopRequireDefault(require("./ProStep"));
 var _ProTabs = _interopRequireDefault(require("./ProTabs"));
@@ -184,7 +170,6 @@ var _ProViewer = _interopRequireDefault(require("./ProViewer"));
 var _ProEditTable = _interopRequireDefault(require("./ProEditTable"));
 var _ProDrawerForm = _interopRequireDefault(require("./ProDrawerForm"));
 var _ProEditLabel = _interopRequireDefault(require("./ProEditLabel"));
-var _ProFormGroup = require("./ProForm/components/ProFormGroup");
 var _ProForm = _interopRequireWildcard(require("./ProForm"));
 Object.keys(_ProForm).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.3.3-beta.4",
+  "version": "3.3.3-beta.6",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",

package/es/ProForm/components/ProFormGroup/index.d.ts

@@ -1,13 +0,0 @@
-import React from 'react';
-import { FormInstance } from 'antd';
-interface FormGroup {
-    [K: string]: FormInstance | undefined;
-}
-type ContextType = [FormGroup, (forms: FormGroup) => void];
-export declare const groupContext: React.Context<ContextType>;
-interface Props {
-    formGroup?: FormGroup;
-}
-export declare const useProFormGroup: () => FormGroup;
-export declare const ProFormGroup: React.FC<Props>;
-export {};

package/es/ProForm/components/ProFormGroup/index.js

@@ -1,27 +0,0 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { jsx as _jsx } from "react/jsx-runtime";
-import React, { useContext, useMemo, useState } from 'react';
-export var groupContext = /*#__PURE__*/React.createContext([{}, function () {
-  return undefined;
-}]);
-export var useProFormGroup = function useProFormGroup() {
-  var formGroup = useContext(groupContext);
-  return formGroup[0];
-};
-export var ProFormGroup = function ProFormGroup(props) {
-  var formGroup = props.formGroup,
-    children = props.children;
-  var Provider = groupContext.Provider;
-  var initialFormGroup = useMemo(function () {
-    return formGroup ? _objectSpread({}, formGroup) : {};
-  }, [formGroup]);
-  var _useState = useState(initialFormGroup),
-    _useState2 = _slicedToArray(_useState, 2),
-    forms = _useState2[0],
-    setForms = _useState2[1];
-  return _jsx(Provider, {
-    value: [forms, setForms],
-    children: children
-  });
-};

package/lib/ProForm/components/ProFormGroup/index.d.ts

@@ -1,13 +0,0 @@
-import React from 'react';
-import { FormInstance } from 'antd';
-interface FormGroup {
-    [K: string]: FormInstance | undefined;
-}
-type ContextType = [FormGroup, (forms: FormGroup) => void];
-export declare const groupContext: React.Context<ContextType>;
-interface Props {
-    formGroup?: FormGroup;
-}
-export declare const useProFormGroup: () => FormGroup;
-export declare const ProFormGroup: React.FC<Props>;
-export {};

package/lib/ProForm/components/ProFormGroup/index.js

@@ -1,35 +0,0 @@
-"use strict";
-
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useProFormGroup = exports.groupContext = exports.ProFormGroup = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _jsxRuntime = require("react/jsx-runtime");
-var _react = _interopRequireWildcard(require("react"));
-var groupContext = exports.groupContext = /*#__PURE__*/_react.default.createContext([{}, function () {
-  return undefined;
-}]);
-var useProFormGroup = exports.useProFormGroup = function useProFormGroup() {
-  var formGroup = (0, _react.useContext)(groupContext);
-  return formGroup[0];
-};
-var ProFormGroup = exports.ProFormGroup = function ProFormGroup(props) {
-  var formGroup = props.formGroup,
-    children = props.children;
-  var Provider = groupContext.Provider;
-  var initialFormGroup = (0, _react.useMemo)(function () {
-    return formGroup ? (0, _objectSpread2.default)({}, formGroup) : {};
-  }, [formGroup]);
-  var _useState = (0, _react.useState)(initialFormGroup),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    forms = _useState2[0],
-    setForms = _useState2[1];
-  return (0, _jsxRuntime.jsx)(Provider, {
-    value: [forms, setForms],
-    children: children
-  });
-};