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

package/dist/index.esm.css

@@ -682,7 +682,7 @@
 .pro-collapse .pro-collapse-icon img {
   vertical-align: sub;
 }
-.pro-collapse.pro-collapse-no-title .ant-collapse-header {
+.pro-collapse.pro-collapse-no-title > .pro-collapse-panel > .ant-collapse-header {
   display: none !important;
 }
 .pro-collapse.pro-collapse-no-title .pro-collapse-level2 .ant-collapse-header {
@@ -2255,7 +2255,11 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-number-range .range-split.ant-input[disabled] {
   background: #fff !important;
 }
+.pro-number-range .ant-input-number-status-error:not(.ant-input-number-disabled):not( .ant-input-number-borderless).ant-input-number {
+  border-color: var(--zaui-danger, #ff5050) !important;
+}
 .pro-number-range .ant-input-status-error.range-split {
+  color: var(--zaui-danger, #ff5050) !important;
   border-color: var(--zaui-danger, #ff5050);
 }
 .pro-number-range .ant-input-rtl.range-right {
@@ -5163,6 +5167,15 @@ input[type='button'] {
 .ant-modal .ant-input-textarea-show-count.ant-input-textarea-in-form-item::after {
   background: transparent;
 }
+.ant-form .ant-drawer-body .ant-form-item .ant-form-item-label.ant-form-item-label-left > .ant-form-item-required::before,
+.ant-drawer .ant-drawer-body .ant-form-item .ant-form-item-label.ant-form-item-label-left > .ant-form-item-required::before,
+.ant-modal .ant-drawer-body .ant-form-item .ant-form-item-label.ant-form-item-label-left > .ant-form-item-required::before {
+  position: absolute;
+  top: calc(50% - 7px);
+  left: -8px;
+  margin: 0;
+  right: inherit;
+}
 .ant-form .ant-form-item.ant-form-item-with-help,
 .ant-drawer .ant-form-item.ant-form-item-with-help,
 .ant-modal .ant-form-item.ant-form-item-with-help {

package/dist/less.esm.css

@@ -682,7 +682,7 @@
 .pro-collapse .pro-collapse-icon img {
   vertical-align: sub;
 }
-.pro-collapse.pro-collapse-no-title .ant-collapse-header {
+.pro-collapse.pro-collapse-no-title > .pro-collapse-panel > .ant-collapse-header {
   display: none !important;
 }
 .pro-collapse.pro-collapse-no-title .pro-collapse-level2 .ant-collapse-header {
@@ -2255,7 +2255,11 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-number-range .range-split.ant-input[disabled] {
   background: #fff !important;
 }
+.pro-number-range .ant-input-number-status-error:not(.ant-input-number-disabled):not( .ant-input-number-borderless).ant-input-number {
+  border-color: var(--zaui-danger, #ff5050) !important;
+}
 .pro-number-range .ant-input-status-error.range-split {
+  color: var(--zaui-danger, #ff5050) !important;
   border-color: var(--zaui-danger, #ff5050);
 }
 .pro-number-range .ant-input-rtl.range-right {

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

@@ -89,6 +89,10 @@ var RenderField = function RenderField(_ref) {
   }
   // type类型 首字母转大写
   type = ((_type = type) === null || _type === void 0 ? void 0 : (_type$replace = _type.replace) === null || _type$replace === void 0 ? void 0 : _type$replace.call(_type, type[0], type[0].toUpperCase())) || 'Input';
+  // 自定义组件时 防止默认值影像后续判断
+  if ('component' in column) {
+    type = null;
+  }
   // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
   var namePath = getNamePath(name, virtualKey);
   var rowData = form.getFieldValue([].concat(_toConsumableArray(namePath), [index])) || record || {};
@@ -406,7 +410,7 @@ var RenderField = function RenderField(_ref) {
             }
             _args = formatArgs([].concat(args));
             rowPath = [].concat(_toConsumableArray(namePath), [index]);
-            row = type === form.getFieldValue(rowPath, true);
+            row = form.getFieldValue(rowPath, true);
             orgRow = cloneDeep(row);
             _args[1] = row;
             _context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 ? void 0 : (_TargetComponent3$pro = _TargetComponent3.props) === null || _TargetComponent3$pro === void 0 ? void 0 : _TargetComponent3$pro.onBlur;

package/es/ProEnum/components/Group.d.ts

@@ -4,6 +4,7 @@ interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
     fieldLabel: string;
     disabled?: boolean;
     allowClear?: boolean;
+    button?: boolean;
 }
 declare const Group: (props: Props) => JSX.Element;
 export default Group;

package/es/ProEnum/index.js

@@ -12,7 +12,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps"],
-  _excluded2 = ["fieldNames", "clear", "cacheKey"];
+  _excluded2 = ["fieldNames", "clear", "cacheKey", "showCodeName"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import React, { useState, useEffect, useMemo } from 'react';
@@ -28,6 +28,7 @@ import useEnum from './hooks/useEnum';
 import locale from '../locale';
 import './style/index.less';
 var ProEnum = function ProEnum(props) {
+  var _enumProps$showCodeNa;
   var code = props.code,
     _props$type = props.type,
     type = _props$type === void 0 ? 'ProSelect' : _props$type,
@@ -41,15 +42,16 @@ var ProEnum = function ProEnum(props) {
     enumProps = _objectWithoutProperties(props, _excluded);
   var _ref = otherProps || {},
     isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty,
-    disabled = _ref.disabled;
+    viewEmpty = _ref.viewEmpty;
   var _ref2 = useProConfig('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
     clear = _ref2$clear === void 0 ? true : _ref2$clear,
     _ref2$cacheKey = _ref2.cacheKey,
     cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
+    showCodeName = _ref2.showCodeName,
     resProps = _objectWithoutProperties(_ref2, _excluded2);
+  enumProps.showCodeName = (_enumProps$showCodeNa = enumProps.showCodeName) !== null && _enumProps$showCodeNa !== void 0 ? _enumProps$showCodeNa : showCodeName;
   var label = '';
   var fieldValue = '';
   var _useState = useState(dataSource || []),
@@ -165,6 +167,7 @@ var ProEnum = function ProEnum(props) {
     switch (type) {
       case 'ProSelect':
         return _jsx(ProSelect, _objectSpread(_objectSpread({}, enumProps), {}, {
+          otherProps: otherProps,
           dataSource: list,
           fieldNames: {
             label: label,
@@ -235,8 +238,8 @@ var ProEnum = function ProEnum(props) {
           return item[fieldValue] === (v === null || v === void 0 ? void 0 : v[fieldValue]);
         }
         return item[fieldValue] === v;
-      });
-      return enumProps.showCodeName ? "".concat(option[fieldValue], "-").concat(option[label]) : option === null || option === void 0 ? void 0 : option[label];
+      }) || {};
+      return enumProps.showCodeName ? "".concat(option === null || option === void 0 ? void 0 : option[fieldValue], "-").concat(option === null || option === void 0 ? void 0 : option[label]) : option === null || option === void 0 ? void 0 : option[label];
     });
     var record = value.map(function (v) {
       return list.find(function (item) {

package/es/ProEnum/style/index.less

@@ -76,8 +76,8 @@
     }
 
     .pro-enum-group-item-selected {
-      color: var(--zaui-brand);
-      background: #fff;
+      background: var(--zaui-brand);
+      color: #fff;
       border: 1px solid var(--zaui-brand);
       &::after {
         background: transparent;

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

@@ -4,7 +4,7 @@ import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { jsx as _jsx } from "react/jsx-runtime";
-import React, { useMemo } from 'react';
+import React from 'react';
 import { omit } from 'lodash';
 import classnames from 'classnames';
 import { insertSeparator, transformColumns } from './utils';
@@ -41,20 +41,18 @@ var GroupCopy = function GroupCopy(props) {
     _option.current[index] = option;
     onChange(_value, _option.current);
   };
-  var columns = useMemo(function () {
-    var columnsProps = transformColumns({
-      columns: children,
-      name: name,
-      names: names,
-      onChange: handleChange,
-      namePath: namePath,
-      form: form,
-      index: index,
-      value: value,
-      groupProps: props
-    });
-    return insertSeparator(columnsProps, space);
-  }, [name, value, children, space, names, namePath, index]);
+  var columnsProps = transformColumns({
+    columns: children,
+    name: name,
+    names: names,
+    onChange: handleChange,
+    namePath: namePath,
+    form: form,
+    index: index,
+    value: value,
+    groupProps: props
+  });
+  var columns = insertSeparator(columnsProps, space);
   var _className = classnames(_defineProperty({
     'pro-group': true,
     'pro-group-diy-width': columns.some(function (item) {

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

@@ -220,7 +220,8 @@ export var transformColumns = function transformColumns(params) {
       onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, form.getFieldValue(namePath), {
         index: outerIndex,
         namePath: namePath,
-        form: form
+        form: form,
+        option: args === null || args === void 0 ? void 0 : args[1]
       });
     };
     return _objectSpread(_objectSpread(_objectSpread({}, column), {}, {

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

@@ -16,7 +16,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "searchForm", "defaultOne"],
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "searchForm", "searchKey", "defaultOne"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -52,6 +52,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     beforeOpen = props.beforeOpen,
     isTooltip = props.isTooltip,
     searchForm = props.searchForm,
+    searchKey = props.searchKey,
     defaultOne = props.defaultOne,
     restProps = _objectWithoutProperties(props, _excluded);
   var contentForm = _Form.useFormInstance();
@@ -603,7 +604,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRows = value;
         }
       } else if (value) {
-        console.log('value', value);
         nextState.selectedRowKeys = [value];
       }
       setState(nextState);
@@ -696,14 +696,14 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       },
       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 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({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
         var params = withPagination ? {
           pageNum: 1,
           pageSize: 50,
           queryBean: queryBean
         } : queryBean;
         run(params);
-      }, 800),
+      }, 2000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }

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

@@ -42,6 +42,7 @@ interface ProModalPropsType {
     isTooltip?: any;
     showCodeName?: boolean;
     searchForm?: FormInstance;
+    searchKey?: string;
 }
 export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;
 export {};

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

@@ -13,9 +13,14 @@
       background: #fff !important;
     }
   }
-
+  .@{ant-prefix}-input-number-status-error:not(.@{ant-prefix}-input-number-disabled):not(
+      .@{ant-prefix}-input-number-borderless
+    ).@{ant-prefix}-input-number {
+    border-color: @zaui-danger !important;
+  }
   .@{ant-prefix}-input-status-error {
     &.range-split {
+      color: @zaui-danger !important;
       border-color: @zaui-danger;
     }
   }

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

@@ -122,8 +122,12 @@ var ProRangeLimit = function ProRangeLimit(props) {
       start = _ref9[0],
       end = _ref9[1];
     if (e.target.checked) {
-      var _start, _end;
-      start = start || moment().startOf('day');
+      var _rest$allowEmpty, _start, _end;
+      if (((_rest$allowEmpty = rest.allowEmpty) === null || _rest$allowEmpty === void 0 ? void 0 : _rest$allowEmpty[0]) === true) {
+        start = null;
+      } else {
+        start = start || moment().startOf('day');
+      }
       end = foreverMoment;
       onChange([start, end, e.target.checked], [(_start = start) === null || _start === void 0 ? void 0 : _start.format(format), (_end = end) === null || _end === void 0 ? void 0 : _end.format(format), foreverStr]);
     } else {

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

@@ -109,9 +109,12 @@ var RenderFields = function RenderFields(props) {
     if (typeof _type === 'string') {
       TargetComponent = _isView && viewRender ? viewRenderHandle : componentMap[_type];
     }
+    // 自定义组件时 防止默认值影像后续判断
+    if ('component' in column) {
+      _type = null;
+    }
     if (component && /*#__PURE__*/React.isValidElement(component)) {
       var _newComponent$props;
-      _type = null;
       var newComponent = component;
       var isProEditTable = (newComponent === null || newComponent === void 0 ? void 0 : (_newComponent$props = newComponent.props) === null || _newComponent$props === void 0 ? void 0 : _newComponent$props.onlyOneLineMsg) === '请先保存数据';
       TargetComponent = _isView ? viewRenderHandle || '' : component;

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/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/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/ProLayout/components/ProCollapse/PropTypes.d.ts

@@ -20,6 +20,11 @@ export interface ProCollapseProps {
     */
     title?: string | React.ReactNode;
     /**
+    * @description     自动适应窗口大小
+    * @default           -
+    */
+    autoHeight?: Boolean;
+    /**
    * @description       标题前图标
    * @default           -
    */