@zat-design/sisyphus-react 3.8.3-beta.1 → 3.8.3-beta.10

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

@@ -50,7 +50,7 @@ var getViewLabel = function getViewLabel(_ref) {
   return viewLabel;
 };
 var ProCascader = function ProCascader(props) {
-  var _props$otherProps, _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+  var _props$otherProps, _value$slice, _ref5, _ref5$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProAddressBar') || {},
     configDetailMaxLength = _ref2.detailMaxLength,
     configEnumCode = _ref2.enumCode,
@@ -90,16 +90,18 @@ var ProCascader = function ProCascader(props) {
   var realLevel = Math.max(2, level);
   var detail = value === null || value === void 0 ? void 0 : value[realLevel];
   var enumData = (0, _useEnum.default)(addressCode);
-  var _ref4 = Array.isArray(enumData) ? enumData : [],
-    _ref5 = (0, _slicedToArray2.default)(_ref4, 1),
-    _ref5$ = _ref5[0],
-    enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
+  var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProEnum'),
+    _useProConfig$dics = _useProConfig.dics,
+    dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
+  var enumDataSource = (0, _react.useMemo)(function () {
+    if (!(props === null || props === void 0 ? void 0 : props.mode)) {
+      return (dics === null || dics === void 0 ? void 0 : dics[addressCode]) || [];
+    }
+    return Array.isArray(enumData) ? enumData[0] : [];
+  }, [dics === null || dics === void 0 ? void 0 : dics[addressCode], enumData]);
   var realDataSource = (0, _react.useMemo)(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
     var result = (0, _index.transformDataName)(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
-    if (transformResponse) {
-      return transformResponse(result);
-    }
     return result;
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = (0, _objectSpread3.default)({}, useRequest),
@@ -115,7 +117,7 @@ var ProCascader = function ProCascader(props) {
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
   var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _yield$service, data, newData, transFormData, serviceData;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -143,9 +145,13 @@ var ProCascader = function ProCascader(props) {
       }, _callee);
     }));
     return function getFirstLevelOptions() {
-      return _ref6.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
+  // 提取出来默认每次都执行
+  if (transformResponse) {
+    realDataSource = transformResponse(realDataSource);
+  }
   (0, _react.useEffect)(function () {
     if (service) {
       // 传入useRequest时，初次加载级联第一级数据源
@@ -154,13 +160,14 @@ var ProCascader = function ProCascader(props) {
   }, [service]);
   (0, _react.useEffect)(function () {
     if (realIsView && value) {
+      var _realDataSource;
       // 传入dataSource + 查看时初始化展示
       if (service) {
         setDefaultLabel(getViewLabel({
           dataSource: serviceData,
           value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
         }));
-      } else if ((realDataSource === null || realDataSource === void 0 ? void 0 : realDataSource.length) > 0) {
+      } else if (((_realDataSource = realDataSource) === null || _realDataSource === void 0 ? void 0 : _realDataSource.length) > 0) {
         setDefaultLabel(getViewLabel({
           dataSource: realDataSource,
           value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
@@ -194,9 +201,9 @@ var ProCascader = function ProCascader(props) {
   var addressValue = isAddressMode ? value && ((_value$slice = value.slice(0, realLevel)) === null || _value$slice === void 0 ? void 0 : _value$slice.some(function (item) {
     return !!item;
   })) ? value.slice(0, realLevel) : undefined : value;
-  var viewValue = isAddressMode ? ((_ref7 = [].concat((0, _toConsumableArray2.default)(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref7 === void 0 ? void 0 : (_ref7$filter = _ref7.filter(function (item) {
+  var viewValue = isAddressMode ? ((_ref5 = [].concat((0, _toConsumableArray2.default)(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref5 === void 0 ? void 0 : (_ref5$filter = _ref5.filter(function (item) {
     return !!item;
-  })) === null || _ref7$filter === void 0 ? void 0 : _ref7$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
+  })) === 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) {

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

@@ -190,11 +190,25 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         value: item[valueKey],
         label: item[labelKey]
       }));
-    })) === null || _data$map === void 0 ? void 0 : _data$map.join('，') : undefined;
+    })) === null || _data$map === void 0 ? void 0 : _data$map.join('，') : '';
   };
   var viewText = (0, _react.useMemo)(function () {
-    return formatValue(labelInValue ? value : _value);
-  }, [value, _value]);
+    var nextValue = labelInValue ? value : _value;
+    if (labelInValue) {
+      nextValue = value;
+    } else {
+      var _options$find;
+      var optionDTO = options === null || options === void 0 ? void 0 : (_options$find = options.find) === null || _options$find === void 0 ? void 0 : _options$find.call(options, function (item) {
+        return item[valueKey] === value;
+      });
+      if (optionDTO) {
+        nextValue = optionDTO;
+      } else {
+        nextValue = _value;
+      }
+    }
+    return formatValue(nextValue);
+  }, [value, _value, options]);
   /**
    * 获取表格的rowKey，支持函数、字符串
    * @date 2023-02-16

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

@@ -17,7 +17,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"];
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
 var ChangedWrapper = function ChangedWrapper(props) {
   var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
@@ -32,6 +32,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     normalize = props.normalize,
     getValueProps = props.getValueProps,
+    viewRender = props.viewRender,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
@@ -57,9 +58,20 @@ var ChangedWrapper = function ChangedWrapper(props) {
   }, [isWatch, noChange, props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
+  var viewRenderFun = (0, _react.useMemo)(function () {
+    var record = form.getFieldsValue();
+    return function (orgValue) {
+      return viewRender(orgValue, record, {
+        form: form
+      });
+    };
+  }, [form]);
   var tipContent = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return undefined;
-    var valueProps = getValueProps ? getValueProps(originalValue) : originalValue;
+    var valueProps = getValueProps && !names ? getValueProps(originalValue) : {
+      value: originalValue
+    };
+    if (viewRender) return viewRenderFun(valueProps === null || valueProps === void 0 ? void 0 : valueProps.value);
     return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), {}, (0, _defineProperty2.default)({
       isView: true
     }, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;

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

@@ -50,7 +50,8 @@ var Render = function Render(props) {
     requiredOnView = props.requiredOnView,
     confirm = props.confirm,
     globalControl = props.globalControl,
-    diffConfig = props.diffConfig;
+    diffConfig = props.diffConfig,
+    viewRender = props.viewRender;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -439,6 +440,7 @@ var Render = function Render(props) {
         valuePropName: _otherFormItemProps.valuePropName,
         normalize: _otherFormItemProps.normalize,
         getValueProps: _otherFormItemProps.getValueProps,
+        viewRender: viewRender,
         children: child
       });
     }

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

@@ -194,7 +194,8 @@ var RenderFields = function RenderFields(props) {
       namePath: column.namePath,
       listName: column.listName,
       globalControl: globalControl,
-      formDisabled: formDisabled
+      formDisabled: formDisabled,
+      diffConfig: diffConfig
     };
     return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
       value: otherProps,
@@ -217,7 +218,8 @@ var RenderFields = function RenderFields(props) {
         diffConfig: diffConfig,
         equalWith: equalWith,
         requiredOnView: requiredOnView,
-        globalControl: globalControl
+        globalControl: globalControl,
+        viewRender: viewRender
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });

package/lib/ProForm/propsType.d.ts

@@ -45,6 +45,7 @@ export interface ProFormOtherProps {
     globalControl?: boolean;
     formDisabled?: boolean;
     isDiffChange?: boolean;
+    diffConfig?: DiffConfigProps;
 }
 export interface DiffConfigProps<Values = any> {
     /** 比对原始数据源 */

package/lib/ProForm/style/index.less

@@ -329,6 +329,9 @@
     border-radius: 4px;
     background: @zaui-contract-bg !important;
 
+    .@{ant-prefix}-input {
+      background: @zaui-contract-bg !important;
+    }
     .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
       background: @zaui-contract-bg !important;
     }
@@ -403,6 +406,10 @@
     border-radius: 4px;
     background: @zaui-contract-bg-add !important;
 
+    .@{ant-prefix}-input {
+      background: @zaui-contract-bg !important;
+    }
+    
     .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
       background: @zaui-contract-bg-add !important;
     }

package/lib/ProForm/utils/diffOriginal.js

@@ -6,6 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.diffOriginal = void 0;
 var _lodash = require("lodash");
 var _utils = require("../../utils");
+// 过滤对象中undefined字段
+// 防止{a: '1'} {a: '1', b: undefined}被认为不相等
+var filterUndefined = function filterUndefined(data) {
+  if (!(0, _lodash.isObject)(data) || Array.isArray(data) || data === null) return data;
+  var resData = {};
+  Object.keys(data).forEach(function (key) {
+    if (data[key] !== undefined) {
+      resData[key] = data[key];
+    }
+  });
+  return resData;
+};
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
 var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
@@ -35,7 +47,7 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
     return isSame ? 'same' : 'changed';
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return (0, _lodash.isEqual)(value, originalValue) ? 'same' : 'changed';
+    return (0, _lodash.isEqual)(filterUndefined(value), filterUndefined(originalValue)) ? 'same' : 'changed';
   }
   return 'same';
 };

package/lib/ProForm/utils/useShouldUpdate.js

@@ -170,9 +170,6 @@ var useShouldUpdate = function useShouldUpdate(props) {
         index: index,
         namePath: namePath
       }) : rules;
-      // const _component = isFunction(originComponent)
-      //   ? originComponent(_currentValues, { form, index, namePath })
-      //   : newComponent;
       var _fieldProps = (0, _lodash.isFunction)(fieldProps) ? fieldProps(_currentValues, {
         form: form,
         index: index,
@@ -203,17 +200,12 @@ var useShouldUpdate = function useShouldUpdate(props) {
       }
       var equalRes = (0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun);
       var proEqualRes = (0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun);
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes
-      // 值变更，需要同步更新函数式的fieldProps
-      // (isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) && !isEqual(prevValues, currentValues)) ||
-      // !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||
-      // equalDependencies(dependencies, prevValues, _currentValues)
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes || (_fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.transformResponse) // 防止fieldProps变更时，transformResponse根据fieldProps新值无法触发更新
       ) {
         showRef.current = _show;
         disabledRef.current = _disabled;
         requiredRef.current = _required;
         rulesRef.current = _rules;
-        // originComponentRef.current = _component;
         fieldPropsRef.current = _fieldProps;
         reRender({});
         return false;

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, }: {
+export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, }: {
     column: ProTableColumn;
     originalObj: any;
     dataSourceObj: any;
@@ -9,6 +9,7 @@ export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey
     wrapToolTipProps?: any;
     scroll?: any;
     onUpdateMinWidth?: any;
+    isInNewRow?: any;
 }) => void;
 /**
  * 查找最近的父级className

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

@@ -57,7 +57,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     diffToolTip = _ref2.diffToolTip,
     wrapToolTipProps = _ref2.wrapToolTipProps,
     scroll = _ref2.scroll,
-    onUpdateMinWidth = _ref2.onUpdateMinWidth;
+    onUpdateMinWidth = _ref2.onUpdateMinWidth,
+    isInNewRow = _ref2.isInNewRow;
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -77,7 +78,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
-    minWidth = column.minWidth;
+    minWidth = column.minWidth,
+    onDiff = column.onDiff;
   // 仅在 {x: 'max-content', y: 300 } 且 column无指定 width minWidth 情况下 才开启 minWidth的自动计算
   var isMaxContentOverFlow = (0, _lodash.isObject)(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
   calcMinWidth({
@@ -114,7 +116,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     }
   };
   if (column === null || column === void 0 ? void 0 : column.render) {
-    if (!originalObj && Object.keys(originalObj !== null && originalObj !== void 0 ? originalObj : {}).length === 0) {
+    if (!originalObj && Object.keys(originalObj !== null && originalObj !== void 0 ? originalObj : {}).length === 0 && !onDiff) {
       return;
     }
     var originalRender = column.render; // 保存原始的 render 方法
@@ -122,12 +124,23 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     column.render = function (value, record, index) {
       var _originalObj$record$r;
       var isFn = (0, _lodash.isFunction)(originalRender);
-      var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : undefined;
+      var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : null;
       var originalValue = (0, _utils2.getOriginalValue)(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
-      var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {}, index) : undefined;
+      var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {}, index) : null;
+      var isInNewRowFlag = isInNewRow(record);
+      // 把比对结果告诉我
+      if (onDiff) {
+        var isDiff = onDiff({
+          value: record,
+          originValue: originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]
+        });
+        if (!isDiff) {
+          originalValue = null;
+        }
+      }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
-        originalValue: originalValue === undefined ? undefined : originalRenderValue,
+        originalValue: !originalValue && originalValue !== 0 ? null : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         value: _value,
@@ -135,7 +148,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: _value,
         originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
-        minWidth: minWidth
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
     return;
@@ -177,6 +191,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -187,7 +202,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
-        minWidth: minWidth
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -213,6 +229,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           children: "-"
         });
       }
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -223,7 +240,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
-        minWidth: minWidth
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -272,6 +290,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           children: "-"
         });
       }
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -282,7 +301,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
-        minWidth: minWidth
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -311,6 +331,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -321,7 +342,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
-        minWidth: minWidth
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   } else if (precision || prefix || suffix) {
@@ -344,6 +366,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           children: "-"
         });
       }
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -354,7 +377,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
-        minWidth: minWidth
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   } else if (valueType === 'address') {
@@ -390,21 +414,32 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         code: code,
         value: originalRealValue
       });
-      return (0, _jsxRuntime.jsx)(_ProForm.default.ProCascader, {
+      var renderNode = (0, _jsxRuntime.jsx)(_ProForm.default.ProCascader, {
         className: className,
         isView: true,
         mode: "address",
         code: code,
         value: realValue,
-        tooltip: originalValue !== undefined ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-          children: ["\u521D\u59CB\u503C\uFF1A", originalRenderValue, (0, _jsxRuntime.jsx)("br", {}), ellipsis ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-            children: ["\u5F53\u524D\u503C\uFF1A", renderValue]
-          }) : undefined]
-        }) : ellipsis
+        tooltip: false
+      });
+      var isInNewRowFlag = isInNewRow(record);
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+        valueType: valueType,
+        originalValue: originalRealValue === undefined ? undefined : originalRenderValue,
+        ellipsis: ellipsis !== null && ellipsis !== void 0 ? ellipsis : true,
+        width: width,
+        node: renderNode,
+        value: renderValue,
+        currentValue: renderValue,
+        originalDiffTip: _originalDiffTip,
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   } else if (copyable) {
     column.render = function (value, record, index) {
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, {
@@ -416,7 +451,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           value: value,
           currentValue: value,
           toolTipProps: _toolTipProps,
-          minWidth: minWidth
+          minWidth: minWidth,
+          isInNewRowFlag: isInNewRowFlag
         }), suffixNode(value, record, index)]
       });
     };
@@ -431,6 +467,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           children: "-"
         });
       }
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, {
@@ -443,7 +480,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           currentValue: value || '-',
           originalDiffTip: _originalDiffTip,
           toolTipProps: _toolTipProps,
-          minWidth: minWidth
+          minWidth: minWidth,
+          isInNewRowFlag: isInNewRowFlag
         }), suffixNode(value, record, index)]
       });
     };
@@ -462,6 +500,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           children: "-"
         });
       }
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalValue || '-',
@@ -472,7 +511,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: value || '-',
         originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
-        minWidth: minWidth
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   }

package/lib/ProTable/components/RenderColumn/index.d.ts

@@ -12,6 +12,7 @@ interface Props {
     originalValue?: any;
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     minWidth?: number;
+    isInNewRowFlag?: boolean;
 }
 declare const RenderColumn: FC<Props>;
 export default RenderColumn;

package/lib/ProTable/components/RenderColumn/index.js

@@ -28,14 +28,15 @@ var RenderColumn = function RenderColumn(props) {
     originalDiffTip = props.originalDiffTip,
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
-    minWidth = props.minWidth;
+    minWidth = props.minWidth,
+    isInNewRowFlag = props.isInNewRowFlag;
   var _useSetState = (0, _ahooks.useSetState)({
       tooltip: false
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
-  if (originalValue !== undefined) {
+  if ((originalValue || originalValue === 0) && !isInNewRowFlag) {
     var renderNode = value ? node : '-';
     if (ellipsis || originalDiffTip) {
       if (ellipsis) {
@@ -57,7 +58,9 @@ var RenderColumn = function RenderColumn(props) {
           minWidth: minWidth
         },
         title: originalDiffTip ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-          children: ["\u521D\u59CB\u503C\uFF1A", originalValue, (0, _jsxRuntime.jsx)("br", {}), ellipsis ? "\u5F53\u524D\u503C\uFF1A".concat(currentValue) : undefined]
+          children: ["\u521D\u59CB\u503C\uFF1A", originalValue, (0, _jsxRuntime.jsx)("br", {}), ellipsis ? (0, _jsxRuntime.jsxs)("span", {
+            children: ["\u5F53\u524D\u503C\uFF1A", currentValue]
+          }) : null]
         }) : node,
         getPopupContainer: function getPopupContainer(triggerNode) {
           return triggerNode.parentNode;

package/lib/ProTable/index.js

@@ -190,6 +190,11 @@ function ProTable(props) {
       setCurColumns(nextColumns);
     };
   };
+  var _rowClassName = function _rowClassName(record, index) {
+    if (originalDataSource && !originalObj.hasOwnProperty((0, _lodash.get)(record, 'rowKey'))) {
+      return 'new-cell';
+    }
+  };
   var columns = (0, _react.useMemo)(function () {
     var newColumns = curColumns.map(function (item, index) {
       var _propsColumnObj$getCo2;
@@ -222,11 +227,12 @@ function ProTable(props) {
         scroll: _scroll,
         onUpdateMinWidth: function onUpdateMinWidth(w) {
           curColumns[index].minWidth = w;
-        }
+        },
+        isInNewRow: _rowClassName
       });
     });
     return newColumns;
-  }, [curColumns, handleResize, _scroll]);
+  }, [curColumns, handleResize, _scroll, originalDataSource, originalObj, _rowClassName]);
   var _columns = (0, _react.useMemo)(function () {
     return columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {
       var show = item.show;
@@ -375,11 +381,6 @@ function ProTable(props) {
       return _ref7.apply(this, arguments);
     };
   }();
-  var _rowClassName = function _rowClassName(record, index) {
-    if (originalDataSource && !originalObj.hasOwnProperty((0, _lodash.get)(record, 'rowKey'))) {
-      return 'new-cell';
-    }
-  };
   var TableComponent = draggable ? _RcTable.DraggableTable : _RcTable.BaseTable;
   // 标记样式
   var tagStyle = {

package/lib/ProTable/propsType.d.ts

@@ -41,6 +41,10 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     transform?: (value: any, record?: any) => string[];
     show?: boolean | (() => boolean);
+    onDiff?: ({ value, originValue }: {
+        value: any;
+        originValue: any;
+    }) => boolean;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/lib/ProTable/style/index.less

@@ -272,8 +272,22 @@
     .@{ant-prefix}-table-cell .varied-cell {
       margin-left: -8px;
       padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
+
       background: var(--zaui-contract-bg; #fffaa1) !important;
       border-radius: var(--zaui-border-radius, 8px);
+      .pro-form-view-container {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+    }
+
+    .@{ant-prefix}-table-cell .@{ant-prefix}-typography-ellipsis {
+      .pro-form-view-container {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
     }
 
     .varied-cell.empty-cell {

package/package.json

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