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

package/es/ProAction/index.js

@@ -40,7 +40,7 @@ var ProAction = function ProAction(props) {
     servicesArray = state.servicesArray;
   var length = config.length;
   var _onActionRun = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(currentIndex, array) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().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 _regeneratorRuntime().wrap(function _callee$(_context) {

package/es/ProDownload/index.js

@@ -37,7 +37,7 @@ var ProDownload = function ProDownload(props) {
     onErrorConfig = _ref.onError;
   defaultProps.headers = _objectSpread(_objectSpread({}, headers), defaultProps.headers);
   var handDownload = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _params;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -131,7 +131,7 @@ var ProDownload = function ProDownload(props) {
   return _jsx(_Button, _objectSpread(_objectSpread({
     className: cls,
     onClick: function () {
-      var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _onClick = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var res;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -146,7 +146,7 @@ var ProDownload = function ProDownload(props) {
                 _context3.next = 13;
                 break;
               }
-              if (!(beforeDownload instanceof /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+              if (!(beforeDownload instanceof /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
                 return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                   while (1) switch (_context2.prev = _context2.next) {
                     case 0:

package/es/ProDownload/utils.js

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

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

@@ -46,7 +46,7 @@ var ProDrawer = function ProDrawer(_ref) {
     loading = _useState2[0],
     toggleLoading = _useState2[1];
   var noRenderFooter = isView || footer === false || footer === null;
-  var onConfirm = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var onConfirm = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3, _locale$ProDrawerForm4;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -74,7 +74,7 @@ var ProDrawer = function ProDrawer(_ref) {
       }
     }, _callee);
   })), [onCancel, modalRef.current]);
-  var handleFinish = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+  var handleFinish = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     var values, _error$errorFields, _error$errorFields$;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -166,7 +166,7 @@ var ProDrawer = function ProDrawer(_ref) {
     if (noRenderFooter) {
       return null;
     }
-    if ( /*#__PURE__*/React.isValidElement(footer)) {
+    if (/*#__PURE__*/React.isValidElement(footer)) {
       return _jsx("div", {
         className: "pro-drawer-footer",
         children: footer
@@ -176,7 +176,7 @@ var ProDrawer = function ProDrawer(_ref) {
       return _jsx("div", {
         className: "pro-drawer-footer",
         children: footer.map(function (item) {
-          if ( /*#__PURE__*/React.isValidElement(item)) {
+          if (/*#__PURE__*/React.isValidElement(item)) {
             return item;
           }
           return false;

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

@@ -52,7 +52,7 @@ var ProModal = function ProModal(_ref) {
     'pro-modal-no-footer': noRenderFooter,
     'pro-modal-footer-shadow': height >= 450
   }]);
-  var handleFinish = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var handleFinish = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var values, _error$errorFields, _error$errorFields$;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -146,7 +146,7 @@ var ProModal = function ProModal(_ref) {
     if (noRenderFooter) {
       return null;
     }
-    if ( /*#__PURE__*/React.isValidElement(footer)) {
+    if (/*#__PURE__*/React.isValidElement(footer)) {
       return _jsx("div", {
         className: "pro-drawer-footer",
         children: footer
@@ -156,7 +156,7 @@ var ProModal = function ProModal(_ref) {
       return _jsx("div", {
         className: "pro-drawer-footer",
         children: footer.map(function (item) {
-          if ( /*#__PURE__*/React.isValidElement(item)) {
+          if (/*#__PURE__*/React.isValidElement(item)) {
             return item;
           }
           return false;

package/es/ProEditLabel/index.js

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

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

@@ -82,7 +82,7 @@ var ActionButton = function ActionButton(_ref) {
         disabled: isDisabled,
         okText: locale.ProEditTable.confirm,
         cancelText: locale.ProEditTable.cancel,
-        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled
@@ -92,7 +92,7 @@ var ActionButton = function ActionButton(_ref) {
           children: btnConfig.label
         }))
       }) : _jsx(_Fragment, {
-        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled,
@@ -109,7 +109,7 @@ var ActionButton = function ActionButton(_ref) {
         }))
       })
     }) : _jsx(_Fragment, {
-      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         record: record,
         index: index
       }))) : _jsx(_Button, _objectSpread(_objectSpread({

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

@@ -4,7 +4,7 @@ import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-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"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
@@ -41,7 +41,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
     var originalValueList = 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;
@@ -78,6 +78,8 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     rowKeyPath = props.rowKeyPath,
     children = props.children,
     type = props.type,
+    normalize = props.normalize,
+    valuePropName = props.valuePropName,
     rest = _objectWithoutProperties(props, _excluded);
   var _ref2 = useProConfig('ProEditTable') || {},
     isDiffAll = _ref2.isDiffAll;
@@ -96,14 +98,15 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
   var diffType = useMemo(function () {
     if (!isWatch || noChange) return 'same';
+    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
     return 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/es/ProEditTable/components/RenderField/index.js

@@ -246,7 +246,7 @@ var RenderField = function RenderField(_ref) {
     if (typeof _editRender === 'function') {
       TargetComponent = _editRender.apply(void 0, rowParams);
     }
-    if ( /*#__PURE__*/React.isValidElement(_editRender)) {
+    if (/*#__PURE__*/React.isValidElement(_editRender)) {
       TargetComponent = _editRender;
     }
   }
@@ -262,7 +262,7 @@ var RenderField = function RenderField(_ref) {
         children: View
       });
     }
-    if ( /*#__PURE__*/React.isValidElement(viewRender)) {
+    if (/*#__PURE__*/React.isValidElement(viewRender)) {
       TargetComponent = viewRender;
     }
   }
@@ -305,7 +305,7 @@ var RenderField = function RenderField(_ref) {
     }, 100);
   };
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
-  var _onChange = debounce( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var _onChange = debounce(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _len2,
       args,
       _key2,
@@ -409,7 +409,7 @@ var RenderField = function RenderField(_ref) {
     }, _callee);
   })), 300);
   var _onblur = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
       var _len3,
         args,
@@ -545,7 +545,7 @@ var RenderField = function RenderField(_ref) {
   var getFieldItem = function getFieldItem() {
     var _componentProps;
     var FormItem = null;
-    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
+    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? (/*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
     if (originalValues) {
       FieldComponent = _jsx(ListChangedWrapper, {
         name: cellName,
@@ -559,6 +559,8 @@ var RenderField = function RenderField(_ref) {
         equalWith: equalWith,
         type: type,
         onChange: _onChange,
+        valuePropName: _formItemProps.valuePropName,
+        normalize: _formItemProps.normalize,
         children: FieldComponent
       });
     }

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

@@ -76,7 +76,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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
+      var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
         var onEvent, result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {

package/es/ProEditTable/utils/config.js

@@ -63,7 +63,7 @@ export var actions = {
     });
   },
   save: function () {
-    var _save = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
+    var _save = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
       var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -166,7 +166,7 @@ export var actions = {
     }
   },
   add: function () {
-    var _add = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
+    var _add = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().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 _regeneratorRuntime().wrap(function _callee2$(_context2) {

package/es/ProEditTable/utils/index.js

@@ -26,7 +26,7 @@ import locale from '../../locale';
 // 渲染操作栏
 var getActionColumn = function getActionColumn(config) {
   var _cloneDeepWith = cloneDeepWith(config, function (value) {
-      if ( /*#__PURE__*/React.isValidElement(value)) {
+      if (/*#__PURE__*/React.isValidElement(value)) {
         return value;
       }
     }),
@@ -83,7 +83,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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
+      var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
         var _form$getFieldValue;
         var rowName, _record, onEvent, result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -234,7 +234,7 @@ export var transformColumns = function transformColumns() {
           children: [before, columnTitle, _jsx(_Tooltip, _objectSpread(_objectSpread({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
-            children: icon ? ( /*#__PURE__*/React.cloneElement(icon, {
+            children: icon ? (/*#__PURE__*/React.cloneElement(icon, {
               className: 'icon-tip'
             })) : _jsx(ReactSVG, {
               className: "icon-tip",
@@ -380,8 +380,8 @@ export var transformColumns = function transformColumns() {
   }
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
-    Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
+    Promise.all(Object.entries(_cacheMap).map(/*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
         var _item, key, value, _ref4, service, option;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {

package/es/ProEditTable/utils/tools.js

@@ -191,7 +191,7 @@ export var handleScrollToError = function handleScrollToError() {
  */
 export function cloneDeepFilterNode(value) {
   return cloneDeepWith(value, function (val) {
-    if ( /*#__PURE__*/React.isValidElement(val)) {
+    if (/*#__PURE__*/React.isValidElement(val)) {
       return val;
     }
   });

package/es/ProEnum/hooks/useEnumRequest.js

@@ -52,7 +52,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     staleTime: 6e4 * 60
   }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
     setCache: function () {
-      var _setCache = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
+      var _setCache = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
         var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -162,7 +162,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     }
   }));
   var mergeData = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {

package/es/ProEnum/index.js

@@ -153,7 +153,7 @@ var ProEnum = function ProEnum(props) {
         list = [];
       }
     }
-    if ( /*#__PURE__*/React.isValidElement(component)) {
+    if (/*#__PURE__*/React.isValidElement(component)) {
       var Component = component;
       return _jsx(Component, _objectSpread(_objectSpread({}, enumProps), {}, {
         dataSource: list,

package/es/ProForm/components/combination/FormList/components/ActionButton.js

@@ -133,7 +133,7 @@ var ActionButton = function ActionButton(props) {
     return _actionProps;
   }, [props.actionProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, index, item) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, index, item) {
       var value, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -272,7 +272,7 @@ var ActionButton = function ActionButton(props) {
           },
           children: label
         }))
-      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : ( /*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
+      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (/*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
         key: "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index),
         type: "text",
         onClick: function onClick(e) {

package/es/ProForm/components/combination/FormList/components/BlockTitle.js

@@ -13,7 +13,7 @@ var BlockTitle = function BlockTitle(props) {
   if (!title) {
     return _jsx("div", {});
   }
-  if ( /*#__PURE__*/React.isValidElement(title)) {
+  if (/*#__PURE__*/React.isValidElement(title)) {
     return title;
   }
   var titleContent = title;

package/es/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -55,7 +55,7 @@ var ToolbarButton = function ToolbarButton(props) {
     return _toolbarProps;
   }, [props.toolbarProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
       var value, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

package/es/ProForm/components/combination/FormList/utils.js

@@ -23,7 +23,7 @@ export var namesPathTransform = function namesPathTransform(_ref) {
 // 比较memo
 export var memoWith = function memoWith(pre, next) {
   return isEqualWith(pre, next, function (objValue, othValue) {
-    if ( /*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
+    if (/*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
       return true;
     }
     // 移除解决formlist函数里不更新问题

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -48,7 +48,7 @@ var ComRender = function ComRender(props) {
   };
   var _props = mergedGetValueProps(fieldProps.value);
   var componentProps = _objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), _props);
-  var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
+  var Component = component ? (/*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
   var Com = getComRender(Component, props, componentProps);
   return _jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {

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

@@ -96,8 +96,11 @@ var ProCascader = function ProCascader(props) {
     enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
   var realDataSource = useMemo(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource;
-    return transformDataName(result, fieldNames);
+    var result = transformDataName(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
+    if (transformResponse) {
+      return transformResponse(result);
+    }
+    return result;
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = _objectSpread({}, useRequest),
     service = _useRequest.service,
@@ -112,7 +115,7 @@ var ProCascader = function ProCascader(props) {
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
   var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _yield$service, data, newData, transFormData, serviceData;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -24,7 +24,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
   });
 };
 var defaultService = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -19,7 +19,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "searchForm", "searchKey", "defaultOne"],
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -53,6 +53,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     style = props.style,
     className = props.className,
     beforeOpen = props.beforeOpen,
+    afterOpen = props.afterOpen,
     isTooltip = props.isTooltip,
     searchForm = props.searchForm,
     searchKey = props.searchKey,
@@ -237,7 +238,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     onChange(val, option);
   };
   var handleClick = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _yield$beforeOpen, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -272,6 +273,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               setState({
                 onOff: true
               });
+              setTimeout(function () {
+                afterOpen === null || afterOpen === void 0 ? void 0 : afterOpen({
+                  setInnerState: setState
+                });
+              }, 100);
             }
           case 14:
           case "end":
@@ -299,7 +305,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   };
   var handleFinish = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -364,7 +370,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     };
   }();
   var handleSearch = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var values;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -437,7 +443,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -500,7 +506,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }();
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
-    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {

package/es/ProForm/components/combination/ProModalSelect/propsType.d.ts

@@ -39,6 +39,7 @@ interface ProModalPropsType {
     labelInValue?: boolean;
     defaultOne?: boolean;
     beforeOpen?: any;
+    afterOpen?: any;
     isTooltip?: any;
     showCodeName?: boolean;
     searchForm?: FormInstance;

package/es/ProForm/components/old/ProAddress/index.js

@@ -92,7 +92,7 @@ export function ProAddress(_ref3) {
     secondCitys = _useState6[0],
     setSecondCitys = _useState6[1];
   var queryCity = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(code, type) {
+    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(code, type) {
       var cityList, _cityList, newList, _secondCitys;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

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

@@ -5,7 +5,7 @@ import _Tooltip from "antd/es/tooltip";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName"];
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
 import { get } from 'lodash';
@@ -25,6 +25,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     diffConfig = props.diffConfig,
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
+    normalize = props.normalize,
     rest = _objectWithoutProperties(props, _excluded);
   var _useProConfig = useProConfig('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
@@ -39,9 +40,10 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
   var diffType = useMemo(function () {
     if (!isWatch || noChange) return 'same';
+    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
     return diffOriginal({
       originalValue: originalValue,
-      value: props[valuePropName],
+      value: _value,
       form: form,
       equalWith: equalWith
       // name: namesStr || name,

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

@@ -22,7 +22,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var _ProForm$useFieldProp = ProForm.useFieldProps(),
     form = _ProForm$useFieldProp.form;
   var handleChange = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(value) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(value) {
       var _len,
         other,
         _key,