@zat-design/sisyphus-react 3.6.9-beta.4 → 3.6.10

package/dist/index.esm.css

@@ -2883,6 +2883,47 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   vertical-align: bottom;
   fill: var(--zaui-aide-text, #909090);
 }
+.pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper,
+.pro-form .ant-form-item.pro-form-item-changed .ant-select .ant-select-selector,
+.pro-form .ant-form-item.pro-form-item-changed .ant-picker,
+.pro-form .ant-form-item.pro-form-item-changed .ant-input-number {
+  background: var(--zaui-contract-bg, #fffaa1) !important;
+}
+.pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper input,
+.pro-form .ant-form-item.pro-form-item-changed .ant-select .ant-select-selector input,
+.pro-form .ant-form-item.pro-form-item-changed .ant-picker input,
+.pro-form .ant-form-item.pro-form-item-changed .ant-input-number input {
+  background: transparent;
+}
+.pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
+.pro-form .ant-form-item.pro-form-item-changed .ant-select .ant-select-selector .ant-select-selection-placeholder,
+.pro-form .ant-form-item.pro-form-item-changed .ant-picker .ant-select-selection-placeholder,
+.pro-form .ant-form-item.pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
+  z-index: 9;
+}
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
+  background: var(--zaui-contract-bg, #fffaa1);
+  border-radius: 4px;
+}
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > span {
+  border-radius: 4px;
+  padding: 5px 8px;
+  background: var(--zaui-contract-bg, #fffaa1);
+}
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-select-selector,
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-affix-wrapper,
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-disabled {
+  background: var(--zaui-contract-bg, #fffaa1);
+}
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
+  background: var(--zaui-contract-bg, #fffaa1);
+}
+.pro-form .ant-form-item.pro-form-item-changed .pro-form-view-container {
+  padding: 4px 8px;
+  background: var(--zaui-contract-bg, #fffaa1);
+  border-radius: 4px;
+}
 .pro-form .ant-form-item .ant-row {
   width: 100%;
 }
@@ -3035,47 +3076,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-list-mode-block .pro-collapse-content .ant-row {
   width: auto;
 }
-.pro-form .pro-form-item-changed span.ant-input-affix-wrapper,
-.pro-form .pro-form-item-changed .ant-select .ant-select-selector,
-.pro-form .pro-form-item-changed .ant-picker,
-.pro-form .pro-form-item-changed .ant-input-number {
-  background: var(--zaui-contract-bg, #fffaa1) !important;
-}
-.pro-form .pro-form-item-changed span.ant-input-affix-wrapper input,
-.pro-form .pro-form-item-changed .ant-select .ant-select-selector input,
-.pro-form .pro-form-item-changed .ant-picker input,
-.pro-form .pro-form-item-changed .ant-input-number input {
-  background: transparent;
-}
-.pro-form .pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
-.pro-form .pro-form-item-changed .ant-select .ant-select-selector .ant-select-selection-placeholder,
-.pro-form .pro-form-item-changed .ant-picker .ant-select-selection-placeholder,
-.pro-form .pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
-  z-index: 9;
-}
-.pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
-.pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
-  background: var(--zaui-contract-bg, #fffaa1);
-  border-radius: 4px;
-}
-.pro-form .pro-form-item-changed .ant-form-item-control-input-content > span {
-  border-radius: 4px;
-  padding: 5px 8px;
-  background: var(--zaui-contract-bg, #fffaa1);
-}
-.pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-select-selector,
-.pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-affix-wrapper,
-.pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-disabled {
-  background: var(--zaui-contract-bg, #fffaa1);
-}
-.pro-form .pro-form-item-changed .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
-  background: var(--zaui-contract-bg, #fffaa1);
-}
-.pro-form .pro-form-item-changed .pro-form-view-container {
-  padding: 4px 8px;
-  background: var(--zaui-contract-bg, #fffaa1);
-  border-radius: 4px;
-}
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {
   padding: var(--zaui-space-size-sm, 8px);
   background: #f8f9fa;

package/dist/less.esm.css

@@ -2883,6 +2883,47 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   vertical-align: bottom;
   fill: var(--zaui-aide-text, #909090);
 }
+.pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper,
+.pro-form .ant-form-item.pro-form-item-changed .ant-select .ant-select-selector,
+.pro-form .ant-form-item.pro-form-item-changed .ant-picker,
+.pro-form .ant-form-item.pro-form-item-changed .ant-input-number {
+  background: var(--zaui-contract-bg, #fffaa1) !important;
+}
+.pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper input,
+.pro-form .ant-form-item.pro-form-item-changed .ant-select .ant-select-selector input,
+.pro-form .ant-form-item.pro-form-item-changed .ant-picker input,
+.pro-form .ant-form-item.pro-form-item-changed .ant-input-number input {
+  background: transparent;
+}
+.pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
+.pro-form .ant-form-item.pro-form-item-changed .ant-select .ant-select-selector .ant-select-selection-placeholder,
+.pro-form .ant-form-item.pro-form-item-changed .ant-picker .ant-select-selection-placeholder,
+.pro-form .ant-form-item.pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
+  z-index: 9;
+}
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
+  background: var(--zaui-contract-bg, #fffaa1);
+  border-radius: 4px;
+}
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > span {
+  border-radius: 4px;
+  padding: 5px 8px;
+  background: var(--zaui-contract-bg, #fffaa1);
+}
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-select-selector,
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-affix-wrapper,
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-disabled {
+  background: var(--zaui-contract-bg, #fffaa1);
+}
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
+  background: var(--zaui-contract-bg, #fffaa1);
+}
+.pro-form .ant-form-item.pro-form-item-changed .pro-form-view-container {
+  padding: 4px 8px;
+  background: var(--zaui-contract-bg, #fffaa1);
+  border-radius: 4px;
+}
 .pro-form .ant-form-item .ant-row {
   width: 100%;
 }
@@ -3035,47 +3076,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-list-mode-block .pro-collapse-content .ant-row {
   width: auto;
 }
-.pro-form .pro-form-item-changed span.ant-input-affix-wrapper,
-.pro-form .pro-form-item-changed .ant-select .ant-select-selector,
-.pro-form .pro-form-item-changed .ant-picker,
-.pro-form .pro-form-item-changed .ant-input-number {
-  background: var(--zaui-contract-bg, #fffaa1) !important;
-}
-.pro-form .pro-form-item-changed span.ant-input-affix-wrapper input,
-.pro-form .pro-form-item-changed .ant-select .ant-select-selector input,
-.pro-form .pro-form-item-changed .ant-picker input,
-.pro-form .pro-form-item-changed .ant-input-number input {
-  background: transparent;
-}
-.pro-form .pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
-.pro-form .pro-form-item-changed .ant-select .ant-select-selector .ant-select-selection-placeholder,
-.pro-form .pro-form-item-changed .ant-picker .ant-select-selection-placeholder,
-.pro-form .pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
-  z-index: 9;
-}
-.pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
-.pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
-  background: var(--zaui-contract-bg, #fffaa1);
-  border-radius: 4px;
-}
-.pro-form .pro-form-item-changed .ant-form-item-control-input-content > span {
-  border-radius: 4px;
-  padding: 5px 8px;
-  background: var(--zaui-contract-bg, #fffaa1);
-}
-.pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-select-selector,
-.pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-affix-wrapper,
-.pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-disabled {
-  background: var(--zaui-contract-bg, #fffaa1);
-}
-.pro-form .pro-form-item-changed .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
-  background: var(--zaui-contract-bg, #fffaa1);
-}
-.pro-form .pro-form-item-changed .pro-form-view-container {
-  padding: 4px 8px;
-  background: var(--zaui-contract-bg, #fffaa1);
-  border-radius: 4px;
-}
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {
   padding: var(--zaui-space-size-sm, 8px);
   background: #f8f9fa;

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

@@ -1,13 +1,18 @@
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
+import "antd/es/space/style";
+import _Space from "antd/es/space";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
-import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 import React, { useCallback, useEffect } from 'react';
@@ -21,10 +26,10 @@ import { useProConfig } from '../../../ProConfigProvider';
 import Container from '../../../ProForm/components/Container';
 import transformNames from '../../../ProForm/utils/transformNames';
 import { FieldProvider } from '../../../ProForm/utils/useFieldProps';
+import { useListChanged } from '../../../ProForm/utils/useListChanged';
 import useRules from '../../../ProForm/utils/useRules';
 import { isSelect, isTrim } from '../../../ProForm/utils';
 import ConfirmWrapper from '../../../ProForm/components/render/ConfirmWrapper';
-import ListChanged from './ListChanged';
 var RenderField = function RenderField(_ref) {
   var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps, _componentProps2;
   var value = _ref.text,
@@ -484,6 +489,21 @@ var RenderField = function RenderField(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
+  // 判断当前字段是否变更
+  var _useListChanged = useListChanged({
+      name: cellName,
+      names: names,
+      namesStr: [].concat(_toConsumableArray(baseName), [index, dataIndex]),
+      rowKeyPath: [].concat(_toConsumableArray(baseName), [index, 'rowKey']),
+      originalName: originalName,
+      originalNames: originalNames,
+      originalValues: originalValues,
+      form: form,
+      equalWith: equalWith
+    }),
+    _useListChanged2 = _slicedToArray(_useListChanged, 2),
+    changed = _useListChanged2[0],
+    originalValue = _useListChanged2[1];
   var componentProps = _objectSpread(_objectSpread(_objectSpread({
     form: form,
     name: cellName
@@ -529,35 +549,16 @@ var RenderField = function RenderField(_ref) {
   if (isView) {
     delete _formItemProps.rules;
   }
-  var _className = classNames(_defineProperty({}, className, className));
+  var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed));
   var FormItem = null;
-  var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
-  if (originalValues) {
-    FieldComponent = _jsx(ListChanged, {
-      name: cellName,
-      names: names,
-      namesStr: [].concat(_toConsumableArray(baseName), [index, dataIndex]),
-      rowKeyPath: [].concat(_toConsumableArray(baseName), [index, 'rowKey']),
-      originalName: originalName,
-      originalNames: originalNames,
-      originalValues: originalValues,
-      form: form,
-      equalWith: equalWith,
-      type: type,
-      children: FieldComponent
-    });
-  }
-  if ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) {
-    FieldComponent = _jsx(ConfirmWrapper, _objectSpread(_objectSpread({}, componentProps), {}, {
-      children: FieldComponent
-    }));
-  }
   FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
     validateFirst: true
   }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell'])), {}, {
     className: _className,
     name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
-    children: FieldComponent
+    children: ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) ? _jsx(ConfirmWrapper, _objectSpread(_objectSpread({}, componentProps), {}, {
+      children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
+    })) : /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
   })) : _jsx(Container, {
     viewEmpty: viewEmpty
   });
@@ -575,9 +576,28 @@ var RenderField = function RenderField(_ref) {
       }
     }));
   }
+  var originalTitle = originalDiffTip && originalValues ? _jsxs(_Space, {
+    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
+      isView: true,
+      value: originalValue,
+      checked: type === 'Switch' ? originalValue : undefined
+    }))) : _jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
+      isView: true,
+      value: originalValue,
+      checked: type === 'Switch' ? originalValue : undefined
+    }))]
+  }) : null;
   return _jsx(FieldProvider, {
     value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
-    children: FormItem
+    children: !originalTitle || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
+      title: originalTitle,
+      placement: "topLeft",
+      open: changed ? undefined : false,
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
+      children: FormItem
+    })
   });
 };
 export default RenderField;

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

@@ -1,9 +1,9 @@
 import "antd/es/input/style";
 import _Input from "antd/es/input";
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
 import "antd/es/cascader/style";
 import _Cascader from "antd/es/cascader";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
@@ -22,7 +22,6 @@ import { useProConfig } from '../../../../ProConfigProvider';
 import useEnum from '../../../../ProEnum/hooks/useEnum';
 import locale from '../../../../locale';
 import ProForm from '../../..';
-import Container from '../../Container';
 var Text = _Typography.Text;
 var defaultFieldNames = {
   label: 'name',
@@ -83,8 +82,7 @@ var ProCascader = function ProCascader(props) {
     detailPlaceholder = props.detailPlaceholder,
     otherProps = _objectWithoutProperties(props, _excluded);
   var _ref3 = ProForm.useFieldProps() || {},
-    isViewCon = _ref3.isView,
-    viewEmpty = _ref3.viewEmpty;
+    isViewCon = _ref3.isView;
   var addressCode = code || enumCode;
   var realIsView = typeof isView === 'boolean' ? isView : isViewCon;
   var realLevel = Math.max(2, level);
@@ -240,9 +238,17 @@ var ProCascader = function ProCascader(props) {
       }
     }
   };
-  return realIsView ? _jsx(Container, {
-    tooltip: !!tooltip,
-    viewEmpty: viewEmpty,
+  return realIsView ? tooltip ? _jsx(_Tooltip, {
+    className: className,
+    title: tooltip === true ? viewValue : tooltip,
+    children: _jsx(Text, {
+      ellipsis: {
+        tooltip: false
+      },
+      children: viewValue
+    })
+  }) : _jsx("span", {
+    className: className,
     children: viewValue
   }) : _jsxs("div", {
     className: "pro-address ".concat(className),

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

@@ -1,5 +1,7 @@
 import "antd/es/col/style";
 import _Col from "antd/es/col";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
@@ -11,6 +13,7 @@ import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -25,10 +28,10 @@ import { isTrim, isUpperCase, findOptionByValue, parseNamePath } from '../../uti
 import { useProConfig } from '../../../ProConfigProvider';
 import transformNames from '../../utils/transformNames';
 import valueTypeMap from '../../utils/valueType';
+import { useChanged } from '../../utils/useChanged';
 import tipSvg from '../../../assets/tip.svg';
 import useRules from '../../utils/useRules';
 import ConfirmWrapper from './ConfirmWrapper';
-import Changed from './Changed';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
   var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
@@ -98,6 +101,18 @@ var Render = function Render(props) {
       return Array.isArray(name) ? name.join('_') : name;
     }).join('-');
   }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
+  // 判断当前字段是否变更
+  var _useChanged = useChanged({
+      name: formItemProps.name,
+      names: otherProps.names,
+      namesStr: namesStr,
+      originalValues: originalValues,
+      form: form,
+      equalWith: equalWith
+    }),
+    _useChanged2 = _slicedToArray(_useChanged, 2),
+    changed = _useChanged2[0],
+    originalValue = _useChanged2[1];
   var internalRule = useRules({
     names: otherProps.names,
     label: otherFormItemProps.label,
@@ -169,7 +184,7 @@ var Render = function Render(props) {
   var lastComponentProps = _objectSpread(_objectSpread(_objectSpread({}, componentProps), _fieldProps), {}, {
     disabled: lastDisabled
   });
-  var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-width-auto', ['Switch'].includes(type)));
+  var _className = classNames(_defineProperty(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed), 'pro-form-item-width-auto', ['Switch'].includes(type)));
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
     return _jsx(_Form.Item, {
@@ -431,17 +446,7 @@ var Render = function Render(props) {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
-      children: _jsx(Changed, {
-        name: formItemProps.name,
-        names: otherProps.names,
-        namesStr: namesStr,
-        originalValues: originalValues,
-        form: form,
-        equalWith: equalWith,
-        originalDiffTip: originalDiffTip,
-        type: type,
-        children: child
-      })
+      children: child
     }));
     var formItem = orgFormItem;
     // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
@@ -457,23 +462,32 @@ var Render = function Render(props) {
               // @ts-ignore
               _internalItemRender: internalItemRender,
               className: _className,
-              children: _jsx(Changed, {
-                name: formItemProps.name,
-                names: otherProps.names,
-                namesStr: namesStr,
-                originalValues: originalValues,
-                form: form,
-                equalWith: equalWith,
-                originalDiffTip: originalDiffTip,
-                type: type,
-                children: child
-              })
+              children: child
             }));
           }
         })
       });
     }
-    return formItem;
+    // 不渲染tooltip
+    if (!originalDiffTip || ['FormList', 'ProEditTable'].includes(type)) {
+      return formItem;
+    }
+    var title = _jsxs(_Space, {
+      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.cloneElement(child, _objectSpread(_objectSpread({}, child), {}, {
+        isView: true,
+        value: originalValue,
+        checked: type === 'Switch' ? originalValue : undefined
+      }))]
+    });
+    return _jsx(_Tooltip, {
+      title: title,
+      open: changed ? undefined : false,
+      // open={true}
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
+      children: formItem
+    });
   };
   var FormItem = _jsxs(_Fragment, {
     children: [renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {

package/es/ProForm/style/index.less

@@ -116,6 +116,58 @@
       }
     }
 
+    // 比较原始值场景下  不同时的样式
+    &.pro-form-item-changed {
+      span.@{ant-prefix}-input-affix-wrapper,
+      .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+      .@{ant-prefix}-picker,
+      .@{ant-prefix}-input-number {
+        background: @zaui-contract-bg !important;
+
+        input {
+          background: transparent;
+        }
+        .@{ant-prefix}-select-selection-placeholder {
+          z-index: 9;
+        }
+      }
+
+      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
+      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
+        background: @zaui-contract-bg;
+        border-radius: 4px;
+      }
+
+      // 地址组件
+      .@{ant-prefix}-form-item-control-input-content {
+        // 查看模式
+        & > span {
+          border-radius: 4px;
+          padding: 5px 8px;
+          background: @zaui-contract-bg;
+        }
+
+        & > .pro-address {
+          .@{ant-prefix}-select-selector,
+          .@{ant-prefix}-input-affix-wrapper,
+          .@{ant-prefix}-input-disabled {
+            background: @zaui-contract-bg;
+          }
+        }
+        & > .@{ant-prefix}-input-group {
+          .forever-checkbox {
+            background: @zaui-contract-bg;
+          }
+        }
+      }
+
+      .pro-form-view-container {
+        padding: 4px 8px;
+        background: @zaui-contract-bg;
+        border-radius: 4px;
+      }
+    }
+
     .@{ant-prefix}-row {
       width: 100%;
     }
@@ -321,56 +373,4 @@
       }
     }
   }
-
-  // 比较原始值场景下  不同时的样式
-  .pro-form-item-changed {
-    span.@{ant-prefix}-input-affix-wrapper,
-    .@{ant-prefix}-select .@{ant-prefix}-select-selector,
-    .@{ant-prefix}-picker,
-    .@{ant-prefix}-input-number {
-      background: @zaui-contract-bg !important;
-
-      input {
-        background: transparent;
-      }
-      .@{ant-prefix}-select-selection-placeholder {
-        z-index: 9;
-      }
-    }
-
-    .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
-    .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
-      background: @zaui-contract-bg;
-      border-radius: 4px;
-    }
-
-    // 地址组件
-    .@{ant-prefix}-form-item-control-input-content {
-      // 查看模式
-      & > span {
-        border-radius: 4px;
-        padding: 5px 8px;
-        background: @zaui-contract-bg;
-      }
-
-      & > .pro-address {
-        .@{ant-prefix}-select-selector,
-        .@{ant-prefix}-input-affix-wrapper,
-        .@{ant-prefix}-input-disabled {
-          background: @zaui-contract-bg;
-        }
-      }
-      & > .@{ant-prefix}-input-group {
-        .forever-checkbox {
-          background: @zaui-contract-bg;
-        }
-      }
-    }
-
-    .pro-form-view-container {
-      padding: 4px 8px;
-      background: @zaui-contract-bg;
-      border-radius: 4px;
-    }
-  }
 }

package/es/ProForm/utils/diffOriginal.d.ts

@@ -3,6 +3,7 @@ interface Params {
     originalValue: any;
     value: any;
     form: FormInstance;
+    name?: string | any[];
     equalWith?: (originalValue: any, currentValue: any) => boolean;
 }
 export declare const diffOriginal: (params: Params) => boolean;

package/es/ProForm/utils/diffOriginal.js

@@ -1,9 +1,31 @@
-import { isEqual, isFunction } from 'lodash';
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import { isEqual, isFunction, isString } from 'lodash';
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
+/** 将解构后的name值，反向转回names,例如 formData {a:1, b:2} names ['a', 'b'] 返回 [1,2] */
+var extractValues = function extractValues(form, pathString) {
+  var _pathString;
+  var result = [];
+  var PrefixesName = isString(pathString) ? [] : pathString.slice(0, -1);
+  if (isString(pathString)) {
+    pathString.split('-').forEach(function (item) {
+      result.push(form.getFieldValue([].concat(_toConsumableArray(PrefixesName), [item])));
+    });
+    return result;
+  }
+  (_pathString = pathString[pathString.length - 1]) === null || _pathString === void 0 ? void 0 : _pathString.split('-').forEach(function (item) {
+    result.push(form.getFieldValue([].concat(_toConsumableArray(PrefixesName), [item])));
+  });
+  return result;
+};
 export var diffOriginal = function diffOriginal(params) {
+  var _name$join;
   var originalValue = params.originalValue,
-    value = params.value,
-    equalWith = params.equalWith;
+    _value = params.value,
+    equalWith = params.equalWith,
+    form = params.form,
+    name = params.name;
+  var isNames = Array.isArray(name) && ((_name$join = name.join(',')) === null || _name$join === void 0 ? void 0 : _name$join.includes('-')) || (name === null || name === void 0 ? void 0 : name.includes('-'));
+  var value = !isNames ? _value : extractValues(form, name);
   // 支持传入自定义比较事件
   if (isFunction(equalWith)) {
     return !equalWith(originalValue, value);
@@ -18,7 +40,8 @@ export var diffOriginal = function diffOriginal(params) {
     });
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !isEqual(value, originalValue);
+    var res = !isEqual(value, originalValue);
+    return res;
   }
   return false;
 };

package/es/ProForm/utils/index.d.ts

@@ -50,12 +50,6 @@ export declare const isNullArray: (arr: any) => boolean;
  */
 export declare const isEmptyArray: (arr: any) => boolean;
 export declare function toArray<T>(value?: T | T[] | null): T[];
-/**
- * names值合并
- * @param obj AnyObject
- * @returns AnyObject
- */
-export declare function processHyphenKeys(obj: AnyObject): AnyObject;
 /**
  * 初始化值names值合并
  * @param obj AnyObject