@zat-design/sisyphus-react 3.9.0-beta.4 → 3.9.0-beta.5

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

@@ -26,7 +26,8 @@ var Group = function Group(props) {
     value = props.value,
     onChange = props.onChange,
     otherProps = props.otherProps,
-    id = props.id;
+    id = props.id,
+    isParentView = props.isView;
   var contextProps = ProForm.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
@@ -71,7 +72,7 @@ var Group = function Group(props) {
       children: columns.map(function (column, index) {
         return _jsx(ComRender, _objectSpread(_objectSpread({
           contextProps: contextProps,
-          isView: isView
+          isView: isParentView || isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);
@@ -82,7 +83,7 @@ var Group = function Group(props) {
       children: columns.map(function (column, index) {
         return _jsx(ComRender, _objectSpread(_objectSpread({
           contextProps: contextProps,
-          isView: isView
+          isView: isParentView || isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);

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

@@ -29,7 +29,6 @@ var ChangedWrapper = function ChangedWrapper(props) {
     getValueProps = props.getValueProps,
     viewRender = props.viewRender,
     rest = _objectWithoutProperties(props, _excluded);
-  // const contentRef = useRef(null);
   var _useProConfig = useProConfig('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
   var originalValues = diffConfig.originalValues,

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

@@ -1,6 +1,8 @@
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code", "copyable", "width", "tooltip", "transform", "prefix", "suffix", "dataIndex", "originalDiffTip", "toolTipProps", "minWidth", "onDiff"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { isValidElement } from 'react';
 import moment from 'moment';
@@ -11,6 +13,7 @@ import { tools } from '@zat-design/utils';
 import TooltipTitle from '../TooltipTitle';
 import RenderColumn from '../RenderColumn';
 import { getDecimalDigits, getOriginalValue } from '../../utils';
+import { isEmpty } from '../../../utils';
 import getEnumLabel from '../../../ProEnum/utils/getEnumLabel';
 import ProForm from '../../../ProForm';
 var isReactElement = function isReactElement(element) {
@@ -73,7 +76,8 @@ export var formatColumn = function formatColumn(_ref2) {
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
     minWidth = column.minWidth,
-    onDiff = column.onDiff;
+    onDiff = column.onDiff,
+    otherProps = _objectWithoutProperties(column, _excluded);
   // 仅在 {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({
@@ -136,9 +140,14 @@ export var formatColumn = function formatColumn(_ref2) {
           extraDiffFlag = true;
         }
       }
-      return _jsx(RenderColumn, {
+      // 存在比对
+      if (originalObj && isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
+        var _originalObj$record$r2;
+        otherProps.viewRender = otherProps.viewRender(originalValue, (_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 : {}, index);
+      }
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
-        originalValue: !originalValue && originalValue !== 0 ? null : extraDiffFlag ? originalRenderValue !== null && originalRenderValue !== void 0 ? originalRenderValue : originalValue : originalRenderValue,
+        originalValue: isEmpty(originalValue) ? null : extraDiffFlag ? originalRenderValue !== null && originalRenderValue !== void 0 ? originalRenderValue : originalValue : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         value: _value,
@@ -148,7 +157,7 @@ export var formatColumn = function formatColumn(_ref2) {
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
     return;
   }
@@ -174,7 +183,7 @@ export var formatColumn = function formatColumn(_ref2) {
       var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRealValue = tools.calc(Number(originalValue || null), '*', multiple);
       var originalRenderValue = getDecimalDigits(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
-      if (!originalValue && originalValue !== 0) {
+      if (isEmpty(originalValue)) {
         originalRenderValue = '-';
       }
       if (!value && value !== 0 && renderValue === originalRenderValue) {
@@ -190,7 +199,7 @@ export var formatColumn = function formatColumn(_ref2) {
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
       var isInNewRowFlag = isInNewRow(record);
-      return _jsx(RenderColumn, {
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
@@ -202,7 +211,7 @@ export var formatColumn = function formatColumn(_ref2) {
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
     // 千分位, 千分位带CNY前缀
   } else if (['thousandth', 'thousandthCNY'].includes(valueType)) {
@@ -212,7 +221,7 @@ export var formatColumn = function formatColumn(_ref2) {
       var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRealValue = valueTypePrecision ? "".concat(Number(originalValue).toFixed(valueTypePrecision)) : "".concat(originalValue);
       var originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-      if (!originalValue && originalValue !== 0) {
+      if (isEmpty(originalValue)) {
         originalRenderValue = '-';
       }
       var node = _jsxs(_Space, {
@@ -228,7 +237,7 @@ export var formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return _jsx(RenderColumn, {
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
@@ -240,7 +249,7 @@ export var formatColumn = function formatColumn(_ref2) {
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
     column.render = function (value, record, index) {
@@ -289,7 +298,7 @@ export var formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return _jsx(RenderColumn, {
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
@@ -301,7 +310,7 @@ export var formatColumn = function formatColumn(_ref2) {
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
     column.render = function (value, record, index) {
@@ -330,7 +339,7 @@ export var formatColumn = function formatColumn(_ref2) {
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
       var isInNewRowFlag = isInNewRow(record);
-      return _jsx(RenderColumn, {
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
@@ -342,7 +351,7 @@ export var formatColumn = function formatColumn(_ref2) {
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   } else if (precision || prefix || suffix) {
     column.render = function (value, record, index) {
@@ -353,7 +362,7 @@ export var formatColumn = function formatColumn(_ref2) {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
-      if (!originalValue && originalValue !== 0) {
+      if (isEmpty(originalValue)) {
         originalRenderValue = '-';
       }
       if (!value && value !== 0 && renderValue === originalRenderValue) {
@@ -365,7 +374,7 @@ export var formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return _jsx(RenderColumn, {
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
@@ -377,7 +386,7 @@ export var formatColumn = function formatColumn(_ref2) {
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   } else if (valueType === 'address') {
     column.render = function (value, record, index) {
@@ -420,7 +429,7 @@ export var formatColumn = function formatColumn(_ref2) {
         tooltip: false
       });
       var isInNewRowFlag = isInNewRow(record);
-      return _jsx(RenderColumn, {
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
@@ -432,14 +441,14 @@ export var formatColumn = function formatColumn(_ref2) {
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   } else if (copyable) {
     column.render = function (value, record, index) {
       var isInNewRowFlag = isInNewRow(record);
       return _jsxs(_Space, {
         size: 8,
-        children: [prefixNode(value, record, index), _jsx(RenderColumn, {
+        children: [prefixNode(value, record, index), _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
           valueType: valueType,
           copyable: copyable,
           ellipsis: ellipsis,
@@ -450,7 +459,7 @@ export var formatColumn = function formatColumn(_ref2) {
           toolTipProps: _toolTipProps,
           minWidth: minWidth,
           isInNewRowFlag: isInNewRowFlag
-        }), suffixNode(value, record, index)]
+        })), suffixNode(value, record, index)]
       });
     };
   } else if (ellipsis) {
@@ -467,7 +476,7 @@ export var formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       return _jsxs(_Space, {
         size: 8,
-        children: [prefixNode(value, record, index), _jsx(RenderColumn, {
+        children: [prefixNode(value, record, index), _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
           valueType: valueType,
           originalValue: originalValue === undefined ? undefined : originalValue || '-',
           ellipsis: ellipsis,
@@ -479,7 +488,7 @@ export var formatColumn = function formatColumn(_ref2) {
           toolTipProps: _toolTipProps,
           minWidth: minWidth,
           isInNewRowFlag: isInNewRowFlag
-        }), suffixNode(value, record, index)]
+        })), suffixNode(value, record, index)]
       });
     };
   } else {
@@ -498,7 +507,7 @@ export var formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return _jsx(RenderColumn, {
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalValue || '-',
         ellipsis: ellipsis,
@@ -510,7 +519,7 @@ export var formatColumn = function formatColumn(_ref2) {
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   }
 };

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

@@ -13,6 +13,7 @@ interface Props {
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     minWidth?: number;
     isInNewRowFlag?: boolean;
+    viewRender?: (value: any, record: any, index: number) => any;
 }
 declare const RenderColumn: FC<Props>;
 export default RenderColumn;

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

@@ -10,6 +10,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { useSetState } from 'ahooks';
 import { CheckOutlined } from '@ant-design/icons';
 import { ReactSVG } from 'react-svg';
+import { isEmpty } from '../../../utils';
 import copySvg from '../../../assets/copy.svg';
 var Paragraph = _Typography.Paragraph,
   Text = _Typography.Text;
@@ -27,14 +28,15 @@ var RenderColumn = function RenderColumn(props) {
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
     minWidth = props.minWidth,
-    isInNewRowFlag = props.isInNewRowFlag;
+    isInNewRowFlag = props.isInNewRowFlag,
+    viewRender = props.viewRender;
   var _useSetState = useSetState({
       tooltip: false
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
-  if ((originalValue || originalValue === 0) && !isInNewRowFlag) {
+  if (!isEmpty(originalValue) && !isInNewRowFlag) {
     var renderNode = value ? node : '-';
     if (ellipsis || originalDiffTip) {
       renderNode = _jsx(Text, {
@@ -63,7 +65,7 @@ var RenderColumn = function RenderColumn(props) {
             children: [_jsxs(_Space, {
               align: "start",
               className: "original-value-container",
-              children: ["\u521D\u59CB\u503C\uFF1A", originalValue]
+              children: ["\u521D\u59CB\u503C\uFF1A", viewRender || originalValue]
             }), _jsx(_Space, {
               className: "current-value-container",
               children: ellipsis ? _jsxs(_Space, {

package/es/ProTable/propsType.d.ts

@@ -45,6 +45,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
         value: any;
         originValue: any;
     }) => boolean;
+    viewRender?: (value: any, record: any, index: number) => any;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

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

@@ -32,7 +32,8 @@ var Group = function Group(props) {
     value = props.value,
     onChange = props.onChange,
     otherProps = props.otherProps,
-    id = props.id;
+    id = props.id,
+    isParentView = props.isView;
   var contextProps = _ProForm.default.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
@@ -77,7 +78,7 @@ var Group = function Group(props) {
       children: columns.map(function (column, index) {
         return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           contextProps: contextProps,
-          isView: isView
+          isView: isParentView || isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);
@@ -88,7 +89,7 @@ var Group = function Group(props) {
       children: columns.map(function (column, index) {
         return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           contextProps: contextProps,
-          isView: isView
+          isView: isParentView || isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);

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

@@ -34,7 +34,6 @@ var ChangedWrapper = function ChangedWrapper(props) {
     getValueProps = props.getValueProps,
     viewRender = props.viewRender,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  // const contentRef = useRef(null);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
   var originalValues = diffConfig.originalValues,

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getParentElement = exports.formatColumn = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _moment15 = _interopRequireDefault(require("moment"));
@@ -17,8 +18,10 @@ var _utils = require("@zat-design/utils");
 var _TooltipTitle = _interopRequireDefault(require("../TooltipTitle"));
 var _RenderColumn = _interopRequireDefault(require("../RenderColumn"));
 var _utils2 = require("../../utils");
+var _utils3 = require("../../../utils");
 var _getEnumLabel = _interopRequireDefault(require("../../../ProEnum/utils/getEnumLabel"));
 var _ProForm = _interopRequireDefault(require("../../../ProForm"));
+var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code", "copyable", "width", "tooltip", "transform", "prefix", "suffix", "dataIndex", "originalDiffTip", "toolTipProps", "minWidth", "onDiff"];
 var isReactElement = function isReactElement(element) {
   return /*#__PURE__*/(0, _react.isValidElement)(element);
 };
@@ -79,7 +82,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
     minWidth = column.minWidth,
-    onDiff = column.onDiff;
+    onDiff = column.onDiff,
+    otherProps = (0, _objectWithoutProperties2.default)(column, _excluded);
   // 仅在 {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({
@@ -142,9 +146,14 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           extraDiffFlag = true;
         }
       }
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      // 存在比对
+      if (originalObj && (0, _lodash.isFunction)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
+        var _originalObj$record$r2;
+        otherProps.viewRender = otherProps.viewRender(originalValue, (_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 : {}, index);
+      }
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         valueType: valueType,
-        originalValue: !originalValue && originalValue !== 0 ? null : extraDiffFlag ? originalRenderValue !== null && originalRenderValue !== void 0 ? originalRenderValue : originalValue : originalRenderValue,
+        originalValue: (0, _utils3.isEmpty)(originalValue) ? null : extraDiffFlag ? originalRenderValue !== null && originalRenderValue !== void 0 ? originalRenderValue : originalValue : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         value: _value,
@@ -154,7 +163,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
     return;
   }
@@ -180,7 +189,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
       var originalRealValue = _utils.tools.calc(Number(originalValue || null), '*', multiple);
       var originalRenderValue = (0, _utils2.getDecimalDigits)(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
-      if (!originalValue && originalValue !== 0) {
+      if ((0, _utils3.isEmpty)(originalValue)) {
         originalRenderValue = '-';
       }
       if (!value && value !== 0 && renderValue === originalRenderValue) {
@@ -196,7 +205,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
@@ -208,7 +217,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
     // 千分位, 千分位带CNY前缀
   } else if (['thousandth', 'thousandthCNY'].includes(valueType)) {
@@ -218,7 +227,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
       var originalRealValue = valueTypePrecision ? "".concat(Number(originalValue).toFixed(valueTypePrecision)) : "".concat(originalValue);
       var originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-      if (!originalValue && originalValue !== 0) {
+      if ((0, _utils3.isEmpty)(originalValue)) {
         originalRenderValue = '-';
       }
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
@@ -234,7 +243,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
@@ -246,7 +255,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
     column.render = function (value, record, index) {
@@ -295,7 +304,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
@@ -307,7 +316,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
     column.render = function (value, record, index) {
@@ -336,7 +345,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
@@ -348,7 +357,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   } else if (precision || prefix || suffix) {
     column.render = function (value, record, index) {
@@ -359,7 +368,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
-      if (!originalValue && originalValue !== 0) {
+      if ((0, _utils3.isEmpty)(originalValue)) {
         originalRenderValue = '-';
       }
       if (!value && value !== 0 && renderValue === originalRenderValue) {
@@ -371,7 +380,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
@@ -383,7 +392,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   } else if (valueType === 'address') {
     column.render = function (value, record, index) {
@@ -426,7 +435,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         tooltip: false
       });
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
@@ -438,14 +447,14 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         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, {
+        children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
           valueType: valueType,
           copyable: copyable,
           ellipsis: ellipsis,
@@ -456,7 +465,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           toolTipProps: _toolTipProps,
           minWidth: minWidth,
           isInNewRowFlag: isInNewRowFlag
-        }), suffixNode(value, record, index)]
+        })), suffixNode(value, record, index)]
       });
     };
   } else if (ellipsis) {
@@ -473,7 +482,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
-        children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+        children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
           valueType: valueType,
           originalValue: originalValue === undefined ? undefined : originalValue || '-',
           ellipsis: ellipsis,
@@ -485,7 +494,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           toolTipProps: _toolTipProps,
           minWidth: minWidth,
           isInNewRowFlag: isInNewRowFlag
-        }), suffixNode(value, record, index)]
+        })), suffixNode(value, record, index)]
       });
     };
   } else {
@@ -504,7 +513,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalValue || '-',
         ellipsis: ellipsis,
@@ -516,7 +525,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   }
 };

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

@@ -13,6 +13,7 @@ interface Props {
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     minWidth?: number;
     isInNewRowFlag?: boolean;
+    viewRender?: (value: any, record: any, index: number) => any;
 }
 declare const RenderColumn: FC<Props>;
 export default RenderColumn;

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

@@ -12,6 +12,7 @@ var _antd = require("antd");
 var _ahooks = require("ahooks");
 var _icons = require("@ant-design/icons");
 var _reactSvg = require("react-svg");
+var _utils = require("../../../utils");
 var _copy = _interopRequireDefault(require("../../../assets/copy.svg"));
 var Paragraph = _antd.Typography.Paragraph,
   Text = _antd.Typography.Text;
@@ -29,14 +30,15 @@ var RenderColumn = function RenderColumn(props) {
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
     minWidth = props.minWidth,
-    isInNewRowFlag = props.isInNewRowFlag;
+    isInNewRowFlag = props.isInNewRowFlag,
+    viewRender = props.viewRender;
   var _useSetState = (0, _ahooks.useSetState)({
       tooltip: false
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
-  if ((originalValue || originalValue === 0) && !isInNewRowFlag) {
+  if (!(0, _utils.isEmpty)(originalValue) && !isInNewRowFlag) {
     var renderNode = value ? node : '-';
     if (ellipsis || originalDiffTip) {
       renderNode = (0, _jsxRuntime.jsx)(Text, {
@@ -65,7 +67,7 @@ var RenderColumn = function RenderColumn(props) {
             children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
               align: "start",
               className: "original-value-container",
-              children: ["\u521D\u59CB\u503C\uFF1A", originalValue]
+              children: ["\u521D\u59CB\u503C\uFF1A", viewRender || originalValue]
             }), (0, _jsxRuntime.jsx)(_antd.Space, {
               className: "current-value-container",
               children: ellipsis ? (0, _jsxRuntime.jsxs)(_antd.Space, {

package/lib/ProTable/propsType.d.ts

@@ -45,6 +45,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
         value: any;
         originValue: any;
     }) => boolean;
+    viewRender?: (value: any, record: any, index: number) => any;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.9.0-beta.4",
+  "version": "3.9.0-beta.5",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",