@zat-design/sisyphus-react 3.9.1-beta.9 → 3.9.2-beta.1

package/es/ProTable/style/index.less

@@ -277,16 +277,29 @@
       }
     }
 
-    .@{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 {
+      .varied-cell {
+        margin-left: -8px;
+        padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
+  
+        background-color: 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;
+        }
+      }
+      .add-cell{
+        margin-left: -8px;
+        padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
+        background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
+        border-radius: var(--zaui-border-radius, 8px);
+        .pro-form-view-container {
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
       }
     }
 

package/es/ProTable/utils/index.d.ts

@@ -12,9 +12,11 @@ export declare const getDecimalDigits: (num?: number) => number;
  * @param any originalObj
  * @param {any} dataIndex
  * @return {any} isChanged 返回bool值，表示存在比对
+ * @return {any} isAddCell 返回bool值，表示存在比对
  */
 export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => {
     originalValue: any;
+    isAddCell: boolean;
     isChanged: boolean;
 };
 export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;

package/es/ProTable/utils/index.js

@@ -1,4 +1,6 @@
 import { get, isEqual } from 'lodash';
+import { validate } from '@zat-design/utils';
+var isEmpty = validate.isEmpty;
 /**
  * 获取小数点后的位数
  * @param num 数字
@@ -17,25 +19,36 @@ export var getDecimalDigits = function getDecimalDigits() {
  * @param any originalObj
  * @param {any} dataIndex
  * @return {any} isChanged 返回bool值，表示存在比对
+ * @return {any} isAddCell 返回bool值，表示存在比对
  */
 export var getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
   if (!originalObj) {
     return {
       originalValue: null,
-      isChanged: null
+      isChanged: null,
+      isAddCell: null
     };
   }
   var originalRecord = get(originalObj, get(record, rowKey));
   var originalValue = get(originalRecord, dataIndex);
+  if (isEmpty(originalValue) && !isEmpty(value)) {
+    return {
+      originalValue: originalValue,
+      isAddCell: true,
+      isChanged: false
+    };
+  }
   if (!isEqual(originalValue, value)) {
     return {
       originalValue: originalValue,
-      isChanged: true
+      isChanged: true,
+      isAddCell: false
     };
   }
   return {
     originalValue: null,
-    isChanged: false
+    isChanged: false,
+    isAddCell: false
   };
 };
 export var getColumnDataIndex = function getColumnDataIndex(dataIndex) {

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

@@ -123,7 +123,8 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
   var diffType = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return 'same';
-    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
+    var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
+    : props[valuePropName];
     return (0, _diffOriginal.diffOriginal)({
       value: _value,
       originalValue: originalValue,

package/lib/ProEditTable/propsType.d.ts

@@ -8,6 +8,7 @@ import type { ColumnType, TableProps } from 'antd/es/table';
 import type { FormInstance, FormItemProps } from 'antd/es/form';
 import type { FunctionArgs, ProRule } from '../ProForm/propsType';
 import { ProFormValueType, ColumnPropsMap } from '../ProForm/components/render/propsType';
+import { DiffOriginalParams } from '../ProForm/utils/diffOriginal';
 export type ActionType = 'edit' | 'delete' | 'save' | 'cancel' | 'add' | 'mulDelete' | 'custom';
 export type ShowFunction<T> = (record?: T, options?: {
     index?: number;
@@ -105,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>;
+    onDiff?: DiffOriginalParams['equalWith'];
     [key: string]: any;
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;

package/lib/ProEnum/index.js

@@ -232,7 +232,6 @@ var ProEnum = function ProEnum(props) {
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
     _antd.message.error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum4 = _locale.default.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType);
-    // return;
   }
   var transToLabel = function transToLabel(value) {
     var list = dataList && dataList.length ? dataList : enumLists;

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

@@ -76,23 +76,30 @@ var Group = function Group(props) {
     id: id,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? (0, _jsxRuntime.jsx)(_antd.Space.Compact, {
       children: columns.map(function (column, index) {
-        return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        column.otherProps = otherProps;
+        // 自定义间隔移除对于参数
+        if (column === null || column === void 0 ? void 0 : column.separator) {
+          delete column.separator;
+          delete column.otherProps;
+        }
+        return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)({
           contextProps: contextProps,
           isView: isParentView || isView
-        }, column), {}, {
-          otherProps: otherProps
-        }), column.name);
+        }, column), column.name || index);
       })
     }) : (0, _jsxRuntime.jsx)(_antd.Space, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       align: "start"
     }, (0, _lodash.omit)(space, ['separator', 'compact'])), {}, {
       children: columns.map(function (column, index) {
-        return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        column.otherProps = otherProps;
+        if (column === null || column === void 0 ? void 0 : column.separator) {
+          delete column.separator;
+          delete column.otherProps;
+        }
+        return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)({
           contextProps: contextProps,
           isView: isParentView || isView
-        }, column), {}, {
-          otherProps: otherProps
-        }), column.name);
+        }, column), column.name || index);
       })
     }))
   });

package/lib/ProForm/components/combination/Group/propsType.d.ts

@@ -12,6 +12,8 @@ export interface SpaceType extends SpaceProps {
      * 分隔符
      */
     separator?: string | React.ReactNode;
+    /** 分隔符插入位置 */
+    separatorIndex?: number | number[];
     /** 间隔距离 */
     size?: number;
 }

package/lib/ProForm/components/combination/Group/style/index.less

@@ -104,6 +104,21 @@
       }
     }
 
+    .pro-select {
+      .@{ant-prefix}-select .@{ant-prefix}-select-selector{
+        border-radius: 0 !important;
+      }
+      &:first-child   .@{ant-prefix}-select .@{ant-prefix}-select-selector {
+        border-start-start-radius: 4px !important;
+        border-end-start-radius: 4px !important;
+      }
+
+      &:last-child   .@{ant-prefix}-select .@{ant-prefix}-select-selector {
+        border-start-end-radius: 4px  !important;
+        border-end-end-radius: 4px!important;
+      }
+    }
+
     .@{ant-prefix}-select {
       .@{ant-prefix}-select-selector {
         .border-radius(0, 0, 0, 0);

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

@@ -12,10 +12,13 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _lodash = require("lodash");
+var _utils = require("@zat-design/utils");
 var _antd = require("antd");
 var _valueType = _interopRequireDefault(require("../../../utils/valueType"));
 var _useDeepCompareMemo = require("../../../utils/useDeepCompareMemo");
 var _tools = require("../../../../ProEditTable/utils/tools");
+/* eslint-disable no-lonely-if */
+
 /**
  * 插入间隔符
  * @param columns 表单配置数组
@@ -25,20 +28,52 @@ var insertSeparator = exports.insertSeparator = function insertSeparator(columns
   if (!(space === null || space === void 0 ? void 0 : space.separator)) {
     return columns;
   }
+  var separatorIndexs = function () {
+    var reuslt = [];
+    if (_utils.validate.isEmpty(space === null || space === void 0 ? void 0 : space.separatorIndex)) {
+      return reuslt;
+    }
+    // 如果 index 是数字，将其转换为数组
+    if (typeof (space === null || space === void 0 ? void 0 : space.separatorIndex) === 'number') {
+      reuslt.push(space.separatorIndex);
+    }
+    if (Array.isArray(space.separatorIndex)) {
+      reuslt = reuslt.concat(space.separatorIndex);
+    }
+    return reuslt;
+  }();
   return columns.reduce(function (result, current, index, array) {
     // 将当前元素添加到结果数组中
     result.push(current);
-    // 如果当前元素不是最后一个元素，则添加间隔符
-    if (index < array.length - 1) {
-      result.push({
-        component: (0, _jsxRuntime.jsx)(_antd.Button, {
-          className: "group-separator",
-          children: space.separator
-        }),
-        fieldProps: {
-          disabled: true
+    if (separatorIndexs === null || separatorIndexs === void 0 ? void 0 : separatorIndexs.length) {
+      separatorIndexs.forEach(function (separatorIndex) {
+        if (index === separatorIndex) {
+          result.push({
+            separator: true,
+            component: (0, _jsxRuntime.jsx)(_antd.Button, {
+              className: "group-separator",
+              children: space.separator
+            }),
+            fieldProps: {
+              disabled: true
+            }
+          });
         }
       });
+    } else {
+      // 如果当前元素不是最后一个元素，则添加间隔符
+      if (index < array.length - 1) {
+        result.push({
+          separator: true,
+          component: (0, _jsxRuntime.jsx)(_antd.Button, {
+            className: "group-separator",
+            children: space.separator
+          }),
+          fieldProps: {
+            disabled: true
+          }
+        });
+      }
     }
     return result;
   }, []);

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

@@ -35,11 +35,17 @@ var _filterDataSource = function filterDataSource(dataSource, level, fieldNames)
   });
 };
 var getViewLabel = function getViewLabel(_ref) {
+  var _value2;
   var dataSource = _ref.dataSource,
     value = _ref.value;
+  var _value = value;
   var viewLabel = [];
+  // fix: value是string类型，需要转为数组
+  if (_value && !Array.isArray(_value)) {
+    _value = [value];
+  }
   // 根据dataSource得到label数组，查看模式展示需要
-  value === null || value === void 0 ? void 0 : value.forEach(function (value, index) {
+  (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2.forEach(function (value, index) {
     var _dataSource;
     var temp = (_dataSource = dataSource) === null || _dataSource === void 0 ? void 0 : _dataSource.find(function (item) {
       return (item === null || item === void 0 ? void 0 : item.value) === value;

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

@@ -49,7 +49,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
   var diffType = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return 'same';
-    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
+    var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
+    : props[valuePropName];
     return (0, _diffOriginal.diffOriginal)({
       originalValue: originalValue,
       value: _value,

package/lib/ProLayout/style/index.less

@@ -67,6 +67,11 @@
           border-radius: var(--zaui-border-radius, 8px) !important;
           background: #E4F2FE;
         }
+        .pro-collapse-level2-collapse{
+          .@{ant-prefix}-collapse-header{
+            border-radius: 0 !important;
+          }
+        }
      
       }
     }

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

@@ -119,9 +119,9 @@ 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 && !onDiff) {
-      return;
-    }
+    // if (!originalObj && Object.keys(originalObj ?? {}).length === 0 && !onDiff) {
+    //   return;
+    // }
     var originalRender = column.render; // 保存原始的 render 方法
     // 自定义render 手动重载下
     column.render = function (value, record, index) {
@@ -129,8 +129,10 @@ var formatColumn = exports.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 = (0, _utils2.getOriginalValue)(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
       var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        isAddCell = originalResult.isAddCell;
       var isInNewRowFlag = isInNewRow(record);
+      var _isAddCell = isAddCell;
       otherProps.isChanged = isChanged;
       // 存在比对
       if ((0, _lodash.isFunction)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender) && (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
@@ -148,6 +150,27 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         }
         originalValue = diffResult;
       }
+      // 存在自定义onDiff比对
+      if ((0, _lodash.isFunction)(onDiff)) {
+        var _originalObj$record$r2;
+        var _diffResult = onDiff({
+          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,
+          record: record,
+          index: index
+        });
+        if (_diffResult === 'changed') {
+          otherProps.isChanged = true;
+        }
+        if (_diffResult === 'same') {
+          otherProps.isChanged = false;
+        }
+        if (_diffResult === 'add') {
+          _isAddCell = true;
+          otherProps.isChanged = false;
+        }
+      }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         valueType: valueType,
         originalValue: (0, _utils3.isEmpty)(originalValue) ? null : originalValue,
@@ -158,7 +181,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: _value,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: _isAddCell
       }));
     };
     return;
@@ -183,8 +207,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var realValue = _utils.tools.calc(Number(value !== null && value !== void 0 ? value : 0), '*', multiple);
       var renderValue = (0, _utils2.getDecimalDigits)(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRealValue = _utils.tools.calc(Number(originalValue || null), '*', multiple);
       var originalRenderValue = (0, _utils2.getDecimalDigits)(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
@@ -214,7 +239,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
     // 千分位, 千分位带CNY前缀
@@ -223,8 +249,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var valueStr = valueTypePrecision ? "".concat(Number(value).toFixed(valueTypePrecision)) : "".concat(value);
       var renderValue = valueStr.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRealValue = valueTypePrecision ? "".concat(Number(originalValue).toFixed(valueTypePrecision)) : "".concat(originalValue);
       var originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
@@ -254,7 +281,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -262,8 +290,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var _moment, _moment2, _moment3, _moment4, _moment5, _moment6, _moment7, _moment8, _moment9, _moment10, _moment11, _moment12, _moment13, _moment14;
       var renderValue = (_moment = (0, _moment15.default)(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRenderValue = (_moment2 = (0, _moment15.default)(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
       switch (valueType) {
@@ -317,7 +346,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -325,8 +355,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var realCode = typeof code === 'function' ? code(value, record) : code;
       var renderValue = (0, _getEnumLabel.default)(realCode, value, valueType === 'enumCodeName');
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRenderValue = (0, _getEnumLabel.default)(realCode, originalValue, valueType === 'enumCodeName');
       if (Array.isArray(column === null || column === void 0 ? void 0 : column.codeValues) && !realCode) {
@@ -360,15 +391,17 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (precision || prefix || suffix) {
     column.render = function (value, record, index) {
       var renderValue = value === 'number' ? value.toFixed(precision) : value;
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRenderValue = originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
@@ -397,7 +430,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (valueType === 'address') {
@@ -405,8 +439,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var _realValue$filter;
       var realValue = transform ? transform(value, record) : value;
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRealValue = transform ? transform(originalValue, record) : originalValue;
       var isEmpty = !realValue || Array.isArray(realValue) && (realValue === null || realValue === void 0 ? void 0 : (_realValue$filter = realValue.filter(function (item) {
@@ -454,7 +489,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (copyable) {
@@ -479,8 +515,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
   } else if (ellipsis) {
     column.render = function (value, record, index) {
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       if (!value && value !== 0 && value === originalValue) {
         (0, _jsxRuntime.jsx)("div", {
@@ -503,15 +540,17 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           currentValue: value || '-',
           toolTipProps: _toolTipProps,
           minWidth: minWidth,
-          isInNewRowFlag: isInNewRowFlag
+          isInNewRowFlag: isInNewRowFlag,
+          isAddCell: isAddCell
         })), suffixNode(value, record, index)]
       });
     };
   } else {
     column.render = function (value, record, index) {
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
@@ -536,7 +575,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: value || '-',
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   }

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

@@ -13,6 +13,8 @@ interface Props {
     minWidth?: number;
     isInNewRowFlag?: boolean;
     isChanged?: boolean;
+    /** 新增单元格字段 */
+    isAddCell?: boolean;
 }
 declare const RenderColumn: FC<Props>;
 export default RenderColumn;

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

@@ -39,7 +39,8 @@ var RenderColumn = function RenderColumn(props) {
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
   var cellDiffCls = (0, _classnames.default)({
-    'varied-cell': props === null || props === void 0 ? void 0 : props.isChanged
+    'varied-cell': props === null || props === void 0 ? void 0 : props.isChanged,
+    'add-cell': props === null || props === void 0 ? void 0 : props.isAddCell
   });
   // 比对场景走的逻辑
   if (!isInNewRowFlag && (0, _lodash.isBoolean)(props === null || props === void 0 ? void 0 : props.isChanged)) {
@@ -99,10 +100,7 @@ var RenderColumn = function RenderColumn(props) {
         children: renderNode
       }));
     }
-    if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
-      return renderNode;
-    }
-    return (0, _jsxRuntime.jsx)("span", {
+    return (0, _jsxRuntime.jsx)("div", {
       className: cellDiffCls,
       style: {
         width: width,

package/lib/ProTable/propsType.d.ts

@@ -40,11 +40,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;
-    viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => any;
+    /** 自定义比对函数, 触发条件必须写render */
+    onDiff?: ({ value, record, index, originalValue, originalRecord }: any) => any;
+    /** 自定义提示render, 触发条件必须写render */
+    viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => 'same' | 'changed' | 'add' | undefined;
     isChanged?: boolean | null;
 }
 export interface CreateTreeFromArrayOptions {

package/lib/ProTable/style/index.less

@@ -277,16 +277,29 @@
       }
     }
 
-    .@{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 {
+      .varied-cell {
+        margin-left: -8px;
+        padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
+  
+        background-color: 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;
+        }
+      }
+      .add-cell{
+        margin-left: -8px;
+        padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
+        background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
+        border-radius: var(--zaui-border-radius, 8px);
+        .pro-form-view-container {
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
       }
     }