@zat-design/sisyphus-react 3.2.1 → 3.2.2

package/lib/ProEditTable/index.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -21,8 +22,8 @@ var _utils = require("./utils");
 var _tools = require("./utils/tools");
 var _components = require("./components");
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
-var _locale = _interopRequireDefault(require("../locale"));
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination"];
+var _locale = _interopRequireWildcard(require("../locale"));
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip"];
 var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _value$2;
   var value = _ref.value,
@@ -50,6 +51,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     max = _ref.max,
     headerRender = _ref.headerRender,
     pagination = _ref.pagination,
+    originalValues = _ref.originalValues,
+    originalTip = _ref.originalTip,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   // 上下文form
   var contentForm = _antd.Form.useFormInstance();
@@ -136,7 +139,9 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     tableRef: tableRef,
     max: max,
     tableLength: value === null || value === void 0 ? void 0 : value.length,
-    page: page
+    page: page,
+    originalValues: originalValues,
+    originalTip: originalTip
   };
   // 判断是否禁止添加、批量删除
   var isForbiddenBtn = (0, _react.useCallback)(function (type) {
@@ -292,8 +297,11 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             showQuickJumper: true,
             total: value.length,
             showTotal: function showTotal(total) {
+              var _locale$ProEditTable;
               if (!total) return;
-              return "\u5171".concat(total, "\u6761");
+              return (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEditTable = _locale.default.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+                total: total
+              });
             },
             onChange: handlePageChange
           }, pagination) : false,

package/lib/ProEditTable/propsType.d.ts

@@ -121,9 +121,19 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @default           -
      */
     form?: FormInstance;
+    /**
+     * @description       原始数据源，设置后可以对比更新后的数值
+     * @default           -
+     */
+    originalValues?: any;
+    /**
+     * @description       原始数据源，是否tooltip显示
+     * @default           -
+     */
+    originalTip?: boolean;
     /**
      * @description       可编辑表格的类型，单行、多行、单元格编辑
-     * @default           multiple
+     * @default           false
      */
     mode?: 'single' | 'multiple' | 'cell';
     /**

package/lib/ProForm/components/base/Checkbox/index.d.ts

@@ -8,6 +8,7 @@ export interface Props extends Omit<CheckboxGroupProps, 'options'> {
         value: string;
     };
     otherProps?: ProFormOtherProps;
+    isView?: boolean;
 }
 declare const Checkbox: React.FC<Props>;
 export default Checkbox;

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

@@ -12,16 +12,18 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
+var _index = _interopRequireDefault(require("../../../index"));
 var _excluded = ["dataSource", "otherProps", "fieldNames"];
 var Checkbox = function Checkbox(props) {
   var dataSource = props.dataSource,
     otherProps = props.otherProps,
     fieldNames = props.fieldNames,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty;
   var initialConfig = (0, _ProConfigProvider.useProConfig)('Checkbox') || {};
+  var _ref = _index.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
+    viewEmpty = _ref.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var _fieldNames = fieldNames || initialConfig.fieldNames || {
     label: 'label',
     value: 'value'

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

@@ -23,14 +23,15 @@ var DatePicker = function DatePicker(props) {
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = _ProForm.default.useFieldProps() || {},
-    isView = _ref.isView,
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = (0, _ProConfigProvider.useProConfig)('DatePicker');
   var _className = (0, _classnames.default)((0, _defineProperty2.default)({
     'full-form-item': true
   }, className, !!className));
-  if (isView || (props === null || props === void 0 ? void 0 : props.isView)) {
+  if (isView) {
     var value = rest.value;
     var viewChildren = null;
     if (!value) {

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

@@ -13,6 +13,7 @@ var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _index = _interopRequireDefault(require("../../../index"));
 var _excluded = ["label", "form", "placeholder", "fieldName", "otherProps"];
 // 参数优先级
 // 组件内默认值 < config默认值 < props
@@ -23,9 +24,10 @@ var Input = function Input(props) {
     fieldName = props.fieldName,
     otherProps = props.otherProps,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = _index.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = (0, _ProConfigProvider.useProConfig)('Input');
   if (isView) {
     return (0, _jsxRuntime.jsx)(_Container.default, {

package/lib/ProForm/components/base/Input/propsType.d.ts

@@ -11,4 +11,5 @@ export interface ProFieldProps<T = any> {
 }
 export interface IProps extends InputProps, ProFieldProps {
     otherProps?: ProFormOtherProps;
+    isView?: boolean;
 }

package/lib/ProForm/components/base/InputNumber/index.d.ts

@@ -5,6 +5,7 @@ export interface Props extends Omit<InputNumberProps, 'onBlur'> {
     otherProps?: ProFormOtherProps;
     range?: string;
     onBlur?: (value?: number, record?: any, object?: any) => void;
+    isView?: boolean;
 }
 declare const InputNumber: React.FC<Props>;
 export default InputNumber;

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

@@ -20,6 +20,7 @@ var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _index = require("../../../utils/index");
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _excluded = ["placeholder", "className", "otherProps", "range", "min", "max", "onBlur"];
 var calc = _utils.tools.calc;
 var rangeReg = /^[([](-?\d+(\.\d+)?)?,\s*(-?\d+(\.\d+)?)?[)\]]$/;
@@ -46,12 +47,13 @@ var InputNumber = function InputNumber(props) {
     max = props.max,
     onBlur = props.onBlur,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref2 = otherProps || {},
-    isView = _ref2.isView,
+  var _ref2 = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty,
-    viewType = _ref2.viewType,
     valueType = _ref2.valueType,
+    viewType = _ref2.viewType,
     label = _ref2.label;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var valueProps = {};
   if (valueType) {
     switch (valueType) {

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

@@ -13,7 +13,8 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _ahooks = require("ahooks");
 var _antd = require("antd");
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["useRequest", "isView", "otherProps", "dataSource", "options"];
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
+var _excluded = ["useRequest", "otherProps", "dataSource", "options"];
 var defaultFieldNames = {
   value: 'value',
   label: 'label',
@@ -47,19 +48,18 @@ var findTreeTarget = function findTreeTarget(dataSource, value, fieldNames) {
 var ProCascader = function ProCascader(props) {
   var _restProps$fieldNames;
   var requestProps = props.useRequest,
-    isView = props.isView,
     otherProps = props.otherProps,
     dataSource = props.dataSource,
     options = props.options,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref2 = otherProps || {},
-    formIsView = _ref2.isView;
+  var _ref2 = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref2.isView;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var _useRequest = (0, _ahooks.useRequest)(requestProps === null || requestProps === void 0 ? void 0 : requestProps.service, requestProps === null || requestProps === void 0 ? void 0 : requestProps.options),
     data = _useRequest.data;
-  var _isView = isView || formIsView;
   var _dataSource = data || dataSource || options;
   var _fieldNames = (_restProps$fieldNames = restProps.fieldNames) !== null && _restProps$fieldNames !== void 0 ? _restProps$fieldNames : defaultFieldNames;
-  if (_isView) {
+  if (isView) {
     var valueTarget = findTreeTarget(_dataSource, restProps.value, _fieldNames);
     var valueName = _fieldNames.value,
       label = _fieldNames.label;

package/lib/ProForm/components/base/Radio/index.d.ts

@@ -9,6 +9,7 @@ export interface Props extends Omit<RadioProps, 'options' | 'onChange'> {
         value: string;
     };
     otherProps?: ProFormOtherProps;
+    isView?: boolean;
 }
 declare const Radio: React.FC<Props>;
 export default Radio;

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

@@ -11,6 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _excluded = ["dataSource", "fieldNames", "onChange", "value", "otherProps"];
 var Radio = function Radio(props) {
   var dataSource = props.dataSource,
@@ -19,9 +20,10 @@ var Radio = function Radio(props) {
     value = props.value,
     otherProps = props.otherProps,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var initialConfig = (0, _ProConfigProvider.useProConfig)('Radio') || {};
   var _fieldNames = fieldNames || initialConfig.fieldNames || {
     label: 'label',

package/lib/ProForm/components/base/RangePicker/index.d.ts

@@ -5,6 +5,7 @@ export type Props = {
     otherProps?: ProFormOtherProps;
     separator?: any;
     showTime?: any;
+    isView?: boolean;
 } & Omit<RangePickerProps, 'separator'>;
 declare const RangePicker: React.FC<Props>;
 export default RangePicker;

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

@@ -12,6 +12,7 @@ var _antd = require("antd");
 var _lodash = require("lodash");
 var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
 var _excluded = ["format", "otherProps", "separator"]; // @ts-check
 var AntRangePicker = _antd.DatePicker.RangePicker;
@@ -22,11 +23,12 @@ var RangePicker = function RangePicker(props) {
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '~' : _props$separator,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var initialConfig = (0, _ProConfigProvider.useProConfig)('AntRangePicker');
+  var _ref = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
-  var initialConfig = (0, _ProConfigProvider.useProConfig)('AntRangePicker');
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   if (isView) {
     var _props$value = props.value,
       value = _props$value === void 0 ? [] : _props$value;

package/lib/ProForm/components/base/Select/index.d.ts

@@ -5,6 +5,7 @@ export interface Props extends SelectProps {
     dataSource?: any[];
     scrollFollowParent?: boolean;
     otherProps?: ProFormOtherProps;
+    isView?: boolean;
 }
 declare const Select: React.FC<Props>;
 export default Select;

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

@@ -12,6 +12,7 @@ var _antd = require("antd");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _index = _interopRequireDefault(require("../../../index"));
 var _excluded = ["dataSource", "fieldNames", "otherProps", "scrollFollowParent"];
 var Select = function Select(props) {
   var _props$dataSource = props.dataSource,
@@ -21,9 +22,10 @@ var Select = function Select(props) {
     _props$scrollFollowPa = props.scrollFollowParent,
     scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = _index.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = (0, _ProConfigProvider.useProConfig)('Select') || {};
   var _fieldNames = fieldNames || initialConfig.fieldNames || {
     label: 'label',

package/lib/ProForm/components/base/Switch/index.d.ts

@@ -4,6 +4,7 @@ import { ProFormOtherProps } from '../../../propsType';
 export interface Props extends Omit<SwitchProps, 'value'> {
     value: any;
     otherProps?: ProFormOtherProps;
+    isView?: boolean;
 }
 declare const Switch: React.FC<Props>;
 export default Switch;

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

@@ -13,15 +13,17 @@ var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _excluded = ["disabled", "otherProps"];
 var Switch = function Switch(props) {
   var disabled = props.disabled,
     otherProps = props.otherProps,
     res = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var config = (0, _ProConfigProvider.useProConfig)('Switch');
   if (isView) {
     if ((0, _lodash.isUndefined)(res === null || res === void 0 ? void 0 : res.checked) || (0, _lodash.isNull)(res === null || res === void 0 ? void 0 : res.checked) || valueType === 'switch' && (0, _lodash.isUndefined)(res.value)) {

package/lib/ProForm/components/base/SwitchCheckbox/index.d.ts

@@ -4,6 +4,7 @@ import { ProFormOtherProps } from '../../../propsType';
 export interface Props extends CheckboxProps {
     label?: string;
     otherProps?: ProFormOtherProps;
+    isView?: boolean;
 }
 declare const SwitchCheckbox: React.FC<Props>;
 export default SwitchCheckbox;

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

@@ -12,6 +12,7 @@ var _antd = require("antd");
 var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _excluded = ["onChange", "disabled", "value", "otherProps"];
 var SwitchCheckbox = function SwitchCheckbox(props) {
   var onChange = props.onChange,
@@ -19,10 +20,11 @@ var SwitchCheckbox = function SwitchCheckbox(props) {
     value = props.value,
     otherProps = props.otherProps,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var initialConfig = (0, _ProConfigProvider.useProConfig)('SwitchCheckbox');
   var changeVal = function changeVal(e) {
     onChange(e.target.checked);

package/lib/ProForm/components/base/TextArea/index.d.ts

@@ -4,6 +4,7 @@ import { ProFormOtherProps } from '../../../propsType';
 import './index.less';
 export interface Props extends TextAreaProps {
     otherProps?: ProFormOtherProps;
+    isView?: boolean;
 }
 declare const TextAreaDef: React.FC<Props>;
 export default TextAreaDef;

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

@@ -13,6 +13,7 @@ var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 require("./index.less");
 var _excluded = ["placeholder", "otherProps", "className"];
 var TextArea = _antd.Input.TextArea;
@@ -21,10 +22,10 @@ var TextAreaDef = function TextAreaDef(props) {
     otherProps = props.otherProps,
     className = props.className,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
+  var _ref = _ProForm.default.useFieldProps() || {},
     label = _ref.label,
-    isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty;
+    isViewCon = _ref.isView;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var initialConfig = (0, _ProConfigProvider.useProConfig)('TextArea');
   var disabled = (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.disabled) || rest.disabled;
   if (isView) {

package/lib/ProForm/components/base/TimePicker/index.d.ts

@@ -8,6 +8,7 @@ export interface Props {
     onChange?: (value: string) => void;
     value?: string;
     otherProps?: ProFormOtherProps;
+    isView?: boolean;
 }
 declare const TimePicker: React.FC<Props & TimePickerProps>;
 export default TimePicker;

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

@@ -12,6 +12,7 @@ var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 require("./style/index.less");
 var _excluded = ["format", "onChange", "value", "otherProps"];
 var TimePicker = function TimePicker(props) {
@@ -21,11 +22,12 @@ var TimePicker = function TimePicker(props) {
     value = props.value,
     otherProps = props.otherProps,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     _ref$valueType = _ref.valueType,
     valueType = _ref$valueType === void 0 ? 'dateTime' : _ref$valueType;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var initialConfig = (0, _ProConfigProvider.useProConfig)('AntTimePicker');
   var handleChange = function handleChange(value) {
     if (valueType === 'dateTime') {

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

@@ -13,16 +13,18 @@ var _lodash = require("lodash");
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _RenderFields = _interopRequireDefault(require("../../render/RenderFields"));
 var _ProCollapse = _interopRequireDefault(require("../../../../ProLayout/components/ProCollapse"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var Container = function Container(props) {
   var children = props.children,
     otherProps = props.otherProps,
     className = props.className,
     container = props.container;
-  var type = otherProps.type,
-    form = otherProps.form,
-    show = otherProps.show,
-    required = otherProps.required,
-    disabled = otherProps.disabled;
+  var _ref = _ProForm.default.useFieldProps() || {},
+    type = _ref.type,
+    form = _ref.form,
+    show = _ref.show,
+    required = _ref.required,
+    disabled = _ref.disabled;
   var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
     'pro-container': true,
     'pro-container-diy': type === 'Container'

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

@@ -17,9 +17,9 @@ var _utils2 = require("./utils");
 var _ToolbarButton = _interopRequireDefault(require("./components/ToolbarButton"));
 var _BlockFields = _interopRequireDefault(require("./components/BlockFields"));
 var _LineFields = _interopRequireDefault(require("./components/LineFields"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var FormList = function FormList(props, ref) {
   var columns = props.columns,
-    otherProps = props.otherProps,
     min = props.min,
     max = props.max,
     toolbarProps = props.toolbarProps,
@@ -35,10 +35,11 @@ var FormList = function FormList(props, ref) {
       key: String(item.key)
     });
   });
-  var form = otherProps.form,
-    name = otherProps.name,
-    isView = otherProps.isView,
-    disabled = otherProps.disabled;
+  var _ref = _ProForm.default.useFieldProps() || {},
+    form = _ref.form,
+    name = _ref.name,
+    isView = _ref.isView,
+    disabled = _ref.disabled;
   var errors = meta.errors;
   var _namePath = (0, _utils.toArray)(name);
   var processColumns = (0, _react.useCallback)(function (fieldName, namePath) {

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

@@ -14,6 +14,7 @@ var _lodash = require("lodash");
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _RenderFields = _interopRequireDefault(require("../../render/RenderFields"));
 var _utils = require("./utils");
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var Group = function Group(props) {
   var columns = props.children,
     otherProps = props.otherProps,
@@ -23,9 +24,11 @@ var Group = function Group(props) {
       size: 12
     } : _props$space,
     id = props.id;
-  var name = otherProps.name,
-    form = otherProps.form;
-  if (!Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names)) {
+  var _ref = _ProForm.default.useFieldProps() || {},
+    names = _ref.names,
+    name = _ref.name,
+    form = _ref.form;
+  if (!Array.isArray(names)) {
     console.error('Warning: Composite form components whose type is Group must be configured with names');
   }
   var _parentNames = (0, _utils.parseName)(id);