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

package/dist/index.esm.css

@@ -1900,12 +1900,12 @@
   background: unset !important;
 }
 .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell {
-  background: #d2fff4 !important;
-  background-color: #d2fff4 !important;
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
+  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
 .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell {
-  background: #d2fff4 !important;
-  background-color: #d2fff4 !important;
+  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);
 }
 .pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell {
@@ -3139,6 +3139,12 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4);
   border-radius: 4px;
 }
+.changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
+  white-space: nowrap;
+}
+.changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
+  white-space: nowrap;
+}
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {
   padding: var(--zaui-space-size-sm, 8px);
   background: #f8f9fa;

package/dist/less.esm.css

@@ -1900,12 +1900,12 @@
   background: unset !important;
 }
 .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell {
-  background: #d2fff4 !important;
-  background-color: #d2fff4 !important;
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
+  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
 .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell {
-  background: #d2fff4 !important;
-  background-color: #d2fff4 !important;
+  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);
 }
 .pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell {
@@ -3139,6 +3139,12 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4);
   border-radius: 4px;
 }
+.changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
+  white-space: nowrap;
+}
+.changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
+  white-space: nowrap;
+}
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {
   padding: var(--zaui-space-size-sm, 8px);
   background: #f8f9fa;

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

@@ -1,10 +1,11 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "valuePropName"];
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
@@ -65,6 +66,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
   }) : get(originalValues, originalName);
 };
 var ListChangedWrapper = function ListChangedWrapper(props) {
+  var _getValueProps;
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
@@ -79,6 +81,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     children = props.children,
     type = props.type,
     normalize = props.normalize,
+    getValueProps = props.getValueProps,
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     rest = _objectWithoutProperties(props, _excluded);
@@ -124,12 +127,10 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       return target.parentElement;
     },
     title: _jsxs(_Space, {
-      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children), {}, {
+      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children), {}, _defineProperty(_defineProperty({
         // @ts-ignore
-        isView: true,
-        value: originalValue,
-        checked: type === 'Switch' ? originalValue : undefined
-      })) : undefined]
+        isView: true
+      }, valuePropName, getValueProps ? (_getValueProps = getValueProps(originalValue)) === null || _getValueProps === void 0 ? void 0 : _getValueProps[valuePropName] : props[valuePropName]), "checked", type === 'Switch' ? originalValue : undefined))) : undefined]
     }),
     children: _jsx("div", {
       className: diffClassName,

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

@@ -559,6 +559,7 @@ var RenderField = function RenderField(_ref) {
         onChange: _onChange,
         valuePropName: _formItemProps.valuePropName,
         normalize: _formItemProps.normalize,
+        getValueProps: _formItemProps.getValueProps,
         children: FieldComponent
       });
     }

package/es/ProEnum/hooks/useEnumRequest.js

@@ -42,7 +42,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
   }
   var logDebug = function logDebug(msg) {
     if (props.debugger) {
-      console.info('proEnum：', msg);
+      console.warn('proEnum：', msg);
     }
   };
   var enumRes = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({

package/es/ProEnum/index.js

@@ -53,8 +53,8 @@ var ProEnum = function ProEnum(props) {
     showCodeName = _ref2.showCodeName,
     resProps = _objectWithoutProperties(_ref2, _excluded2);
   enumProps.showCodeName = (_enumProps$showCodeNa = enumProps.showCodeName) !== null && _enumProps$showCodeNa !== void 0 ? _enumProps$showCodeNa : showCodeName;
-  var label = '';
-  var fieldValue = '';
+  var label = 'label';
+  var fieldValue = 'value';
   var _useState = useState(dataSource || []),
     _useState2 = _slicedToArray(_useState, 2),
     dataList = _useState2[0],

package/es/ProForm/components/base/InputNumber/index.js

@@ -82,7 +82,7 @@ var InputNumber = function InputNumber(props) {
   var _parser = function parser(value, precision) {
     if (value === '') return value;
     var num = Number(value.replace(/[\s,]+/g, ''));
-    return Number.isNaN(num) || !precision && precision !== 0 ? Number.isNaN(Number(value)) ? null : value : num.toFixed(precision);
+    return Number.isNaN(num) || !precision && precision !== 0 ? Number.isNaN(Number(value)) ? null : Number(value) : Number(num.toFixed(precision));
   };
   if (valueType) {
     switch (valueType) {

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

@@ -5,7 +5,7 @@ import _Tooltip from "antd/es/tooltip";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize"];
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
 import { get } from 'lodash';
@@ -26,6 +26,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     normalize = props.normalize,
+    getValueProps = props.getValueProps,
     rest = _objectWithoutProperties(props, _excluded);
   var _useProConfig = useProConfig('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
@@ -53,9 +54,10 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var isChanged = diffType === 'changed';
   var tipContent = useMemo(function () {
     if (!isWatch || noChange) return undefined;
+    var valueProps = getValueProps ? getValueProps(originalValue) : originalValue;
     return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, _defineProperty({
       isView: true
-    }, valuePropName, originalValue))) : undefined;
+    }, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
     // 嵌套子组件
@@ -87,9 +89,13 @@ var ChangedWrapper = function ChangedWrapper(props) {
     },
     title: _jsxs(_Space, {
       direction: "vertical",
+      className: "changed-tooltip",
       children: [_jsxs(_Space, {
+        align: "start",
+        className: "original-value-container",
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
       }), _showEllipse && _jsxs(_Space, {
+        className: "current-value-container",
         children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
           isView: true
         })) : undefined]

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

@@ -438,6 +438,7 @@ var Render = function Render(props) {
         onChange: handleChange,
         valuePropName: _otherFormItemProps.valuePropName,
         normalize: _otherFormItemProps.normalize,
+        getValueProps: _otherFormItemProps.getValueProps,
         children: child
       });
     }

package/es/ProForm/style/index.less

@@ -472,3 +472,16 @@
     }
   }
 }
+
+.changed-tooltip {
+  .original-value-container {
+    .ant-space-item:nth-child(1) {
+      white-space: nowrap;
+    }
+  }
+  .current-value-container {
+    .ant-space-item:nth-child(1) {
+      white-space: nowrap;
+    }
+  }
+}

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

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

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

@@ -5,20 +5,53 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { isValidElement } from 'react';
 import moment from 'moment';
 import classnames from 'classnames';
-import { isEqual, isFunction, isString } from 'lodash';
+import ReactDOM from 'react-dom';
+import { isEqual, isFunction, isString, isObject } from 'lodash';
 import { tools } from '@zat-design/utils';
 import TooltipTitle from '../TooltipTitle';
 import RenderColumn from '../RenderColumn';
 import { getDecimalDigits, getOriginalValue } from '../../utils';
 import getEnumLabel from '../../../ProEnum/utils/getEnumLabel';
 import ProForm from '../../../ProForm';
-export var formatColumn = function formatColumn(_ref) {
-  var column = _ref.column,
-    originalObj = _ref.originalObj,
-    dataSourceObj = _ref.dataSourceObj,
-    rowKey = _ref.rowKey,
-    diffToolTip = _ref.diffToolTip,
-    wrapToolTipProps = _ref.wrapToolTipProps;
+var isReactElement = function isReactElement(element) {
+  return /*#__PURE__*/isValidElement(element);
+};
+var calcMinWidth = function calcMinWidth(_ref) {
+  var minWidth = _ref.minWidth,
+    width = _ref.width,
+    title = _ref.title,
+    isMaxContentOverFlow = _ref.isMaxContentOverFlow,
+    callback = _ref.callback;
+  if (!minWidth && !width && isMaxContentOverFlow) {
+    var tempEl = document.createElement('div');
+    tempEl.style.display = 'inline-block';
+    document.body.appendChild(tempEl);
+    if (isFunction(title)) {
+      var component = title();
+      ReactDOM.render(component, tempEl);
+    } else if (isReactElement(title)) {
+      ReactDOM.render(title, tempEl);
+    } else {
+      tempEl.innerHTML = title;
+    }
+    // 使用 requestAnimationFrame 确保在下一个浏览器重绘周期中获取宽度
+    requestAnimationFrame(function () {
+      var _width = tempEl.offsetWidth;
+      ReactDOM.unmountComponentAtNode(tempEl);
+      tempEl.remove();
+      callback(_width);
+    });
+  }
+};
+export var formatColumn = function formatColumn(_ref2) {
+  var column = _ref2.column,
+    originalObj = _ref2.originalObj,
+    dataSourceObj = _ref2.dataSourceObj,
+    rowKey = _ref2.rowKey,
+    diffToolTip = _ref2.diffToolTip,
+    wrapToolTipProps = _ref2.wrapToolTipProps,
+    scroll = _ref2.scroll,
+    onUpdateMinWidth = _ref2.onUpdateMinWidth;
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -37,7 +70,17 @@ export var formatColumn = function formatColumn(_ref) {
     _column$originalDiffT = column.originalDiffTip,
     originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
     _column$toolTipProps = column.toolTipProps,
-    toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps;
+    toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
+    minWidth = column.minWidth;
+  // 仅在 {x: 'max-content', y: 300 } 且 column无指定 width minWidth 情况下 才开启 minWidth的自动计算
+  var isMaxContentOverFlow = isObject(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
+  calcMinWidth({
+    minWidth: minWidth,
+    width: width,
+    title: title,
+    isMaxContentOverFlow: isMaxContentOverFlow,
+    callback: onUpdateMinWidth
+  });
   var _toolTipProps = _objectSpread(_objectSpread({}, toolTipProps), wrapToolTipProps);
   var _originalDiffTip = diffToolTip !== null && diffToolTip !== void 0 ? diffToolTip : originalDiffTip;
   // 前缀处理
@@ -65,13 +108,17 @@ export var formatColumn = function formatColumn(_ref) {
     }
   };
   if (column === null || column === void 0 ? void 0 : column.render) {
+    if (!originalObj && Object.keys(originalObj !== null && originalObj !== void 0 ? originalObj : {}).length === 0) {
+      return;
+    }
     var originalRender = column.render; // 保存原始的 render 方法
     // 自定义render 手动重载下
     column.render = function (value, record, index) {
+      var _originalObj$record$r;
       var isFn = isFunction(originalRender);
-      var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record, index) : undefined;
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
-      var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, originalObj, index) : undefined;
+      var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : undefined;
+      var originalValue = 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;
       return _jsx(RenderColumn, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -81,7 +128,8 @@ export var formatColumn = function formatColumn(_ref) {
         node: _value,
         currentValue: _value,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
     return;
@@ -112,7 +160,12 @@ export var formatColumn = function formatColumn(_ref) {
         originalRenderValue = '-';
       }
       if (!value && value !== 0 && renderValue === originalRenderValue) {
-        return '-';
+        return _jsx("div", {
+          style: {
+            minWidth: minWidth
+          },
+          children: "-"
+        });
       }
       var node = _jsxs(_Space, {
         size: 8,
@@ -127,7 +180,8 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -146,7 +200,12 @@ export var formatColumn = function formatColumn(_ref) {
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
       if (!value && value !== 0 && renderValue === originalRenderValue) {
-        return '-';
+        _jsx("div", {
+          style: {
+            minWidth: minWidth
+          },
+          children: "-"
+        });
       }
       return _jsx(RenderColumn, {
         valueType: valueType,
@@ -157,7 +216,8 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -199,7 +259,12 @@ export var formatColumn = function formatColumn(_ref) {
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
       if (!value && renderValue === originalRenderValue) {
-        return '-';
+        _jsx("div", {
+          style: {
+            minWidth: minWidth
+          },
+          children: "-"
+        });
       }
       return _jsx(RenderColumn, {
         valueType: valueType,
@@ -210,7 +275,8 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -248,7 +314,8 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   } else if (precision || prefix || suffix) {
@@ -264,7 +331,12 @@ export var formatColumn = function formatColumn(_ref) {
         originalRenderValue = '-';
       }
       if (!value && value !== 0 && renderValue === originalRenderValue) {
-        return '-';
+        _jsx("div", {
+          style: {
+            minWidth: minWidth
+          },
+          children: "-"
+        });
       }
       return _jsx(RenderColumn, {
         valueType: valueType,
@@ -275,7 +347,8 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   } else if (valueType === 'address') {
@@ -288,7 +361,12 @@ export var formatColumn = function formatColumn(_ref) {
         return !!item;
       })) === null || _realValue$filter === void 0 ? void 0 : _realValue$filter.length) === 0;
       if (isEqual(value, originalValue) && isEmpty) {
-        return '-';
+        _jsx("div", {
+          style: {
+            minWidth: minWidth
+          },
+          children: "-"
+        });
       }
       var className = classnames({
         'varied-cell': originalValue !== undefined,
@@ -331,7 +409,8 @@ export var formatColumn = function formatColumn(_ref) {
           node: value,
           value: value,
           currentValue: value,
-          toolTipProps: _toolTipProps
+          toolTipProps: _toolTipProps,
+          minWidth: minWidth
         }), suffixNode(value, record, index)]
       });
     };
@@ -339,7 +418,12 @@ export var formatColumn = function formatColumn(_ref) {
     column.render = function (value, record, index) {
       var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       if (!value && value !== 0 && value === originalValue) {
-        return '-';
+        _jsx("div", {
+          style: {
+            minWidth: minWidth
+          },
+          children: "-"
+        });
       }
       return _jsxs(_Space, {
         size: 8,
@@ -352,7 +436,8 @@ export var formatColumn = function formatColumn(_ref) {
           value: value,
           currentValue: value || '-',
           originalDiffTip: _originalDiffTip,
-          toolTipProps: _toolTipProps
+          toolTipProps: _toolTipProps,
+          minWidth: minWidth
         }), suffixNode(value, record, index)]
       });
     };
@@ -364,7 +449,12 @@ export var formatColumn = function formatColumn(_ref) {
         children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
       });
       if (!value && value !== 0 && value === originalValue) {
-        return '-';
+        _jsx("div", {
+          style: {
+            minWidth: minWidth
+          },
+          children: "-"
+        });
       }
       return _jsx(RenderColumn, {
         valueType: valueType,
@@ -375,7 +465,8 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: value || '-',
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   }

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

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

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

@@ -23,7 +23,8 @@ var RenderColumn = function RenderColumn(props) {
     originalValue = props.originalValue,
     originalDiffTip = props.originalDiffTip,
     _props$toolTipProps = props.toolTipProps,
-    toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps;
+    toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
+    minWidth = props.minWidth;
   var _useSetState = useSetState({
       tooltip: false
     }),
@@ -36,7 +37,8 @@ var RenderColumn = function RenderColumn(props) {
       if (ellipsis) {
         renderNode = _jsx(Text, {
           style: {
-            width: currentValue === '-' ? 32.5 : width
+            width: currentValue === '-' ? 32.5 : width,
+            minWidth: minWidth
           },
           ellipsis: {
             tooltip: false
@@ -47,7 +49,8 @@ var RenderColumn = function RenderColumn(props) {
       return _jsx(_Tooltip, _objectSpread(_objectSpread({
         className: "varied-cell",
         style: {
-          width: width
+          width: width,
+          minWidth: minWidth
         },
         title: originalDiffTip ? _jsxs(_Fragment, {
           children: ["\u521D\u59CB\u503C\uFF1A", originalValue, _jsx("br", {}), ellipsis ? "\u5F53\u524D\u503C\uFF1A".concat(currentValue) : undefined]
@@ -62,7 +65,8 @@ var RenderColumn = function RenderColumn(props) {
     return _jsx("span", {
       className: "varied-cell",
       style: {
-        width: width
+        width: width,
+        minWidth: minWidth
       },
       children: renderNode
     });
@@ -133,7 +137,12 @@ var RenderColumn = function RenderColumn(props) {
       }
     }, toolTipProps);
     if (!value) {
-      return '-';
+      return _jsx("div", {
+        style: {
+          minWidth: minWidth
+        },
+        children: "-"
+      });
     }
     return _jsx(_Tooltip, _objectSpread(_objectSpread({
       title: value,
@@ -146,7 +155,8 @@ var RenderColumn = function RenderColumn(props) {
     }, tooltipProps), {}, {
       children: _jsx(Text, {
         style: {
-          width: width
+          width: width,
+          minWidth: minWidth
         },
         ellipsis: true,
         onMouseOver: handleMouseOver,
@@ -155,6 +165,11 @@ var RenderColumn = function RenderColumn(props) {
       })
     }));
   }
-  return value || value === 0 ? node : '-';
+  return _jsx("div", {
+    style: {
+      minWidth: minWidth
+    },
+    children: value || value === 0 ? node : '-'
+  });
 };
 export default RenderColumn;

package/es/ProTable/index.js

@@ -204,18 +204,22 @@ function ProTable(props) {
     }).filter(function (item) {
       return !(item === null || item === void 0 ? void 0 : item.delete);
     });
-    newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item) {
+    newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item, index) {
       formatColumn({
         column: item,
         originalObj: originalObj,
         dataSourceObj: dataSourceObj,
         rowKey: 'rowKey',
         diffToolTip: toolTip,
-        wrapToolTipProps: wrapToolTipProps
+        wrapToolTipProps: wrapToolTipProps,
+        scroll: _scroll,
+        onUpdateMinWidth: function onUpdateMinWidth(w) {
+          curColumns[index].minWidth = w;
+        }
       });
     });
     return newColumns;
-  }, [curColumns, handleResize]);
+  }, [curColumns, handleResize, _scroll]);
   var _columns = useMemo(function () {
     return columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {
       var show = item.show;
@@ -228,9 +232,10 @@ function ProTable(props) {
       return true;
     });
   }, [columns]);
-  var isExistPercentWidth = !!_columns.find(function (item) {
-    return item.width && typeof item.width === 'string' && item.width.endsWith('%');
-  });
+  var isExistPercentWidth = !!(_columns === null || _columns === void 0 ? void 0 : _columns.find(function (item) {
+    var _item$width;
+    return (item === null || item === void 0 ? void 0 : item.width) && typeof (item === null || item === void 0 ? void 0 : item.width) === 'string' && (item === null || item === void 0 ? void 0 : (_item$width = item.width) === null || _item$width === void 0 ? void 0 : _item$width.endsWith('%'));
+  }));
   if (isExistPercentWidth) {
     _scroll = props === null || props === void 0 ? void 0 : props.scroll;
   }

package/es/ProTable/style/index.less

@@ -259,11 +259,12 @@
 
   tbody.@{ant-prefix}-table-tbody {
     tr.@{ant-prefix}-table-row.new-cell {
-      background: #d2fff4 !important;
-      background-color: #d2fff4 !important;
+      background: var(--zaui-contract-bg-add; #d2fff4) !important;
+      background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
+
       td.@{ant-prefix}-table-cell {
-        background: #d2fff4 !important;
-        background-color: #d2fff4 !important;
+        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);
       }
     }