@zat-design/sisyphus-react 3.3.2 → 3.3.3-beta.3

package/dist/index.esm.css

@@ -751,6 +751,9 @@
 .pro-collapse.pro-collapse-level2 .pro-collapse-level2-collapse .ant-collapse-expand-icon {
   display: block;
 }
+.pro-collapse.pro-collapse-level2 .pro-collapse-level2-no-collapse .ant-collapse-expand-icon {
+  display: none;
+}
 .pro-collapse .ant-collapse-extra .extra-info {
   margin-right: 24px;
 }
@@ -2565,20 +2568,24 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper,
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector,
-.pro-form .ant-form-item.pro-form-item-changed .ant-picker {
+.pro-form .ant-form-item.pro-form-item-changed .ant-picker,
+.pro-form .ant-form-item.pro-form-item-changed .ant-input-number {
   background: var(--zaui-contract-bg, #fffaa1) !important;
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper input,
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector input,
-.pro-form .ant-form-item.pro-form-item-changed .ant-picker input {
+.pro-form .ant-form-item.pro-form-item-changed .ant-picker input,
+.pro-form .ant-form-item.pro-form-item-changed .ant-input-number input {
   background: var(--zaui-contract-bg, #fffaa1);
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector .ant-select-selection-placeholder,
-.pro-form .ant-form-item.pro-form-item-changed .ant-picker .ant-select-selection-placeholder {
+.pro-form .ant-form-item.pro-form-item-changed .ant-picker .ant-select-selection-placeholder,
+.pro-form .ant-form-item.pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
   z-index: 9;
 }
-.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-form-view-container {
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > span,
+.pro-form .ant-form-item.pro-form-item-changed .pro-form-view-container {
   padding: 4px 8px;
   background: var(--zaui-contract-bg, #fffaa1);
   border-radius: 4px;
@@ -4213,9 +4220,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   position: absolute;
   bottom: var(--zaui-space-size-md, 16px);
 }
-.pro-edit-table-toolbar {
-  margin-top: var(--zaui-space-size-md, 16px);
-}
 .pro-edit-table-toolbar .ant-space {
   gap: var(--zaui-space-size-sm, 8px);
 }
@@ -5470,7 +5474,6 @@ input[type='button'] {
   width: calc(100% - 18px);
   margin-bottom: 0;
   text-align: right;
-  background: #fff;
 }
 .ant-space.ant-space-vertical {
   display: -webkit-box;

package/es/ProConfigProvider/index.js

@@ -26,7 +26,6 @@ var antdLangMap = {
   'zh-CN': zhCN,
   'en-US': enUS // en-US
 };
-
 var reducer = function reducer(state, action) {
   var _state$ProEnum;
   switch (action.type) {

package/es/ProDrawerForm/components/ProModal/index.js

@@ -175,7 +175,6 @@ var ProModal = function ProModal(_ref) {
     footer: renderFooter(),
     okText: okText,
     cancelText: cancelText,
-    centered: true,
     closeIcon: _jsx(ReactSVG, {
       className: "close-icon",
       src: closeSvg

package/es/ProEditLabel/index.js

@@ -22,7 +22,6 @@ import { omit } from 'lodash';
 import RenderProForm from './components/RenderProForm';
 import { matchFormValue } from './utils';
 var ProEditLabel = function ProEditLabel(_ref) {
-  var _classnames;
   var _ref$open = _ref.open,
     open = _ref$open === void 0 ? false : _ref$open,
     _ref$disabled = _ref.disabled,
@@ -128,9 +127,9 @@ var ProEditLabel = function ProEditLabel(_ref) {
       }
     }
   }, [confirmValue, mode]);
-  var cls = classnames((_classnames = {
+  var cls = classnames(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
     'pro-edit-label': true
-  }, _defineProperty(_classnames, "trigger-".concat(trigger), trigger), _defineProperty(_classnames, 'pro-edit-label-small', size === 'small'), _defineProperty(_classnames, 'pro-edit-label-middle', size === 'middle'), _defineProperty(_classnames, 'pro-edit-label-large', size === 'large'), _defineProperty(_classnames, "".concat(className), className), _classnames));
+  }, "trigger-".concat(trigger), trigger), 'pro-edit-label-small', size === 'small'), 'pro-edit-label-middle', size === 'middle'), 'pro-edit-label-large', size === 'large'), "".concat(className), className));
   /**
    * pop确认回调
    */

package/es/ProEditTable/components/ActionButton/index.js

@@ -82,24 +82,24 @@ var ActionButton = function ActionButton(_ref) {
         disabled: isDisabled,
         okText: locale.ProEditTable.confirm,
         cancelText: locale.ProEditTable.cancel,
-        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled
-        })) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        }))) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           disabled: isDisabled,
           type: "link",
           children: btnConfig.label
         }))
       }) : _jsx(_Fragment, {
-        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled,
           onClick: function onClick() {
             btnConfig.onEvent(record, index);
           }
-        })) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        }))) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: function onClick() {
@@ -109,10 +109,10 @@ var ActionButton = function ActionButton(_ref) {
         }))
       })
     }) : _jsx(_Fragment, {
-      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
+      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
         record: record,
         index: index
-      })) : _jsx(_Button, _objectSpread(_objectSpread({
+      }))) : _jsx(_Button, _objectSpread(_objectSpread({
         className: "action-button"
       }, omit(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
         type: "link",

package/es/ProEditTable/components/RenderField/index.js

@@ -30,7 +30,7 @@ import useRules from '../../../ProForm/utils/useRules';
 import { isSelect } from '../../../ProForm/utils';
 import locale from '../../../locale';
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4, _classNames;
+  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -506,13 +506,13 @@ var RenderField = function RenderField(_ref) {
   if (!isEditing) {
     delete _formItemProps.rules;
   }
-  var _className = classNames((_classNames = {}, _defineProperty(_classNames, className, className), _defineProperty(_classNames, 'pro-form-item-changed', changed), _classNames));
+  var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed));
   var originalTitle = originalTip ? _jsxs(_Space, {
-    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
+    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
-    })) : _jsx(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
+    }))) : _jsx(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
@@ -523,7 +523,7 @@ var RenderField = function RenderField(_ref) {
   }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: cellName,
-    children: /*#__PURE__*/React.isValidElement(TargetComponent) ? /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange']))) : _jsx(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))
+    children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))) : _jsx(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))
   })) : _jsx(Container, {
     viewEmpty: viewEmpty
   });

package/es/ProEditTable/style/index.less

@@ -313,7 +313,6 @@
 }
 
 .pro-edit-table-toolbar {
-  margin-top: var(--zaui-space-size-md, 16px);
   .@{ant-prefix}-space {
     gap: var(--zaui-space-size-sm, 8px);
 

package/es/ProEditTable/utils/index.js

@@ -217,9 +217,9 @@ export var transformColumns = function transformColumns() {
           children: [columnTitle, _jsx(_Tooltip, _objectSpread(_objectSpread({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
-            children: icon ? /*#__PURE__*/React.cloneElement(icon, {
+            children: icon ? ( /*#__PURE__*/React.cloneElement(icon, {
               className: 'icon-tip'
-            }) : _jsx(ReactSVG, {
+            })) : _jsx(ReactSVG, {
               className: "icon-tip",
               src: tipSvg
             })
@@ -336,7 +336,6 @@ export var transformColumns = function transformColumns() {
         })
       });
     };
-
     item.render = _render;
   });
   if (disabled || isView) {
@@ -359,7 +358,6 @@ export var transformColumns = function transformColumns() {
     var actionColumn = getActionColumn(_objectSpread(_objectSpread({}, config), {}, {
       validateKeys: validateKeys // 需要校验的单元格的formItem的name
     }));
-
     actionColumn && _columns.push(actionColumn);
   }
   // cacheMap 用来存储缓存值，若有值后不再请求

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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,27 @@
+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/es/ProForm/components/base/Switch/index.js

@@ -38,5 +38,4 @@ var Switch = function Switch(props) {
     id: "switch_only" // 解决点击label联动的问题
   }));
 };
-
 export default Switch;

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

@@ -9,6 +9,7 @@ import classnames from 'classnames';
 import { useProConfig } from '../../../../ProConfigProvider';
 import locale from '../../../../locale';
 import ProForm from '../../../../ProForm';
+import Container from '../../Container';
 import './index.less';
 var TextArea = _Input.TextArea;
 var TextAreaDef = function TextAreaDef(props) {
@@ -18,16 +19,20 @@ var TextAreaDef = function TextAreaDef(props) {
     rest = _objectWithoutProperties(props, _excluded);
   var _ref = ProForm.useFieldProps() || {},
     label = _ref.label,
-    isViewCon = _ref.isView;
+    isViewCon = _ref.isView,
+    viewEmpty = _ref.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var initialConfig = useProConfig('TextArea');
-  var disabled = (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.disabled) || rest.disabled;
   if (isView) {
-    disabled = true;
+    return _jsx(Container, {
+      nowrap: false,
+      tooltip: true,
+      viewEmpty: viewEmpty,
+      children: rest.value
+    });
   }
   var _className = classnames({
     'pro-textarea': true,
-    disabled: disabled,
     'pro-textarea-view': isView,
     className: className
   });
@@ -39,7 +44,6 @@ var TextAreaDef = function TextAreaDef(props) {
       minRows: 4
     }
   }, omit(initialConfig, ['trim'])), rest), {}, {
-    disabled: disabled,
     className: _className
   }));
 };

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

@@ -11,11 +11,12 @@ var Container = function Container(props) {
   var children = props.children,
     otherProps = props.otherProps,
     className = props.className,
-    container = props.container;
+    container = props.container,
+    show = props.show,
+    clearNotShow = props.clearNotShow;
   var _ref = ProForm.useFieldProps() || {},
     type = _ref.type,
     form = _ref.form,
-    show = _ref.show,
     required = _ref.required,
     disabled = _ref.disabled;
   var _className = classnames(_defineProperty({
@@ -25,6 +26,7 @@ var Container = function Container(props) {
   var _children = useMemo(function () {
     var result = children.map(function (item) {
       return _objectSpread({
+        clearNotShow: clearNotShow,
         show: show,
         required: required,
         disabled: disabled

package/es/ProForm/components/combination/Container/propsType.d.ts

@@ -7,4 +7,6 @@ export interface ContainerProps {
     rowProps?: RowProps;
     className?: string;
     container?: string | React.ReactNode;
+    show?: boolean | (() => boolean);
+    clearNotShow?: boolean;
 }

package/es/ProForm/components/combination/FormList/components/ActionButton.js

@@ -225,13 +225,13 @@ var ActionButton = function ActionButton(props) {
           },
           children: label
         }))
-      }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : /*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
+      }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : ( /*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
         key: "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index),
         onClick: function onClick(e) {
           e.stopPropagation();
           handleClick(_onClick, index);
         }
-      }), label);
+      }), label));
     })
   });
 };

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

@@ -83,7 +83,6 @@ export var ProCombination = function ProCombination(props) {
     _handleChange(_values, rest === null || rest === void 0 ? void 0 : rest[0], form);
     (_childProps$index = childProps[index]) === null || _childProps$index === void 0 ? void 0 : (_childProps$index$onC = _childProps$index.onChange) === null || _childProps$index$onC === void 0 ? void 0 : _childProps$index$onC.call(_childProps$index, value, rest === null || rest === void 0 ? void 0 : rest[0], form); // 支持子组件分别传入onChange
   };
-
   var className = classNames({
     'pro-combination': true,
     'pro-combination-view': isView

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

@@ -548,8 +548,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         _value: value
       });
     } else if (Object.prototype.toString.call(value) === '[object Object]') {
-      var _initialValue;
-      var initialValue = (_initialValue = {}, _defineProperty(_initialValue, valueKey, value[valueKey]), _defineProperty(_initialValue, labelKey, value[labelKey]), _initialValue);
+      var initialValue = _defineProperty(_defineProperty({}, valueKey, value[valueKey]), labelKey, value[labelKey]);
       setState({
         selectedRowKeys: [value],
         selectedRows: [initialValue],

package/es/ProForm/components/combination/ProTimeLimit/index.d.ts

@@ -3,6 +3,7 @@ import { Moment } from 'moment';
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
 import { Props as ProRangeLimitProps } from '../ProRangeLimit';
+import { DistributiveOmit } from '../../../../ProForm/propsType';
 export type DateType = DatePickerProps['value'];
 export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onChange' | 'mode'> & {
     value?: string;

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

@@ -12,7 +12,7 @@ var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType"
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
 import { omit } from 'lodash';
-import moment, { isMoment } from 'moment';
+import moment from 'moment';
 import { useMemo } from 'react';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
@@ -53,7 +53,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
     onChange = _useControlled2[1];
   var initialConfig = useProConfig('ProTimeLimit');
   var isForever = useMemo(function () {
-    if (isMoment(value)) {
+    if (moment.isMoment(value)) {
       return foreverMoment.format(format) === value.format(format);
     }
     return false;

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

@@ -33,7 +33,7 @@ import tipSvg from '../../../assets/tip.svg';
 import useRules from '../../utils/useRules';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _ref2, _classNames, _otherProps$names2;
+  var _ref2, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -171,11 +171,11 @@ var Render = function Render(props) {
   var lastComponentProps = _objectSpread(_objectSpread(_objectSpread({}, componentProps), _fieldProps), {}, {
     disabled: lastDisabled
   });
-  var _className = classNames((_classNames = {}, _defineProperty(_classNames, className, className), _defineProperty(_classNames, 'pro-form-item-changed', changed), _defineProperty(_classNames, 'pro-form-item-width-auto', ['Switch'].includes(type)), _classNames));
+  var _className = classNames(_defineProperty(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed), 'pro-form-item-width-auto', ['Switch'].includes(type)));
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
     return _jsx(_Form.Item, {
-      name: _otherFormItemProps.name,
+      name: _otherFormItemProps.name || 'proFormItemHidden',
       shouldUpdate: _otherFormItemProps.shouldUpdate,
       className: _className,
       noStyle: true,
@@ -344,7 +344,7 @@ var Render = function Render(props) {
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? /*#__PURE__*/React.cloneElement(AutoComponent, childProps) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
+    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? ( /*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
       otherProps: _objectSpread(_objectSpread({}, otherProps), {}, {
         show: show,
         disabled: lastDisabled,
@@ -390,7 +390,6 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-
     var orgFormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,

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

@@ -146,6 +146,11 @@ var RenderFields = function RenderFields(props) {
     }, _fieldProps), {}, {
       disabled: _disabled
     });
+    // 容器组件，额外处理show的问题
+    if (['ProCollapse', 'Container'].includes(_type)) {
+      componentProps.show = show;
+      componentProps.clearNotShow = clearNotShow;
+    }
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
       _formItemProps.valuePropName = 'checked';

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

@@ -32,6 +32,7 @@ import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
 import { GroupProps } from '../combination/Group/propsType';
 import { ProCollapseProps } from '../../../ProLayout/components/ProCollapse/PropTypes';
+import { DistributiveOmit } from '../../propsType';
 export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;

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

@@ -1 +1,2 @@
+var a = {};
 export {};

package/es/ProForm/index.js

@@ -1,22 +1,22 @@
 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 _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 "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"];
+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"];
 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, useMemo } from 'react';
+import React, { forwardRef, useContext, 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';
@@ -25,8 +25,9 @@ import { getLayout, splitNameStr, useControlled, initialValuesToNames } from './
 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 _localStorage;
+  var _groupForm$groupName, _localStorage;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -65,8 +66,13 @@ var ProForm = function ProForm(props, ref) {
     required = props.required,
     _props$originalTip = props.originalTip,
     originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
+    groupName = props.groupName,
     otherProps = _objectWithoutProperties(props, _excluded);
-  var _useForm = useForm(originForm),
+  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),
     _useForm2 = _slicedToArray(_useForm, 1),
     form = _useForm2[0];
   var _useControlled = useControlled({
@@ -77,6 +83,20 @@ var ProForm = function ProForm(props, ref) {
     openState = _useControlled2[0],
     setOpenState = _useControlled2[1];
   var config = useProConfig('ProForm');
+  // 把表单实例存入表单组
+  useMemo(function () {
+    if (groupName && groupForm[groupName] !== form) {
+      groupForm[groupName] = form;
+      setGroupForm(_objectSpread({}, groupForm));
+    }
+    // 销毁
+    return function () {
+      if (groupName && groupForm[groupName]) {
+        delete _Form[groupName];
+        setGroupForm(_objectSpread({}, groupForm));
+      }
+    };
+  }, [groupName, form]);
   var _getLayout = getLayout({
       span: span,
       form: form

package/es/ProForm/propsType.d.ts

@@ -43,6 +43,7 @@ export interface ProFormOtherProps {
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
     mode?: ModeEnum;
+    groupName?: string;
     /** 是否查看 */
     isView?: boolean;
     span?: number;
@@ -73,3 +74,4 @@ export interface Transform<T = any> {
     getValueProps?: (value: StoreValue) => Record<string, unknown>;
     shouldUpdate?: ShouldUpdate<T>;
 }
+export type DistributiveOmit<T, K extends keyof any> = T extends any ? Omit<T, K> : never;

package/es/ProForm/style/index.less

@@ -126,11 +126,12 @@
       }
     }
 
-    // 比较原始值场景下  不同时候的样式
+    // 比较原始值场景下  不同时的样式
     &.pro-form-item-changed {
       span.@{ant-prefix}-input-affix-wrapper,
       .@{ant-prefix}-select-selector,
-      .@{ant-prefix}-picker {
+      .@{ant-prefix}-picker,
+      .@{ant-prefix}-input-number {
         background: @zaui-contract-bg !important;
 
         input {
@@ -141,7 +142,9 @@
         }
       }
 
-      .@{ant-prefix}-form-item-control-input-content > .pro-form-view-container {
+      // 查看模式 修改容器样式
+      .@{ant-prefix}-form-item-control-input-content > span, // 地址组件
+      .pro-form-view-container {
         padding: 4px 8px;
         background: @zaui-contract-bg;
         border-radius: 4px;

package/es/ProForm/utils/index.js

@@ -134,18 +134,22 @@ export var splitNameStr = function splitNameStr(name) {
 // 过滤掉字段名中包含 '-' 的字段
 export var filterInternalFields = function filterInternalFields(values) {
   var nextValues = values;
+  // fix: braft-editor对象不可遍历
+  if (values === null || values === void 0 ? void 0 : values._immutable) {
+    return nextValues;
+  }
   if (Array.isArray(nextValues)) {
-    nextValues.forEach(function (item) {
-      filterInternalFields(item);
+    return nextValues.map(function (item) {
+      return filterInternalFields(item);
     });
   }
   if (isObject(nextValues)) {
+    var result = {};
     Object.keys(nextValues).forEach(function (key) {
-      if (key.includes('-')) {
-        delete nextValues[key];
-      }
-      filterInternalFields(nextValues[key]);
+      if (key.includes('-')) return;
+      result[key] = filterInternalFields(nextValues[key]);
     });
+    return result;
   }
   return nextValues;
 };

package/es/ProForm/utils/useChanged.js

@@ -12,7 +12,7 @@ export var useChanged = function useChanged(_ref) {
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
     return get(originalValues, name);
   }) : get(originalValues, name);
-  var notWatch = !originalValues || originalValue === undefined;
+  var notWatch = !equalWith && (!originalValues || originalValue === undefined);
   if (notWatch) form = [];
   var value = _Form.useWatch(namesStr || name, form);
   if (notWatch) return [false];