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

package/es/ProTable/propsType.d.ts

@@ -3,6 +3,7 @@ import { TableProps } from 'antd/es/table/Table';
 import { ColumnType, GetRowKey, RowSelectionType } from 'antd/es/table/interface';
 import { FormInstance } from 'antd';
 import type { TooltipProps } from 'antd';
+import type { DragStartEvent, DragMoveEvent, DragOverEvent, DragCancelEvent } from '@dnd-kit/core';
 interface SummaryColumnProps {
     key: string | string[];
     index: number;
@@ -41,6 +42,22 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     transform?: (value: any, record?: any) => string[];
 }
+export interface CreateTreeFromArrayOptions {
+    itemKey?: string;
+    parentKey?: string;
+    childrenKey?: string;
+}
+export interface DragCommonGuardProps<T> {
+    event: T;
+}
+export interface DragEndGuardProps {
+    activeObject: any;
+    overObject: any;
+    currentDataSource: any[];
+    transformTreeToArray: (tree: any[]) => any[];
+    arrayMove: (array: any[], from: number, to: number) => any[];
+    createTreeFromArray: (array: any[], options: CreateTreeFromArrayOptions) => any[];
+}
 export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary' | 'columns'> {
     tableId?: string;
     rowKey?: string | GetRowKey<any>;
@@ -67,6 +84,14 @@ export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary'
     stripe?: boolean;
     columns: ProTableColumn[];
     originalDataSource?: any[];
+    /**
+     * 拖拽额外配置
+     */
+    onDragStart?: DragCommonGuardProps<DragStartEvent>;
+    onDragMove?: DragCommonGuardProps<DragMoveEvent>;
+    onDragOver?: DragCommonGuardProps<DragOverEvent>;
+    onDragCancel?: DragCommonGuardProps<DragCancelEvent>;
+    onDragEnd?: DragEndGuardProps;
 }
 export type ProTableValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime';
 export interface Response<T = any> {

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

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

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

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

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

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

package/es/ProThemeTools/component/index.js

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

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 { ProTools } from './component';
+import { PrdTools } 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(ProTools, {
+    }), _jsx(PrdTools, {
       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/ProTools/style/index.less';
+@import '../component/PrdTools/style/index.less';
 
 .pro-theme-tools {
   display: flex;

package/es/ProTreeModal/components/List.js

@@ -122,11 +122,32 @@ function List(props, ref) {
     document.body.removeChild(temp);
     return len * 20;
   }
+  var handleCommonTitle = function handleCommonTitle(item) {
+    if (isCASCADER) {
+      return item === null || item === void 0 ? void 0 : item.title;
+    }
+    return item[fieldNameLabel];
+  };
+  var handleGetTitle = function handleGetTitle(item) {
+    if (showCodeName) {
+      if (isCASCADER) {
+        if (item[fieldNameValue] && (item === null || item === void 0 ? void 0 : item.title)) {
+          return "".concat(item[fieldNameValue], "-").concat(item.title);
+        }
+        return handleCommonTitle(item);
+      }
+      if (item[fieldNameValue] && item[fieldNameValue]) {
+        return "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]);
+      }
+      return handleCommonTitle(item);
+    }
+    return handleCommonTitle(item);
+  };
   var _useVirtualList = useVirtualList(originalList, {
       containerTarget: containerRef,
       wrapperTarget: wrapperRef,
       itemHeight: function itemHeight(index, item) {
-        var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]) : "".concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]);
+        var title = handleGetTitle(item);
         return Math.floor(getLineHeight(title, 406)) + 12;
       }
     }),
@@ -182,7 +203,7 @@ function List(props, ref) {
             children: _jsx(_Row, {
               children: list.map(function (_item) {
                 var item = _item.data;
-                var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]) : "".concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]);
+                var title = handleGetTitle(item);
                 var content = optionRender ? optionRender(item, searchStr) : _jsx(SearchTitle, {
                   label: title,
                   searchStr: searchStr
@@ -220,7 +241,7 @@ function List(props, ref) {
         value: checkedValues,
         children: _jsx(_Row, {
           children: treeData.map(function (item) {
-            var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]) : "".concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]);
+            var title = handleGetTitle(item);
             var content = optionRender ? optionRender(item, searchStr) : _jsx(SearchTitle, {
               label: title,
               searchStr: searchStr
@@ -257,7 +278,12 @@ function List(props, ref) {
         ref: wrapperRef,
         children: list.map(function (_item) {
           var item = _item.data;
-          var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]) : item[fieldNameLabel];
+          var title = item[fieldNameLabel];
+          if (showCodeName) {
+            if (item[fieldNameValue] && item[fieldNameLabel]) {
+              title = "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]);
+            }
+          }
           return _jsxs("div", {
             className: "pro-tree-modal-checkbox-content",
             children: [_jsx("div", {

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

@@ -7,6 +7,7 @@ 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"));
@@ -25,10 +26,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 */
@@ -491,6 +492,21 @@ 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
@@ -536,36 +552,16 @@ var RenderField = function RenderField(_ref) {
   if (isView) {
     delete _formItemProps.rules;
   }
-  var _className = (0, _classnames.default)((0, _defineProperty2.default)({}, className, className));
+  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed));
   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: FieldComponent
+    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))
   })) : (0, _jsxRuntime.jsx)(_Container.default, {
     viewEmpty: viewEmpty
   });
@@ -583,9 +579,28 @@ 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: FormItem
+    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
+    })
   });
 };
 var _default = exports.default = RenderField;

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

@@ -21,7 +21,6 @@ var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ = _interopRequireDefault(require("../../.."));
-var _Container = _interopRequireDefault(require("../../Container"));
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder"];
 var Text = _antd.Typography.Text;
 var defaultFieldNames = {
@@ -83,8 +82,7 @@ var ProCascader = function ProCascader(props) {
     detailPlaceholder = props.detailPlaceholder,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref3 = _.default.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 ? (0, _jsxRuntime.jsx)(_Container.default, {
-    tooltip: !!tooltip,
-    viewEmpty: viewEmpty,
+  return realIsView ? tooltip ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    className: className,
+    title: tooltip === true ? viewValue : tooltip,
+    children: (0, _jsxRuntime.jsx)(Text, {
+      ellipsis: {
+        tooltip: false
+      },
+      children: viewValue
+    })
+  }) : (0, _jsxRuntime.jsx)("span", {
+    className: className,
     children: viewValue
   }) : (0, _jsxRuntime.jsxs)("div", {
     className: "pro-address ".concat(className),

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

@@ -11,6 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
@@ -23,10 +24,10 @@ var _index = require("../../utils/index");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _transformNames = _interopRequireDefault(require("../../utils/transformNames"));
 var _valueType = _interopRequireDefault(require("../../utils/valueType"));
+var _useChanged3 = require("../../utils/useChanged");
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _ConfirmWrapper = _interopRequireDefault(require("./ConfirmWrapper"));
-var _Changed = _interopRequireDefault(require("./Changed"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
@@ -98,6 +99,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 = (0, _useChanged3.useChanged)({
+      name: formItemProps.name,
+      names: otherProps.names,
+      namesStr: namesStr,
+      originalValues: originalValues,
+      form: form,
+      equalWith: equalWith
+    }),
+    _useChanged2 = (0, _slicedToArray2.default)(_useChanged, 2),
+    changed = _useChanged2[0],
+    originalValue = _useChanged2[1];
   var internalRule = (0, _useRules.default)({
     names: otherProps.names,
     label: otherFormItemProps.label,
@@ -169,7 +182,7 @@ var Render = function Render(props) {
   var lastComponentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), _fieldProps), {}, {
     disabled: lastDisabled
   });
-  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-width-auto', ['Switch'].includes(type)));
+  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, 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 (0, _jsxRuntime.jsx)(_antd.Form.Item, {
@@ -427,20 +440,6 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-    if (originalValues) {
-      child = (0, _jsxRuntime.jsx)(_Changed.default, {
-        name: formItemProps.name,
-        names: otherProps.names,
-        namesStr: namesStr,
-        originalValues: originalValues,
-        form: form,
-        equalWith: equalWith,
-        originalDiffTip: originalDiffTip,
-        type: type,
-        onChange: handleChange,
-        children: child
-      });
-    }
     var orgFormItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
@@ -467,7 +466,26 @@ var Render = function Render(props) {
         })
       });
     }
-    return formItem;
+    // 不渲染tooltip
+    if (!originalDiffTip || ['FormList', 'ProEditTable'].includes(type)) {
+      return formItem;
+    }
+    var title = (0, _jsxRuntime.jsxs)(_antd.Space, {
+      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.cloneElement(child, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child), {}, {
+        isView: true,
+        value: originalValue,
+        checked: type === 'Switch' ? originalValue : undefined
+      }))]
+    });
+    return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+      title: title,
+      open: changed ? undefined : false,
+      // open={true}
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
+      children: formItem
+    });
   };
   var FormItem = (0, _jsxRuntime.jsxs)(_jsxRuntime.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/lib/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 !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/lib/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/lib/ProForm/utils/diffOriginal.js

@@ -1,15 +1,38 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.diffOriginal = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lodash = require("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 = (0, _lodash.isString)(pathString) ? [] : pathString.slice(0, -1);
+  if ((0, _lodash.isString)(pathString)) {
+    pathString.split('-').forEach(function (item) {
+      result.push(form.getFieldValue([].concat((0, _toConsumableArray2.default)(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((0, _toConsumableArray2.default)(PrefixesName), [item])));
+  });
+  return result;
+};
 var diffOriginal = exports.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 ((0, _lodash.isFunction)(equalWith)) {
     return !equalWith(originalValue, value);
@@ -24,7 +47,8 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
     });
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !(0, _lodash.isEqual)(value, originalValue);
+    var res = !(0, _lodash.isEqual)(value, originalValue);
+    return res;
   }
   return false;
 };

package/lib/ProForm/utils/useChanged.js

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

package/lib/ProForm/utils/useListChanged.js

@@ -91,8 +91,8 @@ var useListChanged = exports.useListChanged = function useListChanged(params) {
     value: value,
     originalValue: originalValue,
     form: form,
-    equalWith: equalWith
-    // name: isString(namesStr) ? namesStr : originalName || name,
+    equalWith: equalWith,
+    name: (0, _lodash.isString)(namesStr) ? namesStr : originalName || name
   });
   return [changed, originalValue];
 };

package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.d.ts

@@ -5,12 +5,17 @@ interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     disabled?: boolean;
 }
 export declare const Row: FC<RowProps>;
-declare const DndWrapper: ({ draggable, value, onChange, disabled, children, rowKey }: {
+declare const DndWrapper: ({ draggable, value, onChange, disabled, children, rowKey, onDragStartGuard, onDragMoveGuard, onDragOverGuard, onDragEndGuard, onDragCancelGuard, }: {
     draggable: any;
     value: any;
     onChange: any;
     disabled: any;
     children: any;
     rowKey: any;
+    onDragStartGuard: any;
+    onDragMoveGuard: any;
+    onDragOverGuard: any;
+    onDragEndGuard: any;
+    onDragCancelGuard: any;
 }) => any;
 export default DndWrapper;