@zat-design/sisyphus-react 3.10.2-beta.3 → 3.10.2-beta.4

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

@@ -58,7 +58,7 @@ var ToolbarButton = function ToolbarButton(props) {
     return _toolbarProps;
   }, [props.toolbarProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
       var value, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

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

@@ -23,7 +23,7 @@ export var namesPathTransform = function namesPathTransform(_ref) {
 // 比较memo
 export var memoWith = function memoWith(pre, next) {
   return isEqualWith(pre, next, function (objValue, othValue) {
-    if ( /*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
+    if (/*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
       return true;
     }
     // 移除解决formlist函数里不更新问题

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -68,7 +68,7 @@ var ComRender = function ComRender(props) {
       children: viewRender(componentProps)
     });
   }
-  var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
+  var Component = component ? (/*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
   var Com = getComRender(Component, props, componentProps);
   return _jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {

package/es/ProForm/components/combination/ProCascader/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { ProCascaderProps } from './propsType';
-declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => JSX.Element>;
+declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

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

@@ -28,9 +28,9 @@ var defaultFieldNames = {
   value: 'code',
   children: 'children'
 };
-var filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
+var _filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
-    return _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
+    return _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : _filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
   });
 };
 var getViewLabel = function getViewLabel(_ref) {
@@ -109,7 +109,7 @@ var ProCascader = function ProCascader(props) {
   }, [dics === null || dics === void 0 ? void 0 : dics[addressCode], enumData]);
   var realDataSource = useMemo(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = transformDataName(isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
+    var result = transformDataName(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
     return result;
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var lastDisabled = useMemo(function () {
@@ -131,7 +131,7 @@ var ProCascader = function ProCascader(props) {
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
   var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _yield$service, data, newData, transFormData, serviceData;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -150,7 +150,7 @@ var ProCascader = function ProCascader(props) {
               value: fieldNames.value,
               children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
             });
-            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
+            serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
             setServiceData(serviceData);
           case 9:
           case "end":
@@ -220,7 +220,7 @@ var ProCascader = function ProCascader(props) {
   })) === null || _ref5$filter === void 0 ? void 0 : _ref5$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
     return !!item;
   })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
-  var findSelectedOptions = function findSelectedOptions(options, value) {
+  var _findSelectedOptions = function findSelectedOptions(options, value) {
     var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     var _value = value !== null && value !== void 0 ? value : [];
     // 基准情况：如果 value 数组为空，且 path 不为空，说明找到了完整的路径
@@ -239,7 +239,7 @@ var ProCascader = function ProCascader(props) {
     if (foundOption) {
       // 如果找到了匹配的选项，并且还有更多的 value 需要匹配，递归地在子选项中查找
       if (_value.length > 1 && foundOption.children) {
-        return findSelectedOptions(foundOption.children, _value.slice(1), [].concat(_toConsumableArray(path), [foundOption]));
+        return _findSelectedOptions(foundOption.children, _value.slice(1), [].concat(_toConsumableArray(path), [foundOption]));
       }
       // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
       return [].concat(_toConsumableArray(path), [foundOption]);
@@ -248,7 +248,7 @@ var ProCascader = function ProCascader(props) {
     return null;
   };
   var _selectedOptions = useMemo(function () {
-    return findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+    return _findSelectedOptions(service ? serviceData : realDataSource, addressValue);
   }, [service, serviceData, realDataSource, addressValue]);
   var handleAddressChange = function handleAddressChange(e) {
     var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -24,7 +24,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
   });
 };
 var defaultService = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:

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

@@ -260,7 +260,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     onChange(val, option);
   };
   var handleClick = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _yield$beforeOpen, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -327,7 +327,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   };
   var handleFinish = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -392,7 +392,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     };
   }();
   var handleSearch = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var values;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -465,7 +465,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -525,7 +525,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }();
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
-    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {

package/es/ProForm/components/old/InputRange/index.d.ts

@@ -12,5 +12,5 @@ export interface InputRangeProps {
     isPositiveInteger?: boolean;
     precision?: number;
 }
-declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => JSX.Element;
+declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => import("react/jsx-runtime").JSX.Element;
 export default InputRange;

package/es/ProForm/components/old/InputWithSuffix/index.d.ts

@@ -1,3 +1,3 @@
 import { comPropsType } from './propsTypes';
-declare const InputWithSuffix: (props: comPropsType) => JSX.Element;
+declare const InputWithSuffix: (props: comPropsType) => import("react/jsx-runtime").JSX.Element;
 export default InputWithSuffix;

package/es/ProForm/components/old/ProAddress/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProAddressPropsType } from './propsTypes';
 export declare const transferAddressInfoToRegion: () => {
     normalize: (value: any) => {
@@ -24,5 +23,5 @@ export declare const transferAddressInfoToRegion: () => {
         };
     };
 };
-export declare function ProAddress({ ...props }: ProAddressPropsType): JSX.Element;
+export declare function ProAddress({ ...props }: ProAddressPropsType): import("react/jsx-runtime").JSX.Element;
 export default ProAddress;

package/es/ProForm/components/old/ProAddress/index.js

@@ -92,7 +92,7 @@ export function ProAddress(_ref3) {
     secondCitys = _useState6[0],
     setSecondCitys = _useState6[1];
   var queryCity = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(code, type) {
+    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(code, type) {
       var cityList, _cityList, newList, _secondCitys;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

package/es/ProForm/components/old/ProRangeBox/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import { ProRangeBoxPropsType } from './propsType';
-export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): JSX.Element;
+export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): import("react/jsx-runtime").JSX.Element;

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

@@ -9,7 +9,7 @@ interface Props {
     namesStr?: string;
     diffConfig?: DiffConfigProps;
     form: FormInstance;
-    equalWith?: DiffOriginalParams['equalWith'];
+    onDiff?: DiffOriginalParams['onDiff'];
     valuePropName?: string;
     [name: string]: any;
 }

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

@@ -6,7 +6,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
+var _excluded = ["name", "names", "namesStr", "form", "onDiff", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
 import { get } from 'lodash';
@@ -21,7 +21,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     names = props.names,
     namesStr = props.namesStr,
     form = props.form,
-    equalWith = props.equalWith,
+    onDiff = props.onDiff,
     children = props.children,
     type = props.type,
     diffConfig = props.diffConfig,
@@ -43,7 +43,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
     return get(originalValues, name);
   }) : get(originalValues, name);
-  var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
+  var noChange = !onDiff && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
   var diffType = useMemo(function () {
     if (!isWatch || noChange) return 'same';
     var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
@@ -58,10 +58,10 @@ var ChangedWrapper = function ChangedWrapper(props) {
       value: _value,
       originalValue: _originalValue,
       form: form,
-      equalWith: equalWith
+      onDiff: onDiff
       // name: namesStr || name,
     });
-  }, [isWatch, noChange, props[valuePropName], originalValue, _typeof(equalWith)]);
+  }, [isWatch, noChange, props[valuePropName], originalValue, _typeof(onDiff)]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
   var tipContent = useMemo(function () {
@@ -86,7 +86,6 @@ var ChangedWrapper = function ChangedWrapper(props) {
     }, children.props), rest));
   }
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  // const isFocus = useFocus(contentRef.current);
   var tipOpenCalc = function tipOpenCalc() {
     if (!toolTip) return false;
     // 传入undefined 鼠标移入显示移出隐藏 获得焦点时不显示气泡

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

@@ -22,7 +22,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var _ProForm$useFieldProp = ProForm.useFieldProps(),
     form = _ProForm$useFieldProp.form;
   var handleChange = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(value) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(value) {
       var _len,
         other,
         _key,

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

@@ -46,7 +46,7 @@ var Render = function Render(props) {
     formDisabled = props.formDisabled,
     type = props.type,
     isSelect = props.isSelect,
-    equalWith = props.equalWith,
+    onDiff = props.onDiff,
     requiredOnView = props.requiredOnView,
     confirm = props.confirm,
     globalControl = props.globalControl,
@@ -249,7 +249,7 @@ var Render = function Render(props) {
       _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)) {
+    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;
@@ -299,7 +299,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _len3,
         args,
         _key3,
@@ -382,7 +382,7 @@ var Render = function Render(props) {
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? ( /*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
+    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? (/*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
       otherProps: _objectSpread(_objectSpread({}, otherProps), {}, {
         show: show,
         disabled: lastDisabled,
@@ -447,7 +447,7 @@ var Render = function Render(props) {
         namesStr: namesStr,
         diffConfig: diffConfig,
         form: form,
-        equalWith: equalWith,
+        onDiff: onDiff,
         type: type,
         onChange: handleChange,
         valuePropName: _otherFormItemProps.valuePropName,

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

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "onDiff", "clearNotShow", "required", "confirm", "desensitization"];
+var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "onDiff", "clearNotShow", "required", "confirm", "desensitization"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
 import { isBoolean, isFunction, union, isString } from 'lodash';
@@ -69,7 +69,6 @@ var RenderFields = function RenderFields(props) {
       formItemChildProps = _column$formItemChild === void 0 ? {} : _column$formItemChild,
       _column$fieldProps = column.fieldProps,
       fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
-      equalWith = column.equalWith,
       onDiff = column.onDiff,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
@@ -212,7 +211,7 @@ var RenderFields = function RenderFields(props) {
         fieldProps: isFunction(fieldProps) ? fieldProps : null,
         isSelect: _isSelect,
         diffConfig: diffConfig,
-        equalWith: onDiff || equalWith,
+        onDiff: onDiff,
         requiredOnView: requiredOnView,
         globalControl: globalControl,
         viewRender: viewRender,

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

@@ -206,8 +206,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     upperCase?: boolean;
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
-    equalWith?: DiffOriginalParams['equalWith'];
-    onDiff?: DiffOriginalParams['equalWith'];
+    onDiff?: DiffOriginalParams['onDiff'];
     required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;

package/es/ProForm/index.js

@@ -176,7 +176,7 @@ var ProForm = function ProForm(props, ref) {
     if (isView || disabled) {
       // 查看或禁用模式
       footerEle = null;
-    } else if ( /*#__PURE__*/React.isValidElement(footer)) {
+    } else if (/*#__PURE__*/React.isValidElement(footer)) {
       // 传入组件渲染组件
       footerEle = footer;
     } else if (footer === undefined || footer || isObject(footer)) {

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

@@ -1,8 +1,8 @@
-export declare const useChanged: ({ name, names, namesStr, originalValues, form, equalWith }: {
+export declare const useChanged: ({ name, names, namesStr, originalValues, form, onDiff }: {
     name: any;
     names: any;
     namesStr: any;
     originalValues: any;
     form: any;
-    equalWith: any;
+    onDiff: any;
 }) => any[];

package/es/ProForm/utils/_useChanged.js

@@ -8,18 +8,18 @@ export var useChanged = function useChanged(_ref) {
     namesStr = _ref.namesStr,
     originalValues = _ref.originalValues,
     form = _ref.form,
-    equalWith = _ref.equalWith;
+    onDiff = _ref.onDiff;
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
     return get(originalValues, name);
   }) : get(originalValues, name);
-  var notWatch = !equalWith && (!originalValues || originalValue === undefined);
+  var notWatch = !onDiff && (!originalValues || originalValue === undefined);
   if (notWatch) return [false];
   var value = _Form.useWatch(namesStr || name, form);
   var changed = diffOriginal({
     originalValue: originalValue,
     value: value,
     form: form,
-    equalWith: equalWith
+    onDiff: onDiff
   });
   return [changed, originalValue];
 };

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

@@ -10,7 +10,7 @@ interface Params {
     originalValues: any;
     form: FormInstance;
     rowKeyPath?: InternalNamePath;
-    equalWith?: (originalValue: any, currentValue: any) => boolean;
+    onDiff?: (originalValue: any, currentValue: any) => boolean;
 }
 export declare const useListChanged: (params: Params) => any[];
 export {};

package/es/ProForm/utils/_useListChanged.js

@@ -64,7 +64,7 @@ export var useListChanged = function useListChanged(params) {
     originalNames = _params$originalNames === void 0 ? names : _params$originalNames,
     originalValues = params.originalValues,
     form = params.form,
-    equalWith = params.equalWith,
+    onDiff = params.onDiff,
     rowKeyPath = params.rowKeyPath;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
@@ -78,7 +78,7 @@ export var useListChanged = function useListChanged(params) {
     rowKeyPath: rowKeyPath,
     form: form
   }) : undefined;
-  var noChange = !equalWith && (!originalValues || originalValue === undefined);
+  var noChange = !onDiff && (!originalValues || originalValue === undefined);
   var _form = form;
   if (notWatch || noChange) return [false];
   var value = _Form.useWatch(namePath, _form);
@@ -86,7 +86,7 @@ export var useListChanged = function useListChanged(params) {
     value: value,
     originalValue: originalValue,
     form: form,
-    equalWith: equalWith
+    onDiff: onDiff
     // name: isString(namesStr) ? namesStr : originalName || name,
   });
   return [changed, originalValue];

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

@@ -3,7 +3,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
-    equalWith?: (originalValue: any, currentValue: any) => DiffType | boolean | undefined;
+    onDiff?: (originalValue: any, currentValue: any) => DiffType | boolean | undefined;
 }
 export type DiffType = 'same' | 'add' | 'changed';
 export declare const diffOriginal: (params: DiffOriginalParams) => DiffType;

package/es/ProForm/utils/diffOriginal.js

@@ -30,10 +30,10 @@ var filterObject = function filterObject(data) {
 export var diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
     value = params.value,
-    equalWith = params.equalWith;
+    onDiff = params.onDiff;
   // 支持传入自定义比较事件
-  if (isFunction(equalWith)) {
-    var diffRes = equalWith(originalValue, value);
+  if (isFunction(onDiff)) {
+    var diffRes = onDiff(originalValue, value);
     // 如果返回undefined走内置比较逻辑
     if (diffRes !== undefined) {
       if (typeof diffRes === 'boolean') {

package/es/ProForm/utils/index.js

@@ -120,7 +120,7 @@ export var splitNameStr = function splitNameStr(name) {
   });
 };
 // 过滤掉字段名中包含 '-' 的字段
-export var filterInternalFields = function filterInternalFields(values, optimize) {
+var _filterInternalFields = function filterInternalFields(values, optimize) {
   if (optimize) {
     return values;
   }
@@ -134,20 +134,21 @@ export var filterInternalFields = function filterInternalFields(values, optimize
   }
   if (Array.isArray(nextValues)) {
     return nextValues.map(function (item) {
-      return filterInternalFields(item);
+      return _filterInternalFields(item);
     });
   }
   if (isObject(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
       if (key.includes('-')) return;
-      result[key] = filterInternalFields(nextValues[key]);
+      result[key] = _filterInternalFields(nextValues[key]);
     });
     return result;
   }
   return nextValues;
 };
-export var getAllNamePath = function getAllNamePath(object) {
+export { _filterInternalFields as filterInternalFields };
+var _getAllNamePath = function getAllNamePath(object) {
   var currentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var keys = Object.keys(object);
   var resultKeys = [];
@@ -161,13 +162,14 @@ export var getAllNamePath = function getAllNamePath(object) {
     }
     // 深度获取对象key
     if (isObject(value)) {
-      resultKeys.concat(getAllNamePath(value, [].concat(_toConsumableArray(currentPath), [key])));
+      resultKeys.concat(_getAllNamePath(value, [].concat(_toConsumableArray(currentPath), [key])));
     }
     resultKeys.push([].concat(_toConsumableArray(currentPath), [key]));
   });
   return resultKeys;
 };
 // 判断一个字段值是否算空
+export { _getAllNamePath as getAllNamePath };
 var nullList = [undefined, 'null', '""', '[]'];
 export var isNullValue = function isNullValue(value) {
   return nullList.includes(JSON.stringify(value));
@@ -304,7 +306,7 @@ export var customEqualForFun = function customEqualForFun(value, other) {
 /**
  * 查询数据中是否包含rowKey
  */
-export var hasRowKey = function hasRowKey(obj) {
+var _hasRowKey = function hasRowKey(obj) {
   if (_typeof(obj) !== 'object' || obj === null) {
     return false;
   }
@@ -314,12 +316,13 @@ export var hasRowKey = function hasRowKey(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return hasRowKey(obj[key]);
+    return _hasRowKey(obj[key]);
   });
 };
 /**
  * 查询数据中是否包含rowKey
  */
+export { _hasRowKey as hasRowKey };
 export var view = function view(obj) {
   if (_typeof(obj) !== 'object' || obj === null) {
     return false;
@@ -330,7 +333,7 @@ export var view = function view(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return hasRowKey(obj[key]);
+    return _hasRowKey(obj[key]);
   });
 };
 /**
@@ -366,7 +369,7 @@ export var deleteForPath = function deleteForPath(values, namePath) {
  * @param value 选中值
  * @returns {}
  */
-export var findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
+var _findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if (isObject(value)) {
     return value;
   }
@@ -376,7 +379,7 @@ export var findOptionByValue = function findOptionByValue(treeData, value, field
       return omit(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
     }
     if (node.children) {
-      var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
+      var foundNode = _findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
       if (foundNode) {
         return omit(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }
@@ -386,6 +389,7 @@ export var findOptionByValue = function findOptionByValue(treeData, value, field
 /**
  * 对比依赖列表中的 值是否变更
  */
+export { _findOptionByValue as findOptionByValue };
 export var equalDependencies = function equalDependencies(dependencies, prevValues, currentValues) {
   if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
     return dependencies.some(function (namePath) {

package/es/ProForm/utils/transformValue.js

@@ -15,21 +15,21 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       }
       names.forEach(function (name, index) {
         var _value2;
-        // @ts-ignore
         set(form.getFieldsValue(true), name, (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2[index]);
       });
       return _value;
     },
-    getValueProps: function getValueProps(value, isOrg) {
+    getValueProps: function getValueProps(value, isOrigin) {
       var _curValue;
       var _value = [];
-      if (!isOrg) {
+      if (isOrigin) {
+        _value = value;
+      } else {
+        // 非比对names场景
         names.forEach(function (name, index) {
           var value = form.getFieldValue(name);
           _value[index] = value;
         });
-      } else {
-        _value = value;
       }
       // 支持外部传入转换函数
       var res = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
@@ -43,8 +43,10 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       })) {
         curValue = undefined;
       }
-      // @ts-ignore
-      set(form.getFieldsValue(true), fieldName, curValue);
+      // 如果来源是比对且有names场景, 则不更新表单值
+      if (!isOrigin) {
+        set(form.getFieldsValue(true), fieldName, curValue);
+      }
       // 如果表单里的值和组合得到的值不全等  更新表单里的值、
       return _objectSpread(_objectSpread({}, res), {}, {
         value: curValue

package/es/ProForm/utils/useForm.js

@@ -47,7 +47,7 @@ export var useForm = function useForm(originForm, options) {
     return getFieldsValue(nameList, filterFunc);
   };
   var _validateFields = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
       var _rest$,
         _len,
         rest,