@zat-design/sisyphus-react 3.7.3 → 3.8.0

package/es/ProForm/style/index.less

@@ -99,10 +99,12 @@
 
     &.pro-form-item-width-auto {
       .@{ant-prefix}-form-item-control-input {
+        width: 100%;
         flex-grow: inherit;
       }
 
       .@{ant-prefix}-form-item-control-input-content {
+        width: 100%;
         flex: initial;
       }
     }
@@ -216,7 +218,7 @@
 
     .site-input-left,
     .site-input-right {
-      width: calc(50% - 20px);
+      width: calc(50% - 16px);
     }
 
     .site-input-left {
@@ -314,16 +316,23 @@
       vertical-align: middle;
     }
   }
-  .pro-form-list-mode-block{
-    .pro-collapse-content{
-      .@{ant-prefix}-row{
+
+  .pro-form-list-mode-block {
+    .pro-collapse-content {
+      .@{ant-prefix}-row {
         width: auto;
       }
     }
   }
 
-  // 比较原始值场景下  不同时的样式
   .pro-form-item-changed {
+    border-radius: 4px;
+    background: @zaui-contract-bg !important;
+
+    .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
+      background: @zaui-contract-bg !important;
+    }
+
     span.@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,
@@ -367,10 +376,99 @@
       }
     }
 
+    // checkbox
+    .@{ant-prefix}-checkbox-group {
+      padding: 5px 0
+    }
+    // switch
+    &:has(.@{ant-prefix}-switch) {
+      padding: 5px 0;
+    }
+    
+    // textArea
+    .@{ant-prefix}-input-textarea > textarea  {
+      background: @zaui-contract-bg;
+    }
+
     .pro-form-view-container {
       padding: 4px 8px;
       background: @zaui-contract-bg;
       border-radius: 4px;
     }
   }
+
+
+  // 比较原始值场景下  不同时的样式
+  .pro-form-item-add {
+    border-radius: 4px;
+    background: @zaui-contract-bg-add !important;
+
+    .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
+      background: @zaui-contract-bg-add !important;
+    }
+
+    span.@{ant-prefix}-input-affix-wrapper,
+    .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+    .@{ant-prefix}-picker,
+    .@{ant-prefix}-input-number {
+      background: @zaui-contract-bg-add !important;
+
+      input {
+        background: transparent !important;
+      }
+      .@{ant-prefix}-select-selection-placeholder {
+        z-index: 9;
+      }
+    }
+
+    .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
+    .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
+      background: @zaui-contract-bg-add;
+      border-radius: 4px;
+    }
+
+    // 地址组件
+    .@{ant-prefix}-form-item-control-input-content {
+      // 查看模式
+      & > span {
+        border-radius: 4px;
+        padding: 5px 8px;
+        background: @zaui-contract-bg-add;
+      }
+
+      & > .pro-address {
+        .@{ant-prefix}-select-selector,
+        .@{ant-prefix}-input-affix-wrapper,
+        .@{ant-prefix}-input-disabled {
+          background: @zaui-contract-bg-add;
+        }
+      }
+      & > .@{ant-prefix}-input-group {
+        .forever-checkbox {
+          background: @zaui-contract-bg-add;
+        }
+      }
+    }
+
+    // checkbox
+    .@{ant-prefix}-checkbox-group {
+      padding: 5px 0
+    }
+    // switch
+    &:has(.@{ant-prefix}-switch) {
+      padding: 5px 0;
+    }
+    
+    // textArea
+    .@{ant-prefix}-input-textarea > textarea {
+      background: @zaui-contract-bg-add;
+    }
+
+
+    .pro-form-view-container {
+      padding: 4px 8px;
+      background: @zaui-contract-bg-add;
+      border-radius: 4px;
+    }
+  }
 }

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

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

package/es/ProForm/utils/diffOriginal.js

@@ -1,4 +1,5 @@
 import { isEqual, isFunction } from 'lodash';
+import { isEmpty } from '../../utils';
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
 export var diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
@@ -6,19 +7,29 @@ export var diffOriginal = function diffOriginal(params) {
     equalWith = params.equalWith;
   // 支持传入自定义比较事件
   if (isFunction(equalWith)) {
-    return !equalWith(originalValue, value);
+    var diffRes = equalWith(originalValue, value);
+    if (diffRes === undefined) return 'same';
+    if (typeof diffRes === 'boolean') {
+      return diffRes ? 'same' : 'changed';
+    }
+    return diffRes;
+  }
+  // 如果原始值为空 且当前有值的话 认为变更类型是新增
+  if (isEmpty(originalValue) && !isEmpty(value)) {
+    return 'add';
   }
   if (Array.isArray(originalValue)) {
-    return originalValue.some(function (valueItem, index) {
+    var isSame = originalValue.every(function (valueItem, index) {
       // 如果两个值有一个不是空值, 则进行深比较
-      if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
-        return !isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
+      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 false;
+      return true;
     });
+    return isSame ? 'same' : 'changed';
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !isEqual(value, originalValue);
+    return isEqual(value, originalValue) ? 'same' : 'changed';
   }
-  return false;
+  return 'same';
 };

package/es/ProForm/utils/transformValue.js

@@ -1,8 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value"];
 import { set } from 'lodash';
 import { diffField } from '../utils';
+import { isEmpty } from '../../utils';
 export var transformValue = function transformValue(names, form, fieldName, _normalize, _getValueProps) {
   return {
     normalize: function normalize(value) {
@@ -22,23 +21,30 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       return _value;
     },
     getValueProps: function getValueProps(value) {
+      var _curValue;
       var _value = [];
       names.forEach(function (name, index) {
         var value = form.getFieldValue(name);
         _value[index] = value;
       });
       // 支持外部传入转换函数
-      var _ref = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
-          value: _value
-        },
-        cusValue = _ref.value,
-        cusRest = _objectWithoutProperties(_ref, _excluded);
+      var res = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
+        value: _value
+      };
+      // 如果数组中值都为空, 则值置为空
+      var curValue = res === null || res === void 0 ? void 0 : res.value;
       // @ts-ignore
-      set(form.getFieldsValue(true), fieldName, cusValue);
+      if ((_curValue = curValue) === null || _curValue === void 0 ? void 0 : _curValue.every(function (item) {
+        return isEmpty(item);
+      })) {
+        curValue = undefined;
+      }
+      // @ts-ignore
+      set(form.getFieldsValue(true), fieldName, curValue);
       // 如果表单里的值和组合得到的值不全等  更新表单里的值、
-      return _objectSpread({
-        value: cusValue
-      }, cusRest);
+      return _objectSpread(_objectSpread({}, res), {}, {
+        value: curValue
+      });
     },
     shouldUpdate: function shouldUpdate(prevValues, curValues) {
       return diffField(prevValues, curValues, names);

package/es/ProSelect/index.js

@@ -9,7 +9,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import React, { useImperativeHandle, useState, forwardRef } from 'react';
@@ -53,10 +53,11 @@ export var ProSelect = function ProSelect(props, ref) {
     onChange = props.onChange,
     updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
+    getValueProps = props.getValueProps,
     isViewPro = props.isView,
     selectProps = _objectWithoutProperties(props, _excluded);
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
-  var value = props.value;
+  var value = getValueProps && props.value ? getValueProps(props.value) : props.value;
   var _ref2 = ProForm.useFieldProps() || {},
     isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
@@ -216,6 +217,7 @@ export var ProSelect = function ProSelect(props, ref) {
     return props.children;
   };
   var handleChange = function handleChange(value, option) {
+    var getChangeValue = selectProps.getChangeValue;
     if (selectProps.mode && selectProps.mode === 'multiple') {
       if (Array.isArray(option)) {
         option.forEach(function (item) {
@@ -225,14 +227,14 @@ export var ProSelect = function ProSelect(props, ref) {
         });
       }
       if (labelInValue) {
-        onChange === null || onChange === void 0 ? void 0 : onChange(getValueObject(value), option);
+        onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
       } else {
-        onChange === null || onChange === void 0 ? void 0 : onChange(value, option);
+        onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option);
       }
     } else if (!selectProps.mode && labelInValue) {
-      onChange(getValueObject(value), option);
+      onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
     } else {
-      onChange === null || onChange === void 0 ? void 0 : onChange(value, option === null || option === void 0 ? void 0 : option.record);
+      onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option === null || option === void 0 ? void 0 : option.record);
     }
   };
   /**
@@ -278,7 +280,7 @@ export var ProSelect = function ProSelect(props, ref) {
   if ((otherProps === null || otherProps === void 0 ? void 0 : otherProps.listName) && filterInList) {
     newSelectList = getSelectList({
       otherProps: otherProps,
-      value: props.value,
+      value: value,
       dataSource: selectList,
       labelInValue: labelInValue,
       fieldNames: fieldNames,
@@ -294,8 +296,8 @@ export var ProSelect = function ProSelect(props, ref) {
       showArrow: true,
       loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
       onChange: handleChange,
-      optionLabelProp: "children" // 解决warning报错，添加默认值
-      ,
+      optionLabelProp: (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isDiffChange) ? 'label' : 'children',
+      // optionLabelProp="label" // 解决warning报错，添加默认值
       showSearch: true,
       filterOption: isFunction(_onSearch) ? false : function (input, option) {
         var _option$children, _option$children$prop;
@@ -312,16 +314,15 @@ export var ProSelect = function ProSelect(props, ref) {
       value: transformValue(),
       children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
         return _jsx(Option, {
+          label: item[label],
           value: item[code],
           record: item,
           disabled: !!item.disabled,
           children: _jsx(TooltipOption, {
             title: OptionRender ? OptionRender(item) : selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
             children: OptionRender ? _jsx("span", {
-              title: OptionRender(item),
               children: OptionRender(item)
             }) : _jsx("span", {
-              title: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
               children: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label]
             })
           }, item[code])

package/es/ProSelect/propsType.d.ts

@@ -46,6 +46,10 @@ export interface PropSelectProps extends Omit<SelectProps, 'onSearch'> {
     onSearch?: (value: string, useRequest: Result<any, any>) => void;
     /** 自定义展示 */
     optionRender?: (value: DataOption) => string | ReactNode;
+    /** 用来转换修改value值 和 getValueProps配合使用  */
+    getChangeValue?: (value: DataOption) => any;
+    /** 用来转换传入的value值 getChangeValue配合使用 */
+    getValueProps?: (value: DataOption) => any;
 }
 export interface ProSelectAction {
     /** 实例方法、根据 code ｜ code[] 批量获取数据 */

package/es/ProSelect/utils/index.js

@@ -30,7 +30,7 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
       _iterator.f();
     }
     if (mode === 'multiple') {
-      selectValues = [].concat(_toConsumableArray(selectValues), _toConsumableArray(result));
+      selectValues = [].concat(_toConsumableArray(selectValues), _toConsumableArray(result || []));
     } else {
       selectValues.push(result);
     }
@@ -53,13 +53,14 @@ export var getSelectList = function getSelectList(_ref2) {
   if (!otherProps) {
     return null;
   }
-  var listName = otherProps.listName,
+  var name = otherProps.name,
+    listName = otherProps.listName,
     form = otherProps.form;
   var firstNumberIndex = listName.lastIndexOf(listName.findLast(function (item) {
     return typeof item === 'number';
   }));
-  var fatherName = listName.slice(0, firstNumberIndex);
-  var selectName = listName.slice(firstNumberIndex + 1);
+  var fatherName = (name || listName).slice(0, firstNumberIndex);
+  var selectName = (name || listName).slice(firstNumberIndex + 1);
   return findSelectNameValues({
     list: form.getFieldValue(fatherName) || [],
     selectName: selectName,

package/es/ProStep/components/Listener/index.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const _default: ({ children, delayTime, ...props }: any) => React.DetailedReactHTMLElement<any, HTMLElement>;
+declare const _default: ({ children, delayTime, excludes, ...props }: any) => React.DetailedReactHTMLElement<any, HTMLElement>;
 export default _default;

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

@@ -2,13 +2,14 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["children", "delayTime"];
+var _excluded = ["children", "delayTime", "excludes"];
 import { throttle } from 'lodash';
 import React from 'react';
 import { useStep } from '../../index';
 export default (function (_ref) {
   var children = _ref.children,
     delayTime = _ref.delayTime,
+    excludes = _ref.excludes,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useStep = useStep(),
     notify = _useStep.notify;
@@ -20,7 +21,9 @@ export default (function (_ref) {
           case 0:
             localStorage.setItem('cache-pro-step', '');
             _context.next = 3;
-            return notify === null || notify === void 0 ? void 0 : notify();
+            return notify === null || notify === void 0 ? void 0 : notify({
+              excludes: excludes
+            });
           case 3:
             values = _context.sent;
             setTimeout(function () {

package/es/ProStep/index.d.ts

@@ -7,6 +7,6 @@ declare const ProStep: {
     ({ children, ...resetProps }: ProStepPropsType): import("react/jsx-runtime").JSX.Element;
     useStep: () => any;
     Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) => import("react/jsx-runtime").JSX.Element;
-    Listener: ({ children, delayTime, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
+    Listener: ({ children, delayTime, excludes, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
 };
 export default ProStep;

package/es/ProStep/index.js

@@ -128,47 +128,54 @@ var ProStep = function ProStep(_ref) {
     registerMap.current[id] = record;
   };
   var notify = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var events, res, nextErrorCollection;
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+      var _ref7, excludes, triggerIds, events, res, nextErrorCollection;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            events = Object.values(registerMap.current).map(function (item) {
-              var _item$subEvent;
-              return item === null || item === void 0 ? void 0 : (_item$subEvent = item.subEvent) === null || _item$subEvent === void 0 ? void 0 : _item$subEvent.call(item);
+            _ref7 = params || {}, excludes = _ref7.excludes;
+            triggerIds = Object.keys(registerMap.current); // 排除指定模块不触发校验
+            if (excludes === null || excludes === void 0 ? void 0 : excludes.length) {
+              triggerIds = triggerIds.filter(function (id) {
+                return !excludes.includes(id);
+              });
+            }
+            events = triggerIds.map(function (id) {
+              var _registerMap$current$, _registerMap$current$2;
+              return (_registerMap$current$ = registerMap.current[id]) === null || _registerMap$current$ === void 0 ? void 0 : (_registerMap$current$2 = _registerMap$current$.subEvent) === null || _registerMap$current$2 === void 0 ? void 0 : _registerMap$current$2.call(_registerMap$current$);
             });
-            _context2.next = 3;
+            _context2.next = 6;
             return Promise.all(events);
-          case 3:
+          case 6:
             res = _context2.sent;
             nextErrorCollection = {};
-            Object.keys(registerMap.current).forEach(function (id, index) {
-              var _ref7 = (res === null || res === void 0 ? void 0 : res[index]) || {},
-                errorFields = _ref7.errorFields;
+            triggerIds.forEach(function (id, index) {
+              var _ref8 = (res === null || res === void 0 ? void 0 : res[index]) || {},
+                errorFields = _ref8.errorFields;
               nextErrorCollection[id] = (errorFields === null || errorFields === void 0 ? void 0 : errorFields.length) || 0;
             });
             setErrorCollection(nextErrorCollection);
             return _context2.abrupt("return", res);
-          case 8:
+          case 11:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
-    return function notify() {
+    return function notify(_x) {
       return _ref6.apply(this, arguments);
     };
   }();
   var triggerTo = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys) {
       var events, result, nextErrorCollection;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             events = [];
             keys === null || keys === void 0 ? void 0 : keys.forEach(function (key) {
-              var _registerMap$current, _registerMap$current$, _registerMap$current$2;
-              events.push(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current = registerMap.current) === null || _registerMap$current === void 0 ? void 0 : (_registerMap$current$ = _registerMap$current[key]) === null || _registerMap$current$ === void 0 ? void 0 : (_registerMap$current$2 = _registerMap$current$.subEvent) === null || _registerMap$current$2 === void 0 ? void 0 : _registerMap$current$2.call(_registerMap$current$));
+              var _registerMap$current, _registerMap$current$3, _registerMap$current$4;
+              events.push(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current = registerMap.current) === null || _registerMap$current === void 0 ? void 0 : (_registerMap$current$3 = _registerMap$current[key]) === null || _registerMap$current$3 === void 0 ? void 0 : (_registerMap$current$4 = _registerMap$current$3.subEvent) === null || _registerMap$current$4 === void 0 ? void 0 : _registerMap$current$4.call(_registerMap$current$3));
             });
             _context3.next = 4;
             return Promise.all(events);
@@ -190,8 +197,8 @@ var ProStep = function ProStep(_ref) {
         }
       }, _callee3);
     }));
-    return function triggerTo(_x) {
-      return _ref8.apply(this, arguments);
+    return function triggerTo(_x2) {
+      return _ref9.apply(this, arguments);
     };
   }();
   useDeepCompareEffect(function () {

package/es/ProTable/components/FormatColumn/index.d.ts

@@ -1,6 +1,12 @@
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: (column: ProTableColumn, originalObj: any, dataSourceObj: any, rowKey: any) => void;
+export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, }: {
+    column: ProTableColumn;
+    originalObj: any;
+    dataSourceObj: any;
+    rowKey: any;
+    diffToolTip?: boolean;
+}) => void;
 /**
  * 查找最近的父级className
  * @param element 当前node节点

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

@@ -11,7 +11,12 @@ import RenderColumn from '../RenderColumn';
 import { getDecimalDigits, getOriginalValue } from '../../utils';
 import getEnumLabel from '../../../ProEnum/utils/getEnumLabel';
 import ProForm from '../../../ProForm';
-export var formatColumn = function formatColumn(column, originalObj, dataSourceObj, rowKey) {
+export var formatColumn = function formatColumn(_ref) {
+  var column = _ref.column,
+    originalObj = _ref.originalObj,
+    dataSourceObj = _ref.dataSourceObj,
+    rowKey = _ref.rowKey,
+    diffToolTip = _ref.diffToolTip;
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -31,6 +36,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
     originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps;
+  var _originalDiffTip = diffToolTip !== null && diffToolTip !== void 0 ? diffToolTip : originalDiffTip;
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
     if (!prefix) {
@@ -98,7 +104,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };
@@ -128,7 +134,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };
@@ -181,7 +187,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };
@@ -219,7 +225,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };
@@ -246,7 +252,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };
@@ -323,7 +329,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
           node: value,
           value: value,
           currentValue: value || '-',
-          originalDiffTip: originalDiffTip,
+          originalDiffTip: _originalDiffTip,
           toolTipProps: toolTipProps
         }), suffixNode(value, record, index)]
       });
@@ -346,7 +352,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: value || '-',
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };