@zat-design/sisyphus-react 3.8.0 → 3.8.2

package/es/ProStep/components/Listener/index.js

@@ -14,7 +14,7 @@ export default (function (_ref) {
   var _useStep = useStep(),
     notify = _useStep.notify;
   return /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, props), {}, {
-    onClick: throttle( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    onClick: throttle(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

package/es/ProStep/index.js

@@ -82,7 +82,7 @@ var ProStep = function ProStep(_ref) {
       return null;
     }
     var subEvent = /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var value, _form$validateFields, _error$errorFields;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -128,7 +128,7 @@ var ProStep = function ProStep(_ref) {
     registerMap.current[id] = record;
   };
   var notify = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
       var _ref7, excludes, triggerIds, events, res, nextErrorCollection;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -167,7 +167,7 @@ var ProStep = function ProStep(_ref) {
     };
   }();
   var triggerTo = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys) {
+    var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys) {
       var events, result, nextErrorCollection;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {

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

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

package/es/ProTable/components/FormatColumn/index.js

@@ -1,5 +1,6 @@
 import "antd/es/space/style";
 import _Space from "antd/es/space";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { isValidElement } from 'react';
 import moment from 'moment';
@@ -16,7 +17,8 @@ export var formatColumn = function formatColumn(_ref) {
     originalObj = _ref.originalObj,
     dataSourceObj = _ref.dataSourceObj,
     rowKey = _ref.rowKey,
-    diffToolTip = _ref.diffToolTip;
+    diffToolTip = _ref.diffToolTip,
+    wrapToolTipProps = _ref.wrapToolTipProps;
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -36,6 +38,7 @@ export var formatColumn = function formatColumn(_ref) {
     originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps;
+  var _toolTipProps = _objectSpread(_objectSpread({}, toolTipProps), wrapToolTipProps);
   var _originalDiffTip = diffToolTip !== null && diffToolTip !== void 0 ? diffToolTip : originalDiffTip;
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
@@ -105,7 +108,7 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -135,7 +138,7 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -188,7 +191,7 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -226,7 +229,7 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
   } else if (precision || prefix || suffix) {
@@ -253,7 +256,7 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
   } else if (valueType === 'address') {
@@ -309,7 +312,7 @@ export var formatColumn = function formatColumn(_ref) {
           node: value,
           value: value,
           currentValue: value,
-          toolTipProps: toolTipProps
+          toolTipProps: _toolTipProps
         }), suffixNode(value, record, index)]
       });
     };
@@ -330,7 +333,7 @@ export var formatColumn = function formatColumn(_ref) {
           value: value,
           currentValue: value || '-',
           originalDiffTip: _originalDiffTip,
-          toolTipProps: toolTipProps
+          toolTipProps: _toolTipProps
         }), suffixNode(value, record, index)]
       });
     };
@@ -353,7 +356,7 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: value || '-',
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
   }

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

@@ -74,7 +74,7 @@ var DndWrapper = function DndWrapper(_ref2) {
     onDragStartGuard = _ref2.onDragStartGuard,
     onDragEndGuard = _ref2.onDragEndGuard;
   var onDragStart = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
       var active, _transformedValue, activeObject;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -105,7 +105,7 @@ var DndWrapper = function DndWrapper(_ref2) {
     };
   }();
   var onDragEnd = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
       var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {

package/es/ProTable/hooks/useAntdTable.js

@@ -276,7 +276,7 @@ function useAntdTable(service, options, useRequestOptions) {
     }
   };
   var handleRefresh = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -388,7 +388,7 @@ function useAntdTable(service, options, useRequestOptions) {
         total: total
       }),
       onSelect: function () {
-        var _onSelect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(changeableRowKeys) {
+        var _onSelect = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(changeableRowKeys) {
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -412,7 +412,7 @@ function useAntdTable(service, options, useRequestOptions) {
       key: 'uncheckAll',
       text: locale === null || locale === void 0 ? void 0 : (_locale$ProTable4 = locale.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.deselect,
       onSelect: function () {
-        var _onSelect2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var _onSelect2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:

package/es/ProTable/index.js

@@ -56,6 +56,15 @@ function ProTable(props) {
     onDragStartGuard = props.onDragStart,
     onDragEndGuard = props.onDragEnd,
     restProps = _objectWithoutProperties(props, _excluded);
+  var _props$scrollFollowPa = props.scrollFollowParent,
+    scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa;
+  var wrapToolTipProps = {
+    getPopupContainer: scrollFollowParent ? function (triggerNode) {
+      return triggerNode.parentNode;
+    } : function () {
+      return document.body;
+    }
+  };
   var _ref3 = diffConfig || {},
     originalDataSource = _ref3.originalDataSource,
     changeTipColor = _ref3.changeTipColor,
@@ -198,7 +207,8 @@ function ProTable(props) {
         originalObj: originalObj,
         dataSourceObj: dataSourceObj,
         rowKey: 'rowKey',
-        diffToolTip: toolTip
+        diffToolTip: toolTip,
+        wrapToolTipProps: wrapToolTipProps
       });
     });
     return newColumns;
@@ -216,7 +226,7 @@ function ProTable(props) {
     });
   }, [columns]);
   var handleColumnConfig = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(checkList) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -325,7 +335,7 @@ function ProTable(props) {
     return _rowSelection;
   };
   var onDataSourceChange = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(nextDataSource) {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(nextDataSource) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:

package/es/ProTable/propsType.d.ts

@@ -103,6 +103,10 @@ export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary'
      */
     onDragStart?: DragStartGuardProps;
     onDragEnd?: DragEndGuardProps;
+    /**
+     * 滚动额外配置
+     */
+    scrollFollowParent?: boolean;
 }
 export type ProTableValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime';
 export interface Response<T = any> {

package/es/ProTree/components/ProTree.js

@@ -359,7 +359,7 @@ var ProTree = function ProTree(props) {
   };
   /** 点击了树节点开始loading,改变自身state并将值通过onchange上传到form */
   var onSelectTreeNode = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(props, info) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(props, info) {
       var _options$;
       var values, options, option;
       return _regeneratorRuntime().wrap(function _callee$(_context) {

package/es/ProTree/components/ProTreeSelect/index.js

@@ -297,6 +297,16 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     var labelText = node[label];
     var value = node[code];
     var key = node[uuidKey];
+    // 三无走默认
+    if (['undefined-undefined', 'undefined'].includes(labelText) && !value && !key) {
+      if (showCodeName) {
+        labelText = "".concat(node === null || node === void 0 ? void 0 : node.value, "-").concat(node === null || node === void 0 ? void 0 : node.label);
+      } else {
+        labelText = node === null || node === void 0 ? void 0 : node.label;
+      }
+      value = node === null || node === void 0 ? void 0 : node.value;
+      key = node === null || node === void 0 ? void 0 : node.value;
+    }
     var titleHtml = _jsx("span", {
       dangerouslySetInnerHTML: {
         __html: labelText

package/es/ProTree/components/Tree.js

@@ -110,7 +110,7 @@ function List(props) {
     }
   }, [selectedKey]);
   var onSelect = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(value, item) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(value, item) {
       var _props$onSelect;
       var val;
       return _regeneratorRuntime().wrap(function _callee$(_context) {

package/es/ProUpload/components/ImageRender.js

@@ -168,7 +168,7 @@ var ImageRender = function ImageRender(props) {
                   disabled: isView || disabled,
                   className: "action-item",
                   onClick: function () {
-                    var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+                    var _onClick = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
                       var res;
                       return _regeneratorRuntime().wrap(function _callee$(_context) {
                         while (1) switch (_context.prev = _context.next) {

package/es/ProViewer/index.js

@@ -109,8 +109,8 @@ var ProViewer = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   useEffect(function () {
     if (previewFile) {
       try {
-        previewFile().then( /*#__PURE__*/function () {
-          var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
+        previewFile().then(/*#__PURE__*/function () {
+          var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
             var res, blob, blobUrl;
             return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {

package/es/old/ProEditableTable/index.js

@@ -172,7 +172,7 @@ var ProEditableTable = /*#__PURE__*/forwardRef(function (props, ref) {
    * @returns {Promise<{nextList: IRowDataPropsType[], list: IRowDataPropsType[], rowData: IRowDataPropsType, rowIndex: number}>}
    */
   var onMultipleDelete = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var res, values, nextList, resetFieldsIndex;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -278,7 +278,7 @@ var ProEditableTable = /*#__PURE__*/forwardRef(function (props, ref) {
    * @returns {Promise<{nextList: IRowDataPropsType[], list: IRowDataPropsType[], rowData: IRowDataPropsType, rowIndex: number}>}
    */
   var onSave = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(rowIndex, callback) {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(rowIndex, callback) {
       var _form$getFieldsValue$, _form$getFieldsValue, nextValues, res, values;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -404,12 +404,12 @@ var ProEditableTable = /*#__PURE__*/forwardRef(function (props, ref) {
           }, antButtonProps), {}, {
             children: buttonText
           }))]
-        }) : ( /*#__PURE__*/cloneElement(buttonText, antButtonProps))
+        }) : (/*#__PURE__*/cloneElement(buttonText, antButtonProps))
       }) : null
     });
   };
   var validateFields = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var values, nextValues, nextList, isEditing;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {

package/lib/ProAction/index.js

@@ -44,7 +44,7 @@ var ProAction = function ProAction(props) {
     servicesArray = state.servicesArray;
   var length = config.length;
   var _onActionRun = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(currentIndex, array) {
+    var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(currentIndex, array) {
       var _actionProps$useReque, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
       var actionProps, newServicesArray, _ref2, service, options, transformResponse, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, _newServicesArray$cur6, list, errorTitle, isContinue;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {

package/lib/ProDownload/index.js

@@ -44,7 +44,7 @@ var ProDownload = function ProDownload(props) {
     onErrorConfig = _ref.onError;
   defaultProps.headers = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, headers), defaultProps.headers);
   var handDownload = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _params;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -138,7 +138,7 @@ var ProDownload = function ProDownload(props) {
   return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     className: cls,
     onClick: function () {
-      var _onClick = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+      var _onClick = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
         var res;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -153,7 +153,7 @@ var ProDownload = function ProDownload(props) {
                 _context3.next = 13;
                 break;
               }
-              if (!(beforeDownload instanceof /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+              if (!(beforeDownload instanceof /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
                 return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
                   while (1) switch (_context2.prev = _context2.next) {
                     case 0:

package/lib/ProDownload/utils.js

@@ -79,7 +79,7 @@ function getFilenameFromContentDisposition(contentDisposition) {
 }
 // 发起请求获取下载文件
 var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
-  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref2) {
+  var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref2) {
     var url, _ref2$method, method, params, headers, transformResponse, fileName, onFinish, onError, config, res, fileBlob, data, contentFileName;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -106,8 +106,8 @@ var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
             config.headers = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, config.headers), headers);
           }
           _context2.next = 7;
-          return fetch(url, config).then( /*#__PURE__*/function () {
-            var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(response) {
+          return fetch(url, config).then(/*#__PURE__*/function () {
+            var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(response) {
               var _data, errorMsg;
               return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {

package/lib/ProDrawerForm/components/ProDrawer/index.js

@@ -49,7 +49,7 @@ var ProDrawer = function ProDrawer(_ref) {
     loading = _useState2[0],
     toggleLoading = _useState2[1];
   var noRenderFooter = isView || footer === false || footer === null;
-  var onConfirm = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+  var onConfirm = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3, _locale$ProDrawerForm4;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -77,7 +77,7 @@ var ProDrawer = function ProDrawer(_ref) {
       }
     }, _callee);
   })), [onCancel, modalRef.current]);
-  var handleFinish = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+  var handleFinish = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
     var values, _error$errorFields, _error$errorFields$;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -169,7 +169,7 @@ var ProDrawer = function ProDrawer(_ref) {
     if (noRenderFooter) {
       return null;
     }
-    if ( /*#__PURE__*/_react.default.isValidElement(footer)) {
+    if (/*#__PURE__*/_react.default.isValidElement(footer)) {
       return (0, _jsxRuntime.jsx)("div", {
         className: "pro-drawer-footer",
         children: footer
@@ -179,7 +179,7 @@ var ProDrawer = function ProDrawer(_ref) {
       return (0, _jsxRuntime.jsx)("div", {
         className: "pro-drawer-footer",
         children: footer.map(function (item) {
-          if ( /*#__PURE__*/_react.default.isValidElement(item)) {
+          if (/*#__PURE__*/_react.default.isValidElement(item)) {
             return item;
           }
           return false;

package/lib/ProDrawerForm/components/ProModal/index.js

@@ -55,7 +55,7 @@ var ProModal = function ProModal(_ref) {
     'pro-modal-no-footer': noRenderFooter,
     'pro-modal-footer-shadow': height >= 450
   }]);
-  var handleFinish = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+  var handleFinish = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     var values, _error$errorFields, _error$errorFields$;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -149,7 +149,7 @@ var ProModal = function ProModal(_ref) {
     if (noRenderFooter) {
       return null;
     }
-    if ( /*#__PURE__*/_react.default.isValidElement(footer)) {
+    if (/*#__PURE__*/_react.default.isValidElement(footer)) {
       return (0, _jsxRuntime.jsx)("div", {
         className: "pro-drawer-footer",
         children: footer
@@ -159,7 +159,7 @@ var ProModal = function ProModal(_ref) {
       return (0, _jsxRuntime.jsx)("div", {
         className: "pro-drawer-footer",
         children: footer.map(function (item) {
-          if ( /*#__PURE__*/_react.default.isValidElement(item)) {
+          if (/*#__PURE__*/_react.default.isValidElement(item)) {
             return item;
           }
           return false;

package/lib/ProEditLabel/index.js

@@ -135,7 +135,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
    * pop确认回调
    */
   var onConfirmHandle = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var res, value;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -222,7 +222,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
       })
     });
     if (disabled) {
-      if ( /*#__PURE__*/_react.default.isValidElement(children)) {
+      if (/*#__PURE__*/_react.default.isValidElement(children)) {
         return children;
       }
       if (props.value && !popupProps) {
@@ -254,7 +254,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
     if (mode === 'popup') {
       // 查看时内容渲染
       var labelRender = function labelRender() {
-        if ( /*#__PURE__*/_react.default.isValidElement(children)) {
+        if (/*#__PURE__*/_react.default.isValidElement(children)) {
           return children;
         }
         return TextNode;

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

@@ -86,7 +86,7 @@ var ActionButton = function ActionButton(_ref) {
         disabled: isDisabled,
         okText: _locale.default.ProEditTable.confirm,
         cancelText: _locale.default.ProEditTable.cancel,
-        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? (/*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled
@@ -96,7 +96,7 @@ var ActionButton = function ActionButton(_ref) {
           children: btnConfig.label
         }))
       }) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? (/*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled,
@@ -113,7 +113,7 @@ var ActionButton = function ActionButton(_ref) {
         }))
       })
     }) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+      children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? (/*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         record: record,
         index: index
       }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({

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

@@ -16,7 +16,7 @@ var _lodash = require("lodash");
 var _diffOriginal = require("../../../ProForm/utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
-var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type"];
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "valuePropName"];
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -46,7 +46,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     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) {
+    var originalValueRow = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
     var originalValue;
@@ -83,13 +83,16 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     rowKeyPath = props.rowKeyPath,
     children = props.children,
     type = props.type,
+    normalize = props.normalize,
+    _props$valuePropName = props.valuePropName,
+    valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEditTable') || {},
     isDiffAll = _ref2.isDiffAll;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var isWatch = originalValues && !['FormList', 'ProEditTable'].includes(type);
+  var isWatch = Boolean(originalValues);
   var originalValue = isWatch ? getOriginalValue({
     namePath: namePath,
     originalName: originalNamePath,
@@ -101,14 +104,15 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
   var diffType = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return 'same';
+    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
     return (0, _diffOriginal.diffOriginal)({
-      value: props.value,
+      value: _value,
       originalValue: originalValue,
       form: form,
       equalWith: equalWith
       // name: isString(namesStr) ? namesStr : originalName || name,
     });
-  }, [props.value, originalValue]);
+  }, [props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
   if (!isWatch || noChange) {