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

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;
     }
@@ -387,7 +390,7 @@
     
     // textArea
     .@{ant-prefix}-input-textarea > textarea  {
-      background: @zaui-contract-bg;
+      background: @zaui-contract-bg !important;
     }
 
     .pro-form-view-container {
@@ -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;
     }
@@ -461,7 +468,7 @@
     
     // textArea
     .@{ant-prefix}-input-textarea > textarea {
-      background: @zaui-contract-bg-add;
+      background: @zaui-contract-bg-add !important;
     }
 
 
@@ -472,3 +479,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/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

@@ -27,7 +27,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
     index = formItemProps.index,
     namePath = formItemProps.namePath,
     names = formItemProps.names,
-    dependencies = formItemProps.dependencies;
+    dependNames = formItemProps.dependNames;
   var timerRef = (0, _react.useRef)();
   var needClear = (0, _react.useRef)(); // 是否需要执行清值操作
   var showRef = (0, _react.useRef)();
@@ -36,13 +36,14 @@ var useShouldUpdate = function useShouldUpdate(props) {
   var rulesRef = (0, _react.useRef)();
   var fieldPropsRef = (0, _react.useRef)();
   var originComponentRef = (0, _react.useRef)();
+  var dependNamesRef = (0, _react.useRef)();
   var newComponent = originComponent || component; // 解决component默认赋值污染问题，需要使用originComponent
   var _useState = (0, _react.useState)({}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     reRender = _useState2[1];
   var values = {};
   // 不是动态函数直接返回
-  if (!(0, _lodash.isFunction)(show) && !(0, _lodash.isFunction)(disabled) && !(0, _lodash.isFunction)(required) && !(0, _lodash.isFunction)(rules) && !(0, _lodash.isFunction)(fieldProps) && !(0, _lodash.isFunction)(originComponent)) {
+  if (!(dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) && !(0, _lodash.isFunction)(show) && !(0, _lodash.isFunction)(disabled) && !(0, _lodash.isFunction)(required) && !(0, _lodash.isFunction)(rules) && !(0, _lodash.isFunction)(fieldProps) && !(0, _lodash.isFunction)(originComponent)) {
     return {
       shouldUpdate: _shouldUpdate,
       show: show,
@@ -126,9 +127,22 @@ var useShouldUpdate = function useShouldUpdate(props) {
   } else {
     fieldPropsRef.current = fieldProps;
   }
+  if (dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) {
+    dependNamesRef.current = dependNames.map(function (name) {
+      return (0, _lodash.get)(values, name);
+    });
+  }
   return {
     shouldUpdate: function shouldUpdate(prevValues, currentValues) {
       // @ts-ignore formList场景取当前行数据，不取shouldUpdate变更后值
+      if (dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) {
+        var curDependNamesValue = dependNames.map(function (name) {
+          return (0, _lodash.get)(currentValues, name);
+        });
+        var dependNamesChanged = !(0, _lodash.isEqualWith)(dependNamesRef.current, curDependNamesValue, _index.customEqualForFun);
+        dependNamesRef.current = curDependNamesValue;
+        if (!dependNamesChanged) return false;
+      }
       var _currentValues;
       if (namePath) {
         // formList场景values取当前行数据
@@ -156,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,
@@ -189,16 +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) ||
-      (0, _index.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,12 +1,15 @@
 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, isInNewRow, }: {
     column: ProTableColumn;
     originalObj: any;
     dataSourceObj: any;
     rowKey: any;
     diffToolTip?: boolean;
     wrapToolTipProps?: any;
+    scroll?: any;
+    onUpdateMinWidth?: any;
+    isInNewRow?: any;
 }) => void;
 /**
  * 查找最近的父级className

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

@@ -10,6 +10,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _moment15 = _interopRequireDefault(require("moment"));
 var _classnames = _interopRequireDefault(require("classnames"));
+var _reactDom = _interopRequireDefault(require("react-dom"));
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
@@ -18,13 +19,46 @@ var _RenderColumn = _interopRequireDefault(require("../RenderColumn"));
 var _utils2 = require("../../utils");
 var _getEnumLabel = _interopRequireDefault(require("../../../ProEnum/utils/getEnumLabel"));
 var _ProForm = _interopRequireDefault(require("../../../ProForm"));
-var formatColumn = exports.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__*/(0, _react.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 ((0, _lodash.isFunction)(title)) {
+      var component = title();
+      _reactDom.default.render(component, tempEl);
+    } else if (isReactElement(title)) {
+      _reactDom.default.render(title, tempEl);
+    } else {
+      tempEl.innerHTML = title;
+    }
+    // 使用 requestAnimationFrame 确保在下一个浏览器重绘周期中获取宽度
+    requestAnimationFrame(function () {
+      var _width = tempEl.offsetWidth;
+      _reactDom.default.unmountComponentAtNode(tempEl);
+      tempEl.remove();
+      callback(_width);
+    });
+  }
+};
+var formatColumn = exports.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,
+    isInNewRow = _ref2.isInNewRow;
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -43,7 +77,18 @@ var formatColumn = exports.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,
+    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({
+    minWidth: minWidth,
+    width: width,
+    title: title,
+    isMaxContentOverFlow: isMaxContentOverFlow,
+    callback: onUpdateMinWidth
+  });
   var _toolTipProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, toolTipProps), wrapToolTipProps);
   var _originalDiffTip = diffToolTip !== null && diffToolTip !== void 0 ? diffToolTip : originalDiffTip;
   // 前缀处理
@@ -71,6 +116,42 @@ var formatColumn = exports.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 && !onDiff) {
+      return;
+    }
+    var originalRender = column.render; // 保存原始的 render 方法
+    // 自定义render 手动重载下
+    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) : 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) : 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 && originalValue !== 0 ? null : originalRenderValue,
+        ellipsis: ellipsis,
+        width: width,
+        value: _value,
+        node: _value,
+        currentValue: _value,
+        originalDiffTip: _originalDiffTip,
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
+      });
+    };
     return;
   }
   if (tooltip) {
@@ -99,12 +180,18 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         originalRenderValue = '-';
       }
       if (!value && value !== 0 && renderValue === originalRenderValue) {
-        return '-';
+        return (0, _jsxRuntime.jsx)("div", {
+          style: {
+            minWidth: minWidth
+          },
+          children: "-"
+        });
       }
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         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,
@@ -114,7 +201,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -133,8 +222,14 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
       if (!value && value !== 0 && renderValue === originalRenderValue) {
-        return '-';
+        (0, _jsxRuntime.jsx)("div", {
+          style: {
+            minWidth: minWidth
+          },
+          children: "-"
+        });
       }
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -144,7 +239,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -186,8 +283,14 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
       if (!value && renderValue === originalRenderValue) {
-        return '-';
+        (0, _jsxRuntime.jsx)("div", {
+          style: {
+            minWidth: minWidth
+          },
+          children: "-"
+        });
       }
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -197,7 +300,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -226,6 +331,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         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,
@@ -235,7 +341,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   } else if (precision || prefix || suffix) {
@@ -251,8 +359,14 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         originalRenderValue = '-';
       }
       if (!value && value !== 0 && renderValue === originalRenderValue) {
-        return '-';
+        (0, _jsxRuntime.jsx)("div", {
+          style: {
+            minWidth: minWidth
+          },
+          children: "-"
+        });
       }
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -262,7 +376,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   } else if (valueType === 'address') {
@@ -275,7 +391,12 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         return !!item;
       })) === null || _realValue$filter === void 0 ? void 0 : _realValue$filter.length) === 0;
       if ((0, _lodash.isEqual)(value, originalValue) && isEmpty) {
-        return '-';
+        (0, _jsxRuntime.jsx)("div", {
+          style: {
+            minWidth: minWidth
+          },
+          children: "-"
+        });
       }
       var className = (0, _classnames.default)({
         'varied-cell': originalValue !== undefined,
@@ -293,21 +414,32 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         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, {
@@ -318,7 +450,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
           node: value,
           value: value,
           currentValue: value,
-          toolTipProps: _toolTipProps
+          toolTipProps: _toolTipProps,
+          minWidth: minWidth,
+          isInNewRowFlag: isInNewRowFlag
         }), suffixNode(value, record, index)]
       });
     };
@@ -326,8 +460,14 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
     column.render = function (value, record, index) {
       var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
       if (!value && value !== 0 && value === originalValue) {
-        return '-';
+        (0, _jsxRuntime.jsx)("div", {
+          style: {
+            minWidth: minWidth
+          },
+          children: "-"
+        });
       }
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, {
@@ -339,7 +479,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
           value: value,
           currentValue: value || '-',
           originalDiffTip: _originalDiffTip,
-          toolTipProps: _toolTipProps
+          toolTipProps: _toolTipProps,
+          minWidth: minWidth,
+          isInNewRowFlag: isInNewRowFlag
         }), suffixNode(value, record, index)]
       });
     };
@@ -351,8 +493,14 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
       });
       if (!value && value !== 0 && value === originalValue) {
-        return '-';
+        (0, _jsxRuntime.jsx)("div", {
+          style: {
+            minWidth: minWidth
+          },
+          children: "-"
+        });
       }
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalValue || '-',
@@ -362,7 +510,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: value || '-',
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   }

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

@@ -11,6 +11,8 @@ interface Props {
     width?: number | string;
     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

@@ -27,20 +27,23 @@ 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,
+    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) {
         renderNode = (0, _jsxRuntime.jsx)(Text, {
           style: {
-            width: currentValue === '-' ? 32.5 : width
+            width: currentValue === '-' ? 32.5 : width,
+            minWidth: minWidth
           },
           ellipsis: {
             tooltip: false
@@ -51,10 +54,13 @@ var RenderColumn = function RenderColumn(props) {
       return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         className: "varied-cell",
         style: {
-          width: width
+          width: width,
+          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;
@@ -66,7 +72,8 @@ var RenderColumn = function RenderColumn(props) {
     return (0, _jsxRuntime.jsx)("span", {
       className: "varied-cell",
       style: {
-        width: width
+        width: width,
+        minWidth: minWidth
       },
       children: renderNode
     });
@@ -137,7 +144,12 @@ var RenderColumn = function RenderColumn(props) {
       }
     }, toolTipProps);
     if (!value) {
-      return '-';
+      return (0, _jsxRuntime.jsx)("div", {
+        style: {
+          minWidth: minWidth
+        },
+        children: "-"
+      });
     }
     return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       title: value,
@@ -150,7 +162,8 @@ var RenderColumn = function RenderColumn(props) {
     }, tooltipProps), {}, {
       children: (0, _jsxRuntime.jsx)(Text, {
         style: {
-          width: width
+          width: width,
+          minWidth: minWidth
         },
         ellipsis: true,
         onMouseOver: handleMouseOver,
@@ -159,6 +172,11 @@ var RenderColumn = function RenderColumn(props) {
       })
     }));
   }
-  return value || value === 0 ? node : '-';
+  return (0, _jsxRuntime.jsx)("div", {
+    style: {
+      minWidth: minWidth
+    },
+    children: value || value === 0 ? node : '-'
+  });
 };
 var _default = exports.default = RenderColumn;