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

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

@@ -32,15 +32,15 @@ var Group = function Group(props) {
     value = props.value,
     onChange = props.onChange,
     otherProps = props.otherProps,
-    disabled = props.disabled,
     id = props.id,
-    isView = props.isView;
+    isParentView = props.isView;
   var contextProps = _ProForm.default.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
     form = contextProps.form,
     namePath = contextProps.namePath,
-    index = contextProps.index;
+    index = contextProps.index,
+    isView = contextProps.isView;
   var _option = _react.default.useRef([]);
   // 组合onChange
   var handleChange = function handleChange(value, option, index) {
@@ -78,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);
@@ -89,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/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,
@@ -79,7 +79,7 @@ var ProCascader = function ProCascader(props) {
     code = _props$code === void 0 ? configCode : _props$code,
     tooltip = props.tooltip,
     _props$separator = props.separator,
-    separator = _props$separator === void 0 ? '' : _props$separator,
+    separator = _props$separator === void 0 ? '/' : _props$separator,
     detailPlaceholder = props.detailPlaceholder,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref3 = _.default.useFieldProps() || {},
@@ -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
@@ -826,7 +840,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       onOk: handleFinish,
       // @ts-ignore
       onCancel: handleClose,
-      visible: visible
+      visible: visible,
+      zIndex: 1071
     }, restModalProps), {}, {
       children: [(0, _jsxRuntime.jsx)(_index.ProForm, {
         submitOnEnter: true,

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", "getValueProps"];
+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,
@@ -32,12 +32,15 @@ var ChangedWrapper = function ChangedWrapper(props) {
     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;
   var originalValues = diffConfig.originalValues,
     changeTipColor = diffConfig.changeTipColor,
-    addTipColor = diffConfig.addTipColor;
+    addTipColor = diffConfig.addTipColor,
+    _diffConfig$scrollFol = diffConfig.scrollFollowParent,
+    scrollFollowParent = _diffConfig$scrollFol === void 0 ? true : _diffConfig$scrollFol;
   var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
   var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
@@ -57,9 +60,19 @@ var ChangedWrapper = function ChangedWrapper(props) {
   }, [isWatch, noChange, props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
+  var viewRenderFun = (0, _react.useMemo)(function () {
+    return function (orgValue) {
+      return viewRender(orgValue, originalValues, {
+        form: form
+      });
+    };
+  }, [form]);
   var tipContent = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return undefined;
-    var valueProps = getValueProps ? getValueProps(originalValue) : originalValue;
+    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, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;
@@ -71,27 +84,32 @@ var ChangedWrapper = function ChangedWrapper(props) {
       originalValues: isNestedField ? originalValues : undefined
     }, children.props), rest));
   }
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  // const isFocus = useFocus(contentRef.current);
   var tipOpenCalc = function tipOpenCalc() {
     if (!toolTip) return false;
-    // 传入undefined 鼠标移入显示移出隐藏
+    // 传入undefined 鼠标移入显示移出隐藏 获得焦点时不显示气泡
     return isChanged ? undefined : false;
   };
   var style = {
     '--zaui-contract-bg': changeTipColor,
     '--zaui-contract-bg-add': addTipColor
   };
+  // @ts-ignore
+  var _showEllipse = ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.tooltip);
   var diffClassName = (0, _classnames.default)({
     'pro-form-item-changed': isChanged,
     'pro-form-item-add': isAdd
   });
-  // @ts-ignore
-  var _showEllipse = ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.tooltip);
+  var open = tipOpenCalc();
   return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-    open: tipOpenCalc(),
-    // mouseEnterDelay={1}
-    getPopupContainer: function getPopupContainer(target) {
-      return target.parentElement;
+    open: open,
+    getPopupContainer: function getPopupContainer(trigger) {
+      return scrollFollowParent ? trigger.parentElement : document.body;
     },
+    overlayClassName: "original-value-tootip",
+    placement: "topLeft",
+    autoAdjustOverflow: false,
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {
       direction: "vertical",
       className: "changed-tooltip",
@@ -102,15 +120,16 @@ var ChangedWrapper = function ChangedWrapper(props) {
       }), _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), {}, {
+          scrollFollowParent: scrollFollowParent,
           isView: true
         })) : undefined]
       })]
     }),
-    placement: "topLeft",
     children: (0, _jsxRuntime.jsx)("div", {
       className: diffClassName,
       style: style,
       children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
+        scrollFollowParent: scrollFollowParent,
         otherProps: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
           isDiffChange: isChanged
         })

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,
@@ -439,6 +440,7 @@ var Render = function Render(props) {
         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/propsType.d.ts

@@ -45,6 +45,7 @@ export interface ProFormOtherProps {
     globalControl?: boolean;
     formDisabled?: boolean;
     isDiffChange?: boolean;
+    diffConfig?: DiffConfigProps;
 }
 export interface DiffConfigProps<Values = any> {
     /** 比对原始数据源 */
@@ -55,6 +56,8 @@ export interface DiffConfigProps<Values = any> {
     changeTipColor?: string;
     /** 新增提示颜色 */
     addTipColor?: string;
+    /** 是否跟随父组件滚动 */
+    scrollFollowParent?: string;
 }
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;

package/lib/ProForm/style/index.less

@@ -53,6 +53,11 @@
   }
 
   &.pro-form-view {
+    .pro-group{
+      .@{ant-prefix}-space-item, .pro-form-view-container{
+        width: max-content;
+      }
+    }
     .@{ant-prefix}-form-item-label {
       label {
         color: var(--zaui-aide-text, #939599);
@@ -329,6 +334,9 @@
     border-radius: 4px;
     background: @zaui-contract-bg !important;
 
+    .@{ant-prefix}-input {
+      background: @zaui-contract-bg !important;
+    }
     .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
       background: @zaui-contract-bg !important;
     }
@@ -403,6 +411,10 @@
     border-radius: 4px;
     background: @zaui-contract-bg-add !important;
 
+    .@{ant-prefix}-input {
+      background: @zaui-contract-bg !important;
+    }
+    
     .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
       background: @zaui-contract-bg-add !important;
     }
@@ -473,15 +485,29 @@
   }
 }
 
-.changed-tooltip {
-  .original-value-container {
-    .ant-space-item:nth-child(1) {
-      white-space: nowrap;
+.original-value-tootip{
+  max-width: 100%;
+  width: max-content;
+  position: fixed;
+  .changed-tooltip {
+    .original-value-container {
+      .ant-space-item:nth-child(1) {
+        white-space: nowrap;
+      }
+      .pro-group{
+        .ant-space-compact{
+          display: block;
+        }
+        .pro-form-view-container{
+          word-break: keep-all;
+        }
+      }
     }
-  }
-  .current-value-container {
-    .ant-space-item:nth-child(1) {
-      white-space: nowrap;
+    .current-value-container {
+      .ant-space-item:nth-child(1) {
+        white-space: nowrap;
+      }
     }
   }
-}
+}
+

package/lib/ProForm/utils/diffOriginal.js

@@ -6,6 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.diffOriginal = void 0;
 var _lodash = require("lodash");
 var _utils = require("../../utils");
+// 过滤对象中undefined字段
+// 防止{a: '1'} {a: '1', b: undefined}被认为不相等
+var filterUndefined = function filterUndefined(data) {
+  if (!(0, _lodash.isObject)(data) || Array.isArray(data) || data === null) return data;
+  var resData = {};
+  Object.keys(data).forEach(function (key) {
+    if (data[key] !== undefined) {
+      resData[key] = data[key];
+    }
+  });
+  return resData;
+};
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
 var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
@@ -35,7 +47,7 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
     return isSame ? 'same' : 'changed';
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return (0, _lodash.isEqual)(value, originalValue) ? 'same' : 'changed';
+    return (0, _lodash.isEqual)(filterUndefined(value), filterUndefined(originalValue)) ? 'same' : 'changed';
   }
   return 'same';
 };

package/lib/ProForm/utils/useShouldUpdate.js

@@ -170,9 +170,6 @@ var useShouldUpdate = function useShouldUpdate(props) {
         index: index,
         namePath: namePath
       }) : rules;
-      // const _component = isFunction(originComponent)
-      //   ? originComponent(_currentValues, { form, index, namePath })
-      //   : newComponent;
       var _fieldProps = (0, _lodash.isFunction)(fieldProps) ? fieldProps(_currentValues, {
         form: form,
         index: index,
@@ -203,17 +200,12 @@ var useShouldUpdate = function useShouldUpdate(props) {
       }
       var equalRes = (0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun);
       var proEqualRes = (0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun);
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes
-      // 值变更，需要同步更新函数式的fieldProps
-      // (isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) && !isEqual(prevValues, currentValues)) ||
-      // !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||
-      // equalDependencies(dependencies, prevValues, _currentValues)
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes || (_fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.transformResponse) // 防止fieldProps变更时，transformResponse根据fieldProps新值无法触发更新
       ) {
         showRef.current = _show;
         disabledRef.current = _disabled;
         requiredRef.current = _required;
         rulesRef.current = _rules;
-        // originComponentRef.current = _component;
         fieldPropsRef.current = _fieldProps;
         reRender({});
         return false;

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

@@ -1,14 +1,15 @@
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, }: {
+export declare const formatColumn: ({ column, originalObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, diffConfig, }: {
     column: ProTableColumn;
     originalObj: any;
-    dataSourceObj: any;
     rowKey: any;
     diffToolTip?: boolean;
     wrapToolTipProps?: any;
     scroll?: any;
     onUpdateMinWidth?: any;
+    isInNewRow?: any;
+    diffConfig: any;
 }) => void;
 /**
  * 查找最近的父级className