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

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

@@ -1,7 +1,5 @@
 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";
@@ -13,7 +11,6 @@ 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";
@@ -28,10 +25,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;
@@ -101,18 +98,6 @@ 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,
@@ -184,7 +169,7 @@ var Render = function Render(props) {
   var lastComponentProps = _objectSpread(_objectSpread(_objectSpread({}, componentProps), _fieldProps), {}, {
     disabled: lastDisabled
   });
-  var _className = classNames(_defineProperty(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed), 'pro-form-item-width-auto', ['Switch'].includes(type)));
+  var _className = classNames(_defineProperty(_defineProperty({}, className, className), '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, {
@@ -442,6 +427,20 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
+    if (originalValues) {
+      child = _jsx(Changed, {
+        name: formItemProps.name,
+        names: otherProps.names,
+        namesStr: namesStr,
+        originalValues: originalValues,
+        form: form,
+        equalWith: equalWith,
+        originalDiffTip: originalDiffTip,
+        type: type,
+        onChange: handleChange,
+        children: child
+      });
+    }
     var orgFormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
@@ -468,26 +467,7 @@ var Render = function Render(props) {
         })
       });
     }
-    // 不渲染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
-    });
+    return 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,58 +116,6 @@
       }
     }
 
-    // 比较原始值场景下  不同时的样式
-    &.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%;
     }
@@ -373,4 +321,56 @@
       }
     }
   }
+
+  // 比较原始值场景下  不同时的样式
+  .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 !important;
+      }
+      .@{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,7 +3,6 @@ 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,31 +1,9 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { isEqual, isFunction, isString } from 'lodash';
+import { isEqual, isFunction } 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,
-    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);
+    value = params.value,
+    equalWith = params.equalWith;
   // 支持传入自定义比较事件
   if (isFunction(equalWith)) {
     return !equalWith(originalValue, value);
@@ -40,8 +18,7 @@ export var diffOriginal = function diffOriginal(params) {
     });
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    var res = !isEqual(value, originalValue);
-    return res;
+    return !isEqual(value, originalValue);
   }
   return false;
 };

package/es/ProForm/utils/useChanged.js

@@ -19,8 +19,7 @@ export var useChanged = function useChanged(_ref) {
     originalValue: originalValue,
     value: value,
     form: form,
-    equalWith: equalWith,
-    name: namesStr || name
+    equalWith: equalWith
   });
   return [changed, originalValue];
 };

package/es/ProForm/utils/useListChanged.js

@@ -1,6 +1,6 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
-import { get, isString } from 'lodash';
+import { get } from 'lodash';
 import { diffOriginal } from './diffOriginal';
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
@@ -86,8 +86,8 @@ export var useListChanged = function useListChanged(params) {
     value: value,
     originalValue: originalValue,
     form: form,
-    equalWith: equalWith,
-    name: isString(namesStr) ? namesStr : originalName || name
+    equalWith: equalWith
+    // name: isString(namesStr) ? namesStr : originalName || name,
   });
   return [changed, originalValue];
 };

package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js

@@ -75,7 +75,7 @@ var DndWrapper = function DndWrapper(_ref2) {
     onDragEndGuard = _ref2.onDragEndGuard;
   var onDragStart = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
-      var active, transformedValue, activeObject;
+      var active, _transformedValue, activeObject;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -85,8 +85,8 @@ var DndWrapper = function DndWrapper(_ref2) {
               break;
             }
             // 为数据源划分层级及parentId
-            transformedValue = addLevelAndParentId(value, rowKey);
-            activeObject = treeNodeFind(transformedValue, function (t) {
+            _transformedValue = addLevelAndParentId(value, rowKey);
+            activeObject = treeNodeFind(_transformedValue, function (t) {
               return t.rowKey === active.id;
             });
             _context.next = 6;
@@ -174,8 +174,9 @@ var DndWrapper = function DndWrapper(_ref2) {
       return _ref6.apply(this, arguments);
     };
   }();
+  var transformedValue = addLevelAndParentId(value, rowKey);
   // 将树平铺
-  var flatTree = transformTreeToArray(value).map(function (item) {
+  var flatTree = transformTreeToArray(transformedValue).map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
       children: undefined
     });

package/es/ProThemeTools/component/{PrdTools → ProTools}/index.d.ts

@@ -1,3 +1,3 @@
 import type { DevToolsPropsType } from '../../propsType';
-declare const PrdTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => import("react/jsx-runtime").JSX.Element;
-export default PrdTools;
+declare const ProTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => import("react/jsx-runtime").JSX.Element;
+export default ProTools;

package/es/ProThemeTools/component/{PrdTools → ProTools}/index.js

@@ -21,7 +21,7 @@ var connect = function connect(Component) {
   return ComponentWrapper;
 };
 var NewDrawer = connect(_Drawer);
-var PrdTools = function PrdTools(_ref) {
+var ProTools = function ProTools(_ref) {
   var onReset = _ref.onReset,
     onClose = _ref.onClose,
     setState = _ref.setState,
@@ -266,4 +266,4 @@ var PrdTools = function PrdTools(_ref) {
     })]
   });
 };
-export default PrdTools;
+export default ProTools;

package/es/ProThemeTools/component/index.d.ts

@@ -1,2 +1 @@
-/// <reference types="typings" />
-export { default as PrdTools } from './PrdTools';
+export { default as ProTools } from './ProTools';

package/es/ProThemeTools/component/index.js

@@ -1,2 +1 @@
-/// <reference path="../../../typings.d.ts" />;
-export { default as PrdTools } from './PrdTools';
+export { default as ProTools } from './ProTools';

package/es/ProThemeTools/index.js

@@ -17,7 +17,7 @@ import { isEqual } from 'lodash';
 import classnames from 'classnames';
 import { getKebabCase, setThemes, setTableBorder, getMapKebabCase, getMapHumpCase } from './utils/index';
 import settingSvg from '../assets/setting.svg';
-import { PrdTools } from './component';
+import { ProTools } from './component';
 import locale from '../locale';
 var defaultCacheTime = 1; // 配置保存时间为一天
 var defaultThemeConfig = {
@@ -183,7 +183,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
         className: "setting-icon",
         src: settingSvg
       })
-    }), _jsx(PrdTools, {
+    }), _jsx(ProTools, {
       prefixCls: prefixCls,
       onReset: onReset,
       onClose: toggle,

package/es/ProThemeTools/style/index.less

@@ -1,7 +1,7 @@
 @root-entry-name: 'default';
 @import (reference) '~antd/es/style/themes/index.less';
 
-@import '../component/PrdTools/style/index.less';
+@import '../component/ProTools/style/index.less';
 
 .pro-theme-tools {
   display: flex;

package/lib/ProEditTable/components/RenderField/ListChanged.d.ts

@@ -0,0 +1,16 @@
+import React from 'react';
+import { FormInstance } from 'antd';
+import { NamePath } from 'antd/lib/form/interface';
+interface Props {
+    name?: NamePath;
+    names?: NamePath[];
+    originalName?: NamePath;
+    originalNames?: NamePath[];
+    namesStr?: NamePath;
+    originalValues?: any;
+    form: FormInstance;
+    equalWith?: (preValue: any, curValue: any) => boolean | undefined;
+    [name: string]: any;
+}
+declare const ListChanged: React.FC<Props>;
+export default ListChanged;

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

@@ -0,0 +1,129 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
+var _lodash = require("lodash");
+var _diffOriginal = require("../../../ProForm/utils/diffOriginal");
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type"];
+var toNamePath = function toNamePath(name) {
+  if (Array.isArray(name)) {
+    return name;
+  }
+  return [name];
+};
+var toNamePaths = function toNamePaths(names) {
+  return names.map(function (name) {
+    return toNamePath(name);
+  });
+};
+var getOriginalValue = function getOriginalValue(_ref) {
+  var namePath = _ref.namePath,
+    originalName = _ref.originalName,
+    originalNames = _ref.originalNames,
+    originalValues = _ref.originalValues,
+    rowKeyPath = _ref.rowKeyPath,
+    form = _ref.form;
+  if (!originalValues) {
+    return undefined;
+  }
+  if (rowKeyPath) {
+    var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
+    var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
+    var rowValue = form.getFieldValue(rowValueNamePath);
+    if (!rowValue) return undefined;
+    var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
+    if (!keyValue) return undefined;
+    var originalValueList = (0, _lodash.get)(originalValues, originalName.slice(0, rowKeyPath.length - 2));
+    var originalValueRow = originalValueList.find(function (item) {
+      return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
+    });
+    var originalValue;
+    if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
+      var originalNamesValue = originalNames.map(function (originalName) {
+        return (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+      });
+      // 有可能出现数组中全是undefined的情况  视为没有值
+      var fillUndefined = originalNamesValue.every(function (valItem) {
+        return valItem === undefined;
+      });
+      originalValue = fillUndefined ? undefined : originalNamesValue;
+    } else {
+      originalValue = (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    }
+    return originalValue;
+  }
+  // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
+  return (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
+    return (0, _lodash.get)(originalValues, originalName);
+  }) : (0, _lodash.get)(originalValues, originalName);
+};
+var ListChanged = function ListChanged(props) {
+  var name = props.name,
+    names = props.names,
+    namesStr = props.namesStr,
+    _props$originalName = props.originalName,
+    originalName = _props$originalName === void 0 ? name : _props$originalName,
+    _props$originalNames = props.originalNames,
+    originalNames = _props$originalNames === void 0 ? names : _props$originalNames,
+    originalValues = props.originalValues,
+    form = props.form,
+    equalWith = props.equalWith,
+    rowKeyPath = props.rowKeyPath,
+    children = props.children,
+    type = props.type,
+    rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var namePath = toNamePath(namesStr || name);
+  var originalNamePath = toNamePath(originalName);
+  var originalNamePaths = originalNames && toNamePaths(originalNames);
+  var notWatch = !originalValues || ['FormList', 'ProEditTable'].includes(type);
+  var originalValue = !notWatch ? getOriginalValue({
+    namePath: namePath,
+    originalName: originalNamePath,
+    originalNames: originalNamePaths,
+    originalValues: originalValues,
+    rowKeyPath: rowKeyPath,
+    form: form
+  }) : undefined;
+  var noChange = !equalWith && (!originalValues || originalValue === undefined);
+  var changed = (0, _react.useMemo)(function () {
+    if (notWatch || noChange) return false;
+    return (0, _diffOriginal.diffOriginal)({
+      value: props.value,
+      originalValue: originalValue,
+      form: form,
+      equalWith: equalWith
+      // name: isString(namesStr) ? namesStr : originalName || name,
+    });
+  }, [props.value, originalValue]);
+  if (notWatch || noChange) {
+    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest));
+  }
+  return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    open: changed ? undefined : false,
+    getPopupContainer: function getPopupContainer(target) {
+      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: (0, _jsxRuntime.jsx)("div", {
+      className: changed ? 'pro-form-item-changed' : '',
+      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest)) : undefined
+    })
+  });
+};
+var _default = exports.default = ListChanged;

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

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -26,10 +25,10 @@ var _ProConfigProvider = require("../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
 var _transformNames = _interopRequireDefault(require("../../../ProForm/utils/transformNames"));
 var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
-var _useListChanged3 = require("../../../ProForm/utils/useListChanged");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
+var _ListChanged = _interopRequireDefault(require("./ListChanged"));
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
@@ -492,21 +491,6 @@ var RenderField = function RenderField(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
-  // 判断当前字段是否变更
-  var _useListChanged = (0, _useListChanged3.useListChanged)({
-      name: cellName,
-      names: names,
-      namesStr: [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]),
-      rowKeyPath: [].concat((0, _toConsumableArray2.default)(baseName), [index, 'rowKey']),
-      originalName: originalName,
-      originalNames: originalNames,
-      originalValues: originalValues,
-      form: form,
-      equalWith: equalWith
-    }),
-    _useListChanged2 = (0, _slicedToArray2.default)(_useListChanged, 2),
-    changed = _useListChanged2[0],
-    originalValue = _useListChanged2[1];
   var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     form: form,
     name: cellName
@@ -552,16 +536,36 @@ var RenderField = function RenderField(_ref) {
   if (isView) {
     delete _formItemProps.rules;
   }
-  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed));
+  var _className = (0, _classnames.default)((0, _defineProperty2.default)({}, className, className));
   var FormItem = null;
+  var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
+  if (originalValues) {
+    FieldComponent = (0, _jsxRuntime.jsx)(_ListChanged.default, {
+      name: cellName,
+      names: names,
+      namesStr: [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]),
+      rowKeyPath: [].concat((0, _toConsumableArray2.default)(baseName), [index, 'rowKey']),
+      originalName: originalName,
+      originalNames: originalNames,
+      originalValues: originalValues,
+      form: form,
+      equalWith: equalWith,
+      type: type,
+      onChange: _onChange,
+      children: FieldComponent
+    });
+  }
+  if ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) {
+    FieldComponent = (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+      children: FieldComponent
+    }));
+  }
   FormItem = TargetComponent ? (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     validateFirst: true
   }, (0, _lodash.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: ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) ? (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
-      children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
-    })) : /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
+    children: FieldComponent
   })) : (0, _jsxRuntime.jsx)(_Container.default, {
     viewEmpty: viewEmpty
   });
@@ -579,28 +583,9 @@ var RenderField = function RenderField(_ref) {
       }
     }));
   }
-  var originalTitle = originalDiffTip && originalValues ? (0, _jsxRuntime.jsxs)(_antd.Space, {
-    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
-      isView: true,
-      value: originalValue,
-      checked: type === 'Switch' ? originalValue : undefined
-    }))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
-      isView: true,
-      value: originalValue,
-      checked: type === 'Switch' ? originalValue : undefined
-    }))]
-  }) : null;
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
-    children: !originalTitle || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-      title: originalTitle,
-      placement: "topLeft",
-      open: changed ? undefined : false,
-      getPopupContainer: function getPopupContainer(target) {
-        return target.parentElement;
-      },
-      children: FormItem
-    })
+    children: FormItem
   });
 };
 var _default = exports.default = RenderField;