@zat-design/sisyphus-react 3.8.2 → 3.8.3

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,6 +108,30 @@ 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 !== 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,
+        ellipsis: ellipsis,
+        width: width,
+        value: _value,
+        node: _value,
+        currentValue: _value,
+        originalDiffTip: _originalDiffTip,
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
+      });
+    };
     return;
   }
   if (tooltip) {
@@ -108,7 +175,8 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -138,7 +206,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)) {
@@ -191,7 +260,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)) {
@@ -229,7 +299,8 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   } else if (precision || prefix || suffix) {
@@ -256,7 +327,8 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: _toolTipProps
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   } else if (valueType === 'address') {
@@ -312,7 +384,8 @@ export var formatColumn = function formatColumn(_ref) {
           node: value,
           value: value,
           currentValue: value,
-          toolTipProps: _toolTipProps
+          toolTipProps: _toolTipProps,
+          minWidth: minWidth
         }), suffixNode(value, record, index)]
       });
     };
@@ -333,7 +406,8 @@ export var formatColumn = function formatColumn(_ref) {
           value: value,
           currentValue: value || '-',
           originalDiffTip: _originalDiffTip,
-          toolTipProps: _toolTipProps
+          toolTipProps: _toolTipProps,
+          minWidth: minWidth
         }), suffixNode(value, record, index)]
       });
     };
@@ -356,7 +430,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

@@ -30,7 +30,7 @@ export var defaultPage = {
   pageSize: 10
 };
 function ProTable(props) {
-  var _locale$ProTable, _curTableConfig$pathK;
+  var _locale$ProTable, _props$scroll, _curTableConfig$pathK;
   var _ref = useProConfig('globalConfig') || {},
     configStorage = _ref.storage; // 获取全局缓存位置配置
   var _ref2 = useProConfig('ProTable') || {},
@@ -58,6 +58,9 @@ function ProTable(props) {
     restProps = _objectWithoutProperties(props, _excluded);
   var _props$scrollFollowPa = props.scrollFollowParent,
     scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa;
+  var _scroll = (_props$scroll = props === null || props === void 0 ? void 0 : props.scroll) !== null && _props$scroll !== void 0 ? _props$scroll : {
+    x: 'max-content'
+  };
   var wrapToolTipProps = {
     getPopupContainer: scrollFollowParent ? function (triggerNode) {
       return triggerNode.parentNode;
@@ -201,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;
@@ -225,6 +232,13 @@ function ProTable(props) {
       return true;
     });
   }, [columns]);
+  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;
+  }
   var handleColumnConfig = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;
@@ -415,7 +429,8 @@ function ProTable(props) {
             summary: summary,
             dataSource: _dataSource
           },
-          dataSource: _dataSource
+          dataSource: _dataSource,
+          scroll: _scroll
         })), _jsx("span", {
           className: "pro-table-resizable-line",
           style: {

package/es/ProTable/style/index.less

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

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

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireWildcard(require("react"));
@@ -16,7 +17,7 @@ var _lodash = require("lodash");
 var _diffOriginal = require("../../../ProForm/utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
-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"];
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -70,6 +71,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
   }) : (0, _lodash.get)(originalValues, originalName);
 };
 var ListChangedWrapper = function ListChangedWrapper(props) {
+  var _getValueProps;
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
@@ -84,6 +86,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 = (0, _objectWithoutProperties2.default)(props, _excluded);
@@ -116,7 +119,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
   if (!isWatch || noChange) {
-    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest));
+    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest));
   }
   var diffClassName = (0, _classnames.default)({
     'pro-form-item-changed': isChanged,
@@ -131,16 +134,14 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       return target.parentElement;
     },
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {
-      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children), {}, {
+      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({
         // @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: (0, _jsxRuntime.jsx)("div", {
       className: diffClassName,
-      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest)) : undefined
+      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest)) : undefined
     })
   });
 };

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

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

package/lib/ProEnum/hooks/useEnumRequest.js

@@ -49,7 +49,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 = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)((0, _objectSpread2.default)({

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;
+    }
+  }
+}