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

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

@@ -666,7 +666,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         run(nextParams);
       }, 300);
     }
-  }, [JSON.stringify(value), JSON.stringify(options), visible, JSON.stringify(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), JSON.stringify(initParams)]);
+  }, [JSON.stringify(value), visible, JSON.stringify(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), JSON.stringify(initParams)]);
   useDebounceEffect(function () {
     if (!value) {
       if (defaultOne) {
@@ -830,23 +830,24 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       children: "".concat(viewText)
     });
   }
-  return _jsxs("div", {
-    id: uuid,
-    className: "pro-modal-select ".concat(className !== null && className !== void 0 ? className : ''),
-    style: style,
-    children: [isTooltip && viewText ? _jsx(_Tooltip, {
-      placement: "topLeft",
-      open: open,
-      title: viewText,
-      children: initRender
-    }) : initRender, _jsxs(ProDrawerForm, _objectSpread(_objectSpread({
+  return _jsxs(_Fragment, {
+    children: [_jsx("div", {
+      id: uuid,
+      className: "pro-modal-select ".concat(className !== null && className !== void 0 ? className : ''),
+      style: style,
+      children: isTooltip && viewText ? _jsx(_Tooltip, {
+        placement: "topLeft",
+        open: open,
+        title: viewText,
+        children: initRender
+      }) : initRender
+    }), _jsxs(ProDrawerForm, _objectSpread(_objectSpread({
       showType: "Modal",
       title: title,
       onOk: handleFinish,
       // @ts-ignore
       onCancel: handleClose,
-      visible: visible,
-      zIndex: 1071
+      visible: visible
     }, restModalProps), {}, {
       children: [_jsx(ProForm, {
         submitOnEnter: true,

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

@@ -44,7 +44,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
   var diffType = 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 diffOriginal({
       originalValue: originalValue,
       value: _value,

package/es/ProForm/style/index.less

@@ -351,7 +351,7 @@
         background: transparent !important;
       }
       .@{ant-prefix}-select-selection-placeholder {
-        z-index: 9;
+        // z-index: 9;
       }
     }
 
@@ -429,7 +429,7 @@
         background: transparent !important;
       }
       .@{ant-prefix}-select-selection-placeholder {
-        z-index: 9;
+        // z-index: 9;
       }
     }
 

package/es/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/es/ProTable/components/FormatColumn/index.js

@@ -113,9 +113,9 @@ export var 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) {
@@ -123,8 +123,10 @@ 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 isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        isAddCell = originalResult.isAddCell;
       var isInNewRowFlag = isInNewRow(record);
+      var _isAddCell = isAddCell;
       otherProps.isChanged = isChanged;
       // 存在比对
       if (isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender) && (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
@@ -142,6 +144,27 @@ export var formatColumn = function formatColumn(_ref2) {
         }
         originalValue = diffResult;
       }
+      // 存在自定义onDiff比对
+      if (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 _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
         originalValue: isEmpty(originalValue) ? null : originalValue,
@@ -152,7 +175,8 @@ export var formatColumn = function formatColumn(_ref2) {
         currentValue: _value,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: _isAddCell
       }));
     };
     return;
@@ -177,8 +201,9 @@ export var formatColumn = function formatColumn(_ref2) {
       var realValue = tools.calc(Number(value !== null && value !== void 0 ? value : 0), '*', multiple);
       var renderValue = getDecimalDigits(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
       var originalResult = 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 = tools.calc(Number(originalValue || null), '*', multiple);
       var originalRenderValue = getDecimalDigits(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
@@ -208,7 +233,8 @@ export var formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
     // 千分位, 千分位带CNY前缀
@@ -217,8 +243,9 @@ export var 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 = 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, ',');
@@ -248,7 +275,8 @@ export var 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)) {
@@ -256,8 +284,9 @@ export var formatColumn = function formatColumn(_ref2) {
       var _moment, _moment2, _moment3, _moment4, _moment5, _moment6, _moment7, _moment8, _moment9, _moment10, _moment11, _moment12, _moment13, _moment14;
       var renderValue = (_moment = moment(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
       var originalResult = 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 = moment(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
       switch (valueType) {
@@ -311,7 +340,8 @@ export var formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -319,8 +349,9 @@ export var formatColumn = function formatColumn(_ref2) {
       var realCode = typeof code === 'function' ? code(value, record) : code;
       var renderValue = getEnumLabel(realCode, value, valueType === 'enumCodeName');
       var originalResult = 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 = getEnumLabel(realCode, originalValue, valueType === 'enumCodeName');
       if (Array.isArray(column === null || column === void 0 ? void 0 : column.codeValues) && !realCode) {
@@ -354,15 +385,17 @@ export var 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 = 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 = _jsxs(_Space, {
@@ -391,7 +424,8 @@ export var formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (valueType === 'address') {
@@ -399,8 +433,9 @@ export var formatColumn = function formatColumn(_ref2) {
       var _realValue$filter;
       var realValue = transform ? transform(value, record) : value;
       var originalResult = 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) {
@@ -448,7 +483,8 @@ export var formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (copyable) {
@@ -473,8 +509,9 @@ export var formatColumn = function formatColumn(_ref2) {
   } else if (ellipsis) {
     column.render = function (value, record, index) {
       var originalResult = 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) {
         _jsx("div", {
@@ -497,15 +534,17 @@ export var 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 = 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 = _jsxs(_Space, {
         size: 8,
@@ -530,7 +569,8 @@ export var formatColumn = function formatColumn(_ref2) {
         currentValue: value || '-',
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   }

package/es/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/es/ProTable/components/RenderColumn/index.js

@@ -37,7 +37,8 @@ var RenderColumn = function RenderColumn(props) {
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
   var cellDiffCls = classNames({
-    '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 && isBoolean(props === null || props === void 0 ? void 0 : props.isChanged)) {
@@ -97,10 +98,7 @@ var RenderColumn = function RenderColumn(props) {
         children: renderNode
       }));
     }
-    if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
-      return renderNode;
-    }
-    return _jsx("span", {
+    return _jsx("div", {
       className: cellDiffCls,
       style: {
         width: width,

package/es/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/es/ProTable/style/index.less

@@ -257,37 +257,49 @@
     }
   }
 
-  tbody.@{ant-prefix}-table-tbody {
-    tr.@{ant-prefix}-table-row.new-cell {
-      background: var(--zaui-contract-bg-add; #d2fff4) !important;
+
+  .@{ant-prefix}-table table tbody.@{ant-prefix}-table-tbody,
+  .@{ant-prefix}-table.@{ant-prefix}-table-scroll-horizontal table tbody.@{ant-prefix}-table-tbody {
+    tr.@{ant-prefix}-table-row.new-cell,
+    tr.@{ant-prefix}-table-row.new-cell:hover {
       background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
-      td.@{ant-prefix}-table-cell {
-        background: var(--zaui-contract-bg-add; #d2fff4) !important;
+      td.@{ant-prefix}-table-cell{
         background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
         border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
         &.@{ant-prefix}-table-cell-fix-right {
-          background: var(--zaui-contract-bg-add; #d2fff4) !important;
           background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
           border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
         }
         &.@{ant-prefix}-table-cell-fix-left {
-          background: var(--zaui-contract-bg-add; #d2fff4) !important;
           background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
           border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
         }
       }
     }
 
-    .@{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;
+        }
       }
     }
 
@@ -583,3 +595,9 @@
     }
   }
 }
+
+.@{ant-prefix}-table{
+  .original-value-tooltip{
+    position: fixed;
+  }
+}

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/ProDrawerForm/style/index.less

@@ -2,6 +2,9 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-drawer {
+  .original-value-tooltip {
+    position: fixed;
+  }
   .pro-drawer-close {
     position: absolute;
     top: 6px;

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/ProEditTable/style/index.less

@@ -290,12 +290,19 @@
     }
   }
 
-  .@{ant-prefix}-table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row  td{
-    background: var(--zaui-contract-bg-add, #d2fff4) !important;
+  .@{ant-prefix}-table table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row  td,   
+  .@{ant-prefix}-table table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row  td.@{ant-prefix}-table-cell-fix-left, 
+  .@{ant-prefix}-table table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row  td.@{ant-prefix}-table-cell-fix-right,   
+  .@{ant-prefix}-table.@{ant-prefix}-table-scroll-horizontal table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row  td,
+  .@{ant-prefix}-table.@{ant-prefix}-table-scroll-horizontal table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row  td.@{ant-prefix}-table-cell-fix-left,
+  .@{ant-prefix}-table.@{ant-prefix}-table-scroll-horizontal table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row  td.@{ant-prefix}-table-cell-fix-right{
+    background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
+    border-bottom: 1px solid var(--zaui-form-control-line,#dcdcdc) ;
   }
-  .@{ant-prefix}-table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row:hover{
+  .@{ant-prefix}-table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row:hover,
+  .@{ant-prefix}-table.@{ant-prefix}-table-scroll-horizontal table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row:hover{
        td, .@{ant-prefix}-table-cell-row-hover {
-      background: var(--zaui-contract-bg-add, #d2fff4) !important;
+      background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
     }
   }
 }

package/lib/ProEnum/index.js

@@ -26,10 +26,11 @@ var _getEnumLabel = _interopRequireDefault(require("./utils/getEnumLabel"));
 var _useEnum = _interopRequireDefault(require("./hooks/useEnum"));
 var _locale = _interopRequireDefault(require("../locale"));
 require("./style/index.less");
+var _useFieldProps2 = require("../ProForm/utils/useFieldProps");
 var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps", "isView"],
   _excluded2 = ["fieldNames", "clear", "cacheKey", "showCodeName"];
 var ProEnum = function ProEnum(props) {
-  var _enumProps$showCodeNa;
+  var _otherProps$isView, _enumProps$showCodeNa;
   var code = props.code,
     _props$type = props.type,
     type = _props$type === void 0 ? 'ProSelect' : _props$type,
@@ -44,8 +45,9 @@ var ProEnum = function ProEnum(props) {
     enumProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = otherProps || {},
     viewEmpty = _ref.viewEmpty;
-  var _isView = isView !== undefined && isView !== null ? isView : otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
   var _defalutValue = props === null || props === void 0 ? void 0 : props.defaultValue;
+  var _useFieldProps = (0, _useFieldProps2.useFieldProps)(),
+    configIsView = _useFieldProps.isView;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -54,6 +56,7 @@ var ProEnum = function ProEnum(props) {
     cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
     showCodeName = _ref2.showCodeName,
     resProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
+  var _isView = isView !== undefined && isView !== null ? isView : (_otherProps$isView = otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView) !== null && _otherProps$isView !== void 0 ? _otherProps$isView : configIsView;
   enumProps.showCodeName = (_enumProps$showCodeNa = enumProps.showCodeName) !== null && _enumProps$showCodeNa !== void 0 ? _enumProps$showCodeNa : showCodeName;
   var label = 'label';
   var fieldValue = 'value';
@@ -229,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/FormList/index.js

@@ -49,7 +49,7 @@ var FormList = function FormList(props, ref) {
   var _namePath = (0, _utils.toArray)(name);
   var orgValues = (0, _lodash.get)(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
   var _diffConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, diffConfig), {}, {
-    originalValues: isDiffAll ? orgValues || [] : orgValues
+    originalValues: (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues) && isDiffAll ? orgValues || [] : orgValues
   });
   var processColumns = (0, _react.useCallback)(function (fieldName, namePath) {
     return columns.map(function (item) {