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

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", "viewRender"];
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -84,8 +85,10 @@ 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,
+    viewRender = props.viewRender,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEditTable') || {},
     isDiffAll = _ref2.isDiffAll;
@@ -115,8 +118,25 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   }, [props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
+  var tipContent = (0, _react.useMemo)(function () {
+    var _getValueProps;
+    if (!isWatch || noChange) return undefined;
+    var orgValue = getValueProps ? (_getValueProps = getValueProps(originalValue)) === null || _getValueProps === void 0 ? void 0 : _getValueProps[valuePropName] : originalValue;
+    // 兼容viewRender函数和Element场景
+    var _children = children;
+    if (viewRender) {
+      if (! /*#__PURE__*/_react.default.isValidElement(viewRender)) {
+        return viewRender(orgValue);
+      }
+      _children = viewRender;
+    }
+    return /*#__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
+    }, valuePropName, orgValue), "checked", type === 'Switch' ? originalValue : undefined))) : undefined;
+  }, [originalValue, children]);
   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 +151,11 @@ 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), {}, {
-        // @ts-ignore
-        isView: true,
-        value: originalValue,
-        checked: type === 'Switch' ? originalValue : undefined
-      })) : undefined]
+      children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
     }),
     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

@@ -255,13 +255,19 @@ var RenderField = function RenderField(_ref) {
       TargetComponent = _editRender;
     }
   }
+  var viewRenderFun = function viewRenderFun(value) {
+    if (/*#__PURE__*/_react.default.isValidElement(viewRender)) {
+      return viewRender;
+    }
+    return viewRender === null || viewRender === void 0 ? void 0 : viewRender(value, record, options);
+  };
   // 查看模式
   if (isView) {
     // 存在viewRender覆盖默认值
     if (typeof viewRender === 'function') {
       var _column$dataIndex;
       currentValue = (column === null || column === void 0 ? void 0 : (_column$dataIndex = column.dataIndex) === null || _column$dataIndex === void 0 ? void 0 : _column$dataIndex.includes('-')) ? value : currentValue;
-      var View = viewRender(currentValue, record, options);
+      var View = viewRenderFun(currentValue);
       TargetComponent = (0, _jsxRuntime.jsx)(_Container.default, {
         viewEmpty: viewEmpty,
         children: View
@@ -566,6 +572,8 @@ var RenderField = function RenderField(_ref) {
         onChange: _onChange,
         valuePropName: _formItemProps.valuePropName,
         normalize: _formItemProps.normalize,
+        getValueProps: _formItemProps.getValueProps,
+        viewRender: viewRender && viewRenderFun,
         children: FieldComponent
       });
     }

package/lib/ProEditTable/index.js

@@ -92,7 +92,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return (_ref2 = (_themeConfig$data$zau = themeConfig === null || themeConfig === void 0 ? void 0 : (_themeConfig$data = themeConfig.data) === null || _themeConfig$data === void 0 ? void 0 : _themeConfig$data.zauiFormAlign) !== null && _themeConfig$data$zau !== void 0 ? _themeConfig$data$zau : configRequiredAlign) !== null && _ref2 !== void 0 ? _ref2 : 'left';
   }, [themeConfig === null || themeConfig === void 0 ? void 0 : (_themeConfig$data2 = themeConfig.data) === null || _themeConfig$data2 === void 0 ? void 0 : _themeConfig$data2.zauiFormAlign]);
   var _useSetState = (0, _ahooks.useSetState)({
-      _columns: columns,
       cellNamePath: [],
       forceUpdate: {},
       editingKeys: [],

package/lib/ProEditTable/propsType.d.ts

@@ -109,7 +109,6 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;
 export interface State {
-    _columns: ProEditTableColumnsProps[];
     cellNamePath: NamePath[];
     forceUpdate: {};
     editingKeys: string[];

package/lib/ProEditTable/utils/index.js

@@ -339,14 +339,21 @@ var transformColumns = exports.transformColumns = function transformColumns() {
         });
       }
       // 单行多行交互有较大差异
-      return (0, _jsxRuntime.jsx)("div", {
+      return (0, _jsxRuntime.jsxs)("div", {
         className: cellClassName,
         onClick: function onClick() {
           isCanEdit && setState({
             cellNamePath: cellName
           });
         },
-        children: (0, _jsxRuntime.jsx)(_components.RenderField, {
+        children: [index === 0 && !item.width ? (0, _jsxRuntime.jsx)("div", {
+          style: {
+            visibility: 'hidden',
+            height: 0,
+            paddingLeft: (item === null || item === void 0 ? void 0 : item.required) ? 16 : 0
+          },
+          children: columnTitle
+        }) : null, (0, _jsxRuntime.jsx)(_components.RenderField, {
           text: _text,
           record: record,
           index: index,
@@ -355,7 +362,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
             cellName: cellName,
             isEditing: isEditing // 是否正在编辑
           })
-        })
+        })]
       });
     };
     item.render = _render;

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/FormList/components/BlockFields.d.ts

@@ -3,6 +3,7 @@ import React from 'react';
 import { InternalNamePath } from 'antd/es/form/interface';
 import type { levelType } from '../../../../../ProLayout/components/ProCollapse/PropTypes';
 import type { FormListProps } from '../propsType';
+import { DiffConfigProps } from '../../../../propsType';
 interface Props extends Omit<FormListProps, 'toolbarProps'> {
     index: number;
     namePath: InternalNamePath;
@@ -14,6 +15,7 @@ interface Props extends Omit<FormListProps, 'toolbarProps'> {
     };
     level?: levelType;
     towCollapse?: boolean;
+    diffConfig?: DiffConfigProps;
 }
 declare const BlockFields: React.FC<Props>;
 export default BlockFields;

package/lib/ProForm/components/combination/FormList/components/BlockFields.js

@@ -36,7 +36,8 @@ var BlockFields = function BlockFields(props) {
     _props$level = props.level,
     level = _props$level === void 0 ? '2' : _props$level,
     towCollapse = props.towCollapse,
-    id = props.id;
+    id = props.id,
+    diffConfig = props.diffConfig;
   var _title = (0, _react.useMemo)(function () {
     if ((0, _lodash.isFunction)(title)) {
       var record = form.getFieldValue(namePath);
@@ -78,7 +79,8 @@ var BlockFields = function BlockFields(props) {
           form: form,
           colProps: colProps,
           disabled: disabled,
-          isView: isView
+          isView: isView,
+          diffConfig: diffConfig
         })
       }, field.key)
     })

package/lib/ProForm/components/combination/FormList/components/LineFields.d.ts

@@ -2,6 +2,7 @@ import { ColProps, FormListFieldData } from 'antd';
 import React from 'react';
 import { InternalNamePath } from 'antd/es/form/interface';
 import { FormListProps } from '../propsType';
+import { DiffConfigProps } from '../../../../propsType';
 interface Props extends Omit<FormListProps, 'toolbarProps'> {
     className?: string;
     index: number;
@@ -12,6 +13,7 @@ interface Props extends Omit<FormListProps, 'toolbarProps'> {
     field: Omit<FormListFieldData, 'key'> & {
         key: string;
     };
+    diffConfig?: DiffConfigProps;
 }
 declare const LineFields: React.FC<Props>;
 export default LineFields;

package/lib/ProForm/components/combination/FormList/components/LineFields.js

@@ -35,7 +35,8 @@ var LineFields = function LineFields(props) {
     isView = props.isView,
     draggable = props.draggable,
     className = props.className,
-    id = props.id;
+    id = props.id,
+    diffConfig = props.diffConfig;
   var isLess = mode === 'less';
   var _useSortable = (0, _sortable.useSortable)({
       id: field.key,
@@ -76,7 +77,8 @@ var LineFields = function LineFields(props) {
         form: form,
         colProps: colProps,
         disabled: disabled,
-        isView: isView
+        isView: isView,
+        diffConfig: diffConfig
       })
     }), actionProps !== false && (0, _jsxRuntime.jsx)(_ActionButton.default, {
       min: min,

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

@@ -11,6 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _antd = require("antd");
 var _core = require("@dnd-kit/core");
+var _lodash = require("lodash");
 var _sortable = require("@dnd-kit/sortable");
 var _utils = require("../../../utils");
 var _utils2 = require("./utils");
@@ -18,6 +19,7 @@ var _ToolbarButton = _interopRequireDefault(require("./components/ToolbarButton"
 var _BlockFields = _interopRequireDefault(require("./components/BlockFields"));
 var _LineFields = _interopRequireDefault(require("./components/LineFields"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
+var _ProConfigProvider = require("../../../../ProConfigProvider");
 var FormList = function FormList(props, ref) {
   var columns = props.columns,
     min = props.min,
@@ -39,9 +41,16 @@ var FormList = function FormList(props, ref) {
   var _ref = _ProForm.default.useFieldProps() || {},
     form = _ref.form,
     name = _ref.name,
-    isView = _ref.isView;
+    isView = _ref.isView,
+    diffConfig = _ref.diffConfig;
+  var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
+    isDiffAll = _useProConfig.isDiffAll;
   var errors = meta.errors;
   var _namePath = (0, _utils.toArray)(name);
+  var orgValues = (0, _lodash.get)(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
+  var _diffConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, diffConfig), {}, {
+    originalValues: isDiffAll ? orgValues || [] : orgValues
+  });
   var processColumns = (0, _react.useCallback)(function (fieldName, namePath) {
     return columns.map(function (item) {
       // names的name处理
@@ -104,7 +113,8 @@ var FormList = function FormList(props, ref) {
           colProps: {
             span: span
           },
-          form: form
+          form: form,
+          diffConfig: _diffConfig
         }), field.key) : (0, _jsxRuntime.jsx)(_LineFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           className: _fields.length === index + 1 ? 'pro-form-list-last' : ''
         }, props), {}, {
@@ -118,7 +128,8 @@ var FormList = function FormList(props, ref) {
           colProps: {
             span: mode === 'less' ? 24 : span
           },
-          form: form
+          form: form,
+          diffConfig: _diffConfig
         }), field.key);
       }), (0, _jsxRuntime.jsx)(_antd.Form.ErrorList, {
         errors: errors

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/combination/ProCascader/index.js

@@ -50,7 +50,7 @@ var getViewLabel = function getViewLabel(_ref) {
   return viewLabel;
 };
 var ProCascader = function ProCascader(props) {
-  var _props$otherProps, _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+  var _props$otherProps, _value$slice, _ref5, _ref5$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProAddressBar') || {},
     configDetailMaxLength = _ref2.detailMaxLength,
     configEnumCode = _ref2.enumCode,
@@ -90,16 +90,18 @@ var ProCascader = function ProCascader(props) {
   var realLevel = Math.max(2, level);
   var detail = value === null || value === void 0 ? void 0 : value[realLevel];
   var enumData = (0, _useEnum.default)(addressCode);
-  var _ref4 = Array.isArray(enumData) ? enumData : [],
-    _ref5 = (0, _slicedToArray2.default)(_ref4, 1),
-    _ref5$ = _ref5[0],
-    enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
+  var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProEnum'),
+    _useProConfig$dics = _useProConfig.dics,
+    dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
+  var enumDataSource = (0, _react.useMemo)(function () {
+    if (!(props === null || props === void 0 ? void 0 : props.mode)) {
+      return (dics === null || dics === void 0 ? void 0 : dics[addressCode]) || [];
+    }
+    return Array.isArray(enumData) ? enumData[0] : [];
+  }, [dics === null || dics === void 0 ? void 0 : dics[addressCode], enumData]);
   var realDataSource = (0, _react.useMemo)(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
     var result = (0, _index.transformDataName)(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
-    if (transformResponse) {
-      return transformResponse(result);
-    }
     return result;
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = (0, _objectSpread3.default)({}, useRequest),
@@ -115,7 +117,7 @@ var ProCascader = function ProCascader(props) {
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
   var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _yield$service, data, newData, transFormData, serviceData;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -143,9 +145,13 @@ var ProCascader = function ProCascader(props) {
       }, _callee);
     }));
     return function getFirstLevelOptions() {
-      return _ref6.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
+  // 提取出来默认每次都执行
+  if (transformResponse) {
+    realDataSource = transformResponse(realDataSource);
+  }
   (0, _react.useEffect)(function () {
     if (service) {
       // 传入useRequest时，初次加载级联第一级数据源
@@ -154,13 +160,14 @@ var ProCascader = function ProCascader(props) {
   }, [service]);
   (0, _react.useEffect)(function () {
     if (realIsView && value) {
+      var _realDataSource;
       // 传入dataSource + 查看时初始化展示
       if (service) {
         setDefaultLabel(getViewLabel({
           dataSource: serviceData,
           value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
         }));
-      } else if ((realDataSource === null || realDataSource === void 0 ? void 0 : realDataSource.length) > 0) {
+      } else if (((_realDataSource = realDataSource) === null || _realDataSource === void 0 ? void 0 : _realDataSource.length) > 0) {
         setDefaultLabel(getViewLabel({
           dataSource: realDataSource,
           value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
@@ -194,9 +201,9 @@ var ProCascader = function ProCascader(props) {
   var addressValue = isAddressMode ? value && ((_value$slice = value.slice(0, realLevel)) === null || _value$slice === void 0 ? void 0 : _value$slice.some(function (item) {
     return !!item;
   })) ? value.slice(0, realLevel) : undefined : value;
-  var viewValue = isAddressMode ? ((_ref7 = [].concat((0, _toConsumableArray2.default)(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref7 === void 0 ? void 0 : (_ref7$filter = _ref7.filter(function (item) {
+  var viewValue = isAddressMode ? ((_ref5 = [].concat((0, _toConsumableArray2.default)(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref5 === void 0 ? void 0 : (_ref5$filter = _ref5.filter(function (item) {
     return !!item;
-  })) === null || _ref7$filter === void 0 ? void 0 : _ref7$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
+  })) === null || _ref5$filter === void 0 ? void 0 : _ref5$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
     return !!item;
   })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
   var _findSelectedOptions = function findSelectedOptions(options, value) {

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

@@ -190,11 +190,25 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         value: item[valueKey],
         label: item[labelKey]
       }));
-    })) === null || _data$map === void 0 ? void 0 : _data$map.join('，') : undefined;
+    })) === null || _data$map === void 0 ? void 0 : _data$map.join('，') : '';
   };
   var viewText = (0, _react.useMemo)(function () {
-    return formatValue(labelInValue ? value : _value);
-  }, [value, _value]);
+    var nextValue = labelInValue ? value : _value;
+    if (labelInValue) {
+      nextValue = value;
+    } else {
+      var _options$find;
+      var optionDTO = options === null || options === void 0 ? void 0 : (_options$find = options.find) === null || _options$find === void 0 ? void 0 : _options$find.call(options, function (item) {
+        return item[valueKey] === value;
+      });
+      if (optionDTO) {
+        nextValue = optionDTO;
+      } else {
+        nextValue = _value;
+      }
+    }
+    return formatValue(nextValue);
+  }, [value, _value, options]);
   /**
    * 获取表格的rowKey，支持函数、字符串
    * @date 2023-02-16

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", "viewRender"];
 var ChangedWrapper = function ChangedWrapper(props) {
   var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
@@ -31,6 +31,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     normalize = props.normalize,
+    getValueProps = props.getValueProps,
+    viewRender = props.viewRender,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
@@ -56,11 +58,23 @@ var ChangedWrapper = function ChangedWrapper(props) {
   }, [isWatch, noChange, props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
+  var viewRenderFun = (0, _react.useMemo)(function () {
+    var record = form.getFieldsValue();
+    return function (orgValue) {
+      return viewRender(orgValue, record, {
+        form: form
+      });
+    };
+  }, [form]);
   var tipContent = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return undefined;
+    var valueProps = getValueProps && !names ? getValueProps(originalValue) : {
+      value: originalValue
+    };
+    if (viewRender) return viewRenderFun(valueProps === null || valueProps === void 0 ? void 0 : valueProps.value);
     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 +106,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

@@ -50,7 +50,8 @@ var Render = function Render(props) {
     requiredOnView = props.requiredOnView,
     confirm = props.confirm,
     globalControl = props.globalControl,
-    diffConfig = props.diffConfig;
+    diffConfig = props.diffConfig,
+    viewRender = props.viewRender;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -155,7 +156,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 +427,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 +439,8 @@ var Render = function Render(props) {
         onChange: handleChange,
         valuePropName: _otherFormItemProps.valuePropName,
         normalize: _otherFormItemProps.normalize,
+        getValueProps: _otherFormItemProps.getValueProps,
+        viewRender: viewRender,
         children: child
       });
     }

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

@@ -194,7 +194,8 @@ var RenderFields = function RenderFields(props) {
       namePath: column.namePath,
       listName: column.listName,
       globalControl: globalControl,
-      formDisabled: formDisabled
+      formDisabled: formDisabled,
+      diffConfig: diffConfig
     };
     return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
       value: otherProps,
@@ -217,7 +218,8 @@ var RenderFields = function RenderFields(props) {
         diffConfig: diffConfig,
         equalWith: equalWith,
         requiredOnView: requiredOnView,
-        globalControl: globalControl
+        globalControl: globalControl,
+        viewRender: viewRender
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });

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/propsType.d.ts

@@ -45,6 +45,7 @@ export interface ProFormOtherProps {
     globalControl?: boolean;
     formDisabled?: boolean;
     isDiffChange?: boolean;
+    diffConfig?: DiffConfigProps;
 }
 export interface DiffConfigProps<Values = any> {
     /** 比对原始数据源 */