@zat-design/sisyphus-react 3.4.3-beta.1 → 3.4.3-beta.11

package/dist/index.esm.css

@@ -689,7 +689,7 @@
   display: block !important;
 }
 .pro-collapse.ant-collapse .pro-collapse-panel {
-  margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
+  margin-bottom: 16px;
 }
 .pro-collapse .ant-collapse-header {
   -webkit-box-align: center !important;
@@ -2696,7 +2696,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .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:has(.ant-switch-handle, .ant-checkbox-wrapper-in-form-item) {
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
   background: var(--zaui-contract-bg, #fffaa1);
   border-radius: 4px;
 }
@@ -2850,6 +2851,19 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .delete-icon {
   width: 18px;
 }
+.pro-form .pro-form-list-tool-btn {
+  margin-left: 8px;
+  padding: 0;
+  cursor: pointer;
+}
+.pro-form .pro-form-list-tool-btn .anticon {
+  color: var(--zaui-text-weak, #a0a0a0);
+  font-size: 16px;
+  vertical-align: middle;
+}
+.pro-form .pro-form-list-mode-block .pro-collapse-content .ant-row {
+  width: auto;
+}
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {
   background: #F8F9FA;
   border-radius: var(--zaui-border-radius, 8px);
@@ -3864,6 +3878,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox * {
   height: 16px !important;
 }
+.ant-select-dropdown.pro-tree-select-drop-down-container.checkable-tree {
+  overflow: hidden!important;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;

package/dist/less.esm.css

@@ -689,7 +689,7 @@
   display: block !important;
 }
 .pro-collapse.ant-collapse .pro-collapse-panel {
-  margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
+  margin-bottom: 16px;
 }
 .pro-collapse .ant-collapse-header {
   -webkit-box-align: center !important;
@@ -2696,7 +2696,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .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:has(.ant-switch-handle, .ant-checkbox-wrapper-in-form-item) {
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
   background: var(--zaui-contract-bg, #fffaa1);
   border-radius: 4px;
 }
@@ -2850,6 +2851,19 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .delete-icon {
   width: 18px;
 }
+.pro-form .pro-form-list-tool-btn {
+  margin-left: 8px;
+  padding: 0;
+  cursor: pointer;
+}
+.pro-form .pro-form-list-tool-btn .anticon {
+  color: var(--zaui-text-weak, #a0a0a0);
+  font-size: 16px;
+  vertical-align: middle;
+}
+.pro-form .pro-form-list-mode-block .pro-collapse-content .ant-row {
+  width: auto;
+}
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {
   background: #F8F9FA;
   border-radius: var(--zaui-border-radius, 8px);
@@ -3864,6 +3878,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox * {
   height: 16px !important;
 }
+.ant-select-dropdown.pro-tree-select-drop-down-container.checkable-tree {
+  overflow: hidden!important;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;

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

@@ -28,7 +28,7 @@ export var Row = function Row(props) {
     transition: transition
   }, isDragging ? {
     position: 'relative',
-    zIndex: 9999
+    zIndex: 2
   } : {});
   return _jsx("tr", _objectSpread(_objectSpread(_objectSpread({}, restProps), {}, {
     ref: setNodeRef,

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

@@ -1,9 +1,9 @@
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
@@ -72,7 +72,9 @@ var RenderField = function RenderField(_ref) {
     virtualKey = config.virtualKey,
     viewEmpty = config.viewEmpty,
     originalValues = config.originalValues,
-    originalDiffTip = config.originalDiffTip;
+    formNamePath = config.namePath,
+    _config$originalDiffT = config.originalDiffTip,
+    originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -515,7 +517,16 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed));
-  var originalTitle = originalDiffTip ? _jsxs(_Space, {
+  var FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
+    validateFirst: true
+  }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+    className: _className,
+    name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
+    children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
+  })) : _jsx(Container, {
+    viewEmpty: viewEmpty
+  });
+  var originalTitle = originalDiffTip && originalValues ? _jsxs(_Space, {
     children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
       isView: true,
       value: originalValue,
@@ -526,19 +537,11 @@ var RenderField = function RenderField(_ref) {
       checked: type === 'Switch' ? originalValue : undefined
     }))]
   }) : null;
-  var FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
-    validateFirst: true
-  }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
-    className: _className,
-    name: cellName,
-    children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
-  })) : _jsx(Container, {
-    viewEmpty: viewEmpty
-  });
   return _jsx(FieldProvider, {
     value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
     children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
       title: originalTitle,
+      placement: "topLeft",
       open: changed ? undefined : false,
       getPopupContainer: function getPopupContainer(target) {
         return target.parentElement;

package/es/ProEditTable/index.js

@@ -7,10 +7,11 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/config-provider/style";
 import _ConfigProvider from "antd/es/config-provider";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-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", "originalDiffTip", "rowKey"];
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray } from 'lodash';
@@ -19,6 +20,7 @@ import classnames from 'classnames';
 import { transformColumns } from './utils';
 import { getRandom, getNamePath } from './utils/tools';
 import { DndWrapper, Row, Validator, Summary, RenderToolbar } from './components';
+import ProForm from '../ProForm';
 import Empty from '../assets/empty.png';
 import locale, { formatMessage } from '../locale';
 var ProEditTable = function ProEditTable(_ref, ref) {
@@ -41,8 +43,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     onlyOneLineMsg = _ref.onlyOneLineMsg,
     deletePoConfirmMsg = _ref.deletePoConfirmMsg,
     mulDeletePoConfirmMsg = _ref.mulDeletePoConfirmMsg,
-    _ref$otherProps = _ref.otherProps,
-    otherProps = _ref$otherProps === void 0 ? {} : _ref$otherProps,
     configRequiredAlign = _ref.requiredAlign,
     summary = _ref.summary,
     max = _ref.max,
@@ -54,17 +54,23 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     resetProps = _objectWithoutProperties(_ref, _excluded);
   // 上下文form
   var contentForm = _Form.useFormInstance();
-  var form = contentForm || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.form) || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.form);
-  var name = (otherProps === null || otherProps === void 0 ? void 0 : otherProps.name) || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.name) || (resetProps === null || resetProps === void 0 ? void 0 : (_resetProps$id = resetProps.id) === null || _resetProps$id === void 0 ? void 0 : (_resetProps$id$split = _resetProps$id.split) === null || _resetProps$id$split === void 0 ? void 0 : _resetProps$id$split.call(_resetProps$id, '_'));
-  var _otherProps$isView = otherProps.isView,
-    isView = _otherProps$isView === void 0 ? false : _otherProps$isView,
-    _otherProps$viewEmpty = otherProps.viewEmpty,
-    viewEmpty = _otherProps$viewEmpty === void 0 ? '-' : _otherProps$viewEmpty;
+  var formFieldProps = ProForm.useFieldProps() || {};
+  var form = contentForm || (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.form) || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.form);
+  var name = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.name) || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.name) || (resetProps === null || resetProps === void 0 ? void 0 : (_resetProps$id = resetProps.id) === null || _resetProps$id === void 0 ? void 0 : (_resetProps$id$split = _resetProps$id.split) === null || _resetProps$id$split === void 0 ? void 0 : _resetProps$id$split.call(_resetProps$id, '_'));
+  var _formFieldProps$isVie = formFieldProps.isView,
+    isView = _formFieldProps$isVie === void 0 ? false : _formFieldProps$isVie,
+    _formFieldProps$viewE = formFieldProps.viewEmpty,
+    viewEmpty = _formFieldProps$viewE === void 0 ? '-' : _formFieldProps$viewE,
+    namePath = formFieldProps.namePath;
+  // 判断是否在formList内
+  if (namePath === null || namePath === void 0 ? void 0 : namePath.length) {
+    name = [].concat(_toConsumableArray(namePath), _toConsumableArray(name.slice(1)));
+  }
   var tableRef = useRef(null);
   var _React$useContext = React.useContext(_ConfigProvider.ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls;
   var prefixCls = getPrefixCls();
-  disabled = (otherProps === null || otherProps === void 0 ? void 0 : otherProps.disabled) || disabled;
+  disabled = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.disabled) || disabled;
   var _useLocalStorageState = useLocalStorageState('themeConfig'),
     _useLocalStorageState2 = _slicedToArray(_useLocalStorageState, 1),
     themeConfig = _useLocalStorageState2[0];
@@ -146,6 +152,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     virtualKey: virtualKey,
     requiredAlign: requiredAlign,
     name: isArray(name) ? name : [name],
+    namePath: namePath,
     tableRef: tableRef,
     max: max,
     tableLength: value === null || value === void 0 ? void 0 : value.length,

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

@@ -56,7 +56,9 @@ var DatePicker = function DatePicker(props) {
       disabled: true
     };
   }
-  return _jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), _rest), {}, {
+  return _jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
+    format: format
+  }, _rest), {}, {
     className: _className
   }));
 };

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

@@ -27,7 +27,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         add(undefined, index + 1);
       },
       type: 'text',
-      label: "".concat(locale.ProForm.formList_actions[0]),
+      label: "".concat(locale.ProForm.formListActions[0]),
       icon: _jsx(PlusSquareOutlined, {})
     },
     delete: {
@@ -39,7 +39,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         remove(index);
       },
       type: 'text',
-      label: "".concat(locale.ProForm.formList_actions[1]),
+      label: "".concat(locale.ProForm.formListActions[1]),
       icon: mode === 'less' ? _jsx(ProIcon, {
         type: "solid-close",
         className: "single-delete"
@@ -56,7 +56,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         add(record, index + 1);
       },
       type: 'text',
-      label: "".concat(locale.ProForm.formList_actions[2]),
+      label: "".concat(locale.ProForm.formListActions[2]),
       icon: _jsx(CopyOutlined, {})
     },
     moveUp: {
@@ -68,7 +68,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         move(index, index - 1);
       },
       type: 'text',
-      label: "".concat(locale.ProForm.formList_actions[3]),
+      label: "".concat(locale.ProForm.formListActions[3]),
       icon: _jsx(UpSquareOutlined, {})
     },
     moveDown: {
@@ -80,13 +80,14 @@ var getDefaultActions = function getDefaultActions(mode) {
         move(index, index + 1);
       },
       type: 'text',
-      label: "".concat(locale.ProForm.formList_actions[4]),
+      label: "".concat(locale.ProForm.formListActions[4]),
       icon: _jsx(DownSquareOutlined, {})
     }
   };
   if (mode === 'block') {
     Object.keys(originActions).forEach(function (key) {
-      originActions[key].type = 'default';
+      originActions[key].type = 'text';
+      originActions[key].className = 'pro-form-list-tool-btn';
     });
   }
   if (mode === 'line') {
@@ -188,7 +189,7 @@ var ActionButton = function ActionButton(props) {
           return false;
         }
         return _needConfirm ? _jsx(_Popconfirm, _objectSpread(_objectSpread({
-          title: title !== null && title !== void 0 ? title : "".concat(locale.ProForm.formList_confirmMessage),
+          title: title !== null && title !== void 0 ? title : "".concat(locale.ProForm.formListConfirmMessage),
           onCancel: function onCancel(e) {
             return e.stopPropagation();
           },
@@ -211,7 +212,7 @@ var ActionButton = function ActionButton(props) {
         }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
       }
       return needConfirm ? _jsx(_Popconfirm, _objectSpread(_objectSpread({
-        title: title !== null && title !== void 0 ? title : "".concat(locale.ProForm.formList_confirmMessage),
+        title: title !== null && title !== void 0 ? title : "".concat(locale.ProForm.formListConfirmMessage),
         onCancel: function onCancel(e) {
           return e.stopPropagation();
         },

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

@@ -2,9 +2,11 @@ import "antd/es/row/style";
 import _Row from "antd/es/row";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useMemo } from 'react';
 import { isFunction } from 'lodash';
+import classNames from 'classnames';
 import ActionButton from './ActionButton';
 import RenderFields from '../../../render/RenderFields';
 import ProCollapse from '../../../../../ProLayout/components/ProCollapse';
@@ -34,8 +36,10 @@ var BlockFields = function BlockFields(props) {
     }
     return title;
   }, [title, index]);
+  var cls = classNames(_defineProperty({}, "pro-form-list-mode-".concat(mode), mode === 'block' || mode === 'line' || mode === 'less'));
   return _jsx(_Space, {
     direction: "vertical",
+    className: cls,
     children: _jsx(ProCollapse, {
       title: _title,
       index: index,

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

@@ -20,7 +20,7 @@ var actions = {
         namePath = _ref.namePath;
       operation.add();
     },
-    label: "".concat(locale.ProForm.formList_actions[5]),
+    label: "".concat(locale.ProForm.formListActions[5]),
     type: 'link',
     icon: _jsx(PlusOutlined, {})
   }

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

@@ -86,13 +86,14 @@ var Group = function Group(props) {
       });
     }
   }, [value]);
+  var _otherProps = omit(otherProps, ['colProps', 'required']);
   return _jsx("div", {
     className: _className,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
       children: _jsx(RenderFields, _objectSpread({
         columns: data.columns,
         form: form
-      }, omit(otherProps, ['colProps'])))
+      }, _otherProps))
     }) : _jsx(_Space, _objectSpread(_objectSpread({
       align: "start"
     }, omit(space, ['separator', 'compact'])), {}, {
@@ -100,7 +101,7 @@ var Group = function Group(props) {
         return _jsx(RenderFields, _objectSpread({
           columns: [column],
           form: form
-        }, omit(otherProps, ['colProps'])), (column === null || column === void 0 ? void 0 : column.name) || index);
+        }, _otherProps), (column === null || column === void 0 ? void 0 : column.name) || index);
       })
     }))
   });

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

@@ -9,7 +9,7 @@
     border-right: 0px;
     border-left: 0px;
     pointer-events: none;
-    &.ant-input[disabled] {
+    &.@{ant-prefix}-input[disabled] {
       background: #fff !important;
     }
   }

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

@@ -154,9 +154,9 @@ var Render = function Render(props) {
   // ↑↑↑↑↑↑  formItem参数整理  ↑↑↑↑↑↑
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
-  }, internalRule, labelRequired || _required ? {
-    required: labelRequired || _required
-  } : null, otherProps.isView && !requiredOnView ? {
+  }, internalRule, {
+    required: typeof labelRequired === 'boolean' ? labelRequired : _required
+  }, otherProps.isView && !requiredOnView ? {
     required: false
   } : null, _objectSpread({}, isTrim(type, trim, useProConfig())), // 优先取传进来的，其次取ProConfigProvider配置的
   _objectSpread({}, isUpperCase(type, upperCase)), {
@@ -222,12 +222,8 @@ var Render = function Render(props) {
     if (valueType) {
       _args[2].transformValue = form.getFieldValue(_otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : _otherFormItemProps.name) || undefined;
     }
+    _args[2].option = args[1];
     switch (type) {
-      case 'ProSelect':
-      case 'ProModalSelect':
-      case 'ProEnum':
-        _args[2].option = args[1];
-        break;
       case 'ProAddressBar':
         _args[2].selectedOptions = args[1];
         break;
@@ -244,7 +240,7 @@ var Render = function Render(props) {
    * onChange参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleChange = function handleChange() {
-    var _lastComponentProps$c2;
+    var _otherFormItemProps$n3, _lastComponentProps$c2;
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
@@ -262,6 +258,11 @@ var Render = function Render(props) {
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat(_toConsumableArray(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat(_toConsumableArray(_args))));
       return false;
     }
+    var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
+    // FormList 和 Group场景 对比值改变的话, 回显到表单上
+    if (inList) {
+      form.setFieldsValue(_args[1]);
+    }
     // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
     if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
       setTimeout(function () {

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

@@ -16,7 +16,7 @@ interface Props<T = any> {
     originalValues?: ProFormProps<T>['originalValues'];
     clearNotShow?: boolean;
     requiredOnView?: boolean;
-    required?: boolean | (() => boolean);
+    required?: boolean | boolean[] | (() => boolean | boolean[]);
     originalDiffTip?: boolean;
     globalControl?: boolean;
 }

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

@@ -206,7 +206,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
     equalWith?: (originValue: any, currentValue: any) => boolean;
-    required?: boolean | ReactiveFunction<Values, boolean>;
+    required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;
     clearNotShow?: boolean;

package/es/ProForm/propsType.d.ts

@@ -38,7 +38,7 @@ export interface ProFormOtherProps {
     colProps: ColProps;
     disabled: boolean;
     show?: boolean | (() => boolean);
-    required?: boolean | (() => boolean);
+    required?: boolean | boolean[] | (() => boolean | boolean[]);
     mode?: string;
     namePath?: any[] | string | number;
 }
@@ -70,7 +70,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     formId?: string;
-    required?: boolean;
+    required?: boolean | boolean[];
     originalDiffTip?: boolean;
 }
 export interface Transform<T = any> {

package/es/ProForm/style/index.less

@@ -132,7 +132,8 @@
         }
       }
 
-      .ant-form-item-control:has(.ant-switch-handle, .ant-checkbox-wrapper-in-form-item) {
+      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
+      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
         background: @zaui-contract-bg;
         border-radius: 4px;
       }
@@ -140,13 +141,13 @@
       // 地址组件
       .@{ant-prefix}-form-item-control-input-content {
         & > .pro-address {
-          .ant-select-selector,
-          .ant-input-affix-wrapper,
-          .ant-input-disabled {
+          .@{ant-prefix}-select-selector,
+          .@{ant-prefix}-input-affix-wrapper,
+          .@{ant-prefix}-input-disabled {
             background: @zaui-contract-bg;
           }
         }
-        & > .ant-input-group {
+        & > .@{ant-prefix}-input-group {
           .forever-checkbox {
             background: @zaui-contract-bg;
           }
@@ -346,4 +347,21 @@
   .delete-icon {
     width: 18px;
   }
+  .pro-form-list-tool-btn {
+    margin-left: 8px;
+    padding: 0;
+    cursor: pointer;
+    .anticon {
+      color: var(--zaui-text-weak, #a0a0a0);
+      font-size: 16px;
+      vertical-align: middle;
+    }
+  }
+  .pro-form-list-mode-block{
+    .pro-collapse-content{
+      .@{ant-prefix}-row{
+        width: auto;
+      }
+    }
+  }
 }

package/es/ProForm/utils/diffOriginal.js

@@ -1,46 +1,31 @@
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import { isEqual, isFunction } from 'lodash';
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import { isEqual, isFunction, isString } from 'lodash';
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
-var extractValue = function extractValue(obj, path) {
-  var value = obj || {};
-  if (!Object.keys(obj)) {
-    return [];
-  }
-  var _iterator = _createForOfIteratorHelper(path),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var key = _step.value;
-      if (value && value.hasOwnProperty(key)) {
-        value = value[key];
-      } else {
-        return undefined;
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  return Object.values(value);
-};
 /** 将解构后的name值，反向转回names,例如 formData {a:1, b:2} names ['a', 'b'] 返回 [1,2] */
-var extractValues = function extractValues(data, pathString) {
-  if (pathString.includes('_')) {
-    var namePrefixes = pathString.split('-')[0].split('_').slice(0, -1);
-    return extractValue(data, namePrefixes);
+var extractValues = function extractValues(form, pathString) {
+  var _pathString;
+  var result = [];
+  var PrefixesName = isString(pathString) ? [] : pathString.slice(0, -1);
+  if (isString(pathString)) {
+    pathString.split('-').forEach(function (item) {
+      result.push(form.getFieldValue([].concat(_toConsumableArray(PrefixesName), [item])));
+    });
+    return result;
   }
-  return pathString.split('-').map(function (item) {
-    return data[item];
+  (_pathString = pathString[pathString.length - 1]) === null || _pathString === void 0 ? void 0 : _pathString.split('-').forEach(function (item) {
+    result.push(form.getFieldValue([].concat(_toConsumableArray(PrefixesName), [item])));
   });
+  return result;
 };
 export var diffOriginal = function diffOriginal(params) {
+  var _name$join;
   var originalValue = params.originalValue,
     _value = params.value,
     equalWith = params.equalWith,
     form = params.form,
     name = params.name;
-  var value = !(name === null || name === void 0 ? void 0 : name.includes('-')) ? _value : extractValues(form.getFieldsValue(), name);
+  var isNames = Array.isArray(name) && ((_name$join = name.join(',')) === null || _name$join === void 0 ? void 0 : _name$join.includes('-')) || (name === null || name === void 0 ? void 0 : name.includes('-'));
+  var value = !isNames ? _value : extractValues(form, name);
   // 支持传入自定义比较事件
   if (isFunction(equalWith)) {
     return !equalWith(originalValue, value);

package/es/ProForm/utils/index.d.ts

@@ -36,7 +36,7 @@ export declare const isNullValue: (value: any) => boolean;
  * @param arr 值
  * @returns boole
  */
-export declare const isNotFullArray: (arr: any, length: any) => boolean;
+export declare const isNotFullArray: (arr: any, length: any, required: any) => boolean;
 /**
  * 判断数组中值是否都为空 全部为空则为true
  * @param arr 值