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

package/lib/ProEnum/index.js

@@ -54,8 +54,8 @@ var ProEnum = function ProEnum(props) {
     showCodeName = _ref2.showCodeName,
     resProps = (0, _objectWithoutProperties2.default)(_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 = (0, _react.useState)(dataSource || []),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     dataList = _useState2[0],

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

@@ -86,7 +86,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/lib/ProForm/components/combination/Group/component/ComRender.d.ts

@@ -14,6 +14,7 @@ interface Props {
     name?: NamePath;
     valueType: string;
     valuePropName?: string;
+    isView?: boolean;
     getValueProps?: (value: any) => Record<string, unknown>;
 }
 /** 渲染组件 */

package/lib/ProForm/components/combination/Group/component/ComRender.js

@@ -15,7 +15,7 @@ var _ConfirmWrapper = _interopRequireDefault(require("../../../../components/ren
 var _useFieldProps = require("../../../../utils/useFieldProps");
 var componentMap = _interopRequireWildcard(require("../../../../../index"));
 var _AddonWrapper = _interopRequireDefault(require("./AddonWrapper"));
-var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType"];
+var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView"];
 // 这里的key与组件内参数一致, 决定使用哪个包裹组件
 var wrapperMap = {
   confirm: _ConfirmWrapper.default,
@@ -49,6 +49,7 @@ var ComRender = function ComRender(props) {
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     valueType = props.valueType,
+    isView = props.isView,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var TypeComponent = componentMap[type];
   var mergedGetValueProps = getValueProps || function (val) {
@@ -61,7 +62,8 @@ var ComRender = function ComRender(props) {
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {
       valueType: valueType,
-      type: type
+      type: type,
+      isView: isView
     }),
     children: Com
   });

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

@@ -33,7 +33,8 @@ var Group = function Group(props) {
     onChange = props.onChange,
     otherProps = props.otherProps,
     disabled = props.disabled,
-    id = props.id;
+    id = props.id,
+    isView = props.isView;
   var contextProps = _ProForm.default.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
@@ -76,7 +77,8 @@ var Group = function Group(props) {
     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)({
-          contextProps: contextProps
+          contextProps: contextProps,
+          isView: isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);
@@ -86,7 +88,8 @@ var Group = function Group(props) {
     }, (0, _lodash.omit)(space, ['separator', 'compact'])), {}, {
       children: columns.map(function (column, index) {
         return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-          contextProps: contextProps
+          contextProps: contextProps,
+          isView: isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);

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

@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _diffOriginal = require("../../utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
-var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize"];
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps"];
 var ChangedWrapper = function ChangedWrapper(props) {
   var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
@@ -31,6 +31,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 = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
@@ -58,9 +59,10 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var isChanged = diffType === 'changed';
   var tipContent = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return undefined;
+    var valueProps = getValueProps ? getValueProps(originalValue) : originalValue;
     return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), {}, (0, _defineProperty2.default)({
       isView: true
-    }, valuePropName, originalValue))) : undefined;
+    }, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
     // 嵌套子组件
@@ -92,9 +94,13 @@ var ChangedWrapper = function ChangedWrapper(props) {
     },
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {
       direction: "vertical",
+      className: "changed-tooltip",
       children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
+        align: "start",
+        className: "original-value-container",
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
       }), _showEllipse && (0, _jsxRuntime.jsxs)(_antd.Space, {
+        className: "current-value-container",
         children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
           isView: true
         })) : undefined]

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

@@ -155,7 +155,7 @@ var Render = function Render(props) {
     };
   }
   /** 移除多余参数，防止透传给formItem报错 */
-  var _otherFormItemProps = (0, _lodash.omit)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow']);
+  var _otherFormItemProps = (0, _lodash.omit)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames']);
   /**
    * globalControl 全局控制优先
    * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
@@ -426,7 +426,7 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-    if (diffConfig) {
+    if (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues) {
       child = (0, _jsxRuntime.jsx)(_ChangedWrapper.default, {
         name: formItemProps.name,
         names: otherProps.names,
@@ -438,6 +438,7 @@ var Render = function Render(props) {
         onChange: handleChange,
         valuePropName: _otherFormItemProps.valuePropName,
         normalize: _otherFormItemProps.normalize,
+        getValueProps: _otherFormItemProps.getValueProps,
         children: child
       });
     }

package/lib/ProForm/components/render/propsType.d.ts

@@ -182,6 +182,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     }) => React.ReactElement<any, any> | string | undefined | null;
     viewType?: ViewType;
     colProps?: ColProps;
+    /** 依赖刷新字段列表 */
+    dependNames?: NamePath[];
     /**
      * @description       表单item的props属性
      * @deprecated        将于下个版本 4.0.0 被弃用
@@ -190,6 +192,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     formItemProps?: FormItemProps<Values> & {
         index?: number;
         namePath?: NamePath;
+        /** 依赖刷新字段列表 */
+        dependNames?: NamePath[];
     };
     /**
      * @description       表单props属性

package/lib/ProForm/style/index.less

@@ -387,7 +387,7 @@
     
     // textArea
     .@{ant-prefix}-input-textarea > textarea  {
-      background: @zaui-contract-bg;
+      background: @zaui-contract-bg !important;
     }
 
     .pro-form-view-container {
@@ -461,7 +461,7 @@
     
     // textArea
     .@{ant-prefix}-input-textarea > textarea {
-      background: @zaui-contract-bg-add;
+      background: @zaui-contract-bg-add !important;
     }
 
 
@@ -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/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取当前行数据
@@ -189,11 +203,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 ||
+      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)) {
+      // equalDependencies(dependencies, prevValues, _currentValues)
+      ) {
         showRef.current = _show;
         disabledRef.current = _disabled;
         requiredRef.current = _required;

package/lib/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/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,45 @@ 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;
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -43,7 +76,17 @@ 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;
+  // 仅在 {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 +114,30 @@ 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) {
+      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) : undefined;
+      var originalValue = (0, _utils2.getOriginalValue)(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
+      var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {}, index) : undefined;
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+        valueType: valueType,
+        originalValue: originalValue === undefined ? undefined : originalRenderValue,
+        ellipsis: ellipsis,
+        width: width,
+        value: _value,
+        node: _value,
+        currentValue: _value,
+        originalDiffTip: _originalDiffTip,
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
+      });
+    };
     return;
   }
   if (tooltip) {
@@ -99,7 +166,12 @@ 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,
@@ -114,7 +186,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -133,7 +206,12 @@ 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: "-"
+        });
       }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
@@ -144,7 +222,8 @@ var formatColumn = exports.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)) {
@@ -186,7 +265,12 @@ 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: "-"
+        });
       }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
@@ -197,7 +281,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -235,7 +320,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   } else if (precision || prefix || suffix) {
@@ -251,7 +337,12 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         originalRenderValue = '-';
       }
       if (!value && value !== 0 && renderValue === originalRenderValue) {
-        return '-';
+        (0, _jsxRuntime.jsx)("div", {
+          style: {
+            minWidth: minWidth
+          },
+          children: "-"
+        });
       }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
@@ -262,7 +353,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   } else if (valueType === 'address') {
@@ -275,7 +367,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,
@@ -318,7 +415,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
           node: value,
           value: value,
           currentValue: value,
-          toolTipProps: _toolTipProps
+          toolTipProps: _toolTipProps,
+          minWidth: minWidth
         }), suffixNode(value, record, index)]
       });
     };
@@ -326,7 +424,12 @@ 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: "-"
+        });
       }
       return (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
@@ -339,7 +442,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
           value: value,
           currentValue: value || '-',
           originalDiffTip: _originalDiffTip,
-          toolTipProps: _toolTipProps
+          toolTipProps: _toolTipProps,
+          minWidth: minWidth
         }), suffixNode(value, record, index)]
       });
     };
@@ -351,7 +455,12 @@ 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: "-"
+        });
       }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
@@ -362,7 +471,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: value || '-',
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   }

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

@@ -27,7 +27,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 = (0, _ahooks.useSetState)({
       tooltip: false
     }),
@@ -40,7 +41,8 @@ var RenderColumn = function RenderColumn(props) {
       if (ellipsis) {
         renderNode = (0, _jsxRuntime.jsx)(Text, {
           style: {
-            width: currentValue === '-' ? 32.5 : width
+            width: currentValue === '-' ? 32.5 : width,
+            minWidth: minWidth
           },
           ellipsis: {
             tooltip: false
@@ -51,7 +53,8 @@ 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]
@@ -66,7 +69,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 +141,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 +159,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 +169,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;