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

package/es/ProEditTable/components/RenderField/ListChangedWrapper.d.ts

@@ -10,7 +10,7 @@ interface Props {
     namesStr?: NamePath;
     originalValues?: any;
     form: FormInstance;
-    equalWith?: DiffOriginalParams['equalWith'];
+    onDiff?: DiffOriginalParams['onDiff'];
     [name: string]: any;
 }
 declare const ListChangedWrapper: React.FC<Props>;

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

@@ -5,7 +5,7 @@ import _Tooltip from "antd/es/tooltip";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "onDiff", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
 import classnames from 'classnames';
@@ -84,7 +84,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     originalNames = _props$originalNames === void 0 ? names : _props$originalNames,
     originalValues = props.originalValues,
     form = props.form,
-    equalWith = props.equalWith,
+    onDiff = props.onDiff,
     rowKeyPath = props.rowKeyPath,
     children = props.children,
     type = props.type,
@@ -115,7 +115,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     form: form
   });
   var originalValue = isWatch ? originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originalValue : undefined;
-  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 代表是值比对时的调用
@@ -130,7 +130,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       value: _value,
       originalValue: _originalValue,
       form: form,
-      equalWith: equalWith,
+      onDiff: onDiff,
       originRecord: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord,
       record: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.record,
       index: index

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

@@ -568,9 +568,10 @@ var RenderField = function RenderField(_ref) {
         originalNames: originalNames,
         originalValues: originalValues,
         form: form,
-        equalWith: onDiff,
+        onDiff: onDiff,
         type: type,
         onChange: _onChange,
+        onBlur: _onblur,
         valuePropName: _formItemProps.valuePropName,
         normalize: _formItemProps.normalize,
         getValueProps: _formItemProps.getValueProps,

package/es/ProEditTable/propsType.d.ts

@@ -110,7 +110,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     rules?: ProRule[] | RulesFn<T>;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
     dependencies?: NamePath[];
-    onDiff?: DiffOriginalParams['equalWith'];
+    onDiff?: DiffOriginalParams['onDiff'];
     [key: string]: any;
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;

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

@@ -4,7 +4,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
-    equalWith?: ({ originValue, originRecord, value, record, index, }: {
+    onDiff?: ({ originValue, originRecord, value, record, index, }: {
         originValue: any;
         originRecord: any;
         value: any;

package/es/ProEditTable/utils/diffOriginal.js

@@ -31,13 +31,13 @@ var filterObject = function filterObject(data) {
 export var diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
     value = params.value,
-    equalWith = params.equalWith,
+    onDiff = params.onDiff,
     originRecord = params.originRecord,
     record = params.record,
     index = params.index;
   // 支持传入自定义比较事件
-  if (isFunction(equalWith)) {
-    var diffRes = equalWith({
+  if (isFunction(onDiff)) {
+    var diffRes = onDiff({
       originValue: originalValue,
       originRecord: originRecord,
       value: value,

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/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,
@@ -447,9 +447,10 @@ var Render = function Render(props) {
         namesStr: namesStr,
         diffConfig: diffConfig,
         form: form,
-        equalWith: equalWith,
+        onDiff: onDiff,
         type: type,
         onChange: handleChange,
+        onBlur: handleBlur,
         valuePropName: _otherFormItemProps.valuePropName,
         normalize: _otherFormItemProps.normalize,
         getValueProps: _otherFormItemProps.getValueProps,

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/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/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/lib/ProEditTable/components/RenderField/ListChangedWrapper.d.ts

@@ -10,7 +10,7 @@ interface Props {
     namesStr?: NamePath;
     originalValues?: any;
     form: FormInstance;
-    equalWith?: DiffOriginalParams['equalWith'];
+    onDiff?: DiffOriginalParams['onDiff'];
     [name: string]: any;
 }
 declare const ListChangedWrapper: React.FC<Props>;

package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js

@@ -17,7 +17,7 @@ var _lodash = require("lodash");
 var _diffOriginal = require("../../utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
-var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "onDiff", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -89,7 +89,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     originalNames = _props$originalNames === void 0 ? names : _props$originalNames,
     originalValues = props.originalValues,
     form = props.form,
-    equalWith = props.equalWith,
+    onDiff = props.onDiff,
     rowKeyPath = props.rowKeyPath,
     children = props.children,
     type = props.type,
@@ -120,7 +120,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     form: form
   });
   var originalValue = isWatch ? originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originalValue : undefined;
-  var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
+  var noChange = !onDiff && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
   var diffType = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return 'same';
     var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
@@ -135,7 +135,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       value: _value,
       originalValue: _originalValue,
       form: form,
-      equalWith: equalWith,
+      onDiff: onDiff,
       originRecord: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord,
       record: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.record,
       index: index

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

@@ -575,9 +575,10 @@ var RenderField = function RenderField(_ref) {
         originalNames: originalNames,
         originalValues: originalValues,
         form: form,
-        equalWith: onDiff,
+        onDiff: onDiff,
         type: type,
         onChange: _onChange,
+        onBlur: _onblur,
         valuePropName: _formItemProps.valuePropName,
         normalize: _formItemProps.normalize,
         getValueProps: _formItemProps.getValueProps,

package/lib/ProEditTable/propsType.d.ts

@@ -110,7 +110,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     rules?: ProRule[] | RulesFn<T>;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
     dependencies?: NamePath[];
-    onDiff?: DiffOriginalParams['equalWith'];
+    onDiff?: DiffOriginalParams['onDiff'];
     [key: string]: any;
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;

package/lib/ProEditTable/utils/diffOriginal.d.ts

@@ -4,7 +4,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
-    equalWith?: ({ originValue, originRecord, value, record, index, }: {
+    onDiff?: ({ originValue, originRecord, value, record, index, }: {
         originValue: any;
         originRecord: any;
         value: any;

package/lib/ProEditTable/utils/diffOriginal.js

@@ -37,13 +37,13 @@ var filterObject = function filterObject(data) {
 var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
     value = params.value,
-    equalWith = params.equalWith,
+    onDiff = params.onDiff,
     originRecord = params.originRecord,
     record = params.record,
     index = params.index;
   // 支持传入自定义比较事件
-  if ((0, _lodash.isFunction)(equalWith)) {
-    var diffRes = equalWith({
+  if ((0, _lodash.isFunction)(onDiff)) {
+    var diffRes = onDiff({
       originValue: originalValue,
       originRecord: originRecord,
       value: value,

package/lib/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/lib/ProForm/components/render/ChangedWrapper.js

@@ -18,7 +18,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _diffOriginal = require("../../utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
-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"];
 var componentsWithFloatWindow = ['Select', 'ProSelect', 'ProEnum', 'ProTimeLimit', 'ProModalSelect', 'ProCascader', 'DataPicker', 'RangePicker', 'TimePicker'];
 var ChangedWrapper = function ChangedWrapper(props) {
   var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
@@ -26,7 +26,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,
@@ -48,7 +48,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
     return (0, _lodash.get)(originalValues, name);
   }) : (0, _lodash.get)(originalValues, name);
-  var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
+  var noChange = !onDiff && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
   var diffType = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return 'same';
     var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
@@ -63,10 +63,10 @@ var ChangedWrapper = function ChangedWrapper(props) {
       value: _value,
       originalValue: _originalValue,
       form: form,
-      equalWith: equalWith
+      onDiff: onDiff
       // name: namesStr || name,
     });
-  }, [isWatch, noChange, props[valuePropName], originalValue, (0, _typeof2.default)(equalWith)]);
+  }, [isWatch, noChange, props[valuePropName], originalValue, (0, _typeof2.default)(onDiff)]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
   var tipContent = (0, _react.useMemo)(function () {
@@ -91,7 +91,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/lib/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,
@@ -447,9 +447,10 @@ var Render = function Render(props) {
         namesStr: namesStr,
         diffConfig: diffConfig,
         form: form,
-        equalWith: equalWith,
+        onDiff: onDiff,
         type: type,
         onChange: handleChange,
+        onBlur: handleBlur,
         valuePropName: _otherFormItemProps.valuePropName,
         normalize: _otherFormItemProps.normalize,
         getValueProps: _otherFormItemProps.getValueProps,

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

@@ -17,7 +17,7 @@ var componentMap = _interopRequireWildcard(require("../index"));
 var _utils = require("../../utils");
 var _useFieldProps = require("../../utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../../../locale"));
-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"];
 var RenderFields = function RenderFields(props) {
   var isView = props.isView,
     _props$columns = props.columns,
@@ -77,7 +77,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,
@@ -220,7 +219,7 @@ var RenderFields = function RenderFields(props) {
         fieldProps: (0, _lodash.isFunction)(fieldProps) ? fieldProps : null,
         isSelect: _isSelect,
         diffConfig: diffConfig,
-        equalWith: onDiff || equalWith,
+        onDiff: onDiff,
         requiredOnView: requiredOnView,
         globalControl: globalControl,
         viewRender: viewRender,

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

@@ -13,18 +13,18 @@ var useChanged = exports.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 (0, _lodash.get)(originalValues, name);
   }) : (0, _lodash.get)(originalValues, name);
-  var notWatch = !equalWith && (!originalValues || originalValue === undefined);
+  var notWatch = !onDiff && (!originalValues || originalValue === undefined);
   if (notWatch) return [false];
   var value = _antd.Form.useWatch(namesStr || name, form);
   var changed = (0, _diffOriginal.diffOriginal)({
     originalValue: originalValue,
     value: value,
     form: form,
-    equalWith: equalWith
+    onDiff: onDiff
   });
   return [changed, originalValue];
 };

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

@@ -69,7 +69,7 @@ var useListChanged = exports.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);
@@ -83,7 +83,7 @@ var useListChanged = exports.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 = _antd.Form.useWatch(namePath, _form);
@@ -91,7 +91,7 @@ var useListChanged = exports.useListChanged = function useListChanged(params) {
     value: value,
     originalValue: originalValue,
     form: form,
-    equalWith: equalWith
+    onDiff: onDiff
     // name: isString(namesStr) ? namesStr : originalName || name,
   });
   return [changed, originalValue];

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

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

package/lib/ProForm/utils/transformValue.js

@@ -22,21 +22,21 @@ var transformValue = exports.transformValue = function transformValue(names, for
       }
       names.forEach(function (name, index) {
         var _value2;
-        // @ts-ignore
         (0, _lodash.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)) || {
@@ -50,8 +50,10 @@ var transformValue = exports.transformValue = function transformValue(names, for
       })) {
         curValue = undefined;
       }
-      // @ts-ignore
-      (0, _lodash.set)(form.getFieldsValue(true), fieldName, curValue);
+      // 如果来源是比对且有names场景, 则不更新表单值
+      if (!isOrigin) {
+        (0, _lodash.set)(form.getFieldsValue(true), fieldName, curValue);
+      }
       // 如果表单里的值和组合得到的值不全等  更新表单里的值、
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, res), {}, {
         value: curValue

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.10.2-beta.3",
+  "version": "3.10.2-beta.5",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",