@zat-design/sisyphus-react 3.4.3 → 3.4.4

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, {})
   }
@@ -59,9 +59,6 @@ var ToolbarButton = function ToolbarButton(props) {
       operation.add(data);
     }
   };
-  if (disabled || isView) {
-    return null;
-  }
   return _jsx(_Space, {
     align: "start",
     className: "pro-form-list-toolbar",
@@ -80,7 +77,7 @@ var ToolbarButton = function ToolbarButton(props) {
         rest = _objectWithoutProperties(item, _excluded);
       var _onClick = _onClick2 || onHandle;
       if (['add'].includes(actionType)) {
-        if (disabled) return _jsx(_Fragment, {});
+        if (disabled || isView) return _jsx(_Fragment, {});
         var _actions$actionType = actions[actionType],
           internalOnClick = _actions$actionType.onClick,
           defaultLabel = _actions$actionType.label,

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/ProModalSelect/hooks/useRequestList.js

@@ -47,7 +47,8 @@ export function useRequestList(service, options, useRequestOptions) {
     onPageChange = _useDefaultOptions.onPageChange,
     transformParams = _useDefaultOptions.transformParams,
     transformResponse = _useDefaultOptions.transformResponse;
-  var defaultParams = useRequestOptions.defaultParams;
+  var _ref2 = useRequestOptions || {},
+    defaultParams = _ref2.defaultParams;
   // 搜索表单里的值
   var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),

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

@@ -1,7 +1,11 @@
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
+import "antd/es/space/style";
+import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "antd/es/message/style";
 import _message from "antd/es/message";
@@ -16,12 +20,13 @@ var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames",
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { CloseOutlined, SearchOutlined } from '@ant-design/icons';
+import { SearchOutlined } from '@ant-design/icons';
 import { useMount, useSetState } from 'ahooks';
-import { cloneDeep, isArray, isEqual, isFunction, omit } from 'lodash';
+import { useRequest as useUmiRequest } from 'umi';
+import { cloneDeep, debounce, isArray, isEqual, isFunction, omit } from 'lodash';
 import { ReactSVG } from 'react-svg';
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
-import { ProForm, ProDrawerForm, ProTable, useProConfig } from '../../../../index';
+import { ProForm, ProDrawerForm, ProTable, useProConfig, ProSelect } from '../../../../index';
 import Container from '../../Container';
 import viewSvg from '../../../../assets/view.svg';
 import useRequestList from './hooks/useRequestList';
@@ -49,7 +54,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     isTooltip = props.isTooltip,
     searchForm = props.searchForm,
     defaultOne = props.defaultOne,
-    restInputProps = _objectWithoutProperties(props, _excluded);
+    restProps = _objectWithoutProperties(props, _excluded);
   var contentForm = _Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
     throw new Error('error: 请检查枚举选择弹框的配置项【configOption】');
@@ -102,6 +107,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       onOff: false,
       visible: false,
       open: false,
+      options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || [],
       selectedRows: [],
       selectedRowKeys: []
     }),
@@ -112,6 +118,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     onOff = _useSetState2$.onOff,
     visible = _useSetState2$.visible,
     open = _useSetState2$.open,
+    options = _useSetState2$.options,
     _selectedRows = _useSetState2$.selectedRows,
     _selectedRowKeys = _useSetState2$.selectedRowKeys,
     setState = _useSetState2[1];
@@ -120,13 +127,23 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     form = _Form$useForm2[0];
   var selectedRows = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || _selectedRows;
   var selectedRowKeys = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || _selectedRowKeys;
+  var _useUmiRequest = useUmiRequest(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+      manual: true,
+      onSuccess: function onSuccess(data) {
+        var list = withPagination ? data === null || data === void 0 ? void 0 : data.list : data;
+        setState({
+          options: list
+        });
+      }
+    })),
+    run = _useUmiRequest.run;
   var _useRequestList = useRequestList(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
       withPagination: withPagination,
       transformParams: transformParams,
       transformResponse: transformResponse
     }, _objectSpread({
       manual: true,
-      ready: (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || visible || defaultOne
+      ready: ((useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || defaultOne) && !readOnly || visible
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList.data,
     loading = _useRequestList.loading,
@@ -207,14 +224,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       });
     }
   };
-  // 清空表单项
-  var handleClearValue = function handleClearValue() {
-    onChange(undefined, {});
-    setState({
-      _value: undefined,
-      selectedRowKeys: [],
-      selectedRows: []
-    });
+  var handleSelectValue = function handleSelectValue(val, option) {
+    onChange(val, option);
   };
   var handleClick = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -317,7 +328,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? _data : getNextValues(_data), _data);
               // 更新内部展示值
               setState({
-                _value: _data
+                _value: _data,
+                options: isArray(_data) ? _data : [_data]
               });
               handleClose();
             }
@@ -586,9 +598,30 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }, [onOff, visible, value]);
   useEffect(function () {
     if (value && !visible && isInit) {
-      getInitValues();
+      if (readOnly) {
+        // 加定时器 修复依赖数据同步更新未取到问题
+        setTimeout(function () {
+          var _useRequest$options7, _useRequest$options8;
+          var initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams;
+          if (typeof (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) === 'function') {
+            var _contentForm$getField2;
+            initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField2 = contentForm.getFieldsValue) === null || _contentForm$getField2 === void 0 ? void 0 : _contentForm$getField2.call(contentForm));
+          }
+          var params = withPagination ? {
+            pageNum: 1,
+            pageSize: 50,
+            queryBean: _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
+          } : _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams);
+          run(params);
+          setState({
+            isInit: false
+          });
+        }, 300);
+      } else {
+        getInitValues();
+      }
     }
-  }, [value, visible, isInit]);
+  }, [value, visible, isInit, useRequest]);
   useEffect(function () {
     if (!value) {
       if (defaultOne) {
@@ -601,59 +634,79 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       }
     }
-    if (labelInValue && _value && !isEqual(value, _value)) {
-      setState({
-        _value: value,
-        selectedRowKeys: [],
-        selectedRows: []
-      });
-    }
-    if (!labelInValue && (_value === null || _value === void 0 ? void 0 : _value[valueKey]) && !isEqual(value, _value === null || _value === void 0 ? void 0 : _value[valueKey])) {
-      setState({
-        _value: value,
-        selectedRowKeys: [],
-        selectedRows: []
-      });
+    if (!readOnly) {
+      if (labelInValue && _value && !isEqual(value, _value)) {
+        setState({
+          _value: value,
+          selectedRowKeys: [],
+          selectedRows: []
+        });
+      }
+      if (!labelInValue && (_value === null || _value === void 0 ? void 0 : _value[valueKey]) && !isEqual(value, _value === null || _value === void 0 ? void 0 : _value[valueKey])) {
+        setState({
+          _value: value,
+          selectedRowKeys: [],
+          selectedRows: []
+        });
+      }
     }
   }, [value, _value]);
-  var defaultAddonAfter = _jsxs("div", {
-    className: "pro-enum-input-addonAfter",
-    children: [value && !disabled && _jsx("span", {
-      className: "close-icon",
-      children: _jsx(CloseOutlined, {
-        onClick: handleClearValue
-      })
-    }), _jsx(ReactSVG, {
-      className: "viewSvg",
-      src: viewSvg,
-      onClick: handleClick
-    })]
-  });
-  var forceAddonAfterRender = function forceAddonAfterRender() {
-    if (isView || disabled) {
-      return;
-    }
-    if (addonAfter) {
-      return _jsx("div", {
-        onClick: handleClick,
-        children: addonAfter
-      });
-    }
-    return defaultAddonAfter;
-  };
   // 加个中间状态Input
-  var initRender = _jsxs(_Fragment, {
-    children: [_jsx(_Input, _objectSpread({
+  var initRender = _jsxs(_Space.Compact, {
+    style: {
+      width: '100%'
+    },
+    block: true,
+    children: [readOnly ? _jsx(ProSelect, _objectSpread({
+      value: value,
+      onChange: handleSelectValue,
+      disabled: disabled,
+      fieldNames: fieldNames,
+      showCodeName: showCodeName,
+      labelInValue: labelInValue,
+      dataSource: options,
+      scrollFollowParent: false,
+      onClick: function onClick() {
+        // 没有值的时候，初始化点击默认查询前五十条
+        if (!value && isInit || !(options === null || options === void 0 ? void 0 : options.length)) {
+          var _useRequest$options9;
+          var queryBean = useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams;
+          var params = withPagination ? {
+            pageNum: 1,
+            pageSize: 50,
+            queryBean: queryBean
+          } : queryBean;
+          run(params);
+          setState({
+            isInit: false
+          });
+        }
+      },
+      onSearch: debounce(function (val) {
+        var _useRequest$options10;
+        var queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams), {}, _defineProperty({}, labelKey, val));
+        var params = withPagination ? {
+          pageNum: 1,
+          pageSize: 50,
+          queryBean: queryBean
+        } : queryBean;
+        run(params);
+      }, 800),
+      style: {
+        width: isView || disabled ? '100%' : 'calc(100% - 30px)'
+      }
+    }, omit(restProps, ['otherProps']))) : _jsx(_Input, _objectSpread({
       value: viewText,
-      readOnly: readOnly,
-      onClick: readOnly ? handleClick : undefined,
       onChange: handleChangeValue,
       disabled: disabled,
-      addonAfter: forceAddonAfterRender(),
-      autoComplete: "off"
-    }, omit(restInputProps, ['otherProps']))), _jsx(_Input, {
-      type: "hidden",
-      value: value
+      autoComplete: "off",
+      allowClear: true
+    }, omit(restProps, ['otherProps']))), isView || disabled ? null : _jsx(_Button, {
+      icon: _jsx(ReactSVG, {
+        className: "viewSvg",
+        src: viewSvg,
+        onClick: handleClick
+      })
     })]
   });
   if (customRender && /*#__PURE__*/React.isValidElement(customRender)) {

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

@@ -1,4 +1,4 @@
-import { FormInstance, InputProps, ModalProps } from 'antd';
+import { FormInstance, InputProps, SelectProps, ModalProps } from 'antd';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
 import React from 'react';
 import { ProColumnProps } from '../../render/propsType';
@@ -43,5 +43,5 @@ interface ProModalPropsType {
     showCodeName?: boolean;
     searchForm?: FormInstance;
 }
-export declare type ProModalSelectPropsType = InputProps & ProModalPropsType;
+export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;
 export {};

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

@@ -88,7 +88,7 @@
   }
 
   .viewSvg {
-    height: 24px;
+    height: 20px;
     cursor: pointer;
     fill: #c5c7cd;
   }

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/ConfirmWrapper.js

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/modal/style";
 import _Modal from "antd/es/modal";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["onChange", "children", "confirm"];
+var _excluded = ["onChange", "children", "confirm", "otherProps"];
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { isFunction, isObject } from 'lodash';
 import React from 'react';
@@ -15,6 +15,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var onChange = props.onChange,
     children = props.children,
     confirm = props.confirm,
+    otherProps = props.otherProps,
     rest = _objectWithoutProperties(props, _excluded);
   var _ProForm$useFieldProp = ProForm.useFieldProps(),
     form = _ProForm$useFieldProp.form;
@@ -23,7 +24,12 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
       other[_key - 1] = arguments[_key];
     }
     var _value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
-    var confirmProps = isFunction(confirm) ? confirm(form.getFieldsValue()) : confirm;
+    var confirmProps = isFunction(confirm) ? confirm(value, form.getFieldsValue(), {
+      option: other[0],
+      form: form,
+      namePath: otherProps.namePath,
+      index: otherProps.index
+    }) : confirm;
     if (confirmProps === true) {
       _Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
         onOk: function onOk() {

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

@@ -154,9 +154,11 @@ 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 || (rules === null || rules === void 0 ? void 0 : rules.some(function (item) {
+      return item === null || item === void 0 ? void 0 : item.required;
+    }))
+  }, otherProps.isView && !requiredOnView ? {
     required: false
   } : null, _objectSpread({}, isTrim(type, trim, useProConfig())), // 优先取传进来的，其次取ProConfigProvider配置的
   _objectSpread({}, isUpperCase(type, upperCase)), {
@@ -222,12 +224,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 +242,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 +260,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

@@ -52,12 +52,12 @@ interface ControlProps {
 /**
  * 扩展函数的参数
  */
-type FunctionArgs<Values> = (value: any, record: any, { form, index, namePath, option, selectedOptions, dateString, }: {
+type FunctionArgs<Values, R = any> = (value: any, record: any, { form, index, namePath, option, selectedOptions, dateString, }: {
     form: FormInstance<Values>;
     index?: number;
     namePath?: NamePath;
     [key: string]: any;
-}) => any;
+}) => R;
 type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T, 'onChange' | 'value'> & {
     value?: T['value'];
     onChange?: (value: Parameters<T['onChange']>[0], options: Parameters<T['onChange']>[1], form: FormInstance<Values>) => void;
@@ -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;
@@ -220,7 +220,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     extra?: string | React.ReactNode;
     /** 是否固定字段, 不隐藏 */
     fixed?: boolean;
-    confirm?: boolean | ModalFuncProps | ((values: Values) => boolean | ModalFuncProps);
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
 }
 export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
 /**

package/es/ProForm/index.js

@@ -26,7 +26,7 @@ import { useForm } from './utils/useForm';
 import { useFieldProps } from './utils/useFieldProps';
 import locale from '../locale';
 var ProForm = function ProForm(props, ref) {
-  var _forms$formKey, _localStorage;
+  var _forms$formKey, _localStorage, _ref;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -49,8 +49,7 @@ var ProForm = function ProForm(props, ref) {
     expandOpenChange = props.expandOpenChange,
     _props$viewEmpty = props.viewEmpty,
     viewEmpty = _props$viewEmpty === void 0 ? '-' : _props$viewEmpty,
-    _props$labelAlign = props.labelAlign,
-    labelAlign = _props$labelAlign === void 0 ? 'left' : _props$labelAlign,
+    labelAlign = props.labelAlign,
     labelWidth = props.labelWidth,
     onValuesChange = props.onValuesChange,
     onFinish = props.onFinish,
@@ -231,9 +230,9 @@ var ProForm = function ProForm(props, ref) {
       }
     },
     className: cls,
-    form: form,
-    labelAlign: labelAlign
+    form: form
   }, formProps), config), otherProps), {}, {
+    labelAlign: (_ref = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref !== void 0 ? _ref : 'left',
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,

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 值