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

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

@@ -1,3 +1,5 @@
+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 _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["disabled", "children"];
@@ -6,6 +8,7 @@ import React from 'react';
 import { DndContext, closestCorners } from '@dnd-kit/core';
 import { arrayMove, useSortable, SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
+import { isFunction } from 'lodash';
 import { addLevelAndParentId, treeNodeFind, transformTreeToArray, createTreeFromArray } from './utils/index';
 import ProIcon from '../../../../../../../ProIcon';
 export var Row = function Row(props) {
@@ -67,48 +70,177 @@ var DndWrapper = function DndWrapper(_ref2) {
     onChange = _ref2.onChange,
     disabled = _ref2.disabled,
     children = _ref2.children,
-    rowKey = _ref2.rowKey;
-  var onDragEnd = function onDragEnd(_ref3) {
-    var active = _ref3.active,
-      over = _ref3.over;
-    // 为数据源划分层级及parentId
-    var transformedValue = addLevelAndParentId(value, rowKey);
-    // 同一level层级的且parentId相同的，可以互相之间拖拽替换
-    if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
-      var activeObject = treeNodeFind(transformedValue, function (t) {
-        return t.rowKey === active.id;
-      });
-      var overObject = treeNodeFind(transformedValue, function (t) {
-        return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
-      });
-      if (activeObject && overObject) {
-        var activeLevel = activeObject.level,
-          activeParentId = activeObject.parentId;
-        var overLevel = overObject.level,
-          overParentId = overObject.parentId;
-        if (activeLevel === overLevel && activeParentId === overParentId) {
-          // 将树平铺
-          var _flatTree = transformTreeToArray(transformedValue).map(function (item) {
-            return _objectSpread(_objectSpread({}, item), {}, {
-              children: undefined
+    rowKey = _ref2.rowKey,
+    onDragStartGuard = _ref2.onDragStartGuard,
+    onDragMoveGuard = _ref2.onDragMoveGuard,
+    onDragOverGuard = _ref2.onDragOverGuard,
+    onDragEndGuard = _ref2.onDragEndGuard,
+    onDragCancelGuard = _ref2.onDragCancelGuard;
+  var onDragStart = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(event) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(onDragStartGuard && isFunction(onDragStartGuard))) {
+              _context.next = 3;
+              break;
+            }
+            _context.next = 3;
+            return onDragStartGuard({
+              event: event
             });
-          });
-          var activeIndex = _flatTree.findIndex(function (i) {
-            return i.rowKey === active.id;
-          });
-          var overIndex = _flatTree.findIndex(function (i) {
-            return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
-          });
-          var nextValue = arrayMove(_flatTree, activeIndex, overIndex);
-          onChange(createTreeFromArray(nextValue, {
-            itemKey: 'rowKey',
-            parentKey: 'parentId',
-            childrenKey: 'children'
-          }));
+          case 3:
+          case "end":
+            return _context.stop();
         }
-      }
-    }
-  };
+      }, _callee);
+    }));
+    return function onDragStart(_x) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var onDragMove = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(event) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!(onDragMoveGuard && isFunction(onDragMoveGuard))) {
+              _context2.next = 3;
+              break;
+            }
+            _context2.next = 3;
+            return onDragMoveGuard({
+              event: event
+            });
+          case 3:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function onDragMove(_x2) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var onDragOver = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(event) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (!(onDragOverGuard && isFunction(onDragOverGuard))) {
+              _context3.next = 3;
+              break;
+            }
+            _context3.next = 3;
+            return onDragOverGuard({
+              event: event
+            });
+          case 3:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function onDragOver(_x3) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
+  var onDragEnd = /*#__PURE__*/function () {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref6) {
+      var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            active = _ref6.active, over = _ref6.over;
+            // 为数据源划分层级及parentId
+            transformedValue = addLevelAndParentId(value, rowKey); // 同一level层级的且parentId相同的，可以互相之间拖拽替换
+            if (!(active.id !== (over === null || over === void 0 ? void 0 : over.id))) {
+              _context4.next = 15;
+              break;
+            }
+            activeObject = treeNodeFind(transformedValue, function (t) {
+              return t.rowKey === active.id;
+            });
+            overObject = treeNodeFind(transformedValue, function (t) {
+              return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
+            });
+            if (!(activeObject && overObject)) {
+              _context4.next = 15;
+              break;
+            }
+            activeLevel = activeObject.level, activeParentId = activeObject.parentId;
+            overLevel = overObject.level, overParentId = overObject.parentId; // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
+            if (!(onDragEndGuard && isFunction(onDragEndGuard))) {
+              _context4.next = 14;
+              break;
+            }
+            _context4.next = 11;
+            return onDragEndGuard({
+              activeObject: activeObject,
+              overObject: overObject,
+              currentDataSource: value,
+              transformTreeToArray: transformTreeToArray,
+              arrayMove: arrayMove,
+              createTreeFromArray: createTreeFromArray
+            });
+          case 11:
+            nextDataSource = _context4.sent;
+            onChange(nextDataSource !== null && nextDataSource !== void 0 ? nextDataSource : []);
+            return _context4.abrupt("return");
+          case 14:
+            if (activeLevel === overLevel && activeParentId === overParentId) {
+              // 将树平铺
+              _flatTree = transformTreeToArray(transformedValue).map(function (item) {
+                return _objectSpread(_objectSpread({}, item), {}, {
+                  children: undefined
+                });
+              });
+              activeIndex = _flatTree.findIndex(function (i) {
+                return i.rowKey === active.id;
+              });
+              overIndex = _flatTree.findIndex(function (i) {
+                return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
+              });
+              nextValue = arrayMove(_flatTree, activeIndex, overIndex);
+              onChange(createTreeFromArray(nextValue, {
+                itemKey: 'rowKey',
+                parentKey: 'parentId',
+                childrenKey: 'children'
+              }));
+            }
+          case 15:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    return function onDragEnd(_x4) {
+      return _ref7.apply(this, arguments);
+    };
+  }();
+  var onDragCancel = /*#__PURE__*/function () {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(event) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            if (!(onDragCancelGuard && isFunction(onDragCancelGuard))) {
+              _context5.next = 3;
+              break;
+            }
+            _context5.next = 3;
+            return onDragCancelGuard({
+              event: event
+            });
+          case 3:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    }));
+    return function onDragCancel(_x5) {
+      return _ref8.apply(this, arguments);
+    };
+  }();
   // 将树平铺
   var flatTree = transformTreeToArray(value).map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
@@ -117,6 +249,10 @@ var DndWrapper = function DndWrapper(_ref2) {
   });
   return draggable && !disabled ? _jsx(DndContext, {
     onDragEnd: onDragEnd,
+    onDragStart: onDragStart,
+    onDragMove: onDragMove,
+    onDragOver: onDragOver,
+    onDragCancel: onDragCancel,
     collisionDetection: closestCorners,
     children: _jsx(SortableContext, {
       items: (flatTree === null || flatTree === void 0 ? void 0 : (_flatTree$ = flatTree[0]) === null || _flatTree$ === void 0 ? void 0 : _flatTree$.rowKey) ? flatTree.map(function (i) {

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

@@ -4,6 +4,15 @@ import _Table from "antd/es/table";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
 import { jsx as _jsx } from "react/jsx-runtime";
+/*
+ * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Date: 2024-08-09 13:48:59
+ * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditTime: 2024-08-20 19:31:24
+ * @FilePath: /za-material-warehouse/src/ProTable/components/RcTable/components/DraggableTable/index.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+
 import { memo } from 'react';
 import DndWrapper, { Row } from './components/DndWrapper';
 import { RenderEmptyText, RenderSummary } from '../../../index';
@@ -21,13 +30,23 @@ var DraggableTable = function DraggableTable(_ref) {
     disabled = tableProps.disabled;
   var onChange = draggableProps.onChange,
     draggable = draggableProps.draggable,
-    rowKey = draggableProps.rowKey;
+    rowKey = draggableProps.rowKey,
+    onDragStartGuard = draggableProps.onDragStartGuard,
+    onDragMoveGuard = draggableProps.onDragMoveGuard,
+    onDragOverGuard = draggableProps.onDragOverGuard,
+    onDragEndGuard = draggableProps.onDragEndGuard,
+    onDragCancelGuard = draggableProps.onDragCancelGuard;
   return _jsx(DndWrapper, {
     value: dataSource !== null && dataSource !== void 0 ? dataSource : [],
     onChange: onChange,
     disabled: disabled,
     draggable: draggable,
     rowKey: rowKey,
+    onDragStartGuard: onDragStartGuard,
+    onDragMoveGuard: onDragMoveGuard,
+    onDragOverGuard: onDragOverGuard,
+    onDragEndGuard: onDragEndGuard,
+    onDragCancelGuard: onDragCancelGuard,
     children: _jsx(_Table, _objectSpread(_objectSpread({
       className: "pro-edit-table-drag",
       components: {

package/es/ProTable/index.js

@@ -5,7 +5,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "originalDataSource"],
+var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "originalDataSource", "onDragStart", "onDragMove", "onDragOver", "onDragEnd", "onDragCancel"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState, createContext } from 'react';
@@ -53,6 +53,11 @@ function ProTable(props) {
     _props$emptyText = props.emptyText,
     emptyText = _props$emptyText === void 0 ? locale === null || locale === void 0 ? void 0 : (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.noData : _props$emptyText,
     originalDataSource = props.originalDataSource,
+    onDragStartGuard = props.onDragStart,
+    onDragMoveGuard = props.onDragMove,
+    onDragOverGuard = props.onDragOver,
+    onDragEndGuard = props.onDragEnd,
+    onDragCancelGuard = props.onDragCancel,
     restProps = _objectWithoutProperties(props, _excluded);
   var quickTableConfig = quickConfig ? _objectSpread({
     columnConfig: true,
@@ -352,7 +357,12 @@ function ProTable(props) {
           draggableProps: {
             onChange: onDataSourceChange,
             draggable: draggable,
-            rowKey: rowKey
+            rowKey: rowKey,
+            onDragStartGuard: onDragStartGuard,
+            onDragMoveGuard: onDragMoveGuard,
+            onDragOverGuard: onDragOverGuard,
+            onDragEndGuard: onDragEndGuard,
+            onDragCancelGuard: onDragCancelGuard
           },
           tableProps: {
             value: _dataSource,

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;
@@ -26,6 +27,10 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     format?: string;
     precision?: number;
     code?: string | string[] | ((text: any, record: any) => string);
+    codeValues?: {
+        label: string;
+        value: string | number;
+    }[];
     copyable?: boolean;
     originalDiffTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
@@ -37,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>;
@@ -63,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,35 +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,
-      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
   });
@@ -582,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),