@zat-design/sisyphus-react 3.9.3 → 3.9.4-beta.10

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

@@ -6,7 +6,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "onDiff", "className", "trim", "confirm"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "onDiff", "className", "trim", "confirm", "dependencies"];
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
@@ -52,11 +52,11 @@ var RenderField = function RenderField(_ref) {
     required = _column$required === void 0 ? false : _column$required,
     _column$rules = column.rules,
     rules = _column$rules === void 0 ? [] : _column$rules,
-    equalWith = column.equalWith,
     onDiff = column.onDiff,
     className = column.className,
     trim = column.trim,
     confirm = column.confirm,
+    dependencies = column.dependencies,
     resetProps = _objectWithoutProperties(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -312,6 +312,8 @@ var RenderField = function RenderField(_ref) {
       _key2,
       _args,
       rowPath,
+      _dependencies$map,
+      validateFieldKeys,
       row,
       orgRow,
       _TargetComponent,
@@ -323,77 +325,85 @@ var RenderField = function RenderField(_ref) {
       _Object$keys,
       _Object$keys$map,
       diff,
-      validateFieldKeys,
+      _validateFieldKeys,
       _args2 = arguments;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (!(!onFieldChange && !onChange)) {
-            _context.next = 2;
-            break;
-          }
-          return _context.abrupt("return", null);
-        case 2:
           for (_len2 = _args2.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
             args[_key2] = _args2[_key2];
           }
           _args = [].concat(args);
           rowPath = [].concat(_toConsumableArray(namePath), [index]);
-          row = form.getFieldValue(rowPath, true); // if (type === 'InputNumber' && column.name) row[column.name] = args[0];
+          if (!(!onFieldChange && !onChange)) {
+            _context.next = 6;
+            break;
+          }
+          if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
+            validateFieldKeys = dependencies === null || dependencies === void 0 ? void 0 : (_dependencies$map = dependencies.map) === null || _dependencies$map === void 0 ? void 0 : _dependencies$map.call(dependencies, function (key) {
+              return [].concat(_toConsumableArray(rowPath), [key]);
+            });
+            setTimeout(function () {
+              form.validateFields(validateFieldKeys);
+            }, 100);
+          }
+          return _context.abrupt("return", null);
+        case 6:
+          row = form.getFieldValue(rowPath, true);
           orgRow = cloneDeep(row);
           if (!onFieldChange) {
-            _context.next = 20;
+            _context.next = 21;
             break;
           }
           _args = formatArgs(args);
           _args[1] = row;
           _context.t0 = (_TargetComponent = TargetComponent) === null || _TargetComponent === void 0 ? void 0 : (_TargetComponent$prop = _TargetComponent.props) === null || _TargetComponent$prop === void 0 ? void 0 : _TargetComponent$prop.onFieldChange;
           if (!_context.t0) {
-            _context.next = 14;
+            _context.next = 15;
             break;
           }
-          _context.next = 14;
+          _context.next = 15;
           return (_TargetComponent$prop2 = TargetComponent.props).onFieldChange.apply(_TargetComponent$prop2, _toConsumableArray(_args));
-        case 14:
+        case 15:
           _context.t1 = onFieldChange;
           if (!_context.t1) {
-            _context.next = 18;
+            _context.next = 19;
             break;
           }
-          _context.next = 18;
+          _context.next = 19;
           return onFieldChange.apply(void 0, _toConsumableArray(_args));
-        case 18:
-          _context.next = 29;
+        case 19:
+          _context.next = 30;
           break;
-        case 20:
+        case 21:
           _args = _args.concat([row, index, form]);
           _context.t2 = (_TargetComponent2 = TargetComponent) === null || _TargetComponent2 === void 0 ? void 0 : (_TargetComponent2$pro = _TargetComponent2.props) === null || _TargetComponent2$pro === void 0 ? void 0 : _TargetComponent2$pro.onChange;
           if (!_context.t2) {
-            _context.next = 25;
+            _context.next = 26;
             break;
           }
-          _context.next = 25;
+          _context.next = 26;
           return (_TargetComponent$prop3 = TargetComponent.props).onChange.apply(_TargetComponent$prop3, _toConsumableArray(_args));
-        case 25:
+        case 26:
           _context.t3 = onChange;
           if (!_context.t3) {
-            _context.next = 29;
+            _context.next = 30;
             break;
           }
-          _context.next = 29;
+          _context.next = 30;
           return onChange.apply(void 0, _toConsumableArray(_args));
-        case 29:
+        case 30:
           // 判断属性是否变动
           form.setFieldValue(rowPath, row);
           if (validateTrigger && validateTrigger.includes('onChange')) {
             if (!isEqual(orgRow, row)) {
               diff = difference(row, orgRow) || {};
-              validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
+              _validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
                 return [].concat(_toConsumableArray(rowPath), [key]);
-              });
-              if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
+              }).concat(dependencies || []);
+              if (_validateFieldKeys === null || _validateFieldKeys === void 0 ? void 0 : _validateFieldKeys.length) {
                 setTimeout(function () {
-                  form.validateFields(validateFieldKeys);
+                  form.validateFields(_validateFieldKeys);
                 }, 100);
               }
             }
@@ -403,7 +413,7 @@ var RenderField = function RenderField(_ref) {
               d: Date.now()
             }
           });
-        case 32:
+        case 33:
         case "end":
           return _context.stop();
       }
@@ -464,7 +474,7 @@ var RenderField = function RenderField(_ref) {
                 diff = difference(row, orgRow) || {};
                 validateFieldKeys = (_Object$keys2 = Object.keys(diff)) === null || _Object$keys2 === void 0 ? void 0 : (_Object$keys2$map = _Object$keys2.map) === null || _Object$keys2$map === void 0 ? void 0 : _Object$keys2$map.call(_Object$keys2, function (key) {
                   return [].concat(_toConsumableArray(rowPath), [key]);
-                });
+                }).concat(dependencies || []);
                 if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
                   debounceValidate(validateFieldKeys);
                 }
@@ -557,7 +567,7 @@ var RenderField = function RenderField(_ref) {
         originalNames: originalNames,
         originalValues: originalValues,
         form: form,
-        equalWith: onDiff || equalWith,
+        equalWith: onDiff,
         type: type,
         onChange: _onChange,
         valuePropName: _formItemProps.valuePropName,

package/es/ProEditTable/propsType.d.ts

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

package/es/ProEditTable/style/index.less

@@ -305,6 +305,47 @@
       background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
     }
   }
+
+  * {
+    // ie浏览器
+    scrollbar-face-color: #d2d3d7;
+    scrollbar-highlight-color: #979797;
+    scrollbar-3dlight-color: #979797;
+  
+    // 悬浮轨道
+    ::-webkit-scrollbar-thumb {
+      background-color: #979797;
+      background-clip: padding-box;
+      border-color: transparent;
+      border-style: dashed;
+      border-width: 4px;
+      border-radius: 10px;
+      -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+    }
+  
+    ::-webkit-scrollbar-track {
+      background: transparent;
+    }
+  
+    ::-webkit-scrollbar-thumb {
+      background-color: #d2d3d7;
+      background-clip: padding-box;
+      border-color: transparent;
+      border-style: dashed;
+      border-width: 4px;
+      border-radius: 10px;
+      -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+    }
+  
+    ::-webkit-scrollbar-thumb {
+      background-color: #979797;
+    }
+  
+    ::-webkit-scrollbar-track {
+      background: transparent;
+    }
+  }
+  
 }
 
 .pro-edit-table-footer{

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

@@ -0,0 +1,21 @@
+import { FormInstance } from 'antd';
+export type DiffType = 'same' | 'add' | 'changed';
+export interface DiffOriginalParams {
+    originalValue: any;
+    value: any;
+    form: FormInstance;
+    equalWith?: ({ originValue, originRecord, value, record, index }: {
+        originValue: any;
+        originRecord: any;
+        value: any;
+        record: any;
+        index: number;
+    }) => DiffType | undefined;
+    /** 原始行数据 */
+    originRecord: any;
+    /** 当前行数据 */
+    record: any;
+    /** 当前行索引 */
+    index: number;
+}
+export declare const diffOriginal: (params: DiffOriginalParams) => DiffType;

package/es/ProEditTable/utils/diffOriginal.js

@@ -0,0 +1,62 @@
+import { isEqual, isFunction, isObject } from 'lodash';
+import { validate } from '@zat-design/utils';
+var isEmpty = validate.isEmpty;
+// 过滤对象中undefined字段
+// 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
+var filterObject = function filterObject(data) {
+  if (!isObject(data) || Array.isArray(data) || data === null) return data;
+  var resData = {};
+  Object.keys(data).forEach(function (key) {
+    if (!isEmpty(data[key])) {
+      resData[key] = data[key];
+    }
+  });
+  // 空对象视为null 比较时 null undefined {} [] '' 视为相等
+  if (!Object.keys(resData).length) return null;
+  return resData;
+};
+export var diffOriginal = function diffOriginal(params) {
+  var originalValue = params.originalValue,
+    value = params.value,
+    equalWith = params.equalWith,
+    originRecord = params.originRecord,
+    record = params.record,
+    index = params.index;
+  // 支持传入自定义比较事件
+  if (isFunction(equalWith)) {
+    var diffRes = equalWith({
+      originValue: originalValue,
+      originRecord: originRecord,
+      value: value,
+      record: record,
+      index: index
+    });
+    // 如果返回undefined走内置比较逻辑
+    if (diffRes !== undefined) {
+      if (typeof diffRes === 'boolean') {
+        return diffRes ? 'same' : 'changed';
+      }
+      return diffRes;
+    }
+  }
+  var _value = filterObject(value);
+  var _originalValue = filterObject(originalValue);
+  // 如果原始值为空 且当前有值的话 认为变更类型是新增
+  if (isEmpty(_originalValue) && !isEmpty(_value)) {
+    return 'add';
+  }
+  if (Array.isArray(_originalValue)) {
+    var isSame = _originalValue.every(function (valueItem, index) {
+      // 如果两个值有一个不是空值, 则进行深比较
+      if (!isEmpty(value === null || value === void 0 ? void 0 : value[index]) || !isEmpty(valueItem)) {
+        return isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
+      }
+      return true;
+    });
+    return isSame ? 'same' : 'changed';
+  }
+  if (!isEmpty(_originalValue) || !isEmpty(_value)) {
+    return isEqual(_value, _originalValue) ? 'same' : 'changed';
+  }
+  return 'same';
+};

package/es/ProEnum/index.js

@@ -230,7 +230,7 @@ var ProEnum = function ProEnum(props) {
   };
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
-    _message.error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType);
+    _message.error("".concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.label, "-").concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name, "-").concat(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType));
   }
   var transToLabel = function transToLabel(value) {
     var list = dataList && dataList.length ? dataList : enumLists;

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

@@ -329,7 +329,7 @@ export var useTransformColumns = function useTransformColumns(params) {
     }, reactiveProps), {}, {
       disabled: getLastDisabled(),
       getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
-      fieldProps: _objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
+      fieldProps: _objectSpread(_objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), reactiveProps === null || reactiveProps === void 0 ? void 0 : reactiveProps.fieldProps), {}, {
         onChange: handleChange,
         onBlur: handleBlur,
         value: value === null || value === void 0 ? void 0 : value[index]

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

@@ -16,7 +16,7 @@ import _Typography from "antd/es/typography";
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState, memo, useMemo } from 'react';
-import { omit, find as _find } from 'lodash';
+import { omit, find as _find, isBoolean } from 'lodash';
 import { transformDataName } from './utils/index';
 import { useProConfig } from '../../../../ProConfigProvider';
 import useEnum from '../../../../ProEnum/hooks/useEnum';
@@ -111,6 +111,12 @@ var ProCascader = function ProCascader(props) {
     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 () {
+    if (isBoolean(disabled) || disabled === undefined) {
+      return [disabled, disabled];
+    }
+    return disabled;
+  }, [disabled]);
   var _useRequest = _objectSpread({}, useRequest),
     service = _useRequest.service,
     _useRequest$defaultPa = _useRequest.defaultParams,
@@ -268,7 +274,7 @@ var ProCascader = function ProCascader(props) {
       placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar = locale.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
       value: addressValue,
       options: service ? serviceData : realDataSource,
-      disabled: disabled,
+      disabled: lastDisabled[0],
       displayRender: displayRender,
       showSearch: {
         filter: handlefilter,
@@ -278,19 +284,19 @@ var ProCascader = function ProCascader(props) {
       getPopupContainer: function getPopupContainer(trigger) {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, omit(otherProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && disabled && detail ? _jsx(_Tooltip, {
+    }, omit(otherProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? _jsx(_Tooltip, {
       title: detail,
       children: _jsx("span", {
         className: "pro-address-detail",
         children: _jsx(_Input, {
-          disabled: disabled,
+          disabled: lastDisabled[1],
           value: detail
         })
       })
     }) : _jsx(_Input, {
       allowClear: true,
       autoComplete: "off",
-      disabled: disabled,
+      disabled: lastDisabled[1],
       value: detail,
       maxLength: detailMaxLength,
       placeholder: detailPlaceholder || (locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar2 = locale.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder),

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

@@ -2,6 +2,7 @@ import "antd/es/space/style";
 import _Space from "antd/es/space";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -47,9 +48,15 @@ var ChangedWrapper = function ChangedWrapper(props) {
     if (!isWatch || noChange) return 'same';
     var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
     : props[valuePropName];
+    // fix:修复 DatePicker时，originalValue与最新值一致时，显示为 changed的问题
+    var _originalValue = normalize && ['DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
+    // fix:修复 InputNumber 时，originalValue与最新值一致都为'0'时，显示为 changed的问题
+    if (['InputNumber'].includes(props.type) && normalize && _value === Number(originalValue)) {
+      return 'same';
+    }
     return diffOriginal({
-      originalValue: originalValue,
       value: _value,
+      originalValue: _originalValue,
       form: form,
       equalWith: equalWith
       // name: namesStr || name,
@@ -57,23 +64,20 @@ var ChangedWrapper = function ChangedWrapper(props) {
   }, [isWatch, noChange, props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
-  var viewRenderFun = useMemo(function () {
-    return function (orgValue) {
-      return viewRender(orgValue, originalValues, {
-        form: form
-      });
-    };
-  }, [form]);
   var tipContent = useMemo(function () {
     if (!isWatch || noChange) return undefined;
     var valueProps = getValueProps && !names ? getValueProps(originalValue) : {
       value: originalValue
     };
-    if (viewRender) return viewRenderFun(valueProps === null || valueProps === void 0 ? void 0 : valueProps.value);
+    if (viewRender) {
+      return viewRender(valueProps === null || valueProps === void 0 ? void 0 : valueProps.value, originalValues, {
+        form: form
+      });
+    }
     return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, _defineProperty({
       isView: true
     }, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;
-  }, [originalValue, children]);
+  }, [_typeof(viewRender), originalValue, children]);
   if (!isWatch || noChange) {
     // 嵌套子组件
     var isNestedField = ['ProEditTable'].includes(type);

package/es/ProForm/style/index.less

@@ -341,6 +341,10 @@
       background: @zaui-contract-bg !important;
     }
 
+    .ant-picker-clear {
+      background: @zaui-contract-bg;
+    }
+
     span.@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,
@@ -419,6 +423,10 @@
       background: @zaui-contract-bg-add !important;
     }
 
+    .ant-picker-clear {
+      background: @zaui-contract-bg-add;
+    }
+
     span.@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,

package/es/ProForm/utils/useShouldUpdate.js

@@ -2,6 +2,14 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useRef, useState } from 'react';
 import { isFunction, isEqualWith, get } from 'lodash';
 import { customEqualForFun } from './index';
+/** FormList中被删除的行也会再触发一次响应式函数 排除这种场景 */
+var isDeleteLine = function isDeleteLine(form, namePath) {
+  if (namePath) {
+    var line = form.getFieldValue(namePath);
+    return line === undefined;
+  }
+  return false;
+};
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
 var useShouldUpdate = function useShouldUpdate(props) {
   var show = props.show,
@@ -64,7 +72,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
   }
   if (isFunction(disabled)) {
     // RangePicker返回数组时，特殊处理
-    if (['Group', 'RangePicker'].includes(type) && Array.isArray(disabled(values, {
+    if (['Group', 'RangePicker', 'ProCascader'].includes(type) && Array.isArray(disabled(values, {
       form: form,
       index: index,
       namePath: namePath
@@ -169,7 +177,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
         namePath: namePath
       }) : fieldProps;
       // 清值防抖  多次刷新时以最后一次为准
-      if (clearNotShow !== false && (name || names)) {
+      if (clearNotShow !== false && (name || names) && !isDeleteLine(form, namePath)) {
         // 当show为其他变为false的时候记录一次需要清值
         if (_show !== showRef.current && _show === false) {
           needClear.current = true;

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

@@ -2,6 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["id", "title", "collapse", "children"];
 import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect } from 'react';
 import { useStep } from '../../index';
 import ProCollapse from '../../../ProLayout/components/ProCollapse';
 export default (function (_ref) {
@@ -14,10 +15,18 @@ export default (function (_ref) {
   var _useStep = useStep(),
     register = _useStep.register,
     collapse = _useStep.collapse;
-  register === null || register === void 0 ? void 0 : register(_objectSpread(_objectSpread({}, restProps), {}, {
-    title: title,
-    id: id
-  }));
+  useEffect(function () {
+    // 子组件更新父组件 延迟状态更新，避免重渲染
+    var timeoutId = setTimeout(function () {
+      register === null || register === void 0 ? void 0 : register(_objectSpread(_objectSpread({}, restProps), {}, {
+        title: title,
+        id: id
+      }));
+    }, 0);
+    return function () {
+      return clearTimeout(timeoutId);
+    };
+  }, [register]);
   return _jsx("div", {
     className: "pro-step-item",
     id: id,

package/es/ProTable/components/FormatColumn/index.js

@@ -123,11 +123,13 @@ export var formatColumn = function formatColumn(_ref2) {
       var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : null;
       var originalResult = getOriginalValue(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
       var originalValue = originalResult.originalValue;
+      var _originalValue = originalValue;
       var isChanged = originalResult.isChanged,
         isAddCell = originalResult.isAddCell;
       var isInNewRowFlag = isInNewRow(record);
       var _isAddCell = isAddCell;
       otherProps.isChanged = isChanged;
+      var nextValue = value;
       // 存在比对
       if (isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender) && (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
         var _originalObj$record$r;
@@ -139,25 +141,34 @@ export var formatColumn = function formatColumn(_ref2) {
           index: index
         });
         // viewRender 返回值为 false 时，不显示对比
-        if (isBoolean(diffResult)) {
+        if (isBoolean(diffResult) && !diffResult) {
           otherProps.isChanged = false;
         }
-        originalValue = diffResult;
+        _originalValue = diffResult;
+        nextValue = otherProps.viewRender({
+          originalValue: value,
+          originalRecord: record !== null && record !== void 0 ? record : {},
+          value: value,
+          record: record,
+          index: index
+        });
       }
       // 存在自定义onDiff比对
       if (isFunction(onDiff)) {
         var _originalObj$record$r2;
         var _diffResult = onDiff({
-          originalValue: originalValue,
+          originalValue: _originalValue,
           originalRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
-          value: value,
+          value: nextValue,
           record: record,
           index: index
         });
         if (_diffResult === 'changed') {
+          _isAddCell = false;
           otherProps.isChanged = true;
         }
         if (_diffResult === 'same') {
+          _isAddCell = false;
           otherProps.isChanged = false;
         }
         if (_diffResult === 'add') {
@@ -167,7 +178,7 @@ export var formatColumn = function formatColumn(_ref2) {
       }
       return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
-        originalValue: isEmpty(originalValue) ? null : originalValue,
+        originalValue: isEmpty(_originalValue) ? null : _originalValue,
         ellipsis: ellipsis,
         width: width,
         value: _value,