@zat-design/sisyphus-react 3.4.7 → 3.4.8-beta.10

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

@@ -1,6 +1,8 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/modal/style";
 import _Modal from "antd/es/modal";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["onChange", "children", "confirm", "otherProps"];
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
@@ -19,40 +21,73 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
     rest = _objectWithoutProperties(props, _excluded);
   var _ProForm$useFieldProp = ProForm.useFieldProps(),
     form = _ProForm$useFieldProp.form;
-  var handleChange = function handleChange(value) {
-    for (var _len = arguments.length, other = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      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(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() {
-          return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
+  var handleChange = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(value) {
+      var _len,
+        other,
+        _key,
+        _value,
+        confirmProps,
+        _args = arguments;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            for (_len = _args.length, other = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+              other[_key - 1] = _args[_key];
+            }
+            _value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
+            if (!isFunction(confirm)) {
+              _context.next = 8;
+              break;
+            }
+            _context.next = 5;
+            return confirm(value, form.getFieldsValue(), {
+              option: other[0],
+              form: form,
+              namePath: otherProps.namePath,
+              index: otherProps.index
+            });
+          case 5:
+            _context.t0 = _context.sent;
+            _context.next = 9;
+            break;
+          case 8:
+            _context.t0 = confirm;
+          case 9:
+            confirmProps = _context.t0;
+            // 只处理 false, true 和 对象的情况
+            if (confirmProps === false) {
+              onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
+            }
+            if (confirmProps === true) {
+              _Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
+                onOk: function onOk() {
+                  return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
+                }
+              }));
+            }
+            if (isObject(confirmProps)) {
+              _Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
+                onOk: function onOk() {
+                  var _confirmProps$onOk;
+                  for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+                    arg[_key2] = arguments[_key2];
+                  }
+                  (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
+                  onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
+                }
+              }));
+            }
+          case 13:
+          case "end":
+            return _context.stop();
         }
-      }));
-      return;
-    }
-    if (isObject(confirmProps)) {
-      _Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
-        onOk: function onOk() {
-          var _confirmProps$onOk;
-          for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-            arg[_key2] = arguments[_key2];
-          }
-          (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
-          onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
-        }
-      }));
-      return;
-    }
-    onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
-  };
+      }, _callee);
+    }));
+    return function handleChange(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   return _jsx(_Fragment, {
     children: /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, rest), {}, {
       // @ts-ignore

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

@@ -22,7 +22,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
-import { isFunction, isString, omit } from 'lodash';
+import { isFunction, isString, omit, set } from 'lodash';
 import useShouldUpdate from '../../utils/useShouldUpdate';
 import { isTrim, isUpperCase, findOptionByValue, parseNamePath } from '../../utils/index';
 import { useProConfig } from '../../../ProConfigProvider';
@@ -242,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];
     }
@@ -255,16 +255,18 @@ var Render = function Render(props) {
     if (changeKey === 'onFieldChange') {
       _args = functionArgs([].concat(args));
     }
+    var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
     if ( /*#__PURE__*/React.isValidElement(AutoComponent)) {
       var _AutoComponent$props$, _AutoComponent$props, _lastComponentProps$c;
       ((_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;
     }
-    // const inList = _otherFormItemProps?.namePath?.length;
-    // // FormList 和 Group场景 对比值改变的话, 回显到表单上
-    // if (inList) {
-    //   form.setFieldsValue(_args[1]);
-    // }
+    // FormList 和 Group场景 对比值改变的话, 回显到表单上
+    if (inList && changeKey === 'onFieldChange') {
+      var values = form.getFieldsValue();
+      var newValues = set(values, _otherFormItemProps.namePath, _args[1]);
+      form.setFieldsValue(newValues);
+    }
     // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
     if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
       setTimeout(function () {
@@ -316,7 +318,7 @@ var Render = function Render(props) {
   }();
   var renderItem = function renderItem() {
     // 移除多余字段，group保留onFieldChange
-    var lastComponentPropsFilter = type === 'Group' ? ['disabledStrictly'] : ['onFieldChange', 'disabledStrictly'];
+    var lastComponentPropsFilter = ['onFieldChange', 'disabledStrictly'];
     // 表单渲染 start
     var childProps = _objectSpread(_objectSpread(_objectSpread({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), omit(lastComponentProps, lastComponentPropsFilter)), {}, {
       // @ts-ignore

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

@@ -28,7 +28,7 @@ import { ProEditTableProps } from '../../../ProEditTable/propsType';
 import { ProTreeModalProps } from '../../../ProTreeModal/propsType';
 import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
-import { GroupProps } from '../combination/Group/propsType';
+import { GroupProps as GroupCopyProps } from '../combination/Group/propsType';
 import { ProCollapseProps } from '../../../ProLayout/components/ProCollapse/PropTypes';
 import { DistributiveOmit } from '../../propsType';
 export type ComponentMap = keyof typeof componentMap;
@@ -159,7 +159,7 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
     fieldProps?: FieldProps<ProTreeProps, Values, T>;
 } | {
     type?: 'Group';
-    fieldProps?: GroupProps | ReactiveFunction<Values, GroupProps>;
+    fieldProps?: GroupCopyProps | ReactiveFunction<Values, GroupCopyProps>;
 } | {
     type?: 'ProCollapse';
     fieldProps?: ProCollapseProps | ReactiveFunction<Values, ProCollapseProps>;

package/es/ProForm/index.d.ts

@@ -1,5 +1,6 @@
 import { Form, FormInstance } from 'antd';
-import { ForwardRefRenderFunction } from 'react';
+import React, { ForwardRefRenderFunction } from 'react';
+import { FormProviderProps } from 'antd/es/form/context';
 import { ProFormProps } from './propsType';
 interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, ProFormProps<T>> {
     useForm: typeof Form.useForm;
@@ -7,4 +8,5 @@ interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, Pr
     [key: string]: any;
 }
 declare const ProFormForward: IProForm;
+export declare const ProFormProvider: React.FC<FormProviderProps>;
 export default ProFormForward;

package/es/ProForm/index.js

@@ -1,4 +1,3 @@
-import _toArray from "@babel/runtime/helpers/esm/toArray";
 import "antd/es/row/style";
 import _Row from "antd/es/row";
 import "antd/es/form/style";
@@ -282,30 +281,32 @@ ProFormForward.useWatch = function (watchValue, form) {
   }
   return _Form.useWatch([], form);
 };
-var ProFormProvider = function ProFormProvider(props) {
+export var ProFormProvider = function ProFormProvider(props) {
   var onFormChange = props.onFormChange,
     onFormFinish = props.onFormFinish,
     children = props.children;
-  var handleFormChange = function handleFormChange(name, info) {
+  var handleFormChange = function handleFormChange(formName, info) {
     var changedFields = info.changedFields;
     var _changedFields = changedFields.flatMap(function (item) {
-      var name = item.name,
-        _item$value = item.value,
+      var _item$value = item.value,
         value = _item$value === void 0 ? [] : _item$value;
-      var _name = _toArray(name),
-        firstName = _name[0],
-        names = _name.slice(1);
-      var _namePath = [].concat(_toConsumableArray(splitNameStr(String(firstName))), _toConsumableArray(names));
-      return _namePath.map(function (name, index) {
+      var name = item.name;
+      var namesStr = name[name.length - 1];
+      // name中的最后一位如果包含 '-' 则是names组件
+      var isNames = String(namesStr).includes('-');
+      if (!isNames) return item; // 不是names组件直接返回
+      var namesList = splitNameStr(String(namesStr)); // 拆解出name列表
+      var prefix = name.slice(0, name.length - 1);
+      return namesList.map(function (nameItem, index) {
         return _objectSpread(_objectSpread({}, item), {}, {
-          name: name,
+          name: [].concat(_toConsumableArray(prefix), _toConsumableArray(nameItem)),
           value: value[index]
         });
       });
     });
     info.changedFields = _changedFields;
     // @ts-ignore
-    onFormChange(name, info);
+    onFormChange(formName, info);
   };
   return _jsx(_Form.Provider, {
     onFormChange: onFormChange ? handleFormChange : undefined,

package/es/ProForm/style/index.less

@@ -140,6 +140,13 @@
 
       // 地址组件
       .@{ant-prefix}-form-item-control-input-content {
+        // 查看模式
+        & > span {
+          border-radius: 4px;
+          padding: 5px 8px;
+          background: @zaui-contract-bg;
+        }
+
         & > .pro-address {
           .@{ant-prefix}-select-selector,
           .@{ant-prefix}-input-affix-wrapper,

package/es/ProForm/utils/diffOriginal.js

@@ -40,7 +40,8 @@ export var diffOriginal = function diffOriginal(params) {
     });
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !isEqual(value, originalValue);
+    var res = !isEqual(value, originalValue);
+    return res;
   }
   return false;
 };

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

@@ -27,7 +27,7 @@ export declare const isTrim: (type: string, trim: boolean, configData: any) => a
 export declare const isUpperCase: (type: string, upperCase: boolean) => any;
 export declare const weedOutProps: (data: Record<string, any>, keys: string[]) => {}[];
 export declare const diffField: (prevValues: any, curValues: any, names: NamePath[]) => boolean;
-export declare const splitNameStr: (name: string) => NamePath[];
+export declare const splitNameStr: (name: string) => string[][];
 export declare const filterInternalFields: (values: any) => any;
 export declare const getAllNamePath: (object: Record<string, any>, currentPath?: InternalNamePath) => InternalNamePath[];
 export declare const isNullValue: (value: any) => boolean;
@@ -95,4 +95,6 @@ export declare const findOptionByValue: (treeData: any[], value: string | number
 export declare const equalDependencies: (dependencies: any, prevValues: any, currentValues: any) => any;
 /** 解析namePath */
 export declare const parseNamePath: (input: string) => any;
+/** 解析namePath */
+export declare function findNamesKeyInArray(arr: string[], key: string): string | null;
 export {};

package/es/ProForm/utils/index.js

@@ -434,4 +434,25 @@ export var parseNamePath = function parseNamePath(input) {
     return isNaN(Number(item)) ? item : Number(item);
   });
   return [result];
-};
+};
+/** 解析namePath */
+export function findNamesKeyInArray(arr, key) {
+  var _iterator2 = _createForOfIteratorHelper(arr),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var item = _step2.value;
+      if (!item.includes('_')) {
+        return null;
+      }
+      if (item.split('_')[0].includes(key)) {
+        return item;
+      }
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  return null;
+}

package/es/ProForm/utils/rulesCreator.js

@@ -6,7 +6,7 @@ import locale, { formatMessage } from '../../locale';
 var getNonEmptyValuesByIndex = function getNonEmptyValuesByIndex(required, valueArray) {
   var result = [];
   required.forEach(function (item, index) {
-    if (item && !valueArray[index] && !isNumber(valueArray[index])) {
+    if (item && !(valueArray === null || valueArray === void 0 ? void 0 : valueArray[index]) && !isNumber(valueArray === null || valueArray === void 0 ? void 0 : valueArray[index])) {
       result.push(index + 1);
     }
   });

package/es/ProForm/utils/transformNames.js

@@ -1,23 +1,16 @@
-import { union, isNumber } from 'lodash';
+import { union } from 'lodash';
 import { transformValue } from './transformValue';
 var transformNames = function transformNames(formItem, form, names, fieldName, type) {
-  var _names2, _names3, _names3$;
   var _ref = formItem || {},
     normalize = _ref.normalize,
     getValueProps = _ref.getValueProps,
     _shouldUpdate2 = _ref.shouldUpdate;
-  var _names = names;
-  if (!((_names2 = _names) === null || _names2 === void 0 ? void 0 : _names2.length)) {
+  if (!(names === null || names === void 0 ? void 0 : names.length)) {
     return {};
   }
   // 当在formList场景下，给transformValue函数的setFiledProps的name, 需要全namePath
   var _fieldName = Array.isArray(formItem === null || formItem === void 0 ? void 0 : formItem.name) ? union(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, formItem === null || formItem === void 0 ? void 0 : formItem.name) : fieldName;
-  if (type === 'Group' && isNumber((_names3 = _names) === null || _names3 === void 0 ? void 0 : (_names3$ = _names3[0]) === null || _names3$ === void 0 ? void 0 : _names3$[0])) {
-    _names = _names.map(function (item) {
-      return union(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, item);
-    });
-  }
-  var _transformValue = transformValue(_names, form, _fieldName, normalize, getValueProps),
+  var _transformValue = transformValue(names, form, _fieldName, normalize, getValueProps),
     _normalize = _transformValue.normalize,
     _getValueProps = _transformValue.getValueProps,
     _shouldUpdate = _transformValue.shouldUpdate;

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

@@ -0,0 +1,2 @@
+/** 深度比较依赖变化memo */
+export declare const useDeepCompareMemo: (fun: () => any, depList: any[]) => any;

package/es/ProForm/utils/useDeepCompareMemo.js

@@ -0,0 +1,14 @@
+import { useRef } from 'react';
+import { isEqualWith } from 'lodash';
+import { customEqualForFun } from '.';
+/** 深度比较依赖变化memo */
+export var useDeepCompareMemo = function useDeepCompareMemo(fun, depList) {
+  var lastDependency = useRef(); // 上一次的依赖
+  var lastRes = useRef(); // 上一次的结果
+  if (!isEqualWith(depList, lastDependency.current, customEqualForFun)) {
+    var res = fun();
+    lastRes.current = res;
+  }
+  lastDependency.current = depList;
+  return lastRes.current;
+};

package/es/ProForm/utils/useForm.js

@@ -21,11 +21,15 @@ export var useForm = function useForm(originForm) {
   };
   var _validateFields = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
-      var _len,
+      var _rest$,
+        _len,
         rest,
         _key,
-        values,
-        _values,
+        isRecursive,
+        validateNames,
+        _form$getInternalHook,
+        getFields,
+        fieldsList,
         _error$errorFields,
         _error$errorFields$,
         _args = arguments;
@@ -36,20 +40,33 @@ export var useForm = function useForm(originForm) {
             for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
               rest[_key - 1] = _args[_key];
             }
-            _context.next = 4;
-            return validateFields.apply(void 0, [nameList].concat(rest));
-          case 4:
-            values = _context.sent;
-            if (!nameList) {
-              _context.next = 7;
+            // @ts-ignore
+            isRecursive = rest === null || rest === void 0 ? void 0 : (_rest$ = rest[0]) === null || _rest$ === void 0 ? void 0 : _rest$.recursive;
+            validateNames = []; // 前缀校验模式
+            if (!isRecursive) {
+              _context.next = 10;
               break;
             }
-            return _context.abrupt("return", values);
-          case 7:
-            _values = _getFieldsValue();
-            return _context.abrupt("return", _values);
-          case 11:
-            _context.prev = 11;
+            // @ts-ignore
+            _form$getInternalHook = form.getInternalHooks('RC_FORM_INTERNAL_HOOKS'), getFields = _form$getInternalHook.getFields;
+            fieldsList = getFields();
+            fieldsList.forEach(function (item) {
+              var _item$name, _item$name2, _item$name2$;
+              if (nameList[0] === ((_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name[0]) || ((_item$name2 = item.name) === null || _item$name2 === void 0 ? void 0 : (_item$name2$ = _item$name2[0]) === null || _item$name2$ === void 0 ? void 0 : _item$name2$.startsWith("".concat(nameList[0], "_")))) {
+                validateNames.push(item.name);
+              }
+            });
+            // @ts-ignore
+            delete rest[0].recursive;
+            return _context.abrupt("return", validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
+              return filterInternalFields(values);
+            }));
+          case 10:
+            return _context.abrupt("return", validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
+              return nameList ? values : _getFieldsValue();
+            }));
+          case 13:
+            _context.prev = 13;
             _context.t0 = _context["catch"](0);
             if (_context.t0 && (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.errorFields)) {
               form === null || form === void 0 ? void 0 : form.scrollToField(_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : (_error$errorFields$ = _error$errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
@@ -58,11 +75,11 @@ export var useForm = function useForm(originForm) {
               });
             }
             throw _context.t0;
-          case 15:
+          case 17:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 11]]);
+      }, _callee, null, [[0, 13]]);
     }));
     return function _validateFields(_x) {
       return _ref.apply(this, arguments);

package/es/ProForm/utils/useListChanged.js

@@ -1,6 +1,6 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
-import { get } from 'lodash';
+import { get, isString } from 'lodash';
 import { diffOriginal } from './diffOriginal';
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
@@ -87,7 +87,7 @@ export var useListChanged = function useListChanged(params) {
     originalValue: originalValue,
     form: form,
     equalWith: equalWith,
-    name: namesStr || name
+    name: isString(namesStr) ? namesStr : originalName || name
   });
   return [changed, originalValue];
 };

package/es/ProForm/utils/useRules.js

@@ -24,10 +24,6 @@ var useRules = function useRules(props) {
     var result = {
       rules: rules || []
     };
-    // Group required: true时，直接走完整校验
-    if (allRequired && type === 'Group') {
-      return result;
-    }
     if (allRequired) {
       if (!requiredRule) {
         var message = isSelect ? "".concat(locale.ProForm.selectPlaceHolder).concat(_label) : "".concat(locale.ProForm.inputPlaceholder).concat(_label);
@@ -58,23 +54,9 @@ var useRules = function useRules(props) {
     required: required
   });
   useEffect(function () {
-    if (type === 'Group' && (allRequired || requiredRule)) {
-      var customRequired = {
-        validator: function validator(rules, value) {
-          // 完整性校验, 数组有值且值不完整则校验不通过
-          if (Array.isArray(value) && isNotFullArray(value, names.length, required)) {
-            return Promise.reject(new Error("".concat(locale.ProForm.completeText).concat(_label)));
-          }
-          return Promise.resolve();
-        }
-      };
-      // 插入rules第一条，完整性校验大于自定义
-      internalRule.rules.unshift(customRequired);
-      return;
-    }
     // 添加完整性校验
     if (names && !isBoolean(labelRequired)) {
-      var _customRequired = {
+      var customRequired = {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
           if (Array.isArray(value) && !isNullArray(value) && isNotFullArray(value, names.length, required)) {
@@ -83,7 +65,7 @@ var useRules = function useRules(props) {
           return Promise.resolve();
         }
       };
-      internalRule.rules.unshift(_customRequired);
+      internalRule.rules.unshift(customRequired);
     }
   }, [internalRule]);
   return internalRule;

package/es/ProLayout/components/ProCollapse/index.js

@@ -119,12 +119,16 @@ var ProCollapse = function ProCollapse(props) {
       return;
     }
     var proCollapseNoTitles = proCollapseContent.querySelectorAll('.pro-collapse-no-level1-title');
+    var proFooterNode = proCollapseContent.querySelector('.pro-footer');
     var proCollapses = proCollapseContent.querySelectorAll('.pro-collapse');
-    if (proCollapseNoTitles.length === 1 && proCollapses.length === 1) {
+    if ((proCollapseNoTitles === null || proCollapseNoTitles === void 0 ? void 0 : proCollapseNoTitles.length) === 1 && proCollapses.length === 1) {
       var rect = proCollapseNoTitles[0].getBoundingClientRect();
       if ((rect === null || rect === void 0 ? void 0 : rect.height) < window.innerHeight - rect.top) {
         proCollapseNoTitles[0].style.minHeight = "calc(100vh - ".concat(rect.top + 16, "px)");
       }
+      if (proFooterNode) {
+        proCollapseNoTitles[0].style.minHeight = "calc(100vh - ".concat(rect.top + proFooterNode.offsetHeight + 16, "px)");
+      }
     }
     return function () {
       if (proCollapseNoTitles.length === 1 && proCollapses.length === 1) {

package/es/ProStep/components/Listener/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-declare const _default: ({ children, }: any) => React.DetailedReactHTMLElement<{
+declare const _default: ({ children, delayTime, }: any) => React.DetailedReactHTMLElement<{
     onClick: import("lodash").DebouncedFunc<() => Promise<void>>;
 }, HTMLElement>;
 export default _default;

package/es/ProStep/components/Listener/index.js

@@ -4,7 +4,8 @@ import { throttle } from 'lodash';
 import React from 'react';
 import { useStep } from '../../index';
 export default (function (_ref) {
-  var children = _ref.children;
+  var children = _ref.children,
+    delayTime = _ref.delayTime;
   var _useStep = useStep(),
     notify = _useStep.notify;
   return /*#__PURE__*/React.cloneElement(children, {
@@ -24,7 +25,7 @@ export default (function (_ref) {
                 var _children$props, _children$props$onCli;
                 children === null || children === void 0 ? void 0 : (_children$props = children.props) === null || _children$props === void 0 ? void 0 : (_children$props$onCli = _children$props.onClick) === null || _children$props$onCli === void 0 ? void 0 : _children$props$onCli.call(_children$props, values);
               }
-            }, 0);
+            }, delayTime !== null && delayTime !== void 0 ? delayTime : 0);
           case 5:
           case "end":
             return _context.stop();

package/es/ProStep/index.d.ts

@@ -7,7 +7,7 @@ declare const ProStep: {
     ({ children, ...resetProps }: ProStepPropsType): JSX.Element;
     useStep: () => any;
     Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) => JSX.Element;
-    Listener: ({ children, }: any) => import("react").DetailedReactHTMLElement<{
+    Listener: ({ children, delayTime, }: any) => import("react").DetailedReactHTMLElement<{
         onClick: import("lodash").DebouncedFunc<() => Promise<void>>;
     }, HTMLElement>;
 };

package/es/global.less

@@ -9,13 +9,21 @@ pre {
   scrollbar-face-color: #d2d3d7;
   scrollbar-highlight-color: #979797;
   scrollbar-3dlight-color: #979797;
+
   ::-webkit-scrollbar  {
     width: 16px;
+    background: transparent;
   }
 
-  // // 滑块
-  ::-webkit-scrollbar-thumb {
-    background-color: #d2d3d7;
+  // 轨道
+  ::-webkit-scrollbar-track {
+    background-color: #fff;
+    border-radius: 10px;
+  }
+
+  // 悬浮轨道
+  ::-webkit-scrollbar-thumb:hover {
+    background-color: #979797;
     background-clip: padding-box;
     border-color: transparent;
     border-style: dashed;
@@ -24,14 +32,25 @@ pre {
     -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
   }
 
-  // 轨道
-  ::-webkit-scrollbar-track {
-    background-color: transparent;
+  :hover::-webkit-scrollbar-track {
+    background: transparent;
+  }
+
+  :hover::-webkit-scrollbar-thumb {
+    background-color: #d2d3d7;
+    background-clip: padding-box;
+    border-color: transparent;
+    border-style: dashed;
+    border-width: 4px;
     border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
   }
 
-  // 悬浮轨道
-  ::-webkit-scrollbar-thumb:hover {
+  :hover::-webkit-scrollbar-thumb:hover {
     background-color: #979797;
   }
+
+  :hover::-webkit-scrollbar-track {
+    background-color: #fff;
+  }
 }

package/es/locale/zh_CN.js

@@ -89,7 +89,7 @@ export default {
     edit: '编辑',
     copy: '复制',
     delete: '删除',
-    mulDelete: '删除',
+    mulDelete: '批量删除',
     save: '保存',
     custom: '自定义',
     operation: '操作',