@ant-design/pro-components 2.3.27 → 2.3.28

package/dist/components.js

@@ -20101,6 +20101,7 @@ __webpack_require__.d(__webpack_exports__, {
   "omitBoolean": function() { return /* reexport */ omitBoolean; },
   "omitUndefined": function() { return /* reexport */ omitUndefined; },
   "omitUndefinedAndEmptyArr": function() { return /* reexport */ omitUndefinedAndEmptyArr; },
+  "openVisibleCompatible": function() { return /* reexport */ openVisibleCompatible; },
   "operationUnit": function() { return /* reexport */ operationUnit; },
   "parseValueToDay": function() { return /* reexport */ parseValueToDay; },
   "pickProFormItemProps": function() { return /* reexport */ pickProFormItemProps; },
@@ -20130,7 +20131,6 @@ __webpack_require__.d(__webpack_exports__, {
   "useMountMergeState": function() { return /* reexport */ useMergedState/* default */.Z; },
   "usePrevious": function() { return /* reexport */ usePrevious; },
   "useRefFunction": function() { return /* reexport */ useRefFunction; },
-  "useSafeState": function() { return /* reexport */ useSafeState; },
   "useStyle": function() { return /* reexport */ useStyle; },
   "useToken": function() { return /* reexport */ useStyle_useToken; },
   "version": function() { return /* reexport */ version_version; },
@@ -27289,6 +27289,49 @@ var FieldLabelFunction = function FieldLabelFunction(props, ref) {
   }));
 };
 var FieldLabel = /*#__PURE__*/external_React_default().forwardRef(FieldLabelFunction);
+;// CONCATENATED MODULE: ./packages/utils/es/components/FilterDropdown/style.js
+
+
+
+var FilterDropdown_style_genProStyle = function genProStyle(token) {
+  var _ref;
+  return _ref = {}, defineProperty_defineProperty(_ref, "".concat(token.componentCls, "-label"), {
+    cursor: 'pointer'
+  }), defineProperty_defineProperty(_ref, "".concat(token.componentCls, "-overlay"), {
+    minWidth: '200px',
+    marginBlockStart: '4px',
+    backgroundColor: token.colorBgContainer,
+    boxShadow: token.boxShadowCard,
+    '*': {
+      fontFamily: token.fontFamily,
+      boxSizing: 'border-box'
+    }
+  }), defineProperty_defineProperty(_ref, "".concat(token.componentCls, "-content"), {
+    paddingBlock: 16,
+    paddingInline: 16
+  }), _ref;
+};
+function FilterDropdown_style_useStyle(prefixCls) {
+  return useStyle('FilterDropdown', function (token) {
+    var proToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
+      componentCls: ".".concat(prefixCls)
+    });
+    return [FilterDropdown_style_genProStyle(proToken)];
+  });
+}
+;// CONCATENATED MODULE: ./packages/utils/es/omitUndefined/index.js
+var omitUndefined = function omitUndefined(obj) {
+  var newObj = {};
+  Object.keys(obj || {}).forEach(function (key) {
+    if (obj[key] !== undefined) {
+      newObj[key] = obj[key];
+    }
+  });
+  if (Object.keys(newObj).length < 1) {
+    return undefined;
+  }
+  return newObj;
+};
 ;// CONCATENATED MODULE: ./packages/utils/es/compareVersions/index.js
 
 
@@ -27345,14 +27388,9 @@ var compareSegments = function compareSegments(a, b) {
  * @returns RegExpMatchArray
  */
 var validateAndParse = function validateAndParse(version) {
-  if (typeof version !== 'string') {
-    throw new TypeError('Invalid argument expected string');
-  }
+  var _match$shift;
   var match = version.match(semver);
-  if (!match) {
-    throw new Error("Invalid argument not valid semver ('".concat(version, "' received)"));
-  }
-  match.shift();
+  match === null || match === void 0 ? void 0 : (_match$shift = match.shift) === null || _match$shift === void 0 ? void 0 : _match$shift.call(match);
   return match;
 };
 /**
@@ -27372,44 +27410,26 @@ var compareVersions = function compareVersions(v1, v2) {
   // validate numbers
   var r = compareSegments(n1, n2);
   if (r !== 0) return r;
-  // validate pre-release
-  if (p1 && p2) {
-    return compareSegments(p1.split('.'), p2.split('.'));
-  } else if (p1 || p2) {
+  if (p1 || p2) {
     return p1 ? -1 : 1;
   }
   return 0;
 };
-;// CONCATENATED MODULE: ./packages/utils/es/components/FilterDropdown/style.js
+;// CONCATENATED MODULE: ./packages/utils/es/compareVersions/openVisibleCompatible.js
 
 
 
-var FilterDropdown_style_genProStyle = function genProStyle(token) {
-  var _ref;
-  return _ref = {}, defineProperty_defineProperty(_ref, "".concat(token.componentCls, "-label"), {
-    cursor: 'pointer'
-  }), defineProperty_defineProperty(_ref, "".concat(token.componentCls, "-overlay"), {
-    minWidth: '200px',
-    marginBlockStart: '4px',
-    backgroundColor: token.colorBgContainer,
-    boxShadow: token.boxShadowCard,
-    '*': {
-      fontFamily: token.fontFamily,
-      boxSizing: 'border-box'
-    }
-  }), defineProperty_defineProperty(_ref, "".concat(token.componentCls, "-content"), {
-    paddingBlock: 16,
-    paddingInline: 16
-  }), _ref;
+var openVisibleCompatible = function openVisibleCompatible(open, onOpenChange) {
+  var props = compareVersions(process.env.ANTD_VERSION || external_antd_.version, '4.23.0') > -1 ? {
+    open: open,
+    onOpenChange: onOpenChange
+  } : {
+    visible: open,
+    onVisibleChange: onOpenChange
+  };
+  return omitUndefined(props);
 };
-function FilterDropdown_style_useStyle(prefixCls) {
-  return useStyle('FilterDropdown', function (token) {
-    var proToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
-      componentCls: ".".concat(prefixCls)
-    });
-    return [FilterDropdown_style_genProStyle(proToken)];
-  });
-}
+
 ;// CONCATENATED MODULE: ./packages/utils/es/components/FilterDropdown/index.js
 
 
@@ -27436,13 +27456,7 @@ var FilterDropdown = function FilterDropdown(props) {
   var _useStyle = FilterDropdown_style_useStyle(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
-  var dropdownOpenProps = compareVersions(external_antd_.version, '4.23.0') > -1 ? {
-    open: open || visible || false,
-    onOpenChange: onOpenChange || onVisibleChange
-  } : {
-    visible: open || visible || false,
-    onVisibleChange: onOpenChange || onVisibleChange
-  };
+  var dropdownOpenProps = openVisibleCompatible(open || visible || false, onOpenChange || onVisibleChange);
   return wrapSSR((0,jsx_runtime.jsx)(external_antd_.Dropdown, objectSpread2_objectSpread2(objectSpread2_objectSpread2({
     disabled: disabled,
     placement: placement,
@@ -27576,7 +27590,6 @@ var InlineErrorFormItem_excluded = ["label", "rules", "name", "children", "popov
 
 
 
-
 var FIX_INLINE_STYLE = {
   marginBlockStart: -5,
   marginBlockEnd: -5,
@@ -27608,23 +27621,14 @@ var InlineErrorFormItemPopover = function InlineErrorFormItemPopover(_ref) {
       setErrorList(inputProps.errors);
     }
   }, [inputProps.errors, inputProps.validateStatus]);
-  var drawerOpenProps = compareVersions(external_antd_.version, '4.23.0') > -1 ? {
-    open: errorStringList.length < 1 ? false : open,
-    onOpenChange: function onOpenChange(changeOpen) {
-      if (changeOpen === open) return;
-      setOpen(changeOpen);
-    }
-  } : {
-    visible: errorStringList.length < 1 ? false : open,
-    onVisibleChange: function onVisibleChange(changeOpen) {
-      if (changeOpen === open) return;
-      setOpen(changeOpen);
-    }
-  };
+  var popoverOpenProps = openVisibleCompatible(errorStringList.length < 1 ? false : open, function (changeOpen) {
+    if (changeOpen === open) return;
+    setOpen(changeOpen);
+  });
   return (0,jsx_runtime.jsx)(external_antd_.Popover, objectSpread2_objectSpread2(objectSpread2_objectSpread2(objectSpread2_objectSpread2({
     trigger: (popoverProps === null || popoverProps === void 0 ? void 0 : popoverProps.trigger) || 'focus',
     placement: (popoverProps === null || popoverProps === void 0 ? void 0 : popoverProps.placement) || 'topRight'
-  }, drawerOpenProps), {}, {
+  }, popoverOpenProps), {}, {
     getPopupContainer: popoverProps === null || popoverProps === void 0 ? void 0 : popoverProps.getPopupContainer,
     getTooltipContainer: popoverProps === null || popoverProps === void 0 ? void 0 : popoverProps.getTooltipContainer,
     content: wrapSSR((0,jsx_runtime.jsxs)("div", {
@@ -28913,19 +28917,6 @@ var omitBoolean = function omitBoolean(obj) {
   }
   return undefined;
 };
-;// CONCATENATED MODULE: ./packages/utils/es/omitUndefined/index.js
-var omitUndefined = function omitUndefined(obj) {
-  var newObj = {};
-  Object.keys(obj || {}).forEach(function (key) {
-    if (obj[key] !== undefined) {
-      newObj[key] = obj[key];
-    }
-  });
-  if (Object.keys(newObj).length < 1) {
-    return undefined;
-  }
-  return newObj;
-};
 ;// CONCATENATED MODULE: ./packages/utils/es/omitUndefinedAndEmptyArr/index.js
 var omitUndefinedAndEmptyArr = function omitUndefinedAndEmptyArr(obj) {
   var newObj = {};
@@ -29312,7 +29303,7 @@ function editableRowByKey(keyProps, action) {
  *
  * @param ActionRenderConfig
  */
-function SaveEditableAction(_ref) {
+function SaveEditableAction(_ref, ref) {
   var recordKey = _ref.recordKey,
     onSave = _ref.onSave,
     row = _ref.row,
@@ -29326,59 +29317,85 @@ function SaveEditableAction(_ref) {
     _useMountMergeState2 = slicedToArray_slicedToArray(_useMountMergeState, 2),
     loading = _useMountMergeState2[0],
     setLoading = _useMountMergeState2[1];
+  var save = useRefFunction( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _context$getFieldForm, isMapEditor, namePath, fields, _recordKey, recordKeyPath, curValue, data, res;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            isMapEditor = editorType === 'Map'; // 为了兼容类型为 array 的 dataIndex,当 recordKey 是一个数组时，用于获取表单值的 key 只取第一项，
+            // 从表单中获取回来之后，再根据 namepath 获取具体的某个字段并设置
+            namePath = [tableName, Array.isArray(recordKey) ? recordKey[0] : recordKey].map(function (key) {
+              return key === null || key === void 0 ? void 0 : key.toString();
+            }).flat(1).filter(Boolean);
+            setLoading(true);
+            // @ts-expect-error
+            _context.next = 6;
+            return form.validateFields(namePath, {
+              recursive: true
+            });
+          case 6:
+            fields = ((_context$getFieldForm = context.getFieldFormatValue) === null || _context$getFieldForm === void 0 ? void 0 : _context$getFieldForm.call(context, namePath)) || form.getFieldValue(namePath); // 处理 dataIndex 为数组的情况
+            if (Array.isArray(recordKey) && recordKey.length > 1) {
+              // 获取 namepath
+              _recordKey = _toArray(recordKey), recordKeyPath = _recordKey.slice(1); // 将目标值获取出来并设置到 fields 当中
+              curValue = (0,utils_get["default"])(fields, recordKeyPath);
+              (0,set/* default */.Z)(fields, recordKeyPath, curValue);
+            }
+            data = isMapEditor ? (0,set/* default */.Z)({}, namePath, fields, true) : fields; // 获取数据并保存
+            _context.next = 11;
+            return onSave === null || onSave === void 0 ? void 0 : onSave(recordKey,
+            // 如果是 map 模式，fields 就是一个值，所以需要set 到对象中
+            // 数据模式 fields 是一个对象，所以不需要
+            merge_merge({}, row, data), row, newLineConfig);
+          case 11:
+            res = _context.sent;
+            setLoading(false);
+            return _context.abrupt("return", res);
+          case 16:
+            _context.prev = 16;
+            _context.t0 = _context["catch"](0);
+            // eslint-disable-next-line no-console
+            console.log(_context.t0);
+            setLoading(false);
+            throw _context.t0;
+          case 21:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[0, 16]]);
+  })));
+  (0,external_React_.useImperativeHandle)(ref, function () {
+    return {
+      save: save
+    };
+  });
   return (0,jsx_runtime.jsxs)("a", {
     onClick: function () {
-      var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e) {
-        var _context$getFieldForm, isMapEditor, namePath, fields, _recordKey, recordKeyPath, curValue, data, res;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
+      var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context.prev = _context.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
                 e.stopPropagation();
                 e.preventDefault();
-                _context.prev = 2;
-                isMapEditor = editorType === 'Map'; // 为了兼容类型为 array 的 dataIndex,当 recordKey 是一个数组时，用于获取表单值的 key 只取第一项，
-                // 从表单中获取回来之后，再根据 namepath 获取具体的某个字段并设置
-                namePath = [tableName, Array.isArray(recordKey) ? recordKey[0] : recordKey].map(function (key) {
-                  return key === null || key === void 0 ? void 0 : key.toString();
-                }).flat(1).filter(Boolean);
-                setLoading(true);
-                // @ts-expect-error
-                _context.next = 8;
-                return form.validateFields(namePath, {
-                  recursive: true
-                });
-              case 8:
-                fields = ((_context$getFieldForm = context.getFieldFormatValue) === null || _context$getFieldForm === void 0 ? void 0 : _context$getFieldForm.call(context, namePath)) || form.getFieldValue(namePath); // 处理 dataIndex 为数组的情况
-                if (Array.isArray(recordKey) && recordKey.length > 1) {
-                  // 获取 namepath
-                  _recordKey = _toArray(recordKey), recordKeyPath = _recordKey.slice(1); // 将目标值获取出来并设置到 fields 当中
-                  curValue = (0,utils_get["default"])(fields, recordKeyPath);
-                  (0,set/* default */.Z)(fields, recordKeyPath, curValue);
-                }
-                data = isMapEditor ? (0,set/* default */.Z)({}, namePath, fields, true) : fields; // 获取数据并保存
-                _context.next = 13;
-                return onSave === null || onSave === void 0 ? void 0 : onSave(recordKey,
-                // 如果是 map 模式，fields 就是一个值，所以需要set 到对象中
-                // 数据模式 fields 是一个对象，所以不需要
-                merge_merge({}, row, data), row, newLineConfig);
-              case 13:
-                res = _context.sent;
-                setLoading(false);
-                return _context.abrupt("return", res);
-              case 18:
-                _context.prev = 18;
-                _context.t0 = _context["catch"](2);
-                // eslint-disable-next-line no-console
-                console.log(_context.t0);
-                setLoading(false);
-                return _context.abrupt("return", null);
-              case 23:
+                _context2.prev = 2;
+                _context2.next = 5;
+                return save();
+              case 5:
+                _context2.next = 9;
+                break;
+              case 7:
+                _context2.prev = 7;
+                _context2.t0 = _context2["catch"](2);
+              case 9:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee, null, [[2, 18]]);
+        }, _callee2, null, [[2, 7]]);
       }));
       function onClick(_x) {
         return _onClick.apply(this, arguments);
@@ -29397,45 +29414,45 @@ function SaveEditableAction(_ref) {
  *
  * @param ActionRenderConfig
  */
-var DeleteEditableAction = function DeleteEditableAction(_ref2) {
-  var recordKey = _ref2.recordKey,
-    onDelete = _ref2.onDelete,
-    row = _ref2.row,
-    children = _ref2.children,
-    deletePopconfirmMessage = _ref2.deletePopconfirmMessage;
+var DeleteEditableAction = function DeleteEditableAction(_ref3) {
+  var recordKey = _ref3.recordKey,
+    onDelete = _ref3.onDelete,
+    row = _ref3.row,
+    children = _ref3.children,
+    deletePopconfirmMessage = _ref3.deletePopconfirmMessage;
   var _useMountMergeState3 = (0,useMergedState/* default */.Z)(function () {
       return false;
     }),
     _useMountMergeState4 = slicedToArray_slicedToArray(_useMountMergeState3, 2),
     loading = _useMountMergeState4[0],
     setLoading = _useMountMergeState4[1];
-  var _onConfirm = useRefFunction( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+  var _onConfirm = useRefFunction( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
     var res;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) {
-        switch (_context2.prev = _context2.next) {
+        switch (_context3.prev = _context3.next) {
           case 0:
-            _context2.prev = 0;
+            _context3.prev = 0;
             setLoading(true);
-            _context2.next = 4;
+            _context3.next = 4;
             return onDelete === null || onDelete === void 0 ? void 0 : onDelete(recordKey, row);
           case 4:
-            res = _context2.sent;
+            res = _context3.sent;
             setLoading(false);
-            return _context2.abrupt("return", res);
+            return _context3.abrupt("return", res);
           case 9:
-            _context2.prev = 9;
-            _context2.t0 = _context2["catch"](0);
+            _context3.prev = 9;
+            _context3.t0 = _context3["catch"](0);
             // eslint-disable-next-line no-console
-            console.log(_context2.t0);
+            console.log(_context3.t0);
             setLoading(false);
-            return _context2.abrupt("return", null);
+            return _context3.abrupt("return", null);
           case 14:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
       }
-    }, _callee2, null, [[0, 9]]);
+    }, _callee3, null, [[0, 9]]);
   })));
   return children !== false ? (0,jsx_runtime.jsx)(external_antd_.Popconfirm, {
     title: deletePopconfirmMessage,
@@ -29464,12 +29481,12 @@ var CancelEditableAction = function CancelEditableAction(props) {
   var form = external_antd_.Form.useFormInstance();
   return (0,jsx_runtime.jsx)("a", {
     onClick: function () {
-      var _onClick2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e) {
+      var _onClick2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(e) {
         var _context$getFieldForm2;
         var isMapEditor, namePath, fields, record, res;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
                 e.stopPropagation();
                 e.preventDefault();
@@ -29477,20 +29494,20 @@ var CancelEditableAction = function CancelEditableAction(props) {
                 namePath = [tableName, recordKey].flat(1).filter(Boolean);
                 fields = ((_context$getFieldForm2 = context.getFieldFormatValue) === null || _context$getFieldForm2 === void 0 ? void 0 : _context$getFieldForm2.call(context, namePath)) || form.getFieldValue(namePath);
                 record = isMapEditor ? (0,set/* default */.Z)({}, namePath, fields) : fields;
-                _context3.next = 8;
+                _context4.next = 8;
                 return onCancel === null || onCancel === void 0 ? void 0 : onCancel(recordKey, record, row, newLineConfig);
               case 8:
-                res = _context3.sent;
+                res = _context4.sent;
                 cancelEditable(recordKey);
                 /** 充值为默认值，不然编辑的行会丢掉 */
                 form.setFieldsValue(defineProperty_defineProperty({}, recordKey, isMapEditor ? (0,utils_get["default"])(row, namePath) : row));
-                return _context3.abrupt("return", res);
+                return _context4.abrupt("return", res);
               case 12:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3);
+        }, _callee4);
       }));
       function onClick(_x2) {
         return _onClick2.apply(this, arguments);
@@ -29505,15 +29522,23 @@ function defaultActionRender(row, config) {
     newLineConfig = config.newLineConfig,
     saveText = config.saveText,
     deleteText = config.deleteText;
-  return [(0,jsx_runtime.jsx)(SaveEditableAction, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, config), {}, {
-    row: row,
-    children: saveText
-  }), 'save' + recordKey), (newLineConfig === null || newLineConfig === void 0 ? void 0 : newLineConfig.options.recordKey) !== recordKey ? (0,jsx_runtime.jsx)(DeleteEditableAction, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, config), {}, {
-    row: row,
-    children: deleteText
-  }), 'delete' + recordKey) : null, (0,jsx_runtime.jsx)(CancelEditableAction, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, config), {}, {
-    row: row
-  }), 'cancel' + recordKey)];
+  var SaveEditableActionRef = /*#__PURE__*/(0,external_React_.forwardRef)(SaveEditableAction);
+  var saveRef = /*#__PURE__*/(0,external_React_.createRef)();
+  return {
+    save: (0,jsx_runtime.jsx)(SaveEditableActionRef, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, config), {}, {
+      row: row,
+      ref: saveRef,
+      children: saveText
+    }), 'save' + recordKey),
+    saveRef: saveRef,
+    delete: (newLineConfig === null || newLineConfig === void 0 ? void 0 : newLineConfig.options.recordKey) !== recordKey ? (0,jsx_runtime.jsx)(DeleteEditableAction, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, config), {}, {
+      row: row,
+      children: deleteText
+    }), 'delete' + recordKey) : undefined,
+    cancel: (0,jsx_runtime.jsx)(CancelEditableAction, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, config), {}, {
+      row: row
+    }), 'cancel' + recordKey)
+  };
 }
 /**
  * 一个方便的hooks 用于维护编辑的状态
@@ -29618,21 +29643,21 @@ function useEditableArray(props) {
    * @param recordKey
    */
   var cancelEditable = useRefFunction( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(recordKey, needReTry) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(recordKey, needReTry) {
       var relayKey, key;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
               relayKey = recordKeyToString(recordKey).toString();
               key = dataSourceKeyIndexMapRef.current.get(relayKey);
               /** 如果没找到key，转化一下再去找 */
               if (!(!editableKeysSet.has(relayKey) && key && (needReTry !== null && needReTry !== void 0 ? needReTry : true) && props.tableName)) {
-                _context4.next = 5;
+                _context5.next = 5;
                 break;
               }
               cancelEditable(key, false);
-              return _context4.abrupt("return");
+              return _context5.abrupt("return");
             case 5:
               /** 如果这个是 new Line 直接删除 */
               if (newLineRecordCache && newLineRecordCache.options.recordKey === recordKey) {
@@ -29641,39 +29666,39 @@ function useEditableArray(props) {
               editableKeysSet.delete(relayKey);
               editableKeysSet.delete(recordKeyToString(recordKey));
               setEditableRowKeys(Array.from(editableKeysSet));
-              return _context4.abrupt("return", true);
+              return _context5.abrupt("return", true);
             case 10:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
         }
-      }, _callee4);
+      }, _callee5);
     }));
     return function (_x3, _x4) {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }());
-  var propsOnValuesChange = useDebounceFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+  var propsOnValuesChange = useDebounceFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
     var _props$onValuesChange;
     var _len,
       rest,
       _key,
-      _args5 = arguments;
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      _args6 = arguments;
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context6.prev = _context6.next) {
           case 0:
-            for (_len = _args5.length, rest = new Array(_len), _key = 0; _key < _len; _key++) {
-              rest[_key] = _args5[_key];
+            for (_len = _args6.length, rest = new Array(_len), _key = 0; _key < _len; _key++) {
+              rest[_key] = _args6[_key];
             }
             //@ts-ignore
             (_props$onValuesChange = props.onValuesChange) === null || _props$onValuesChange === void 0 ? void 0 : _props$onValuesChange.call.apply(_props$onValuesChange, [props].concat(rest));
           case 2:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
       }
-    }, _callee5);
+    }, _callee6);
   })), 64);
   var onValuesChange = useRefFunction(function (value, values) {
     var _Object$keys$pop;
@@ -29714,6 +29739,67 @@ function useEditableArray(props) {
     }) : newLineRecordData;
     propsOnValuesChange.run(editRow || newLineRecordData, dataSource);
   });
+  var saveRefsMap = (0,external_React_.useRef)(new Map());
+  (0,external_React_.useEffect)(function () {
+    // 确保只保留编辑状态的，其它的都删除掉
+    saveRefsMap.current.forEach(function (ref, key) {
+      if (!editableKeysSet.has(key)) {
+        saveRefsMap.current.delete(key);
+      }
+    });
+  }, [saveRefsMap, editableKeysSet]);
+  /**
+   * 保存编辑行
+   *
+   * @param recordKey
+   * @param needReTry
+   */
+  var saveEditable = useRefFunction( /*#__PURE__*/function () {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(recordKey, needReTry) {
+      var relayKey, key, saveRef, _saveRef$current;
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) {
+          switch (_context7.prev = _context7.next) {
+            case 0:
+              relayKey = recordKeyToString(recordKey);
+              key = dataSourceKeyIndexMapRef.current.get(recordKey.toString());
+              /** 如果没找到key，转化一下再去找 */
+              if (!(!editableKeysSet.has(relayKey) && key && (needReTry !== null && needReTry !== void 0 ? needReTry : true) && props.tableName)) {
+                _context7.next = 6;
+                break;
+              }
+              _context7.next = 5;
+              return saveEditable(key, false);
+            case 5:
+              return _context7.abrupt("return", _context7.sent);
+            case 6:
+              saveRef = saveRefsMap.current.get(relayKey) || saveRefsMap.current.get(relayKey.toString());
+              _context7.prev = 7;
+              _context7.next = 10;
+              return saveRef === null || saveRef === void 0 ? void 0 : (_saveRef$current = saveRef.current) === null || _saveRef$current === void 0 ? void 0 : _saveRef$current.save();
+            case 10:
+              _context7.next = 15;
+              break;
+            case 12:
+              _context7.prev = 12;
+              _context7.t0 = _context7["catch"](7);
+              return _context7.abrupt("return", false);
+            case 15:
+              editableKeysSet.delete(relayKey);
+              editableKeysSet.delete(relayKey.toString());
+              setEditableRowKeys(Array.from(editableKeysSet));
+              return _context7.abrupt("return", true);
+            case 19:
+            case "end":
+              return _context7.stop();
+          }
+        }
+      }, _callee7, null, [[7, 12]]);
+    }));
+    return function (_x5, _x6) {
+      return _ref7.apply(this, arguments);
+    };
+  }());
   /**
    * 同时只能支持一行,取消之后数据消息，不会触发 dataSource
    *
@@ -29775,22 +29861,22 @@ function useEditableArray(props) {
   var deleteText = (props === null || props === void 0 ? void 0 : props.deleteText) || intl.getMessage('editableTable.action.delete', '删除');
   var cancelText = (props === null || props === void 0 ? void 0 : props.cancelText) || intl.getMessage('editableTable.action.cancel', '取消');
   var actionSaveRef = useRefFunction( /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(recordKey, editRow, originRow, newLine) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(recordKey, editRow, originRow, newLine) {
       var _props$onSave, _recordKeyToString4, _options$parentKey;
-      var _ref7, options, res, actionProps;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      var _ref9, options, res, actionProps;
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context8.prev = _context8.next) {
             case 0:
-              _ref7 = newLine || newLineRecordRef.current || {}, options = _ref7.options;
-              _context6.next = 3;
+              _ref9 = newLine || newLineRecordRef.current || {}, options = _ref9.options;
+              _context8.next = 3;
               return props === null || props === void 0 ? void 0 : (_props$onSave = props.onSave) === null || _props$onSave === void 0 ? void 0 : _props$onSave.call(props, recordKey, editRow, originRow, newLine);
             case 3:
-              res = _context6.sent;
+              res = _context8.sent;
               // 保存时解除编辑模式
               cancelEditable(recordKey);
               if (!(!(options === null || options === void 0 ? void 0 : options.parentKey) && (options === null || options === void 0 ? void 0 : options.recordKey) === recordKey)) {
-                _context6.next = 8;
+                _context8.next = 8;
                 break;
               }
               if ((options === null || options === void 0 ? void 0 : options.position) === 'top') {
@@ -29798,7 +29884,7 @@ function useEditableArray(props) {
               } else {
                 props.setDataSource([].concat(toConsumableArray_toConsumableArray(props.dataSource), [editRow]));
               }
-              return _context6.abrupt("return", res);
+              return _context8.abrupt("return", res);
             case 8:
               actionProps = {
                 data: props.dataSource,
@@ -29810,25 +29896,25 @@ function useEditableArray(props) {
                 childrenColumnName: props.childrenColumnName || 'children'
               };
               props.setDataSource(editableRowByKey(actionProps, (options === null || options === void 0 ? void 0 : options.position) === 'top' ? 'top' : 'update'));
-              return _context6.abrupt("return", res);
+              return _context8.abrupt("return", res);
             case 11:
             case "end":
-              return _context6.stop();
+              return _context8.stop();
           }
         }
-      }, _callee6);
+      }, _callee8);
     }));
-    return function (_x5, _x6, _x7, _x8) {
-      return _ref6.apply(this, arguments);
+    return function (_x7, _x8, _x9, _x10) {
+      return _ref8.apply(this, arguments);
     };
   }());
   var actionDeleteRef = useRefFunction( /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(recordKey, editRow) {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(recordKey, editRow) {
       var _props$onDelete;
       var actionProps, res;
-      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context9.prev = _context9.next) {
             case 0:
               actionProps = {
                 data: props.dataSource,
@@ -29837,48 +29923,48 @@ function useEditableArray(props) {
                 key: recordKey,
                 childrenColumnName: props.childrenColumnName || 'children'
               };
-              _context7.next = 3;
+              _context9.next = 3;
               return props === null || props === void 0 ? void 0 : (_props$onDelete = props.onDelete) === null || _props$onDelete === void 0 ? void 0 : _props$onDelete.call(props, recordKey, editRow);
             case 3:
-              res = _context7.sent;
-              _context7.next = 6;
+              res = _context9.sent;
+              _context9.next = 6;
               return cancelEditable(recordKey);
             case 6:
               props.setDataSource(editableRowByKey(actionProps, 'delete'));
-              return _context7.abrupt("return", res);
+              return _context9.abrupt("return", res);
             case 8:
             case "end":
-              return _context7.stop();
+              return _context9.stop();
           }
         }
-      }, _callee7);
+      }, _callee9);
     }));
-    return function (_x9, _x10) {
-      return _ref8.apply(this, arguments);
+    return function (_x11, _x12) {
+      return _ref10.apply(this, arguments);
     };
   }());
   var actionCancelRef = useRefFunction( /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(recordKey, editRow, originRow, newLine) {
+    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(recordKey, editRow, originRow, newLine) {
       var _props$onCancel;
       var res;
-      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
         while (1) {
-          switch (_context8.prev = _context8.next) {
+          switch (_context10.prev = _context10.next) {
             case 0:
-              _context8.next = 2;
+              _context10.next = 2;
               return props === null || props === void 0 ? void 0 : (_props$onCancel = props.onCancel) === null || _props$onCancel === void 0 ? void 0 : _props$onCancel.call(props, recordKey, editRow, originRow, newLine);
             case 2:
-              res = _context8.sent;
-              return _context8.abrupt("return", res);
+              res = _context10.sent;
+              return _context10.abrupt("return", res);
             case 4:
             case "end":
-              return _context8.stop();
+              return _context10.stop();
           }
         }
-      }, _callee8);
+      }, _callee10);
     }));
-    return function (_x11, _x12, _x13, _x14) {
-      return _ref9.apply(this, arguments);
+    return function (_x13, _x14, _x15, _x16) {
+      return _ref11.apply(this, arguments);
     };
   }());
   var actionRender = function actionRender(row) {
@@ -29900,13 +29986,19 @@ function useEditableArray(props) {
       setEditableRowKeys: setEditableRowKeys,
       deletePopconfirmMessage: props.deletePopconfirmMessage || "".concat(intl.getMessage('deleteThisLine', '删除此行'), "?")
     };
-    var defaultDoms = defaultActionRender(row, config);
+    var renderResult = defaultActionRender(row, config);
+    // 缓存一下saveRef
+    if (props.tableName) {
+      saveRefsMap.current.set(dataSourceKeyIndexMapRef.current.get(recordKeyToString(key)) || recordKeyToString(key), renderResult.saveRef);
+    } else {
+      saveRefsMap.current.set(recordKeyToString(key), renderResult.saveRef);
+    }
     if (props.actionRender) return props.actionRender(row, config, {
-      save: defaultDoms[0],
-      delete: defaultDoms[1],
-      cancel: defaultDoms[2]
+      save: renderResult.save,
+      delete: renderResult.delete,
+      cancel: renderResult.cancel
     });
-    return defaultDoms;
+    return [renderResult.save, renderResult.delete, renderResult.cancel];
   };
   return {
     editableKeys: editableKeys,
@@ -29916,6 +30008,7 @@ function useEditableArray(props) {
     startEditable: startEditable,
     cancelEditable: cancelEditable,
     addEditRecord: addEditRecord,
+    saveEditable: saveEditable,
     newLineRecord: newLineRecordCache,
     preEditableKeys: editableKeysRef,
     onValuesChange: onValuesChange
@@ -30093,15 +30186,15 @@ function useEditableMap(props) {
       deletePopconfirmMessage: "".concat(intl.getMessage('deleteThisLine', '删除此行'), "?"),
       editorType: 'Map'
     }, config);
-    var defaultDoms = defaultActionRender(props.dataSource, renderConfig);
+    var renderResult = defaultActionRender(props.dataSource, renderConfig);
     if (props.actionRender) {
       return props.actionRender(props.dataSource, renderConfig, {
-        save: defaultDoms[0],
-        delete: defaultDoms[1],
-        cancel: defaultDoms[2]
+        save: renderResult.save,
+        delete: renderResult.delete,
+        cancel: renderResult.cancel
       });
     }
-    return defaultDoms;
+    return [renderResult.save, renderResult.delete, renderResult.cancel];
   }, [editableKeys && editableKeys.join(','), props.dataSource]);
   return {
     editableKeys: editableKeys,
@@ -30112,34 +30205,6 @@ function useEditableMap(props) {
     cancelEditable: cancelEditable
   };
 }
-;// CONCATENATED MODULE: ./packages/utils/es/useSafeState/index.js
-
-
-/**
- * Same as React.useState but `setState` accept `ignoreDestroy` param to not to setState after destroyed.
- * We do not make this auto is to avoid real memory leak.
- * Developer should confirm it's safe to ignore themselves.
- */
-function useSafeState(defaultValue) {
-  var destroyRef = external_React_.useRef(false);
-  var _React$useState = external_React_.useState(defaultValue),
-    _React$useState2 = slicedToArray_slicedToArray(_React$useState, 2),
-    value = _React$useState2[0],
-    setValue = _React$useState2[1];
-  external_React_.useEffect(function () {
-    destroyRef.current = false;
-    return function () {
-      destroyRef.current = true;
-    };
-  }, []);
-  function safeSetState(updater, ignoreDestroy) {
-    if (ignoreDestroy && destroyRef.current) {
-      return;
-    }
-    setValue(updater);
-  }
-  return [value, safeSetState];
-}
 ;// CONCATENATED MODULE: ./packages/utils/es/index.js
 
 
@@ -31078,11 +31143,10 @@ var ProCardActions = function ProCardActions(props) {
       })
     }));
   }
-  if (actions) return wrapSSR((0,jsx_runtime.jsx)("ul", {
+  return wrapSSR((0,jsx_runtime.jsx)("ul", {
     className: classnames_default()("".concat(prefixCls, "-actions"), hashId),
     children: actions
   }));
-  return null;
 };
 /* harmony default export */ var Actions = (ProCardActions);
 ;// CONCATENATED MODULE: ./packages/card/es/components/Loading/style.js
@@ -31752,10 +31816,10 @@ var Card = /*#__PURE__*/external_React_default().forwardRef(function (props, ref
       className: bodyCls,
       style: cardBodyStyle,
       children: loading ? loadingDOM : childrenModified
-    }), (0,jsx_runtime.jsx)(Actions, {
+    }), actions ? (0,jsx_runtime.jsx)(Actions, {
       actions: actions,
       prefixCls: prefixCls
-    })]
+    }) : null]
   })));
 });
 /* harmony default export */ var components_Card = (Card);
@@ -37063,12 +37127,12 @@ var useFieldFetchData = function useFieldFetchData(props) {
   var _ref5, _props$debounceTime, _props$fieldProps3, _props$fieldProps6;
   var cacheForSwr = props.cacheForSwr,
     fieldProps = props.fieldProps;
-  var _useSafeState = useSafeState(props.defaultKeyWords),
-    _useSafeState2 = slicedToArray_slicedToArray(_useSafeState, 2),
-    keyWords = _useSafeState2[0],
-    setKeyWords = _useSafeState2[1];
+  var _useState = (0,external_React_.useState)(props.defaultKeyWords),
+    _useState2 = slicedToArray_slicedToArray(_useState, 2),
+    keyWords = _useState2[0],
+    setKeyWords = _useState2[1];
   /** Key 是用来缓存请求的，如果不在是有问题 */
-  var _useState = (0,external_React_.useState)(function () {
+  var _useState3 = (0,external_React_.useState)(function () {
       if (props.proFieldKey) {
         return props.proFieldKey.toString();
       }
@@ -37077,8 +37141,8 @@ var useFieldFetchData = function useFieldFetchData(props) {
       }
       return 'no-fetch';
     }),
-    _useState2 = slicedToArray_slicedToArray(_useState, 1),
-    cacheKey = _useState2[0];
+    _useState4 = slicedToArray_slicedToArray(_useState3, 1),
+    cacheKey = _useState4[0];
   var proFieldKeyRef = (0,external_React_.useRef)(cacheKey);
   var getOptionsFormValueEnum = (0,external_React_.useCallback)(function (coverValueEnum) {
     return proFieldParsingValueEnumToArray(ObjToMap(coverValueEnum)).map(function (_ref3) {
@@ -40518,10 +40582,10 @@ var Money_excluded = ["content", "numberFormatOptions", "numberPopoverRender", "
 
 
 
-
 // 兼容代码-----------
 
 
+//----------------------
 
 var defaultMoneyIntl = new Intl.NumberFormat('zh-Hans-CN', {
   currency: 'CNY',
@@ -40630,11 +40694,7 @@ var InputNumberPopover = /*#__PURE__*/external_React_default().forwardRef(functi
   var dom = content === null || content === void 0 ? void 0 : content(objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, rest), {}, {
     value: value
   }));
-  var props = compareVersions(external_antd_.version, '4.23.0') > -1 ? {
-    open: dom ? open : false
-  } : {
-    visible: dom ? open : false
-  };
+  var props = openVisibleCompatible(dom ? open : false);
   return (0,jsx_runtime.jsx)(external_antd_.Popover, objectSpread2_objectSpread2(objectSpread2_objectSpread2({
     placement: "topLeft"
   }, props), {}, {
@@ -44972,28 +45032,17 @@ function DrawerForm(_ref) {
       return _ref3.apply(this, arguments);
     };
   }());
-  var drawerOpenProps = compareVersions(external_antd_.version, '4.23.0') > -1 ? {
-    open: open,
-    onOpenChange: onVisibleChange,
-    afterOpenChange: function afterOpenChange(e) {
-      var _drawerProps$afterOpe;
-      if (!e) resetFields();
-      drawerProps === null || drawerProps === void 0 ? void 0 : (_drawerProps$afterOpe = drawerProps.afterOpenChange) === null || _drawerProps$afterOpe === void 0 ? void 0 : _drawerProps$afterOpe.call(drawerProps, e);
-    }
-  } : {
-    visible: open,
-    onVisibleChange: onVisibleChange,
-    afterVisibleChange: function afterVisibleChange(e) {
-      var _drawerProps$afterOpe2;
-      if (!e) resetFields();
-      drawerProps === null || drawerProps === void 0 ? void 0 : (_drawerProps$afterOpe2 = drawerProps.afterOpenChange) === null || _drawerProps$afterOpe2 === void 0 ? void 0 : _drawerProps$afterOpe2.call(drawerProps, e);
-    }
-  };
+  var drawerOpenProps = openVisibleCompatible(open, onVisibleChange);
   return (0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
     children: [(0,jsx_runtime.jsx)(external_antd_.Drawer, objectSpread2_objectSpread2(objectSpread2_objectSpread2(objectSpread2_objectSpread2({
       title: title,
       width: width || 800
     }, drawerProps), drawerOpenProps), {}, {
+      afterOpenChange: function afterOpenChange(e) {
+        var _drawerProps$afterOpe;
+        if (!e) resetFields();
+        drawerProps === null || drawerProps === void 0 ? void 0 : (_drawerProps$afterOpe = drawerProps.afterOpenChange) === null || _drawerProps$afterOpe === void 0 ? void 0 : _drawerProps$afterOpe.call(drawerProps, e);
+      },
       onClose: function onClose(e) {
         var _drawerProps$onClose2;
         // 提交表单loading时，阻止弹框关闭
@@ -45393,7 +45442,6 @@ var ModalForm_excluded = ["children", "trigger", "onVisibleChange", "onOpenChang
 
 
 
-
 function ModalForm(_ref) {
   var _context$locale3, _context$locale3$Moda, _context$locale4, _context$locale4$Moda;
   var children = _ref.children,
@@ -45545,11 +45593,7 @@ function ModalForm(_ref) {
       return _ref5.apply(this, arguments);
     };
   }(), [onFinish, setOpen, submitTimeout]);
-  var modalOpenProps = compareVersions(external_antd_.version, '4.23.0') > -1 ? {
-    open: open
-  } : {
-    visible: open
-  };
+  var modalOpenProps = openVisibleCompatible(open);
   return (0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
     children: [(0,jsx_runtime.jsx)(external_antd_.Modal, objectSpread2_objectSpread2(objectSpread2_objectSpread2(objectSpread2_objectSpread2({
       title: title,
@@ -51732,7 +51776,6 @@ function PageHeader_style_useStyle(prefixCls) {
 
 
 
-
 var renderBack = function renderBack(prefixCls, hashId, backIcon, onBack) {
   if (!backIcon || !onBack) {
     return null;
@@ -51825,13 +51868,13 @@ var renderChildren = function renderChildren(prefixCls, children, hashId) {
 };
 var PageHeader = function PageHeader(props) {
   var _breadcrumbRender, _classNames;
-  var _useSafeState = useSafeState(false),
-    _useSafeState2 = slicedToArray_slicedToArray(_useSafeState, 2),
-    compact = _useSafeState2[0],
-    updateCompact = _useSafeState2[1];
+  var _React$useState = external_React_.useState(false),
+    _React$useState2 = slicedToArray_slicedToArray(_React$useState, 2),
+    compact = _React$useState2[0],
+    updateCompact = _React$useState2[1];
   var onResize = function onResize(_ref) {
     var width = _ref.width;
-    updateCompact(width < 768, true);
+    updateCompact(width < 768);
   };
   var _React$useContext = external_React_.useContext(external_antd_.ConfigProvider.ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls,
@@ -52104,8 +52147,8 @@ function PageContainer_style_useStyle(prefixCls, componentsToken) {
 
 
 
-var PageContainer_excluded = ["title", "content", "pageHeaderRender", "header", "prefixedClassName", "extraContent", "style", "prefixCls", "hashId", "value", "breadcrumbRender"],
-  PageContainer_excluded2 = ["children", "loading", "className", "style", "footer", "affixProps", "token", "fixedHeader", "breadcrumbRender"];
+var PageContainer_excluded = ["title", "content", "pageHeaderRender", "header", "prefixedClassName", "extraContent", "childrenContentStyle", "style", "prefixCls", "hashId", "value", "breadcrumbRender"],
+  PageContainer_excluded2 = ["children", "loading", "className", "style", "footer", "affixProps", "token", "fixedHeader", "breadcrumbRender", "childrenContentStyle"];
 
 
 
@@ -52213,6 +52256,7 @@ var memoRenderPageHeader = function memoRenderPageHeader(props) {
     header = props.header,
     prefixedClassName = props.prefixedClassName,
     extraContent = props.extraContent,
+    childrenContentStyle = props.childrenContentStyle,
     style = props.style,
     prefixCls = props.prefixCls,
     hashId = props.hashId,
@@ -52273,6 +52317,7 @@ var PageContainerBase = function PageContainerBase(props) {
     propsToken = props.token,
     fixedHeader = props.fixedHeader,
     breadcrumbRender = props.breadcrumbRender,
+    childrenContentStyle = props.childrenContentStyle,
     restProps = objectWithoutProperties_objectWithoutProperties(props, PageContainer_excluded2);
   var value = (0,external_React_.useContext)(RouteContext);
   /** 告诉 props 是否存在 footerBar */
@@ -52332,10 +52377,11 @@ var PageContainerBase = function PageContainerBase(props) {
     return children ? (0,jsx_runtime.jsx)(jsx_runtime.Fragment, {
       children: (0,jsx_runtime.jsx)("div", {
         className: classnames_default()("".concat(basePageContainer, "-children-content ").concat(hashId)),
+        style: childrenContentStyle,
         children: children
       })
     }) : null;
-  }, [children, basePageContainer, hashId]);
+  }, [children, basePageContainer, childrenContentStyle, hashId]);
   var renderContentDom = (0,external_React_.useMemo)(function () {
     // 只要loadingDom非空我们就渲染loadingDom,否则渲染内容
     var dom = loadingDom || content;
@@ -53085,13 +53131,9 @@ var AppsLogoComponents = function AppsLogoComponents(props) {
     });
   }, [appList, baseClassName, hashId]);
   if (!(props === null || props === void 0 ? void 0 : (_props$appList = props.appList) === null || _props$appList === void 0 ? void 0 : _props$appList.length)) return null;
-  var popoverOpenProps = compareVersions(external_antd_.version, '4.23.0') > -1 ? {
-    onOpenChange: setOpen
-  } : {
-    onVisibleChange: function onVisibleChange() {
-      return setOpen;
-    }
-  };
+  var popoverOpenProps = openVisibleCompatible(undefined, function (openChange) {
+    return setOpen(openChange);
+  });
   return wrapSSR((0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
     children: [(0,jsx_runtime.jsx)("div", {
       ref: ref,
@@ -53412,13 +53454,15 @@ var MenuCounter = createContainer(useMenuCounter);
 
 
 var genProLayoutBaseMenuStyle = function genProLayoutBaseMenuStyle(token) {
-  var _token$layout, _token$layout$sider, _collapsed, _collapsed2, _$concat2, _itemTitle, _$concat4;
-  return defineProperty_defineProperty({}, "".concat(token.componentCls), (_$concat4 = {
+  var _token$layout, _token$layout$sider, _collapsed, _collapsed2, _$concat3, _itemTitle, _$concat5;
+  return defineProperty_defineProperty({}, "".concat(token.componentCls), (_$concat5 = {
     background: 'transparent',
     border: 'none'
-  }, defineProperty_defineProperty(_$concat4, "".concat(token.componentCls, "-menu-item"), {
+  }, defineProperty_defineProperty(_$concat5, "".concat(token.componentCls, "-menu-item"), {
     transition: 'none !important'
-  }), defineProperty_defineProperty(_$concat4, "& &-collapsed", (_collapsed = {}, defineProperty_defineProperty(_collapsed, "".concat(token.antCls, "-menu-item, \n        ").concat(token.antCls, "-menu-item-group > ").concat(token.antCls, "-menu-item-group-list > ").concat(token.antCls, "-menu-item, \n        ").concat(token.antCls, "-menu-item-group > ").concat(token.antCls, "-menu-item-group-list > ").concat(token.antCls, "-menu-submenu > ").concat(token.antCls, "-menu-submenu-title, \n        ").concat(token.antCls, "-menu-submenu > ").concat(token.antCls, "-menu-submenu-title"), {
+  }), defineProperty_defineProperty(_$concat5, "".concat(token.componentCls, "-submenu-has-icon"), defineProperty_defineProperty({}, "> ".concat(token.antCls, "-menu-sub"), {
+    paddingInlineStart: 10
+  })), defineProperty_defineProperty(_$concat5, "& &-collapsed", (_collapsed = {}, defineProperty_defineProperty(_collapsed, "".concat(token.antCls, "-menu-item, \n        ").concat(token.antCls, "-menu-item-group > ").concat(token.antCls, "-menu-item-group-list > ").concat(token.antCls, "-menu-item, \n        ").concat(token.antCls, "-menu-item-group > ").concat(token.antCls, "-menu-item-group-list > ").concat(token.antCls, "-menu-submenu > ").concat(token.antCls, "-menu-submenu-title, \n        ").concat(token.antCls, "-menu-submenu > ").concat(token.antCls, "-menu-submenu-title"), {
     paddingInline: '0 !important',
     height: 'auto !important',
     marginBlock: '8px !important'
@@ -53427,7 +53471,7 @@ var genProLayoutBaseMenuStyle = function genProLayoutBaseMenuStyle(token) {
     borderRadius: token.radiusBase
   }), defineProperty_defineProperty(_collapsed, "".concat(token.componentCls, "-group"), defineProperty_defineProperty({}, "".concat(token.antCls, "-menu-item-group-title"), {
     paddingInline: 0
-  })), _collapsed)), defineProperty_defineProperty(_$concat4, "".concat(token.componentCls, "-item-icon"), {
+  })), _collapsed)), defineProperty_defineProperty(_$concat5, "".concat(token.componentCls, "-item-icon"), {
     height: '14px',
     width: '14px',
     opacity: '0.85',
@@ -53435,7 +53479,7 @@ var genProLayoutBaseMenuStyle = function genProLayoutBaseMenuStyle(token) {
       lineHeight: '14px',
       height: '14px'
     }
-  }), defineProperty_defineProperty(_$concat4, '& &-item-title', (_itemTitle = {
+  }), defineProperty_defineProperty(_$concat5, '& &-item-title', (_itemTitle = {
     display: 'flex',
     flexDirection: 'row',
     alignItems: 'center',
@@ -53454,16 +53498,16 @@ var genProLayoutBaseMenuStyle = function genProLayoutBaseMenuStyle(token) {
   }), defineProperty_defineProperty(_itemTitle, "&".concat(token.componentCls, "-item-collapsed-show-title"), defineProperty_defineProperty({
     lineHeight: '16px',
     height: '48px'
-  }, "&".concat(token.componentCls, "-item-title-collapsed"), (_$concat2 = {
+  }, "&".concat(token.componentCls, "-item-title-collapsed"), (_$concat3 = {
     display: 'flex'
-  }, defineProperty_defineProperty(_$concat2, "".concat(token.componentCls, "-item-icon"), {
+  }, defineProperty_defineProperty(_$concat3, "".concat(token.componentCls, "-item-icon"), {
     height: '16px',
     lineHeight: '16px !important',
     '.anticon': {
       lineHeight: '16px',
       height: '16px'
     }
-  }), defineProperty_defineProperty(_$concat2, "".concat(token.componentCls, "-item-text"), {
+  }), defineProperty_defineProperty(_$concat3, "".concat(token.componentCls, "-item-text"), {
     opacity: '1 !important',
     display: 'inline !important',
     textAlign: 'center',
@@ -53477,17 +53521,17 @@ var genProLayoutBaseMenuStyle = function genProLayoutBaseMenuStyle(token) {
     margin: 0,
     padding: 0,
     marginBlockStart: 4
-  }), _$concat2))), _itemTitle)), defineProperty_defineProperty(_$concat4, '&-group', defineProperty_defineProperty({}, "".concat(token.antCls, "-menu-item-group-title"), {
+  }), _$concat3))), _itemTitle)), defineProperty_defineProperty(_$concat5, '&-group', defineProperty_defineProperty({}, "".concat(token.antCls, "-menu-item-group-title"), {
     fontSize: 12,
     color: token.colorTextLabel,
     '.anticon': {
       marginInlineEnd: 8
     }
-  })), defineProperty_defineProperty(_$concat4, '&-group-divider', {
+  })), defineProperty_defineProperty(_$concat5, '&-group-divider', {
     color: token.colorTextSecondary,
     fontSize: 12,
     lineHeight: 20
-  }), _$concat4));
+  }), _$concat5));
 };
 function menu_useStyle(prefixCls) {
   return useStyle('ProLayoutBaseMenu', function (token) {
@@ -53580,7 +53624,7 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(props) {
     var children = (item === null || item === void 0 ? void 0 : item.children) || (item === null || item === void 0 ? void 0 : item.routes);
     var menuType = isGroup && level === 0 ? 'group' : undefined;
     if (Array.isArray(children) && children.length > 0) {
-      var _this$props2, _this$props3, _classNames, _this$props4, _this$props5, _designToken$layout, _designToken$layout$s;
+      var _this$props2, _this$props3, _classNames, _this$props4, _this$props5, _classNames3, _designToken$layout, _designToken$layout$s;
       /** Menu 第一级可以有icon，或者 isGroup 时第二级别也要有 */
       var shouldHasIcon = level === 0 || isGroup && level === 1;
       //  get defaultTitle by menuItemRender
@@ -53615,7 +53659,7 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(props) {
         label: title,
         onClick: isGroup ? undefined : item.onTitleClick,
         children: childrenList,
-        className: menuType == 'group' ? "".concat(baseClassName, "-group") : "".concat(baseClassName, "-submenu")
+        className: classnames_default()((_classNames3 = {}, defineProperty_defineProperty(_classNames3, "".concat(baseClassName, "-group"), menuType === 'group'), defineProperty_defineProperty(_classNames3, "".concat(baseClassName, "-submenu"), menuType !== 'group'), defineProperty_defineProperty(_classNames3, "".concat(baseClassName, "-submenu-has-icon"), menuType !== 'group' && shouldHasIcon && iconDom), _classNames3))
       }, isGroup && level === 0 ? {
         type: 'divider',
         prefixCls: prefixCls,
@@ -53654,7 +53698,7 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(props) {
     return name;
   };
   this.getMenuItemPath = function (item, level) {
-    var _this$props9, _this$props10, _classNames3, _this$props11, _this$props12;
+    var _this$props9, _this$props10, _classNames4, _this$props11, _this$props12;
     var itemPath = _this.conversionPath(item.path || '/');
     var _this$props7 = _this.props,
       _this$props7$location = _this$props7.location,
@@ -53677,7 +53721,7 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(props) {
     var icon = !hasIcon ? null : getIcon(item.icon, iconPrefixes, "".concat(baseClassName, "-icon ").concat((_this$props9 = _this.props) === null || _this$props9 === void 0 ? void 0 : _this$props9.hashId));
     var defaultIcon = collapsed && hasIcon ? getMenuTitleSymbol(name) : null;
     var defaultItem = (0,jsx_runtime.jsxs)("div", {
-      className: classnames_default()("".concat(baseClassName, "-item-title"), (_this$props10 = _this.props) === null || _this$props10 === void 0 ? void 0 : _this$props10.hashId, (_classNames3 = {}, defineProperty_defineProperty(_classNames3, "".concat(baseClassName, "-item-title-collapsed"), collapsed), defineProperty_defineProperty(_classNames3, "".concat(baseClassName, "-item-collapsed-show-title"), (menu === null || menu === void 0 ? void 0 : menu.collapsedShowTitle) && collapsed), _classNames3)),
+      className: classnames_default()("".concat(baseClassName, "-item-title"), (_this$props10 = _this.props) === null || _this$props10 === void 0 ? void 0 : _this$props10.hashId, (_classNames4 = {}, defineProperty_defineProperty(_classNames4, "".concat(baseClassName, "-item-title-collapsed"), collapsed), defineProperty_defineProperty(_classNames4, "".concat(baseClassName, "-item-collapsed-show-title"), (menu === null || menu === void 0 ? void 0 : menu.collapsedShowTitle) && collapsed), _classNames4)),
       children: [icon ? (0,jsx_runtime.jsx)("span", {
         className: "anticon ".concat(baseClassName, "-item-icon ").concat((_this$props11 = _this.props) === null || _this$props11 === void 0 ? void 0 : _this$props11.hashId),
         children: icon
@@ -53689,14 +53733,14 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(props) {
     var isHttpUrl = isUrl(itemPath);
     // Is it a http link
     if (isHttpUrl) {
-      var _this$props13, _classNames5, _this$props14, _this$props15;
+      var _this$props13, _classNames6, _this$props14, _this$props15;
       defaultItem = (0,jsx_runtime.jsxs)("span", {
         title: name,
         onClick: function onClick() {
           var _window, _window$open;
           (_window = window) === null || _window === void 0 ? void 0 : (_window$open = _window.open) === null || _window$open === void 0 ? void 0 : _window$open.call(_window, itemPath, '_blank');
         },
-        className: classnames_default()("".concat(baseClassName, "-item-title"), (_this$props13 = _this.props) === null || _this$props13 === void 0 ? void 0 : _this$props13.hashId, (_classNames5 = {}, defineProperty_defineProperty(_classNames5, "".concat(baseClassName, "-item-title-collapsed"), collapsed), defineProperty_defineProperty(_classNames5, "".concat(baseClassName, "-item-link"), true), defineProperty_defineProperty(_classNames5, "".concat(baseClassName, "-item-collapsed-show-title"), (menu === null || menu === void 0 ? void 0 : menu.collapsedShowTitle) && collapsed), _classNames5)),
+        className: classnames_default()("".concat(baseClassName, "-item-title"), (_this$props13 = _this.props) === null || _this$props13 === void 0 ? void 0 : _this$props13.hashId, (_classNames6 = {}, defineProperty_defineProperty(_classNames6, "".concat(baseClassName, "-item-title-collapsed"), collapsed), defineProperty_defineProperty(_classNames6, "".concat(baseClassName, "-item-link"), true), defineProperty_defineProperty(_classNames6, "".concat(baseClassName, "-item-collapsed-show-title"), (menu === null || menu === void 0 ? void 0 : menu.collapsedShowTitle) && collapsed), _classNames6)),
         children: [icon ? (0,jsx_runtime.jsx)("span", {
           className: "anticon ".concat(baseClassName, "-item-icon ").concat((_this$props14 = _this.props) === null || _this$props14 === void 0 ? void 0 : _this$props14.hashId),
           children: icon
@@ -53746,7 +53790,7 @@ var getOpenKeysProps = function getOpenKeysProps(openKeys, _ref) {
   return openKeysProps;
 };
 var BaseMenu = function BaseMenu(props) {
-  var _classNames7;
+  var _classNames8;
   var mode = props.mode,
     className = props.className,
     handleOpenChange = props.handleOpenChange,
@@ -53887,7 +53931,7 @@ var BaseMenu = function BaseMenu(props) {
       backgroundColor: 'transparent',
       border: 'none'
     }, style),
-    className: classnames_default()(className, hashId, baseClassName, (_classNames7 = {}, defineProperty_defineProperty(_classNames7, "".concat(baseClassName, "-horizontal"), mode === 'horizontal'), defineProperty_defineProperty(_classNames7, "".concat(baseClassName, "-collapsed"), props.collapsed), _classNames7)),
+    className: classnames_default()(className, hashId, baseClassName, (_classNames8 = {}, defineProperty_defineProperty(_classNames8, "".concat(baseClassName, "-horizontal"), mode === 'horizontal'), defineProperty_defineProperty(_classNames8, "".concat(baseClassName, "-collapsed"), props.collapsed), _classNames8)),
     items: menuUtils.getNavMenuItems(finallyData, 0),
     onOpenChange: setOpenKeys
   }, props.menuProps)));
@@ -56153,17 +56197,7 @@ var SettingDrawer = function SettingDrawer(props) {
   var _useStyle = SettingDrawer_style_useStyle(baseClassName),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
-  var drawerOpenProps = compareVersions(external_antd_.version, '4.23.0') > -1 ? {
-    open: open,
-    onClose: function onClose() {
-      return setOpen(false);
-    }
-  } : {
-    visible: open,
-    onClose: function onClose() {
-      return setOpen(false);
-    }
-  };
+  var drawerOpenProps = openVisibleCompatible(open);
   return wrapSSR((0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
     children: [(0,jsx_runtime.jsx)("div", {
       className: "".concat(baseClassName, "-handle ").concat(hashId),
@@ -56187,6 +56221,9 @@ var SettingDrawer = function SettingDrawer(props) {
       })
     }), (0,jsx_runtime.jsx)(external_antd_.Drawer, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, drawerOpenProps), {}, {
       width: 300,
+      onClose: function onClose() {
+        return setOpen(false);
+      },
       closable: false,
       placement: "right",
       getContainer: getContainer,
@@ -58417,17 +58454,9 @@ var SiderMenuWrapper = function SiderMenuWrapper(props) {
   if (hide) {
     return null;
   }
-  var drawerOpenProps = compareVersions(external_antd_.version, '4.23.0') > -1 ? {
-    open: !collapsed,
-    onClose: function onClose() {
-      return onCollapse === null || onCollapse === void 0 ? void 0 : onCollapse(true);
-    }
-  } : {
-    visible: !collapsed,
-    onClose: function onClose() {
-      return onCollapse === null || onCollapse === void 0 ? void 0 : onCollapse(true);
-    }
-  };
+  var drawerOpenProps = openVisibleCompatible(!collapsed, function () {
+    return onCollapse === null || onCollapse === void 0 ? void 0 : onCollapse(true);
+  });
   return wrapSSR(isMobile ? (0,jsx_runtime.jsx)(external_antd_.Drawer, objectSpread2_objectSpread2(objectSpread2_objectSpread2({
     placement: "left",
     className: classnames_default()("".concat(prefixCls, "-drawer-sider"), className)
@@ -69914,7 +69943,7 @@ function conductCheck(keyList, checked, keyEntities, getCheckDisabled) {
  * Developer should confirm it's safe to ignore themselves.
  */
 
-function useState_useSafeState(defaultValue) {
+function useSafeState(defaultValue) {
   var destroyRef = external_React_.useRef(false);
   var _React$useState = external_React_.useState(defaultValue),
     _React$useState2 = slicedToArray_slicedToArray(_React$useState, 2),
@@ -69962,7 +69991,7 @@ function useMergedState_useMergedState(defaultStateValue, option) {
     onChange = _ref.onChange,
     postState = _ref.postState; // ======================= Init =======================
 
-  var _useState = useState_useSafeState(function () {
+  var _useState = useSafeState(function () {
       var finalValue = undefined;
       var source;
       if (hasValue(value)) {
@@ -71768,7 +71797,7 @@ function isActive(step) {
   return step === STEP_ACTIVE || step === STEP_ACTIVATED;
 }
 /* harmony default export */ var useStepQueue = (function (status, callback) {
-  var _useState = useState_useSafeState(STEP_NONE),
+  var _useState = useSafeState(STEP_NONE),
     _useState2 = slicedToArray_slicedToArray(_useState, 2),
     step = _useState2[0],
     setStep = _useState2[1];
@@ -71887,15 +71916,15 @@ function useStatus(supportMotion, visible, getElement, _ref) {
     onVisibleChanged = _ref.onVisibleChanged;
 
   // Used for outer render usage to avoid `visible: false & status: none` to render nothing
-  var _useState = useState_useSafeState(),
+  var _useState = useSafeState(),
     _useState2 = slicedToArray_slicedToArray(_useState, 2),
     asyncVisible = _useState2[0],
     setAsyncVisible = _useState2[1];
-  var _useState3 = useState_useSafeState(STATUS_NONE),
+  var _useState3 = useSafeState(STATUS_NONE),
     _useState4 = slicedToArray_slicedToArray(_useState3, 2),
     status = _useState4[0],
     setStatus = _useState4[1];
-  var _useState5 = useState_useSafeState(null),
+  var _useState5 = useSafeState(null),
     _useState6 = slicedToArray_slicedToArray(_useState5, 2),
     style = _useState6[0],
     setStyle = _useState6[1];
@@ -73921,7 +73950,7 @@ RcAlign.displayName = 'Align';
 
 var StatusQueue = ['measure', 'alignPre', 'align', null, 'motion'];
 /* harmony default export */ var useVisibleStatus = (function (visible, doMeasure) {
-  var _useState = useState_useSafeState(null),
+  var _useState = useSafeState(null),
     _useState2 = slicedToArray_slicedToArray(_useState, 2),
     status = _useState2[0],
     setInternalStatus = _useState2[1];
@@ -78982,7 +79011,7 @@ Item.displayName = 'Item';
  */
 
 function useBatchFrameState() {
-  var _useState = useState_useSafeState({}),
+  var _useState = useSafeState({}),
     _useState2 = slicedToArray_slicedToArray(_useState, 2),
     forceUpdate = _useState2[1];
   var statesRef = (0,external_React_.useRef)([]);
@@ -85272,17 +85301,17 @@ function BaseProList(props) {
 /* harmony default export */ var list_es = ((/* unused pure expression or super */ null && (ProList)));
 ;// CONCATENATED MODULE: ./packages/components/src/version.ts
 var version_version = {
-  "@ant-design/pro-card": "2.0.20",
-  "@ant-design/pro-components": "2.3.26",
-  "@ant-design/pro-descriptions": "2.0.22",
-  "@ant-design/pro-field": "2.1.15",
-  "@ant-design/pro-form": "2.2.13",
-  "@ant-design/pro-layout": "7.1.14",
-  "@ant-design/pro-list": "2.0.23",
-  "@ant-design/pro-provider": "2.0.12",
+  "@ant-design/pro-card": "2.0.21",
+  "@ant-design/pro-components": "2.3.27",
+  "@ant-design/pro-descriptions": "2.0.23",
+  "@ant-design/pro-field": "2.1.16",
+  "@ant-design/pro-form": "2.2.14",
+  "@ant-design/pro-layout": "7.1.15",
+  "@ant-design/pro-list": "2.0.24",
+  "@ant-design/pro-provider": "2.0.13",
   "@ant-design/pro-skeleton": "2.0.4",
-  "@ant-design/pro-table": "3.1.0",
-  "@ant-design/pro-utils": "2.2.12"
+  "@ant-design/pro-table": "3.1.1",
+  "@ant-design/pro-utils": "2.2.13"
 };
 ;// CONCATENATED MODULE: ./packages/components/src/index.tsx