@zat-design/sisyphus-react 3.8.0-beat.1 → 3.8.0-beat.10

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

@@ -240,7 +240,7 @@ var Render = function Render(props) {
       _args = functionArgs([].concat(args));
     }
     var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
-    if ( /*#__PURE__*/React.isValidElement(AutoComponent)) {
+    if (/*#__PURE__*/React.isValidElement(AutoComponent)) {
       var _AutoComponent$props$, _AutoComponent$props, _lastComponentProps$c;
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat(_toConsumableArray(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat(_toConsumableArray(_args))));
       return false;
@@ -290,7 +290,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _len3,
         args,
         _key3,
@@ -373,7 +373,7 @@ var Render = function Render(props) {
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? ( /*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
+    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? (/*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
       otherProps: _objectSpread(_objectSpread({}, otherProps), {}, {
         show: show,
         disabled: lastDisabled,
@@ -437,6 +437,7 @@ var Render = function Render(props) {
         type: type,
         onChange: handleChange,
         valuePropName: _otherFormItemProps.valuePropName,
+        normalize: _otherFormItemProps.normalize,
         children: child
       });
     }

package/es/ProForm/index.js

@@ -200,7 +200,7 @@ var ProForm = function ProForm(props, ref) {
     if (isView || disabled) {
       // 查看或禁用模式
       footerEle = null;
-    } else if ( /*#__PURE__*/React.isValidElement(footer)) {
+    } else if (/*#__PURE__*/React.isValidElement(footer)) {
       // 传入组件渲染组件
       footerEle = footer;
     } else if (footer === undefined || footer || isObject(footer)) {

package/es/ProForm/utils/useForm.js

@@ -38,7 +38,7 @@ export var useForm = function useForm(originForm, options) {
     return getFieldsValue(nameList, filterFunc);
   };
   var _validateFields = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
       var _rest$,
         _len,
         rest,

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/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

@@ -216,7 +216,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 +325,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/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

@@ -79,7 +79,9 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     showEllipse = _props$showEllipse === void 0 ? true : _props$showEllipse;
   var _ref2 = otherProps !== null && otherProps !== void 0 ? otherProps : {},
     isDiffChange = _ref2.isDiffChange;
+  console.log('tag1', showEllipse, otherProps, isDiffChange);
   var _showEllipse = showEllipse && !isDiffChange;
+  console.log('tag2', _showEllipse);
   var _ref3 = otherProps || {},
     isView = _ref3.isView,
     viewEmpty = _ref3.viewEmpty;
@@ -297,6 +299,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
@@ -319,6 +331,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
       }) : null]
     });
     if (_showEllipse) {
+      console.log('tag3', '走自身气泡了');
       title = _jsx(AdaptiveTooltip, {
         children: treeCheckable ? titleHtml : _jsxs("span", {
           className: "check-option-text",

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,6 +83,8 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     rowKeyPath = props.rowKeyPath,
     children = props.children,
     type = props.type,
+    normalize = props.normalize,
+    valuePropName = props.valuePropName,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEditTable') || {},
     isDiffAll = _ref2.isDiffAll;
@@ -101,14 +103,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) {

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

@@ -253,7 +253,7 @@ var RenderField = function RenderField(_ref) {
     if (typeof _editRender === 'function') {
       TargetComponent = _editRender.apply(void 0, rowParams);
     }
-    if ( /*#__PURE__*/_react.default.isValidElement(_editRender)) {
+    if (/*#__PURE__*/_react.default.isValidElement(_editRender)) {
       TargetComponent = _editRender;
     }
   }
@@ -269,7 +269,7 @@ var RenderField = function RenderField(_ref) {
         children: View
       });
     }
-    if ( /*#__PURE__*/_react.default.isValidElement(viewRender)) {
+    if (/*#__PURE__*/_react.default.isValidElement(viewRender)) {
       TargetComponent = viewRender;
     }
   }
@@ -312,7 +312,7 @@ var RenderField = function RenderField(_ref) {
     }, 100);
   };
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
-  var _onChange = (0, _lodash.debounce)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+  var _onChange = (0, _lodash.debounce)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     var _len2,
       args,
       _key2,
@@ -416,7 +416,7 @@ var RenderField = function RenderField(_ref) {
     }, _callee);
   })), 300);
   var _onblur = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+    var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
       var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
       var _len3,
         args,
@@ -552,7 +552,7 @@ var RenderField = function RenderField(_ref) {
   var getFieldItem = function getFieldItem() {
     var _componentProps;
     var FormItem = null;
-    var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
+    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)(_ListChangedWrapper.default, {
         name: cellName,
@@ -566,6 +566,8 @@ var RenderField = function RenderField(_ref) {
         equalWith: equalWith,
         type: type,
         onChange: _onChange,
+        valuePropName: _formItemProps.valuePropName,
+        normalize: _formItemProps.normalize,
         children: FieldComponent
       });
     }

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

@@ -82,7 +82,7 @@ var RenderToolbar = function RenderToolbar(config) {
     toolbar.show = show !== null && show !== void 0 ? show : true;
     toolbar.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     toolbar.onEvent = /*#__PURE__*/function () {
-      var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
+      var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
         var onEvent, result;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {

package/lib/ProEditTable/utils/config.js

@@ -69,7 +69,7 @@ var actions = exports.actions = {
     });
   },
   save: function () {
-    var _save = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref2) {
+    var _save = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref2) {
       var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -172,7 +172,7 @@ var actions = exports.actions = {
     }
   },
   add: function () {
-    var _add = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
+    var _add = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
       var _tableRef$current$que, _tableRef$current$que2;
       var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {

package/lib/ProEditTable/utils/index.js

@@ -30,7 +30,7 @@ var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
 // 渲染操作栏
 var getActionColumn = function getActionColumn(config) {
   var _cloneDeepWith = (0, _lodash.cloneDeepWith)(config, function (value) {
-      if ( /*#__PURE__*/_react.default.isValidElement(value)) {
+      if (/*#__PURE__*/_react.default.isValidElement(value)) {
         return value;
       }
     }),
@@ -87,7 +87,7 @@ var getActionColumn = function getActionColumn(config) {
     action.show = show !== null && show !== void 0 ? show : true;
     action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     action.onEvent = /*#__PURE__*/function () {
-      var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
+      var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
         var _form$getFieldValue;
         var rowName, _record, onEvent, result;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
@@ -238,7 +238,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
           children: [before, columnTitle, (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
-            children: icon ? ( /*#__PURE__*/_react.default.cloneElement(icon, {
+            children: icon ? (/*#__PURE__*/_react.default.cloneElement(icon, {
               className: 'icon-tip'
             })) : (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
               className: "icon-tip",
@@ -384,8 +384,8 @@ var transformColumns = exports.transformColumns = function transformColumns() {
   }
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
-    Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {
-      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
+    Promise.all(Object.entries(_cacheMap).map(/*#__PURE__*/function () {
+      var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
         var _item, key, value, _ref4, service, option;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {

package/lib/ProEditTable/utils/tools.js

@@ -199,7 +199,7 @@ var handleScrollToError = exports.handleScrollToError = function handleScrollToE
  */
 function cloneDeepFilterNode(value) {
   return (0, _lodash.cloneDeepWith)(value, function (val) {
-    if ( /*#__PURE__*/_react.default.isValidElement(val)) {
+    if (/*#__PURE__*/_react.default.isValidElement(val)) {
       return val;
     }
   });