@zat-design/sisyphus-react 3.4.6 → 3.4.8

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

@@ -292,58 +292,64 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleFinish = /*#__PURE__*/function () {
     var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
-      var _data, flag, res;
+      var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            if (selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) {
+            if (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) {
               _context2.next = 4;
               break;
             }
             _antd.message.error(_locale.default.ProModalSelect.checkMsg);
             return _context2.abrupt("return", false);
           case 4:
-            _data = isMultiple ? selectedRows : selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows[0];
+            nextSelectedRows = selectedRows;
+            if (!((_nextSelectedRows = nextSelectedRows) === null || _nextSelectedRows === void 0 ? void 0 : _nextSelectedRows[0])) {
+              nextSelectedRows = data.filter(function (item) {
+                return selectedRowKeys.includes(item[valueKey]);
+              });
+            }
+            record = isMultiple ? nextSelectedRows : (_nextSelectedRows2 = nextSelectedRows) === null || _nextSelectedRows2 === void 0 ? void 0 : _nextSelectedRows2[0];
             if (!isMultiple) {
               // @ts-ignore
-              _data.value = _data[valueKey];
+              record.value = record[valueKey];
               // @ts-ignore
-              _data.label = _data[labelKey];
+              record.label = record[labelKey];
             }
             flag = true;
             if (!onOk) {
-              _context2.next = 12;
+              _context2.next = 14;
               break;
             }
-            _context2.next = 10;
-            return onOk(_data);
-          case 10:
+            _context2.next = 12;
+            return onOk(record);
+          case 12:
             res = _context2.sent;
             if (res !== null && res !== undefined) {
               // @ts-ignore
               flag = res;
             }
-          case 12:
+          case 14:
             if (flag) {
-              onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? _data : getNextValues(_data), _data);
+              onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? record : getNextValues(record), record);
               // 更新内部展示值
               setState({
-                _value: _data,
-                options: (0, _lodash.isArray)(_data) ? _data : [_data]
+                _value: record,
+                options: (0, _lodash.isArray)(record) ? record : [record]
               });
               handleClose();
             }
             return _context2.abrupt("return", flag);
-          case 16:
-            _context2.prev = 16;
+          case 18:
+            _context2.prev = 18;
             _context2.t0 = _context2["catch"](0);
             console.warn('error', _context2.t0);
-          case 19:
+          case 21:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 16]]);
+      }, _callee2, null, [[0, 18]]);
     }));
     return function handleFinish() {
       return _ref7.apply(this, arguments);
@@ -424,7 +430,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
-      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data2, nextSelectRowKeys;
+      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -455,15 +461,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               } else {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               }
-              _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
-              if (_data2) {
+              _data = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
+              if (_data) {
                 nextSelectRowKeys = isMultiple ? value : [value];
                 if (labelInValue) {
-                  onChange(_data2);
+                  onChange(_data);
                 }
                 // 更新内部展示值
                 setState({
-                  _value: _data2,
+                  _value: _data,
                   isInit: false,
                   selectedRows: list,
                   selectedRowKeys: nextSelectRowKeys
@@ -490,7 +496,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
-      var queryBean, page, params, res, _list2, list, _res$data3, _data3, nextSelectRowKeys;
+      var queryBean, page, params, res, _list2, list, _res$data3, _data2, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -514,18 +520,18 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               } else {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               }
-              _data3 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
+              _data2 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
               nextSelectRowKeys = isMultiple ? value : [value];
               if (labelInValue) {
-                onChange(_data3);
+                onChange(_data2);
               } else {
-                onChange(isMultiple ? _data3.map(function (item) {
+                onChange(isMultiple ? _data2.map(function (item) {
                   return item[valueKey];
-                }) : _data3[valueKey]);
+                }) : _data2[valueKey]);
               }
               // 更新内部展示值
               setState({
-                _value: _data3,
+                _value: _data2,
                 isInit: false,
                 selectedRows: list,
                 selectedRowKeys: nextSelectRowKeys
@@ -594,8 +600,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRows = value;
         }
       } else if (value) {
+        console.log('value', value);
         nextState.selectedRowKeys = [value];
-        nextState.selectedRows = [(0, _defineProperty2.default)({}, valueKey, value[valueKey])];
       }
       setState(nextState);
     }

package/lib/ProForm/components/combination/_Group/index.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { GroupProps } from './propsType';
+declare const Group: React.FC<GroupProps>;
+export default Group;

package/lib/ProForm/components/combination/_Group/index.js

@@ -0,0 +1,113 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
+var _react = require("react");
+var _lodash = require("lodash");
+var _ahooks = require("ahooks");
+var _classnames2 = _interopRequireDefault(require("classnames"));
+var _RenderFields = _interopRequireDefault(require("../../render/RenderFields"));
+var _utils = require("./utils");
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
+var Group = function Group(props) {
+  var columns = props.children,
+    otherProps = props.otherProps,
+    className = props.className,
+    _props$space = props.space,
+    space = _props$space === void 0 ? {
+      size: 12
+    } : _props$space,
+    id = props.id,
+    value = props.value,
+    isView = props.isView,
+    index = props.index,
+    onFieldChange = props.onFieldChange,
+    namePath = props.namePath;
+  var _ref = _ProForm.default.useFieldProps() || {},
+    names = _ref.names,
+    name = _ref.name,
+    form = _ref.form,
+    _namePath = _ref.namePath;
+  var newNamePath = namePath || _namePath || [];
+  if (!Array.isArray(names)) {
+    console.error('Warning: Composite form components whose type is Group must be configured with names');
+  }
+  var data = (0, _react.useMemo)(function () {
+    var fieldList = [];
+    var result = columns.map(function (item) {
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
+      }, item), {}, {
+        isView: isView !== null && isView !== void 0 ? isView : item.isView,
+        noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
+        parentNames: id,
+        namePath: newNamePath
+      });
+    });
+    var node = (0, _jsxRuntime.jsx)(_antd.Button, {
+      className: "group-separator",
+      children: space.separator
+    });
+    return {
+      columns: (0, _utils.insertSeparator)(result, space, node, otherProps),
+      fieldList: fieldList
+    };
+  }, [name, columns, space, props, names]);
+  var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
+    'pro-group': true,
+    'pro-group-diy-width': columns.some(function (item) {
+      var _item$fieldProps, _item$fieldProps$styl;
+      return item === null || item === void 0 ? void 0 : (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : (_item$fieldProps$styl = _item$fieldProps.style) === null || _item$fieldProps$styl === void 0 ? void 0 : _item$fieldProps$styl.width;
+    }),
+    'pro-group-width-auto': columns.some(function (item) {
+      return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
+    })
+  }, "".concat(className), className));
+  // 用于formList场景下names移除掉了前缀，需要再次合并回来
+  var _names = names.map(function (item) {
+    if ((0, _lodash.isNumber)(item === null || item === void 0 ? void 0 : item[0])) {
+      return (0, _lodash.union)(newNamePath, item);
+    }
+    return item;
+  });
+  (0, _ahooks.useDeepCompareEffect)(function () {
+    var _document, _document$activeEleme;
+    // 焦点激活的表单
+    var touchName = ((_document = document) === null || _document === void 0 ? void 0 : (_document$activeEleme = _document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) || '';
+    // 模拟change,初始化不执行onFieldChange
+    if ((0, _lodash.isFunction)(onFieldChange) && form.isFieldsTouched(_names) && (0, _utils.transformNamesString)(_names).includes(touchName)) {
+      onFieldChange(value, (newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.length) ? form.getFieldValue(newNamePath, true) : form.getFieldsValue(), {
+        form: form,
+        namePath: newNamePath,
+        index: index
+      });
+    }
+  }, [value]);
+  var _otherProps = (0, _lodash.omit)(otherProps, ['colProps', 'required']);
+  return (0, _jsxRuntime.jsx)("div", {
+    className: _className,
+    children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? (0, _jsxRuntime.jsx)(_antd.Space.Compact, {
+      children: (0, _jsxRuntime.jsx)(_RenderFields.default, (0, _objectSpread2.default)({
+        columns: data.columns,
+        form: form
+      }, _otherProps))
+    }) : (0, _jsxRuntime.jsx)(_antd.Space, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      align: "start"
+    }, (0, _lodash.omit)(space, ['separator', 'compact'])), {}, {
+      children: data.columns.map(function (column, index) {
+        return (0, _jsxRuntime.jsx)(_RenderFields.default, (0, _objectSpread2.default)({
+          columns: [column],
+          form: form
+        }, _otherProps), (column === null || column === void 0 ? void 0 : column.name) || index);
+      })
+    }))
+  });
+};
+var _default = exports.default = Group;

package/lib/ProForm/components/combination/_Group/propsType.d.ts

@@ -0,0 +1,35 @@
+import React from 'react';
+import { RowProps, SpaceProps } from 'antd';
+import { FormInstance } from 'antd/es/form/Form';
+import { NamePath } from 'antd/lib/form/interface';
+import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
+export interface SpaceType extends SpaceProps {
+    /**
+     * 是否紧凑合并
+     */
+    compact?: Boolean;
+    /**
+     * 分隔符
+     */
+    separator?: string | React.ReactNode;
+    /** 间隔距离 */
+    size?: number;
+}
+export interface GroupProps {
+    children?: ProColumnProps[];
+    space?: SpaceType;
+    otherProps?: ProFormOtherProps;
+    rowProps?: RowProps;
+    className?: string;
+    value?: any;
+    id?: string;
+    disabled?: boolean | (() => void);
+    isView?: boolean;
+    namePath?: NamePath;
+    index?: number;
+    onFieldChange?: (value: any[] | null, record: any, { form, }: {
+        form: FormInstance;
+        namePath?: NamePath;
+        index?: number;
+    }) => any;
+}

package/lib/ProForm/components/combination/_Group/utils.d.ts

@@ -0,0 +1,10 @@
+import { ReactNode } from 'react';
+import { SpaceType } from './propsType';
+/**
+* 插入间隔符
+* @param columns 表单配置数组
+* @returns
+*/
+export declare const insertSeparator: (columns: any, space?: SpaceType, separatorNode?: ReactNode, otherProps?: any) => any;
+/** 转换names */
+export declare const transformNamesString: (arr: (string | string[])[]) => (string | string[])[];

package/lib/ProForm/components/combination/_Group/utils.js

@@ -0,0 +1,53 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.transformNamesString = exports.insertSeparator = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+/**
+* 插入间隔符
+* @param columns 表单配置数组
+* @returns
+*/
+var insertSeparator = exports.insertSeparator = function insertSeparator(columns, space, separatorNode, otherProps) {
+  var _columns = columns;
+  var _ref = otherProps || {},
+    names = _ref.names;
+  // 紧凑模式存在names时，自动给下级拆解name
+  if (names) {
+    _columns = _columns.map(function (column, index) {
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
+        name: names[index]
+      });
+    });
+  }
+  if (!(space === null || space === void 0 ? void 0 : space.separator)) {
+    return _columns;
+  }
+  return _columns.reduce(function (result, current, index, array) {
+    // 将当前元素添加到结果数组中
+    result.push(current);
+    // 如果当前元素不是最后一个元素，则添加间隔符
+    if (index < array.length - 1) {
+      result.push({
+        component: separatorNode,
+        fieldProps: {
+          disabled: true
+        }
+      });
+    }
+    return result;
+  }, []);
+};
+/** 转换names */
+var transformNamesString = exports.transformNamesString = function transformNamesString(arr) {
+  var result = arr.map(function (subArr) {
+    if (Array.isArray(subArr)) {
+      return subArr.join('_');
+    }
+    return subArr;
+  });
+  return result;
+};

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

@@ -253,15 +253,17 @@ 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.default.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((0, _toConsumableArray2.default)(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat((0, _toConsumableArray2.default)(_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]);
+    if (inList && changeKey === 'onFieldChange') {
+      var values = form.getFieldsValue();
+      var newValues = (0, _lodash.set)(values, _otherFormItemProps.namePath, _args[1]);
+      form.setFieldsValue(newValues);
     }
     // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
     if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
@@ -274,7 +276,7 @@ var Render = function Render(props) {
     // ProTreeSelect返回option
     if (['ProTree'].includes(type)) {
       var _args2, _args2$;
-      _args[2].option = (0, _index.findOptionByValue)(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0]);
+      _args[2].option = (0, _index.findOptionByValue)(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0], (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
     }
     (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 ? void 0 : _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args)));
   };
@@ -314,7 +316,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 = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), (0, _lodash.omit)(lastComponentProps, lastComponentPropsFilter)), {}, {
       // @ts-ignore

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

@@ -187,6 +187,7 @@ var RenderFields = function RenderFields(props) {
       colProps: _colProps,
       mode: componentProps.mode,
       namePath: column.namePath,
+      listName: column.listName,
       globalControl: globalControl,
       formDisabled: formDisabled
     };

package/lib/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>;
@@ -208,6 +208,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     clearNotShow?: boolean;
     index?: number;
     namePath?: NamePath;
+    listName?: NamePath;
     /** 表单前缀信息 */
     before?: string | React.ReactNode;
     /** 表单后缀信息 */
@@ -216,7 +217,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     extra?: string | React.ReactNode;
     /** 是否固定字段, 不隐藏 */
     fixed?: boolean;
-    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
 }
 export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
 /**

package/lib/ProForm/propsType.d.ts

@@ -41,6 +41,7 @@ export interface ProFormOtherProps {
     required?: boolean | boolean[] | (() => boolean | boolean[]);
     mode?: string;
     namePath?: any[] | string | number;
+    listName?: any[] | string | number;
     globalControl?: boolean;
     formDisabled?: boolean;
 }

package/lib/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/lib/ProForm/utils/diffOriginal.js

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

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

@@ -83,7 +83,12 @@ export declare const deleteForPath: (values: any, namePath: string | number | (s
  * @param value 选中值
  * @returns {}
  */
-export declare const findOptionByValue: (treeData: any[], value: string | number) => any;
+export declare const findOptionByValue: (treeData: any[], value: string | number, fieldNames: {
+    [key: string]: any;
+    label?: string;
+    value?: string;
+    children?: string;
+}) => any;
 /**
  * 对比依赖列表中的 值是否变更
  */

package/lib/ProForm/utils/index.js

@@ -408,19 +408,19 @@ var deleteForPath = exports.deleteForPath = function deleteForPath(values, nameP
  * @param value 选中值
  * @returns {}
  */
-var findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value) {
+var findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if ((0, _lodash.isObject)(value)) {
     return value;
   }
   for (var i = 0; i < (treeData === null || treeData === void 0 ? void 0 : treeData.length); i++) {
     var node = treeData[i];
-    if (node.value === value) {
-      return (0, _lodash.omit)(node, ['children']);
+    if (node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || 'value'] === value) {
+      return (0, _lodash.omit)(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
     }
     if (node.children) {
-      var foundNode = findOptionByValue(node.children, value);
+      var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
       if (foundNode) {
-        return (0, _lodash.omit)(foundNode, ['children']);
+        return (0, _lodash.omit)(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }
     }
   }

package/lib/ProForm/utils/transformNames.js

@@ -7,23 +7,16 @@ exports.default = void 0;
 var _lodash = require("lodash");
 var _transformValue2 = require("./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) ? (0, _lodash.union)(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, formItem === null || formItem === void 0 ? void 0 : formItem.name) : fieldName;
-  if (type === 'Group' && (0, _lodash.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 (0, _lodash.union)(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, item);
-    });
-  }
-  var _transformValue = (0, _transformValue2.transformValue)(_names, form, _fieldName, normalize, getValueProps),
+  var _transformValue = (0, _transformValue2.transformValue)(names, form, _fieldName, normalize, getValueProps),
     _normalize = _transformValue.normalize,
     _getValueProps = _transformValue.getValueProps,
     _shouldUpdate = _transformValue.shouldUpdate;

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

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

package/lib/ProForm/utils/useDeepCompareMemo.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useDeepCompareMemo = void 0;
+var _react = require("react");
+var _lodash = require("lodash");
+var _ = require(".");
+/** 深度比较依赖变化memo */
+var useDeepCompareMemo = exports.useDeepCompareMemo = function useDeepCompareMemo(fun, depList) {
+  var lastDependency = (0, _react.useRef)(); // 上一次的依赖
+  var lastRes = (0, _react.useRef)(); // 上一次的结果
+  if (!(0, _lodash.isEqualWith)(depList, lastDependency.current, _.customEqualForFun)) {
+    var res = fun();
+    lastRes.current = res;
+  }
+  lastDependency.current = depList;
+  return lastRes.current;
+};

package/lib/ProForm/utils/useForm.js

@@ -63,7 +63,8 @@ var useForm = exports.useForm = function useForm(originForm) {
                 behavior: 'smooth'
               });
             }
-          case 14:
+            throw _context.t0;
+          case 15:
           case "end":
             return _context.stop();
         }

package/lib/ProForm/utils/useListChanged.js

@@ -92,7 +92,7 @@ var useListChanged = exports.useListChanged = function useListChanged(params) {
     originalValue: originalValue,
     form: form,
     equalWith: equalWith,
-    name: namesStr || name
+    name: (0, _lodash.isString)(namesStr) ? namesStr : originalName || name
   });
   return [changed, originalValue];
 };

package/lib/ProForm/utils/useRules.js

@@ -31,10 +31,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.default.ProForm.selectPlaceHolder).concat(_label) : "".concat(_locale.default.ProForm.inputPlaceholder).concat(_label);
@@ -65,23 +61,9 @@ var useRules = function useRules(props) {
     required: required
   });
   (0, _react.useEffect)(function () {
-    if (type === 'Group' && (allRequired || requiredRule)) {
-      var customRequired = {
-        validator: function validator(rules, value) {
-          // 完整性校验, 数组有值且值不完整则校验不通过
-          if (Array.isArray(value) && (0, _index.isNotFullArray)(value, names.length, required)) {
-            return Promise.reject(new Error("".concat(_locale.default.ProForm.completeText).concat(_label)));
-          }
-          return Promise.resolve();
-        }
-      };
-      // 插入rules第一条，完整性校验大于自定义
-      internalRule.rules.unshift(customRequired);
-      return;
-    }
     // 添加完整性校验
     if (names && !(0, _lodash.isBoolean)(labelRequired)) {
-      var _customRequired = {
+      var customRequired = {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
           if (Array.isArray(value) && !(0, _index.isNullArray)(value) && (0, _index.isNotFullArray)(value, names.length, required)) {
@@ -90,7 +72,7 @@ var useRules = function useRules(props) {
           return Promise.resolve();
         }
       };
-      internalRule.rules.unshift(_customRequired);
+      internalRule.rules.unshift(customRequired);
     }
   }, [internalRule]);
   return internalRule;