@ant-design/pro-components 2.3.13 → 2.3.15

package/dist/components.js

@@ -20642,6 +20642,43 @@ function canUseDom() {
 
 /***/ }),
 
+/***/ 2577:
+/***/ (function(__unused_webpack_module, exports) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = contains;
+
+function contains(root, n) {
+  if (!root) {
+    return false;
+  } // Use native if support
+
+
+  if (root.contains) {
+    return root.contains(n);
+  } // `document.contains` not support with IE11
+
+
+  var node = n;
+
+  while (node) {
+    if (node === root) {
+      return true;
+    }
+
+    node = node.parentNode;
+  }
+
+  return false;
+}
+
+/***/ }),
+
 /***/ 535:
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
@@ -20659,6 +20696,8 @@ exports.updateCSS = updateCSS;
 
 var _canUseDom = _interopRequireDefault(__webpack_require__(7702));
 
+var _contains = _interopRequireDefault(__webpack_require__(2577));
+
 var APPEND_ORDER = 'data-rc-order';
 var MARK_KEY = "rc-util-key";
 var containerCache = new Map();
@@ -20766,7 +20805,7 @@ function removeCSS(key) {
 function syncRealContainer(container, option) {
   var cachedRealContainer = containerCache.get(container); // Find real container when not cached or cached container removed
 
-  if (!cachedRealContainer || !document.contains(cachedRealContainer)) {
+  if (!cachedRealContainer || !(0, _contains.default)(document, cachedRealContainer)) {
     var placeholderStyle = injectCSS('', option);
     var parentNode = placeholderStyle.parentNode;
     containerCache.set(container, parentNode);
@@ -24866,6 +24905,7 @@ __webpack_require__.d(__webpack_exports__, {
   "ProBreadcrumb": function() { return /* reexport */ ProBreadcrumb; },
   "ProCard": function() { return /* reexport */ es_ProCard; },
   "ProDescriptions": function() { return /* reexport */ ProDescriptions; },
+  "ProField": function() { return /* reexport */ ProField; },
   "ProForm": function() { return /* reexport */ ProForm; },
   "ProFormCaptcha": function() { return /* reexport */ Captcha; },
   "ProFormCascader": function() { return /* reexport */ components_Cascader; },
@@ -24901,6 +24941,7 @@ __webpack_require__.d(__webpack_exports__, {
   "ProList": function() { return /* reexport */ ProList; },
   "ProPageHeader": function() { return /* reexport */ ProPageHeader; },
   "ProProvider": function() { return /* reexport */ ProProvider; },
+  "ProSkeleton": function() { return /* reexport */ ProSkeleton; },
   "ProTable": function() { return /* reexport */ es_Table; },
   "QueryFilter": function() { return /* reexport */ QueryFilter; },
   "RouteContext": function() { return /* reexport */ RouteContext; },
@@ -26617,10 +26658,10 @@ var useSWR = withArgs(useSWRHandler);
   moneySymbol: '€',
   form: {
     lightFilter: {
-      more: 'Máis',
-      clear: 'Limpar',
+      more: 'Més',
+      clear: 'Netejar',
       confirm: 'Confirmar',
-      itemUnit: 'Elementos'
+      itemUnit: 'Elements'
     }
   },
   tableForm: {
@@ -26673,15 +26714,15 @@ var useSWR = withArgs(useSWRHandler);
   },
   editableTable: {
     action: {
-      save: 'Gardar',
-      cancel: 'Cancelar',
+      save: 'Guardar',
+      cancel: 'Cancel·lar',
       delete: 'Eliminar',
-      add: 'engadir unha fila de datos'
+      add: 'afegir una fila de dades'
     }
   },
   switch: {
-    open: 'aberto',
-    close: 'pechar'
+    open: 'obert',
+    close: 'tancat'
   }
 });
 ;// CONCATENATED MODULE: ./packages/provider/es/locale/de_DE.js
@@ -28393,7 +28434,7 @@ var CacheClean = function CacheClean() {
 
 
 var ConfigProviderWrap = function ConfigProviderWrap(_ref2) {
-  var _children = _ref2.children,
+  var children = _ref2.children,
       _ref2$autoClearCache = _ref2.autoClearCache,
       autoClearCache = _ref2$autoClearCache === void 0 ? false : _ref2$autoClearCache;
 
@@ -28405,43 +28446,44 @@ var ConfigProviderWrap = function ConfigProviderWrap(_ref2) {
 
   var Provider = locale === undefined ? external_antd_.ConfigProvider : (external_React_default()).Fragment;
   var proProvide = (0,external_React_.useContext)(es_ConfigContext);
+  var proProvideValue = (0,external_React_.useMemo)(function () {
+    var _proProvide$intl;
 
-  var configProviderDom = (0,jsx_runtime.jsx)(ConfigConsumer, {
-    children: function children(value) {
-      var _value$intl, _process$env$NODE_ENV;
+    var localeName = locale === null || locale === void 0 ? void 0 : locale.locale;
+    var key = findIntlKeyByAntdLocaleKey(localeName); // antd 的 key 存在的时候以 antd 的为主
 
-      var localeName = locale === null || locale === void 0 ? void 0 : locale.locale;
-      var key = findIntlKeyByAntdLocaleKey(localeName); // antd 的 key 存在的时候以 antd 的为主
+    var intl = localeName && ((_proProvide$intl = proProvide.intl) === null || _proProvide$intl === void 0 ? void 0 : _proProvide$intl.locale) === 'default' ? intlMap[key] : proProvide.intl || intlMap[key];
+    return objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, proProvide), {}, {
+      isDeps: true,
+      intl: intl || zhCNIntl
+    });
+  }, [locale === null || locale === void 0 ? void 0 : locale.locale, proProvide]);
+  var configProviderDom = (0,external_React_.useMemo)(function () {
+    var _process$env$NODE_ENV; // 自动注入 antd 的配置
 
-      var intl = localeName && ((_value$intl = value.intl) === null || _value$intl === void 0 ? void 0 : _value$intl.locale) === 'default' ? intlMap[key] : value.intl || intlMap[key]; // 自动注入 antd 的配置
 
-      var configProvider = locale === undefined ? {
-        locale: es_locale_zh_CN,
-        theme: {
-          hashed: ((_process$env$NODE_ENV = "production") === null || _process$env$NODE_ENV === void 0 ? void 0 : _process$env$NODE_ENV.toLowerCase()) !== 'test'
-        }
-      } : {};
+    var configProvider = locale === undefined ? {
+      locale: es_locale_zh_CN,
+      theme: {
+        hashed: ((_process$env$NODE_ENV = "production") === null || _process$env$NODE_ENV === void 0 ? void 0 : _process$env$NODE_ENV.toLowerCase()) !== 'test'
+      }
+    } : {};
 
-      var provide = (0,jsx_runtime.jsx)(Provider, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, configProvider), {}, {
-        children: (0,jsx_runtime.jsx)(ConfigProvider, {
-          value: objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, value), {}, {
-            isDeps: true,
-            intl: intl || zhCNIntl
-          }),
-          children: (0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
-            children: [autoClearCache && (0,jsx_runtime.jsx)(CacheClean, {}), _children]
-          })
+    var provide = (0,jsx_runtime.jsx)(Provider, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, configProvider), {}, {
+      children: (0,jsx_runtime.jsx)(ConfigProvider, {
+        value: proProvideValue,
+        children: (0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+          children: [autoClearCache && (0,jsx_runtime.jsx)(CacheClean, {}), children]
         })
-      }));
-
-      if (proProvide.isDeps) return provide;
-      return (0,jsx_runtime.jsx)("div", {
-        className: "".concat((getPrefixCls === null || getPrefixCls === void 0 ? void 0 : getPrefixCls('pro')) || 'ant-pro', " ").concat(token.hashId),
-        children: provide
-      });
-    }
-  });
+      })
+    }));
 
+    if (proProvide.isDeps) return provide;
+    return (0,jsx_runtime.jsx)("div", {
+      className: "".concat((getPrefixCls === null || getPrefixCls === void 0 ? void 0 : getPrefixCls('pro')) || 'ant-pro', " ").concat(token.hashId),
+      children: provide
+    });
+  }, [Provider, autoClearCache, children, getPrefixCls, locale, proProvide.isDeps, proProvideValue, token.hashId]);
   if (!autoClearCache) return configProviderDom;
   return (0,jsx_runtime.jsx)(SWRConfig, {
     value: {
@@ -28488,8 +28530,33 @@ function typeof_typeof(obj) {
 function canUseDom() {
   return !!(typeof window !== 'undefined' && window.document && window.document.createElement);
 }
+;// CONCATENATED MODULE: ./node_modules/rc-util/es/Dom/contains.js
+function contains(root, n) {
+  if (!root) {
+    return false;
+  } // Use native if support
+
+
+  if (root.contains) {
+    return root.contains(n);
+  } // `document.contains` not support with IE11
+
+
+  var node = n;
+
+  while (node) {
+    if (node === root) {
+      return true;
+    }
+
+    node = node.parentNode;
+  }
+
+  return false;
+}
 ;// CONCATENATED MODULE: ./node_modules/rc-util/es/Dom/dynamicCSS.js
 
+
 var APPEND_ORDER = 'data-rc-order';
 var MARK_KEY = "rc-util-key";
 var containerCache = new Map();
@@ -28596,7 +28663,7 @@ function removeCSS(key) {
 function syncRealContainer(container, option) {
   var cachedRealContainer = containerCache.get(container); // Find real container when not cached or cached container removed
 
-  if (!cachedRealContainer || !document.contains(cachedRealContainer)) {
+  if (!cachedRealContainer || !contains(document, cachedRealContainer)) {
     var placeholderStyle = injectCSS('', option);
     var parentNode = placeholderStyle.parentNode;
     containerCache.set(container, parentNode);
@@ -29504,6 +29571,7 @@ function createCache() {
   return new Cache();
 }
 var StyleContext = /*#__PURE__*/external_React_.createContext({
+  hashPriority: 'low',
   cache: createCache(),
   defaultCache: true
 });
@@ -29511,22 +29579,25 @@ var StyleProvider = function StyleProvider(props) {
   var autoClear = props.autoClear,
       mock = props.mock,
       cache = props.cache,
+      hashPriority = props.hashPriority,
       children = props.children;
 
   var _React$useContext = React.useContext(StyleContext),
       parentCache = _React$useContext.cache,
       parentAutoClear = _React$useContext.autoClear,
       parentMock = _React$useContext.mock,
-      parentDefaultCache = _React$useContext.defaultCache;
+      parentDefaultCache = _React$useContext.defaultCache,
+      parentHashPriority = _React$useContext.hashPriority;
 
   var context = React.useMemo(function () {
     return {
       autoClear: autoClear !== null && autoClear !== void 0 ? autoClear : parentAutoClear,
       mock: mock !== null && mock !== void 0 ? mock : parentMock,
       cache: cache || parentCache || createCache(),
-      defaultCache: !cache && parentDefaultCache
+      defaultCache: !cache && parentDefaultCache,
+      hashPriority: hashPriority !== null && hashPriority !== void 0 ? hashPriority : parentHashPriority
     };
-  }, [autoClear, parentAutoClear, parentMock, parentCache, mock, cache, parentDefaultCache]);
+  }, [autoClear, parentAutoClear, parentMock, parentCache, mock, cache, parentDefaultCache, hashPriority, parentHashPriority]);
   return /*#__PURE__*/React.createElement(StyleContext.Provider, {
     value: context
   }, children);
@@ -29796,16 +29867,6 @@ function supportSelector(styleStr, handleElement) {
   return false;
 }
 
-var canWhere = undefined;
-function supportWhere() {
-  if (canWhere === undefined) {
-    canWhere = supportSelector(":where(.".concat(layerKey, ") { width: ").concat(layerWidth, "!important; }"), function (ele) {
-      ele.className = layerKey;
-    });
-  }
-
-  return canWhere;
-}
 var canLayer = undefined;
 function supportLayer() {
   if (canLayer === undefined) {
@@ -29849,13 +29910,13 @@ function isCompoundCSSProperty(value) {
 
 var animationStatistics = {}; // 注入 hash 值
 
-function injectSelectorHash(key, hashId) {
+function injectSelectorHash(key, hashId, hashPriority) {
   if (!hashId) {
     return key;
   }
 
   var hashClassName = ".".concat(hashId);
-  var hashSelector = supportWhere() ? ":where(".concat(hashClassName, ")") : hashClassName; // 注入 hashId
+  var hashSelector = hashPriority === 'low' ? ":where(".concat(hashClassName, ")") : hashClassName; // 注入 hashId
 
   var keys = key.split(',').map(function (k) {
     var _firstPath$match;
@@ -29882,7 +29943,8 @@ var parseStyle = function parseStyle(interpolation) {
 
   var hashId = config.hashId,
       layer = config.layer,
-      path = config.path;
+      path = config.path,
+      hashPriority = config.hashPriority;
   var styleStr = '';
 
   function parseKeyframes(keyframes) {
@@ -29936,7 +29998,7 @@ var parseStyle = function parseStyle(interpolation) {
               subInjectHash = true;
             } else {
               // 注入 hashId
-              mergedKey = injectSelectorHash(key, hashId);
+              mergedKey = injectSelectorHash(key, hashId, hashPriority);
             }
           } else if (root && !hashId && (mergedKey === '&' || mergedKey === '')) {
             // In case of `{ '&': { a: { color: 'red' } } }` or `{ '': { a: { color: 'red' } } }` without hashId,
@@ -30023,7 +30085,8 @@ function useStyleRegister(info, styleFn) {
   var _React$useContext = external_React_.useContext(es_StyleContext),
       autoClear = _React$useContext.autoClear,
       mock = _React$useContext.mock,
-      defaultCache = _React$useContext.defaultCache;
+      defaultCache = _React$useContext.defaultCache,
+      hashPriority = _React$useContext.hashPriority;
 
   var tokenKey = token._tokenKey;
   var fullPath = [tokenKey].concat(toConsumableArray_toConsumableArray(path)); // Check if need insert style
@@ -30037,6 +30100,7 @@ function useStyleRegister(info, styleFn) {
     var styleObj = styleFn();
     var styleStr = normalizeStyle(parseStyle(styleObj, {
       hashId: hashId,
+      hashPriority: hashPriority,
       layer: layer,
       path: path.join('-')
     }));
@@ -31622,7 +31686,7 @@ var operationUnit = function operationUnit(token) {
  * @returns {UseStyleResult}
  */
 
-function useStyle(componentName, styleFn) {
+function useStyle(componentName, styleFn, deps) {
   var _useToken = useStyle_useToken(),
       token = _useToken.token,
       hashId = _useToken.hashId,
@@ -31641,7 +31705,7 @@ function useStyle(componentName, styleFn) {
   return {
     wrapSSR: useStyleRegister({
       theme: theme,
-      token: token,
+      token: objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, deps), token),
       hashId: hashId,
       path: [componentName]
     }, function () {
@@ -42178,8 +42242,13 @@ function useWatch_stringify(value) {
 }
 
 function useWatch() {
-  var dependencies = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var form = arguments.length > 1 ? arguments[1] : undefined;
+  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+    args[_key] = arguments[_key];
+  }
+
+  var _args$ = args[0],
+      dependencies = _args$ === void 0 ? [] : _args$,
+      form = args[1];
 
   var _useState = (0,external_React_.useState)(),
       _useState2 = slicedToArray_slicedToArray(_useState, 2),
@@ -42227,7 +42296,7 @@ function useWatch() {
     return cancelRegister;
   }, // We do not need re-register since namePath content is the same
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  []);
+  [isValidForm]);
   return value;
 }
 
@@ -43451,17 +43520,17 @@ var ObjToMap = function ObjToMap(value) {
  * @param pure 纯净模式，不增加 status
  */
 
-var proFieldParsingText = function proFieldParsingText(text, valueEnumParams) {
+var proFieldParsingText = function proFieldParsingText(text, valueEnumParams, key) {
   if (Array.isArray(text)) {
     return (0,jsx_runtime.jsx)(external_antd_.Space, {
       split: ",",
       size: 2,
-      children: text.map(function (value) {
+      children: text.map(function (value, index) {
         return (// @ts-ignore
-          proFieldParsingText(value, valueEnumParams)
+          proFieldParsingText(value, valueEnumParams, index)
         );
       })
-    });
+    }, key);
   }
 
   var valueEnum = ObjToMap(valueEnumParams);
@@ -43475,7 +43544,9 @@ var proFieldParsingText = function proFieldParsingText(text, valueEnumParams) {
 
   if (!domText) {
     // @ts-ignore
-    return (text === null || text === void 0 ? void 0 : text.label) || text;
+    return (0,jsx_runtime.jsx)((external_React_default()).Fragment, {
+      children: (text === null || text === void 0 ? void 0 : text.label) || text
+    }, key);
   }
 
   var status = domText.status,
@@ -43485,7 +43556,7 @@ var proFieldParsingText = function proFieldParsingText(text, valueEnumParams) {
   if (Status) {
     return (0,jsx_runtime.jsx)(Status, {
       children: domText.text
-    });
+    }, key);
   } // 如果不存在使用颜色
 
 
@@ -43493,11 +43564,13 @@ var proFieldParsingText = function proFieldParsingText(text, valueEnumParams) {
     return (0,jsx_runtime.jsx)(ProFieldBadgeColor, {
       color: color,
       children: domText.text
-    });
+    }, key);
   } // 什么都没有使用 text
 
 
-  return domText.text || domText;
+  return (0,jsx_runtime.jsx)((external_React_default()).Fragment, {
+    children: domText.text || domText
+  }, key);
 };
 
 var Highlight = function Highlight(_ref) {
@@ -43547,6 +43620,7 @@ var Highlight = function Highlight(_ref) {
   }
 
   return wrapSSR( /*#__PURE__*/external_React_default().createElement.apply((external_React_default()), ['div', {
+    title: label,
     className: optionCls
   }].concat(elements)));
 };
@@ -47184,7 +47258,7 @@ var FieldDigit = function FieldDigit(_ref, ref) {
       renderFormItem = _ref.renderFormItem,
       fieldProps = _ref.fieldProps;
   var proxyChange = (0,external_React_.useCallback)(function (value) {
-    var val = value;
+    var val = value !== null && value !== void 0 ? value : undefined;
 
     if (typeof value === 'string') {
       val = Number(val);
@@ -47648,9 +47722,10 @@ var getTextByLocale = function getTextByLocale(moneySymbol, paramsText, precisio
 
   try {
     // readonly moneySymbol = false, unused currency
-    return new Intl.NumberFormat(moneySymbol || 'zh-Hans-CN', objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, moneySymbol === false ? {} : Money_intlMap[moneySymbol || 'zh-Hans-CN'] || Money_intlMap['zh-Hans-CN']), {}, {
+    return new Intl.NumberFormat(moneySymbol || 'zh-Hans-CN', objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, Money_intlMap[moneySymbol || 'zh-Hans-CN'] || Money_intlMap['zh-Hans-CN']), {}, {
       maximumFractionDigits: precision
-    }, config)).format(moneyText);
+    }, config)) // fix: #6003 解决未指定货币符号时，金额文本格式化异常问题
+    .format(moneyText).substring(+(moneySymbol === false));
   } catch (error) {
     return moneyText;
   }
@@ -47748,6 +47823,19 @@ var FieldMoney = function FieldMoney(_ref2, ref) {
 
     return defaultText;
   }, [customSymbol, fieldProps.moneySymbol, intl, rest.moneySymbol]);
+  var getFormateValue = (0,external_React_.useCallback)(function (value) {
+    var reg = new RegExp("\\B(?=(\\d{".concat(3 + Math.max(precision - DefaultPrecisionCont, 0), "})+(?!\\d))"), 'g');
+
+    var _String$split = String(value).split('.'),
+        _String$split2 = slicedToArray_slicedToArray(_String$split, 2),
+        intS = _String$split2[0],
+        floatS = _String$split2[1];
+
+    var resInt = intS.replace(reg, ',');
+    var resFloat = '';
+    if (floatS && precision > 0) resFloat = ".".concat(floatS.slice(0, precision === undefined ? DefaultPrecisionCont : precision));
+    return "".concat(resInt).concat(resFloat);
+  }, [precision]);
 
   if (type === 'read') {
     var dom = (0,jsx_runtime.jsx)("span", {
@@ -47765,20 +47853,6 @@ var FieldMoney = function FieldMoney(_ref2, ref) {
   }
 
   if (type === 'edit' || type === 'update') {
-    var getFormateValue = function getFormateValue(value) {
-      var reg = new RegExp("\\B(?=(\\d{".concat(3 + Math.max(precision - DefaultPrecisionCont, 0), "})+(?!\\d))"), 'g');
-
-      var _String$split = String(value).split('.'),
-          _String$split2 = slicedToArray_slicedToArray(_String$split, 2),
-          intS = _String$split2[0],
-          floatS = _String$split2[1];
-
-      var resInt = intS.replace(reg, ',');
-      var resFloat = '';
-      if (floatS && precision > 0) resFloat = ".".concat(floatS.slice(0, precision === undefined ? DefaultPrecisionCont : precision));
-      return "".concat(resInt).concat(resFloat);
-    };
-
     var _dom = (0,jsx_runtime.jsx)(InputNumberPopover, objectSpread2_objectSpread2({
       content: function content(props) {
         if (numberPopoverRender === false) return;
@@ -48014,14 +48088,14 @@ var FieldPassword = function FieldPassword(_ref, ref) {
   var intl = useIntl();
 
   var _useMergedState = (0,useMergedState/* default */.Z)(function () {
-    return rest.visible || false;
+    return rest.open || rest.visible || false;
   }, {
-    value: rest.visible,
-    onChange: rest.onVisible
+    value: rest.open || rest.visible,
+    onChange: rest.onOpenChange || rest.onVisible
   }),
       _useMergedState2 = slicedToArray_slicedToArray(_useMergedState, 2),
-      visible = _useMergedState2[0],
-      setVisible = _useMergedState2[1];
+      open = _useMergedState2[0],
+      setOpen = _useMergedState2[1];
 
   if (mode === 'read') {
     var dom = (0,jsx_runtime.jsx)(jsx_runtime.Fragment, {
@@ -48032,12 +48106,12 @@ var FieldPassword = function FieldPassword(_ref, ref) {
       dom = (0,jsx_runtime.jsxs)(external_antd_.Space, {
         children: [(0,jsx_runtime.jsx)("span", {
           ref: ref,
-          children: visible ? text : '＊ ＊ ＊ ＊ ＊'
+          children: open ? text : '＊ ＊ ＊ ＊ ＊'
         }), (0,jsx_runtime.jsx)("a", {
           onClick: function onClick() {
-            return setVisible(!visible);
+            return setOpen(!open);
           },
-          children: visible ? (0,jsx_runtime.jsx)(icons_EyeOutlined, {}) : (0,jsx_runtime.jsx)(icons_EyeInvisibleOutlined, {})
+          children: open ? (0,jsx_runtime.jsx)(icons_EyeOutlined, {}) : (0,jsx_runtime.jsx)(icons_EyeInvisibleOutlined, {})
         })]
       });
     }
@@ -48712,8 +48786,7 @@ var FieldSegmented = function FieldSegmented(_ref, ref) {
 
   if (mode === 'edit' || mode === 'update') {
     var _dom = (0,jsx_runtime.jsx)(external_antd_.Segmented, objectSpread2_objectSpread2(objectSpread2_objectSpread2({
-      ref: inputRef,
-      allowClear: true
+      ref: inputRef
     }, fieldProps), {}, {
       options: options
     }));
@@ -49981,8 +50054,7 @@ var defaultRenderText = function defaultRenderText(dataValue, valueType, props,
 
 
 
-
-var ProField = function ProField(_ref, ref) {
+var ProFieldComponent = function ProFieldComponent(_ref, ref) {
   var _ref2, _fieldProps$value, _ref3;
 
   var text = _ref.text,
@@ -50033,7 +50105,9 @@ var ProField = function ProField(_ref, ref) {
   });
 };
 
-/* harmony default export */ var field_es = (/*#__PURE__*/external_React_default().forwardRef(ProField));
+var ProField = /*#__PURE__*/external_React_default().forwardRef(ProFieldComponent);
+
+/* harmony default export */ var field_es = (ProField);
 ;// CONCATENATED MODULE: ./packages/form/es/BaseForm/EditOrReadOnlyContext.js
 
 var EditOrReadOnlyContext = /*#__PURE__*/external_React_default().createContext({
@@ -50710,7 +50784,7 @@ PlusOutlined_PlusOutlined.displayName = 'PlusOutlined';
 
 
 
-var ListItem_excluded = ["creatorButtonProps", "deleteIconProps", "copyIconProps", "itemContainerRender", "itemRender", "alwaysShowItemLabel", "prefixCls", "creatorRecord", "action", "actionGuard", "children", "actionRender", "fields", "meta", "field", "index", "formInstance", "originName", "min", "max", "count"];
+var ListItem_excluded = ["creatorButtonProps", "deleteIconProps", "copyIconProps", "itemContainerRender", "itemRender", "alwaysShowItemLabel", "prefixCls", "creatorRecord", "action", "actionGuard", "children", "actionRender", "fields", "meta", "field", "index", "formInstance", "originName", "containerClassName", "containerStyle", "min", "max", "count"];
 
 
 
@@ -50755,6 +50829,8 @@ var ProFormListItem = function ProFormListItem(props) {
       index = props.index,
       formInstance = props.formInstance,
       originName = props.originName,
+      containerClassName = props.containerClassName,
+      containerStyle = props.containerStyle,
       min = props.min,
       max = props.max,
       count = props.count,
@@ -50936,10 +51012,10 @@ var ProFormListItem = function ProFormListItem(props) {
 
   var contentDom = (itemRender === null || itemRender === void 0 ? void 0 : itemRender({
     listDom: (0,jsx_runtime.jsx)("div", {
-      className: "".concat(prefixCls, "-container ").concat(hashId),
-      style: {
+      className: "".concat(prefixCls, "-container ").concat(containerClassName, " ").concat(hashId),
+      style: objectSpread2_objectSpread2({
         width: grid ? '100%' : undefined
-      },
+      }, containerStyle),
       children: itemContainer
     }),
     action: dom
@@ -50950,10 +51026,10 @@ var ProFormListItem = function ProFormListItem(props) {
       alignItems: 'flex-end'
     },
     children: [(0,jsx_runtime.jsx)("div", {
-      className: "".concat(prefixCls, "-container ").concat(hashId),
-      style: {
+      className: "".concat(prefixCls, "-container ").concat(containerClassName, " ").concat(hashId),
+      style: objectSpread2_objectSpread2({
         width: grid ? '100%' : undefined
-      },
+      }, containerStyle),
       children: itemContainer
     }), dom]
   });
@@ -52526,13 +52602,13 @@ function DrawerForm(_ref) {
         onClick: function onClick(e) {
           var _drawerProps$onClose;
 
-          setOpen(false);
-          resetFields();
+          setOpen(false); // fix: #6006 点击取消按钮时,那么必然会触发抽屉关闭，我们无需在 此处重置表单，只需在抽屉关闭时重置即可
+
           drawerProps === null || drawerProps === void 0 ? void 0 : (_drawerProps$onClose = drawerProps.onClose) === null || _drawerProps$onClose === void 0 ? void 0 : _drawerProps$onClose.call(drawerProps, e);
         }
       }
     }, rest.submitter);
-  }, [rest.submitter, (_context$locale3 = context.locale) === null || _context$locale3 === void 0 ? void 0 : (_context$locale3$Moda = _context$locale3.Modal) === null || _context$locale3$Moda === void 0 ? void 0 : _context$locale3$Moda.okText, (_context$locale4 = context.locale) === null || _context$locale4 === void 0 ? void 0 : (_context$locale4$Moda = _context$locale4.Modal) === null || _context$locale4$Moda === void 0 ? void 0 : _context$locale4$Moda.cancelText, submitTimeout, loading, setOpen, resetFields, drawerProps]);
+  }, [rest.submitter, (_context$locale3 = context.locale) === null || _context$locale3 === void 0 ? void 0 : (_context$locale3$Moda = _context$locale3.Modal) === null || _context$locale3$Moda === void 0 ? void 0 : _context$locale3$Moda.okText, (_context$locale4 = context.locale) === null || _context$locale4 === void 0 ? void 0 : (_context$locale4$Moda = _context$locale4.Modal) === null || _context$locale4$Moda === void 0 ? void 0 : _context$locale4$Moda.cancelText, submitTimeout, loading, setOpen, drawerProps]);
   var contentRender = (0,external_React_.useCallback)(function (formDom, submitter) {
     return (0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
       children: [formDom, footerRef.current && submitter ? /*#__PURE__*/(0,external_ReactDOM_.createPortal)(submitter, footerRef.current) : submitter]
@@ -52613,7 +52689,6 @@ function DrawerForm(_ref) {
         if (submitTimeout && loading) return;
         setOpen(false);
         drawerProps === null || drawerProps === void 0 ? void 0 : (_drawerProps$onClose2 = drawerProps.onClose) === null || _drawerProps$onClose2 === void 0 ? void 0 : _drawerProps$onClose2.call(drawerProps, e);
-        resetFields();
       },
       footer: rest.submitter !== false && (0,jsx_runtime.jsx)("div", {
         ref: footerDomRef,
@@ -52641,14 +52716,9 @@ function DrawerForm(_ref) {
 
                     case 2:
                       result = _context3.sent;
-
-                      if (result === true) {
-                        resetFields();
-                      }
-
                       return _context3.abrupt("return", result);
 
-                    case 5:
+                    case 4:
                     case "end":
                       return _context3.stop();
                   }
@@ -53163,13 +53233,13 @@ function ModalForm(_ref) {
         onClick: function onClick(e) {
           var _modalProps$onCancel;
 
-          setOpen(false);
-          resetFields();
+          setOpen(false); // fix: #6006 点击取消按钮时,那么必然会触发弹窗关闭，我们无需在 此处重置表单，只需在弹窗关闭时重置即可
+
           modalProps === null || modalProps === void 0 ? void 0 : (_modalProps$onCancel = modalProps.onCancel) === null || _modalProps$onCancel === void 0 ? void 0 : _modalProps$onCancel.call(modalProps, e);
         }
       }
     }, rest.submitter);
-  }, [(_context$locale3 = context.locale) === null || _context$locale3 === void 0 ? void 0 : (_context$locale3$Moda = _context$locale3.Modal) === null || _context$locale3$Moda === void 0 ? void 0 : _context$locale3$Moda.cancelText, (_context$locale4 = context.locale) === null || _context$locale4 === void 0 ? void 0 : (_context$locale4$Moda = _context$locale4.Modal) === null || _context$locale4$Moda === void 0 ? void 0 : _context$locale4$Moda.okText, modalProps, rest.submitter, setOpen, loading, submitTimeout, resetFields]);
+  }, [(_context$locale3 = context.locale) === null || _context$locale3 === void 0 ? void 0 : (_context$locale3$Moda = _context$locale3.Modal) === null || _context$locale3$Moda === void 0 ? void 0 : _context$locale3$Moda.cancelText, (_context$locale4 = context.locale) === null || _context$locale4 === void 0 ? void 0 : (_context$locale4$Moda = _context$locale4.Modal) === null || _context$locale4$Moda === void 0 ? void 0 : _context$locale4$Moda.okText, modalProps, rest.submitter, setOpen, loading, submitTimeout]);
   var contentRender = (0,external_React_.useCallback)(function (formDom, submitter) {
     return (0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
       children: [formDom, footerRef.current && submitter ? /*#__PURE__*/(0,external_ReactDOM_.createPortal)(submitter, footerRef.current) : submitter]
@@ -53269,14 +53339,9 @@ function ModalForm(_ref) {
 
                   case 2:
                     result = _context3.sent;
-
-                    if (result === true) {
-                      resetFields();
-                    }
-
                     return _context3.abrupt("return", result);
 
-                  case 5:
+                  case 4:
                   case "end":
                     return _context3.stop();
                 }
@@ -58271,6 +58336,7 @@ var ProFormGroup = ProForm.Group;
 
 
 /* harmony default export */ var form_es = (ProForm);
+
 ;// CONCATENATED MODULE: ./node_modules/use-media-antd-query/es/useMediaQuery.js
 function useMediaQuery_slicedToArray(arr, i) {
   return useMediaQuery_arrayWithHoles(arr) || useMediaQuery_iterableToArrayLimit(arr, i) || useMediaQuery_unsupportedIterableToArray(arr, i) || useMediaQuery_nonIterableRest();
@@ -59190,7 +59256,7 @@ var skeleton_es_excluded = ["type"];
 
 
 
-var PageSkeleton = function PageSkeleton(_ref) {
+var ProSkeleton = function ProSkeleton(_ref) {
   var _ref$type = _ref.type,
       type = _ref$type === void 0 ? 'list' : _ref$type,
       rest = objectWithoutProperties_objectWithoutProperties(_ref, skeleton_es_excluded);
@@ -59207,7 +59273,7 @@ var PageSkeleton = function PageSkeleton(_ref) {
 };
 
 
-/* harmony default export */ var skeleton_es = (PageSkeleton);
+/* harmony default export */ var skeleton_es = (ProSkeleton);
 ;// CONCATENATED MODULE: ./packages/descriptions/es/useFetchData.js
 
 
@@ -59973,7 +60039,7 @@ var GridContent = function GridContent(props) {
 
 
 var getLayoutDesignToken = function getLayoutDesignToken(designTokens, antdToken) {
-  var _finalDesignTokens$si;
+  var _finalDesignTokens$si, _finalDesignTokens$pa, _finalDesignTokens$pa2;
 
   var finalDesignTokens = objectSpread2_objectSpread2({}, designTokens);
 
@@ -60019,8 +60085,8 @@ var getLayoutDesignToken = function getLayoutDesignToken(designTokens, antdToken
     }, finalDesignTokens.sider),
     pageContainer: objectSpread2_objectSpread2({
       colorBgPageContainer: 'transparent',
-      marginBlockPageContainerContent: 24,
-      marginInlinePageContainerContent: 40,
+      paddingInlinePageContainerContent: ((_finalDesignTokens$pa = finalDesignTokens.pageContainer) === null || _finalDesignTokens$pa === void 0 ? void 0 : _finalDesignTokens$pa.marginInlinePageContainerContent) || 40,
+      paddingBlockPageContainerContent: ((_finalDesignTokens$pa2 = finalDesignTokens.pageContainer) === null || _finalDesignTokens$pa2 === void 0 ? void 0 : _finalDesignTokens$pa2.marginBlockPageContainerContent) || 24,
       colorBgPageContainerFixed: '#fff'
     }, finalDesignTokens.pageContainer)
   });
@@ -60063,23 +60129,22 @@ var genPageHeaderStyle = function genPageHeaderStyle(token) {
 
   return defineProperty_defineProperty({}, token.componentCls, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, resetComponent === null || resetComponent === void 0 ? void 0 : resetComponent(token)), {}, (_objectSpread4 = {
     position: 'relative',
-    backgroundColor: token.colorBgContainer,
-    paddingBlock: token.pageHeaderPaddingVertical,
+    backgroundColor: token.pageHeaderBgGhost,
+    paddingBlock: token.pageHeaderPaddingVertical + 2,
     paddingInline: token.pageHeaderPadding,
-    '&-ghost': {
-      backgroundColor: token.pageHeaderBgGhost
-    },
-    '&-has-breadcrumb': {
+    '& &-has-breadcrumb': {
       paddingBlockStart: token.pageHeaderPaddingBreadCrumb
     },
-    '&-has-footer': {
+    '& &-has-footer': {
       paddingBlockEnd: 0
     },
-    '&-back': defineProperty_defineProperty({
+    '& &-back': defineProperty_defineProperty({
       marginInlineEnd: token.margin,
       fontSize: 16,
       lineHeight: 1,
-      '&-button': objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, operationUnit === null || operationUnit === void 0 ? void 0 : operationUnit(token)), {}, {
+      '&-button': objectSpread2_objectSpread2(objectSpread2_objectSpread2({
+        fontSize: 16
+      }, operationUnit === null || operationUnit === void 0 ? void 0 : operationUnit(token)), {}, {
         color: token.pageHeaderColorBack,
         cursor: 'pointer'
       })
@@ -60088,14 +60153,14 @@ var genPageHeaderStyle = function genPageHeaderStyle(token) {
       marginInlineEnd: 0,
       marginInlineStart: 0
     })
-  }, defineProperty_defineProperty(_objectSpread4, 'ant'.concat("-divider-vertical"), {
+  }, defineProperty_defineProperty(_objectSpread4, "& ".concat('ant', "-divider-vertical"), {
     height: 14,
     marginBlock: 0,
     marginInline: token.marginSM,
     verticalAlign: 'middle'
-  }), defineProperty_defineProperty(_objectSpread4, "&-breadcrumb + &-heading", {
+  }), defineProperty_defineProperty(_objectSpread4, "& &-breadcrumb + &-heading", {
     marginBlockStart: token.marginXS
-  }), defineProperty_defineProperty(_objectSpread4, '&-heading', {
+  }), defineProperty_defineProperty(_objectSpread4, '& &-heading', {
     display: 'flex',
     justifyContent: 'space-between',
     '&-left': {
@@ -60170,9 +60235,9 @@ function PageHeader_style_useStyle(prefixCls) {
       componentCls: ".".concat(prefixCls),
       pageHeaderBgGhost: 'transparent',
       pageHeaderPadding: 16,
-      pageHeaderPaddingVertical: 8,
+      pageHeaderPaddingVertical: 4,
       pageHeaderPaddingBreadCrumb: token.paddingSM,
-      pageHeaderColorBack: token.colorIcon,
+      pageHeaderColorBack: token.colorTextHeading,
       pageHeaderFontSizeHeaderTitle: token.fontSizeHeading4,
       pageHeaderFontSizeHeaderSubTitle: 14,
       pageHeaderPaddingContentPadding: token.paddingSM
@@ -60195,19 +60260,19 @@ function PageHeader_style_useStyle(prefixCls) {
 
 
 
-var renderBack = function renderBack(prefixCls, backIcon, onBack) {
+var renderBack = function renderBack(prefixCls, hashId, backIcon, onBack) {
   if (!backIcon || !onBack) {
     return null;
   }
 
   return (0,jsx_runtime.jsx)("div", {
-    className: "".concat(prefixCls, "-back"),
-    children: (0,jsx_runtime.jsx)(external_antd_.Button, {
-      type: "text",
+    className: "".concat(prefixCls, "-back ").concat(hashId),
+    children: (0,jsx_runtime.jsx)("div", {
+      role: "button",
       onClick: function onClick(e) {
         onBack === null || onBack === void 0 ? void 0 : onBack(e);
       },
-      className: "".concat(prefixCls, "-back-button"),
+      className: "".concat(prefixCls, "-back-button ").concat(hashId),
       "aria-label": "back",
       children: backIcon
     })
@@ -60215,6 +60280,9 @@ var renderBack = function renderBack(prefixCls, backIcon, onBack) {
 };
 
 var renderBreadcrumb = function renderBreadcrumb(breadcrumb, prefixCls) {
+  var _breadcrumb$routes;
+
+  if (!((_breadcrumb$routes = breadcrumb.routes) === null || _breadcrumb$routes === void 0 ? void 0 : _breadcrumb$routes.length)) return null;
   return (0,jsx_runtime.jsx)(external_antd_.Breadcrumb, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, breadcrumb), {}, {
     className: classnames_default()("".concat(prefixCls, "-breadcrumb"), breadcrumb.className)
   }));
@@ -60247,7 +60315,7 @@ var renderTitle = function renderTitle(prefixCls, props) {
   }
 
   var backIcon = getBackIcon(props, direction);
-  var backIconDom = renderBack(prefixCls, backIcon, onBack);
+  var backIconDom = renderBack(prefixCls, hashId, backIcon, onBack);
   var hasTitle = backIconDom || avatar || hasHeading;
   return (0,jsx_runtime.jsxs)("div", {
     className: headingPrefixCls + ' ' + hashId,
@@ -60309,7 +60377,6 @@ var PageHeader = function PageHeader(props) {
 
   var _React$useContext = external_React_.useContext(external_antd_.ConfigProvider.ConfigContext),
       getPrefixCls = _React$useContext.getPrefixCls,
-      pageHeader = _React$useContext.pageHeader,
       direction = _React$useContext.direction;
 
   var customizePrefixCls = props.prefixCls,
@@ -60319,14 +60386,6 @@ var PageHeader = function PageHeader(props) {
       breadcrumb = props.breadcrumb,
       breadcrumbRender = props.breadcrumbRender,
       customizeClassName = props.className;
-  var ghost = true; // Use `ghost` from `props` or from `ConfigProvider` instead.
-
-  if ('ghost' in props) {
-    ghost = props.ghost;
-  } else if (pageHeader && 'ghost' in pageHeader) {
-    ghost = pageHeader.ghost;
-  }
-
   var prefixCls = getPrefixCls('page-header', customizePrefixCls);
 
   var _useStyle = PageHeader_style_useStyle(prefixCls),
@@ -60350,7 +60409,7 @@ var PageHeader = function PageHeader(props) {
   var breadcrumbDom = isBreadcrumbComponent ? breadcrumb : breadcrumbRenderDomFromProps;
   var className = classnames_default()(prefixCls, props.className, customizeClassName, (_classNames = {
     hashId: hashId
-  }, defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-has-breadcrumb"), !!breadcrumbDom), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-has-footer"), !!footer), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-ghost"), ghost), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-rtl"), direction === 'rtl'), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-compact"), compact), _classNames));
+  }, defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-has-breadcrumb"), !!breadcrumbDom), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-has-footer"), !!footer), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-rtl"), direction === 'rtl'), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-compact"), compact), _classNames));
   var title = renderTitle(prefixCls, props, direction, hashId);
   var childDom = children && renderChildren(prefixCls, children, hashId);
   var footerDom = renderFooter(prefixCls, footer, hashId);
@@ -60559,24 +60618,20 @@ var genPageContainerStyle = function genPageContainerStyle(token) {
 
   return defineProperty_defineProperty({}, token.componentCls, (_token$componentCls = {
     position: 'relative',
-    '&-layout-has-margin': {
-      marginBlock: token.marginBlockPageContainerContent,
-      marginInline: -token.marginInlinePageContainerContent
-    },
     '&-children-content': {
-      marginBlock: token.marginBlockPageContainerContent,
-      marginInline: token.marginInlinePageContainerContent
+      paddingBlock: token.paddingBlockPageContainerContent,
+      paddingInline: token.paddingInlinePageContainerContent
     },
     '&-affix': defineProperty_defineProperty({}, "".concat(token.antCls, "-affix"), defineProperty_defineProperty({}, "".concat(token.componentCls, "-warp"), {
       backgroundColor: token.colorBgPageContainerFixed,
       boxShadow: '0 2px 8px #f0f1f2'
     }))
   }, defineProperty_defineProperty(_token$componentCls, '& &-warp-page-header', defineProperty_defineProperty({
-    marginBlockEnd: token.marginBlockPageContainerContent / 2,
-    paddingInlineStart: token.marginInlinePageContainerContent,
-    paddingInlineEnd: token.marginInlinePageContainerContent
+    paddingBlockEnd: token.paddingBlockPageContainerContent / 2,
+    paddingInlineStart: token.paddingInlinePageContainerContent,
+    paddingInlineEnd: token.paddingInlinePageContainerContent
   }, "& ~ ".concat(token.proComponentsCls, "-grid-content"), defineProperty_defineProperty({}, "".concat(token.proComponentsCls, "-page-container-children-content"), {
-    marginBlock: token.marginBlockPageContainerContent / 3
+    paddingBlock: token.paddingBlockPageContainerContent / 3
   }))), defineProperty_defineProperty(_token$componentCls, '&-detail', defineProperty_defineProperty({
     display: 'flex'
   }, sm, {
@@ -60608,17 +60663,18 @@ var genPageContainerStyle = function genPageContainerStyle(token) {
   }), _extraContent)), _token$componentCls));
 };
 
-function PageContainer_style_useStyle(prefixCls) {
+function PageContainer_style_useStyle(prefixCls, componentsToken) {
   var _useContext = (0,external_React_.useContext)(ProLayoutContext),
       pageContainer = _useContext.pageContainer;
 
   return useStyle('page-container', function (token) {
-    var proCardToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
+    var proCardToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
       componentCls: ".".concat(prefixCls)
-    }, pageContainer);
+    }, pageContainer), componentsToken);
 
     return [genPageContainerStyle(proCardToken)];
-  });
+  }, // 触发一下更新
+  componentsToken);
 }
 ;// CONCATENATED MODULE: ./packages/layout/es/components/PageContainer/index.js
 
@@ -60626,7 +60682,7 @@ function PageContainer_style_useStyle(prefixCls) {
 
 
 var PageContainer_excluded = ["title", "content", "pageHeaderRender", "header", "prefixedClassName", "extraContent", "style", "prefixCls", "hashId", "value", "breadcrumbRender"],
-    PageContainer_excluded2 = ["children", "loading", "className", "style", "footer", "affixProps", "fixedHeader", "breadcrumbRender"];
+    PageContainer_excluded2 = ["children", "loading", "className", "style", "footer", "affixProps", "token", "fixedHeader", "breadcrumbRender"];
 
 
 
@@ -60817,6 +60873,7 @@ var PageContainer = function PageContainer(props) {
       style = props.style,
       footer = props.footer,
       affixProps = props.affixProps,
+      propsToken = props.token,
       fixedHeader = props.fixedHeader,
       breadcrumbRender = props.breadcrumbRender,
       restProps = objectWithoutProperties_objectWithoutProperties(props, PageContainer_excluded2);
@@ -60848,7 +60905,7 @@ var PageContainer = function PageContainer(props) {
   var prefixCls = props.prefixCls || getPrefixCls('pro');
   var basePageContainer = "".concat(prefixCls, "-page-container");
 
-  var _useStyle = PageContainer_style_useStyle(basePageContainer),
+  var _useStyle = PageContainer_style_useStyle(basePageContainer, propsToken),
       wrapSSR = _useStyle.wrapSSR,
       hashId = _useStyle.hashId;
 
@@ -60890,11 +60947,11 @@ var PageContainer = function PageContainer(props) {
       }), value.hasFooterToolbar && (0,jsx_runtime.jsx)("div", {
         style: {
           height: 64,
-          marginBlockStart: pageContainer.marginBlockPageContainerContent
+          marginBlockStart: pageContainer.paddingBlockPageContainerContent
         }
       })]
     }) : null;
-  }, [children, basePageContainer, hashId, value.hasFooterToolbar, pageContainer.marginBlockPageContainerContent]);
+  }, [children, basePageContainer, hashId, value.hasFooterToolbar, pageContainer.paddingBlockPageContainerContent]);
   var renderContentDom = (0,external_React_.useMemo)(function () {
     // 只要loadingDom非空我们就渲染loadingDom,否则渲染内容
     var dom = loadingDom || content;
@@ -60909,7 +60966,7 @@ var PageContainer = function PageContainer(props) {
 
     return dom;
   }, [props.waterMarkProps, value.waterMarkProps, loadingDom, content]);
-  var containerClassName = classnames_default()(basePageContainer, hashId, className, (_classNames = {}, defineProperty_defineProperty(_classNames, "".concat(basePageContainer, "-ghost"), true), defineProperty_defineProperty(_classNames, "".concat(basePageContainer, "-with-footer"), footer), defineProperty_defineProperty(_classNames, "".concat(basePageContainer, "-with-affix"), fixedHeader && pageHeaderDom), _classNames));
+  var containerClassName = classnames_default()(basePageContainer, hashId, className, (_classNames = {}, defineProperty_defineProperty(_classNames, "".concat(basePageContainer, "-with-footer"), footer), defineProperty_defineProperty(_classNames, "".concat(basePageContainer, "-with-affix"), fixedHeader && pageHeaderDom), _classNames));
   var token = (0,external_React_.useContext)(ProLayoutContext);
   return wrapSSR((0,jsx_runtime.jsxs)(ConfigProviderWrap, {
     children: [(0,jsx_runtime.jsxs)("div", {
@@ -61641,6 +61698,7 @@ function AppsLogoComponents_style_useStyle(prefixCls) {
 var defaultRenderLogo = function defaultRenderLogo(logo) {
   if (typeof logo === 'string') {
     return (0,jsx_runtime.jsx)("img", {
+      width: 22,
       src: logo,
       alt: "logo"
     });
@@ -62879,7 +62937,7 @@ var SiderMenu = function SiderMenu(props) {
         // @ts-ignore
         theme: {
           hashed: false,
-          override: {
+          components: {
             Menu: {
               radiusItem: 4,
               colorItemBgSelected: sider.colorBgMenuItemSelected || 'rgba(0, 0, 0, 0.04)',
@@ -63247,12 +63305,10 @@ var TopNavHeader = function TopNavHeader(props) {
   var contentDom = (0,external_React_.useMemo)(function () {
     var _process$env$NODE_ENV, _props$menuProps;
 
-    var defaultDom = (0,jsx_runtime.jsx)(external_antd_.ConfigProvider // @ts-ignore
-    , {
-      // @ts-ignore
+    var defaultDom = (0,jsx_runtime.jsx)(external_antd_.ConfigProvider, {
       theme: {
         hashed: ((_process$env$NODE_ENV = "production") === null || _process$env$NODE_ENV === void 0 ? void 0 : _process$env$NODE_ENV.toLowerCase()) !== 'test',
-        override: {
+        components: {
           Menu: {
             colorItemBg: header.colorBgHeader || 'transparent',
             colorSubItemBg: header.colorBgHeader || 'transparent',
@@ -63581,7 +63637,7 @@ var DefaultHeader = function DefaultHeader(props) {
       // @ts-ignore
       theme: {
         hashed: ((_process$env$NODE_ENV = "production") === null || _process$env$NODE_ENV === void 0 ? void 0 : _process$env$NODE_ENV.toLowerCase()) !== 'test',
-        override: {
+        components: {
           Layout: {
             colorBgHeader: 'transparent',
             colorBgBody: 'transparent'
@@ -67770,10 +67826,10 @@ var genProLayoutStyle = function genProLayoutStyle(token) {
     '*': {
       boxSizing: 'border-box'
     },
-    marginBlock: token.pageContainer.marginBlockPageContainerContent,
-    marginInline: token.pageContainer.marginInlinePageContainerContent,
+    paddingBlock: token.pageContainer.paddingBlockPageContainerContent,
+    paddingInline: token.pageContainer.paddingInlinePageContainerContent,
     '&-has-page-container': {
-      margin: 0
+      padding: 0
     }
   }), defineProperty_defineProperty(_$concat12, "".concat(token.componentCls, "-container"), {
     width: '100%',
@@ -72148,7 +72204,9 @@ var HeaderMenu = function HeaderMenu(props) {
 
 
 var genProListStyle = function genProListStyle(token) {
-  return defineProperty_defineProperty({}, token.componentCls, {
+  var _token$componentCls;
+
+  return defineProperty_defineProperty({}, token.componentCls, (_token$componentCls = {
     lineHeight: '1',
     '&-container': {
       display: 'flex',
@@ -72220,33 +72278,31 @@ var genProListStyle = function genProListStyle(token) {
         fontWeight: 'bold',
         opacity: '1'
       }
+    }
+  }, defineProperty_defineProperty(_token$componentCls, "".concat(token.antCls, "-tabs-top > ").concat(token.antCls, "-tabs-nav"), defineProperty_defineProperty({
+    marginBlockEnd: 0,
+    '&::before': {
+      borderBlockEnd: 0
+    }
+  }, "".concat(token.antCls, "-tabs-nav-list"), {
+    marginBlockStart: 0,
+    '${token.antCls}-tabs-tab': {
+      paddingBlockStart: 0
+    }
+  })), defineProperty_defineProperty(_token$componentCls, '&-dropdownmenu-label', {
+    fontWeight: 'bold',
+    fontSize: token.fontSizeIcon,
+    textAlign: 'center',
+    cursor: 'pointer'
+  }), defineProperty_defineProperty(_token$componentCls, '@media (max-width: 575px)', defineProperty_defineProperty({}, token.componentCls, {
+    '&-container': {
+      display: 'flex',
+      flexWrap: 'wrap'
     },
-    '&-dropdownmenu-label': defineProperty_defineProperty({
-      fontWeight: 'bold',
-      fontSize: token.fontSizeIcon,
-      textAlign: 'center',
-      cursor: 'pointer'
-    }, "".concat(token.antCls, "-tabs-top > ").concat(token.antCls, "-tabs-nav"), defineProperty_defineProperty({
-      marginBlockEnd: 0,
-      '&::before': {
-        borderBlockEnd: 0
-      }
-    }, "".concat(token.antCls, "-tabs-nav-list"), {
-      marginBlockStart: 0,
-      '${token.antCls}-tabs-tab': {
-        paddingBlockStart: 0
-      }
-    })),
-    '@media (max-width: 575px)': defineProperty_defineProperty({}, token.componentCls, {
-      '&-container': {
-        display: 'flex',
-        flexWrap: 'wrap'
-      },
-      '&-left': {
-        marginBlockEnd: '16px'
-      }
-    })
-  });
+    '&-left': {
+      marginBlockEnd: '16px'
+    }
+  })), _token$componentCls));
 };
 
 function ListToolBar_style_useStyle(prefixCls) {
@@ -75000,7 +75056,6 @@ ProviderWarp.Summary = external_antd_.Table.Summary;
 ;// CONCATENATED MODULE: ./packages/table/es/utils/useDragSort.js
 
 
-var useDragSort_excluded = ["className", "style"];
 
 
 
@@ -75038,9 +75093,7 @@ function useDragSort(props) {
     }, p));
   });
   var DraggableBodyRow = useRefFunction(function (p) {
-    var DraggableBodyRowClassName = p.className,
-        DraggableBodyRowStyle = p.style,
-        restProps = objectWithoutProperties_objectWithoutProperties(p, useDragSort_excluded); // function findIndex base on Table rowKey props and should always be a right array index
+    var restProps = extends_extends({}, p); // function findIndex base on Table rowKey props and should always be a right array index
 
 
     var index = dataSource.findIndex(function (item) {
@@ -81066,13 +81119,17 @@ var genLinkStyle = function genLinkStyle(token) {
     }), _a)
   };
 };
-var genFontStyle = function genFontStyle(token, rootPrefixCls) {
+var genCommonStyle = function genCommonStyle(token, rootPrefixCls) {
   var fontFamily = token.fontFamily,
       fontSize = token.fontSize;
-  return defineProperty_defineProperty({}, "[class^=\"".concat(rootPrefixCls, "-\"], [class*=\" ").concat(rootPrefixCls, "-\"]"), {
+  var rootPrefixSelector = "[class^=\"".concat(rootPrefixCls, "-\"], [class*=\" ").concat(rootPrefixCls, "-\"]");
+  return defineProperty_defineProperty({}, rootPrefixSelector, defineProperty_defineProperty({
     fontFamily: fontFamily,
-    fontSize: fontSize
-  });
+    fontSize: fontSize,
+    boxSizing: 'border-box'
+  }, rootPrefixSelector, {
+    boxSizing: 'border-box'
+  }));
 };
 var genFocusOutline = function genFocusOutline(token) {
   return {
@@ -81087,7 +81144,7 @@ var genFocusStyle = function genFocusStyle(token) {
   };
 };
 ;// CONCATENATED MODULE: ./node_modules/antd/es/version/version.js
-/* harmony default export */ var version = ('5.0.0-experimental.24');
+/* harmony default export */ var version = ('5.0.0-alpha.1');
 ;// CONCATENATED MODULE: ./node_modules/antd/es/version/index.js
 /* eslint import/no-unresolved: 0 */
 // @ts-ignore
@@ -81399,8 +81456,7 @@ var generateNeutralColorPalettes = function generateNeutralColorPalettes(bgBaseC
     colorBgElevated: getSolidColor(colorBgBase, 0),
     colorBgSpotlight: getAlphaColor(colorTextBase, 0.85),
     colorBorder: getSolidColor(colorBgBase, 15),
-    colorBorderSecondary: getSolidColor(colorBgBase, 6),
-    colorSplit: getAlphaColor(colorTextBase, 0.06)
+    colorBorderSecondary: getSolidColor(colorBgBase, 6)
   };
 };
 ;// CONCATENATED MODULE: ./node_modules/antd/es/theme/themes/default/index.js
@@ -81426,6 +81482,53 @@ function derivative(token) {
     generateNeutralColorPalettes: generateNeutralColorPalettes
   })), genCommonMapToken(token));
 }
+;// CONCATENATED MODULE: ./node_modules/antd/es/theme/util/getAlphaColor.js
+
+
+function isStableColor(color) {
+  return color >= 0 && color <= 255;
+}
+
+function getAlphaColor_getAlphaColor(frontColor, backgroundColor) {
+  var _TinyColor$toRgb = new TinyColor(frontColor).toRgb(),
+      fR = _TinyColor$toRgb.r,
+      fG = _TinyColor$toRgb.g,
+      fB = _TinyColor$toRgb.b,
+      originAlpha = _TinyColor$toRgb.a;
+
+  if (originAlpha < 1) {
+    return frontColor;
+  }
+
+  var _TinyColor$toRgb2 = new TinyColor(backgroundColor).toRgb(),
+      bR = _TinyColor$toRgb2.r,
+      bG = _TinyColor$toRgb2.g,
+      bB = _TinyColor$toRgb2.b;
+
+  for (var fA = 0.01; fA <= 1; fA += 0.01) {
+    var r = Math.round((fR - bR * (1 - fA)) / fA);
+    var g = Math.round((fG - bG * (1 - fA)) / fA);
+    var b = Math.round((fB - bB * (1 - fA)) / fA);
+    if (isStableColor(r) && isStableColor(g) && isStableColor(b)) return new TinyColor({
+      r: r,
+      g: g,
+      b: b,
+      a: Math.round(fA * 100) / 100
+    }).toRgbString();
+  } // fallback
+
+  /* istanbul ignore next */
+
+
+  return new TinyColor({
+    r: fR,
+    g: fG,
+    b: fB,
+    a: 1
+  }).toRgbString();
+}
+
+/* harmony default export */ var util_getAlphaColor = (getAlphaColor_getAlphaColor);
 ;// CONCATENATED MODULE: ./node_modules/antd/es/theme/util/alias.js
 
 
@@ -81443,6 +81546,8 @@ var alias_rest = undefined && undefined.__rest || function (s, e) {
 };
 
 
+
+
 /**
  * Seed (designer) > Derivative (designer) > Alias (developer).
  *
@@ -81450,11 +81555,16 @@ var alias_rest = undefined && undefined.__rest || function (s, e) {
  */
 
 function formatToken(derivativeToken) {
-  var derivative = derivativeToken.derivative,
-      alias = derivativeToken.alias,
-      restToken = alias_rest(derivativeToken, ["derivative", "alias"]);
+  var override = derivativeToken.override,
+      restToken = alias_rest(derivativeToken, ["override"]);
+
+  var overrideTokens = extends_extends({}, override);
+
+  Object.keys(seed).forEach(function (token) {
+    delete overrideTokens[token];
+  });
 
-  var mergedToken = extends_extends(extends_extends({}, restToken), derivative);
+  var mergedToken = extends_extends(extends_extends({}, restToken), overrideTokens);
 
   var fontSizes = mergedToken.fontSizes,
       lineHeights = mergedToken.lineHeights;
@@ -81477,6 +81587,7 @@ function formatToken(derivativeToken) {
     colorBgContainerDisabled: mergedToken.colorFillTertiary,
     // ============== Split ============== //
     colorBorderBg: mergedToken.colorBgContainer,
+    colorSplit: util_getAlphaColor(mergedToken.colorBorderSecondary, mergedToken.colorBgContainer),
     // ============== Text ============== //
     colorTextPlaceholder: mergedToken.colorTextQuaternary,
     colorTextDisabled: mergedToken.colorTextQuaternary,
@@ -81488,8 +81599,8 @@ function formatToken(derivativeToken) {
     colorBgTextActive: mergedToken.colorFill,
     colorIcon: mergedToken.colorTextTertiary,
     colorIconHover: mergedToken.colorText,
-    colorErrorOutline: mergedToken.colorErrorBg,
-    colorWarningOutline: mergedToken.colorWarningBg,
+    colorErrorOutline: util_getAlphaColor(mergedToken.colorErrorBg, mergedToken.colorBgContainer),
+    colorWarningOutline: util_getAlphaColor(mergedToken.colorWarningBg, mergedToken.colorBgContainer),
     // Font
     fontSizeSM: fontSizeSM,
     fontSize: fontSizes[1],
@@ -81517,9 +81628,9 @@ function formatToken(derivativeToken) {
     controlItemBgHover: mergedToken.colorFillTertiary,
     controlItemBgActive: mergedToken.colorPrimaryBg,
     controlItemBgActiveHover: mergedToken.colorPrimaryBgHover,
-    controlItemBgActiveDisabled: mergedToken.colorTextQuaternary,
+    controlItemBgActiveDisabled: mergedToken.colorFill,
     controlTmpOutline: mergedToken.colorFillQuaternary,
-    controlOutline: mergedToken.colorPrimaryBg,
+    controlOutline: util_getAlphaColor(mergedToken.colorPrimaryBg, mergedToken.colorBgContainer),
     controlLineType: mergedToken.lineType,
     controlRadius: mergedToken.radiusBase,
     controlRadiusXS: mergedToken.radiusXS,
@@ -81578,7 +81689,7 @@ function formatToken(derivativeToken) {
     boxShadowTabsOverflowRight: "inset -10px 0 8px -8px rgba(0, 0, 0, 0.08)",
     boxShadowTabsOverflowTop: "inset 0 10px 8px -8px rgba(0, 0, 0, 0.08)",
     boxShadowTabsOverflowBottom: "inset 0 -10px 8px -8px rgba(0, 0, 0, 0.08)"
-  }), alias);
+  }), overrideTokens);
 
   return aliasToken;
 }
@@ -81593,6 +81704,7 @@ function formatToken(derivativeToken) {
 
 
 
+
 var theme_defaultTheme = createTheme(derivative);
  // ================================ Context =================================
 // To ensure snapshot stable. We disable hashed in test env.
@@ -81609,16 +81721,18 @@ var saltPrefix =  true ? es_version : 0;
 function theme_useToken() {
   var _React$useContext = external_React_default().useContext(DesignTokenContext),
       rootDesignToken = _React$useContext.token,
-      override = _React$useContext.override,
       hashed = _React$useContext.hashed,
-      theme = _React$useContext.theme;
+      theme = _React$useContext.theme,
+      components = _React$useContext.components;
 
   var salt = "".concat(saltPrefix, "-").concat(hashed || '');
   var mergedTheme = theme || theme_defaultTheme;
 
   var _useCacheToken = useCacheToken(mergedTheme, [seed, rootDesignToken], {
     salt: salt,
-    override: override,
+    override: extends_extends({
+      override: rootDesignToken
+    }, components),
     formatToken: formatToken
   }),
       _useCacheToken2 = slicedToArray_slicedToArray(_useCacheToken, 2),
@@ -81662,7 +81776,7 @@ function genComponentStyleHook(component, styleFn, getDefaultToken) {
       return [{
         // Link
         '&': genLinkStyle(token)
-      }, genFontStyle(token, rootPrefixCls)];
+      }, genCommonStyle(token, rootPrefixCls)];
     });
     return [useStyleRegister({
       theme: theme,
@@ -81675,17 +81789,8 @@ function genComponentStyleHook(component, styleFn, getDefaultToken) {
           flush = _statisticToken.flush;
 
       var defaultComponentToken = typeof getDefaultToken === 'function' ? getDefaultToken(proxyToken) : getDefaultToken;
-      var overrideComponentToken = token[component]; // Only merge token specified in interface
-
-      var mergedComponentToken = extends_extends({}, defaultComponentToken);
 
-      if (overrideComponentToken) {
-        Object.keys(mergedComponentToken).forEach(function (key) {
-          var _a;
-
-          mergedComponentToken[key] = (_a = overrideComponentToken[key]) !== null && _a !== void 0 ? _a : mergedComponentToken[key];
-        });
-      }
+      var mergedComponentToken = extends_extends(extends_extends({}, defaultComponentToken), token[component]);
 
       var componentCls = ".".concat(prefixCls);
       var mergedToken = statistic_merge(proxyToken, {
@@ -81698,7 +81803,8 @@ function genComponentStyleHook(component, styleFn, getDefaultToken) {
         hashId: hashId,
         prefixCls: prefixCls,
         rootPrefixCls: rootPrefixCls,
-        iconPrefixCls: iconPrefixCls
+        iconPrefixCls: iconPrefixCls,
+        overrideComponentToken: token[component]
       });
       flush(component, mergedComponentToken);
       return styleInterpolation;
@@ -81835,6 +81941,7 @@ var genCheckboxStyle = function genCheckboxStyle(token) {
     height: '100%',
     borderRadius: token.controlRadiusSM,
     visibility: 'hidden',
+    border: "".concat(token.lineWidthBold, "px solid ").concat(token.colorPrimary),
     animationName: antCheckboxEffect,
     animationDuration: token.motionDurationSlow,
     animationTimingFunction: 'ease-in-out',
@@ -82237,14 +82344,6 @@ wrapperRaf.cancel = function (id) {
   cleanup(realId);
   return caf(realId);
 };
-;// CONCATENATED MODULE: ./node_modules/rc-util/es/Dom/contains.js
-function contains(root, n) {
-  if (!root) {
-    return false;
-  }
-
-  return root.contains(n);
-}
 ;// CONCATENATED MODULE: ./node_modules/rc-util/es/Portal.js
 
 
@@ -87824,10 +87923,10 @@ function useTheme(theme, parentTheme) {
     } // Override
 
 
-    var mergedOverride = extends_extends({}, parentThemeConfig.override);
+    var mergedOverride = extends_extends({}, parentThemeConfig.components);
 
-    Object.keys(theme.override || {}).forEach(function (componentName) {
-      mergedOverride[componentName] = extends_extends(extends_extends({}, mergedOverride[componentName]), theme.override[componentName]);
+    Object.keys(theme.components || {}).forEach(function (componentName) {
+      mergedOverride[componentName] = extends_extends(extends_extends({}, mergedOverride[componentName]), theme.components[componentName]);
     }); // Base token
 
     var merged = extends_extends(extends_extends(extends_extends({}, parentThemeConfig), themeConfig), {
@@ -88111,6 +88210,11 @@ function genPurePanel(Component, defaultPrefixCls, getDropdownCls) {
         popupHeight = _React$useState2[0],
         setPopupHeight = _React$useState2[1];
 
+    var _React$useState3 = external_React_.useState(0),
+        _React$useState4 = slicedToArray_slicedToArray(_React$useState3, 2),
+        popupWidth = _React$useState4[0],
+        setPopupWidth = _React$useState4[1];
+
     var _useMergedState = useMergedState_useMergedState(false, {
       value: props.open
     }),
@@ -88130,6 +88234,7 @@ function genPurePanel(Component, defaultPrefixCls, getDropdownCls) {
         var resizeObserver = new ResizeObserver(function (entries) {
           var element = entries[0].target;
           setPopupHeight(element.offsetHeight + 8);
+          setPopupWidth(element.offsetWidth);
         });
         var interval = setInterval(function () {
           var _a;
@@ -88150,12 +88255,10 @@ function genPurePanel(Component, defaultPrefixCls, getDropdownCls) {
     }, []);
     return /*#__PURE__*/external_React_.createElement(config_provider, {
       theme: {
-        override: {
-          derivative: {
-            motionDurationFast: '0.01s',
-            motionDurationMid: '0.01s',
-            motionDurationSlow: '0.01s'
-          }
+        token: {
+          motionDurationFast: '0.01s',
+          motionDurationMid: '0.01s',
+          motionDurationSlow: '0.01s'
         }
       }
     }, /*#__PURE__*/external_React_.createElement("div", {
@@ -88163,7 +88266,8 @@ function genPurePanel(Component, defaultPrefixCls, getDropdownCls) {
       style: {
         paddingBottom: popupHeight,
         position: 'relative',
-        width: 'fit-content'
+        width: 'fit-content',
+        minWidth: popupWidth
       }
     }, /*#__PURE__*/external_React_.createElement(Component, extends_extends({}, props, {
       style: extends_extends(extends_extends({}, style), {
@@ -88513,6 +88617,16 @@ function isHidden(element) {
   return !element || element.offsetParent === null || element.hidden;
 }
 
+function getValidateContainer(nodeRoot) {
+  if (nodeRoot instanceof Document) {
+    return nodeRoot.body;
+  }
+
+  return Array.from(nodeRoot.childNodes).find(function (ele) {
+    return (ele === null || ele === void 0 ? void 0 : ele.nodeType) === Node.ELEMENT_NODE;
+  });
+}
+
 function isNotGrey(color) {
   // eslint-disable-next-line no-useless-escape
   var match = (color || '').match(/rgba?\((\d*), (\d*), (\d*)(, [\d.]*)?\)/);
@@ -88587,7 +88701,7 @@ var InternalWave = /*#__PURE__*/function (_React$Component) {
       if (isValidWaveColor(waveColor)) {
         extraNode.style.borderColor = waveColor;
         var nodeRoot = ((_a = node.getRootNode) === null || _a === void 0 ? void 0 : _a.call(node)) || node.ownerDocument;
-        var nodeBody = nodeRoot instanceof Document ? nodeRoot.body : (_b = nodeRoot.firstChild) !== null && _b !== void 0 ? _b : nodeRoot;
+        var nodeBody = (_b = getValidateContainer(nodeRoot)) !== null && _b !== void 0 ? _b : nodeRoot;
         styleForPseudo = updateCSS("\n      [".concat(getPrefixCls(''), "-click-animating-without-extra-node='true']::after, .").concat(getPrefixCls(''), "-click-animating-node {\n        --antd-wave-shadow-color: ").concat(waveColor, ";\n      }"), 'antd-wave', {
           csp: _this.csp,
           attachTo: nodeBody
@@ -89007,21 +89121,23 @@ var genRoundButtonStyle = function genRoundButtonStyle(token) {
 }; // =============================== Type ===============================
 
 
-var genGhostButtonStyle = function genGhostButtonStyle(btnCls, textColor, borderColor, textColorDisabled, borderColorDisabled) {
-  return defineProperty_defineProperty({}, "&".concat(btnCls, "-background-ghost"), {
+var genGhostButtonStyle = function genGhostButtonStyle(btnCls, textColor, borderColor, textColorDisabled, borderColorDisabled, hoverStyle, activeStyle) {
+  return defineProperty_defineProperty({}, "&".concat(btnCls, "-background-ghost"), extends_extends(extends_extends({
     color: textColor || undefined,
     backgroundColor: 'transparent',
     borderColor: borderColor || undefined,
-    boxShadow: 'none',
-    '&:hover': {
-      backgroundColor: 'transparent'
-    },
+    boxShadow: 'none'
+  }, genHoverActiveButtonStyle(extends_extends({
+    backgroundColor: 'transparent'
+  }, hoverStyle), extends_extends({
+    backgroundColor: 'transparent'
+  }, activeStyle))), {
     '&:disabled': {
       cursor: 'not-allowed',
       color: textColorDisabled || undefined,
       borderColor: borderColorDisabled || undefined
     }
-  });
+  }));
 };
 
 var genSolidDisabledButtonStyle = function genSolidDisabledButtonStyle(token) {
@@ -89066,7 +89182,7 @@ var genDefaultButtonStyle = function genDefaultButtonStyle(token) {
     borderColor: token.colorError
   }, genHoverActiveButtonStyle({
     color: token.colorErrorHover,
-    borderColor: token.colorErrorHover
+    borderColor: token.colorErrorBorder
   }, {
     color: token.colorErrorActive,
     borderColor: token.colorErrorActive
@@ -89085,14 +89201,26 @@ var genPrimaryButtonStyle = function genPrimaryButtonStyle(token) {
   }, {
     color: token.colorTextLightSolid,
     backgroundColor: token.colorPrimaryActive
-  })), genGhostButtonStyle(token.componentCls, token.colorPrimary, token.colorPrimary, token.colorTextDisabled, token.colorBorder)), defineProperty_defineProperty({}, "&".concat(token.componentCls, "-dangerous"), extends_extends(extends_extends(extends_extends({
+  })), genGhostButtonStyle(token.componentCls, token.colorPrimary, token.colorPrimary, token.colorTextDisabled, token.colorBorder, {
+    color: token.colorPrimaryHover,
+    borderColor: token.colorPrimaryHover
+  }, {
+    color: token.colorPrimaryActive,
+    borderColor: token.colorPrimaryActive
+  })), defineProperty_defineProperty({}, "&".concat(token.componentCls, "-dangerous"), extends_extends(extends_extends(extends_extends({
     backgroundColor: token.colorError,
     boxShadow: "0 ".concat(token.controlOutlineWidth, "px 0 ").concat(token.colorErrorOutline)
   }, genHoverActiveButtonStyle({
     backgroundColor: token.colorErrorHover
   }, {
     backgroundColor: token.colorErrorActive
-  })), genGhostButtonStyle(token.componentCls, token.colorError, token.colorError, token.colorTextDisabled, token.colorBorder)), genSolidDisabledButtonStyle(token))));
+  })), genGhostButtonStyle(token.componentCls, token.colorError, token.colorError, token.colorTextDisabled, token.colorBorder, {
+    color: token.colorErrorHover,
+    borderColor: token.colorErrorHover
+  }, {
+    color: token.colorErrorActive,
+    borderColor: token.colorErrorActive
+  })), genSolidDisabledButtonStyle(token))));
 }; // Type: Dashed
 
 
@@ -89130,9 +89258,11 @@ var genTextButtonStyle = function genTextButtonStyle(token) {
   })), genPureDisabledButtonStyle(token)), defineProperty_defineProperty({}, "&".concat(token.componentCls, "-dangerous"), extends_extends(extends_extends({
     color: token.colorError
   }, genPureDisabledButtonStyle(token)), genHoverActiveButtonStyle({
-    color: token.colorError
+    color: token.colorErrorHover,
+    backgroundColor: token.colorErrorBg
   }, {
-    color: token.colorError
+    color: token.colorErrorHover,
+    backgroundColor: token.colorErrorBg
   }))));
 };
 
@@ -89866,96 +89996,96 @@ var initSlideMotion = function initSlideMotion(token, motionName) {
 
 var moveDownIn = new Keyframes('antMoveDownIn', {
   '0%': {
-    transform: 'translateY(100%)',
+    transform: 'translate3d(0, 100%, 0)',
     transformOrigin: '0 0',
     opacity: 0
   },
   '100%': {
-    transform: 'translateY(0%)',
+    transform: 'translate3d(0, 0, 0)',
     transformOrigin: '0 0',
     opacity: 1
   }
 });
 var moveDownOut = new Keyframes('antMoveDownOut', {
   '0%': {
-    transform: 'translateY(0%)',
+    transform: 'translate3d(0, 0, 0)',
     transformOrigin: '0 0',
     opacity: 1
   },
   '100%': {
-    transform: 'translateY(100%)',
+    transform: 'translate3d(0, 100%, 0)',
     transformOrigin: '0 0',
     opacity: 0
   }
 });
 var moveLeftIn = new Keyframes('antMoveLeftIn', {
   '0%': {
-    transform: 'translateX(-100%)',
+    transform: 'translate3d(-100%, 0, 0)',
     transformOrigin: '0 0',
     opacity: 0
   },
   '100%': {
-    transform: 'translateX(0%)',
+    transform: 'translate3d(0, 0, 0)',
     transformOrigin: '0 0',
     opacity: 1
   }
 });
 var moveLeftOut = new Keyframes('antMoveLeftOut', {
   '0%': {
-    transform: 'translateX(0%)',
+    transform: 'translate3d(0, 0, 0)',
     transformOrigin: '0 0',
     opacity: 1
   },
   '100%': {
-    transform: 'translateX(-100%)',
+    transform: 'translate3d(-100%, 0, 0)',
     transformOrigin: '0 0',
     opacity: 0
   }
 });
 var moveRightIn = new Keyframes('antMoveRightIn', {
   '0%': {
-    transform: 'translateX(100%)',
+    transform: 'translate3d(100%, 0, 0)',
     transformOrigin: '0 0',
     opacity: 0
   },
   '100%': {
-    transform: 'translateX(0%)',
+    transform: 'translate3d(0, 0, 0)',
     transformOrigin: '0 0',
     opacity: 1
   }
 });
 var moveRightOut = new Keyframes('antMoveRightOut', {
   '0%': {
-    transform: 'translateX(0%)',
+    transform: 'translate3d(0, 0, 0)',
     transformOrigin: '0 0',
     opacity: 1
   },
   '100%': {
-    transform: 'translateX(100%)',
+    transform: 'translate3d(100%, 0, 0)',
     transformOrigin: '0 0',
     opacity: 0
   }
 });
 var moveUpIn = new Keyframes('antMoveUpIn', {
   '0%': {
-    transform: 'translateY(-100%)',
+    transform: 'translate3d(0, -100%, 0)',
     transformOrigin: '0 0',
     opacity: 0
   },
   '100%': {
-    transform: 'translateY(0%)',
+    transform: 'translate3d(0, 0, 0)',
     transformOrigin: '0 0',
     opacity: 1
   }
 });
 var moveUpOut = new Keyframes('antMoveUpOut', {
   '0%': {
-    transform: 'translateY(0%)',
+    transform: 'translate3d(0, 0, 0)',
     transformOrigin: '0 0',
     opacity: 1
   },
   '100%': {
-    transform: 'translateY(-100%)',
+    transform: 'translate3d(0, -100%, 0)',
     transformOrigin: '0 0',
     opacity: 0
   }
@@ -93481,8 +93611,8 @@ var accessibilityFocus = function accessibilityFocus(token) {
   return extends_extends({}, genFocusOutline(token));
 };
 
-var getThemeStyle = function getThemeStyle(token) {
-  var _$concat3, _$concat4, _$concat$concat3, _$concat8, _componentCls;
+var getThemeStyle = function getThemeStyle(token, themeSuffix) {
+  var _$concat3, _$concat4, _$concat$concat3, _$concat8, _$concat$concat4;
 
   var componentCls = token.componentCls,
       colorItemText = token.colorItemText,
@@ -93510,44 +93640,44 @@ var getThemeStyle = function getThemeStyle(token) {
       colorDangerItemTextSelected = token.colorDangerItemTextSelected,
       colorDangerItemBgActive = token.colorDangerItemBgActive,
       colorDangerItemBgSelected = token.colorDangerItemBgSelected;
-  return defineProperty_defineProperty({}, componentCls, (_componentCls = {
+  return defineProperty_defineProperty({}, "".concat(componentCls, "-").concat(themeSuffix), (_$concat$concat4 = {
     color: colorItemText,
     background: colorItemBg
-  }, defineProperty_defineProperty(_componentCls, "&".concat(componentCls, "-root:focus-visible"), extends_extends({}, accessibilityFocus(token))), defineProperty_defineProperty(_componentCls, "".concat(componentCls, "-item-group-title"), {
+  }, defineProperty_defineProperty(_$concat$concat4, "&".concat(componentCls, "-root:focus-visible"), extends_extends({}, accessibilityFocus(token))), defineProperty_defineProperty(_$concat$concat4, "".concat(componentCls, "-item-group-title"), {
     color: colorGroupTitle
-  }), defineProperty_defineProperty(_componentCls, "".concat(componentCls, "-submenu-selected"), defineProperty_defineProperty({}, "> ".concat(componentCls, "-submenu-title"), {
+  }), defineProperty_defineProperty(_$concat$concat4, "".concat(componentCls, "-submenu-selected"), defineProperty_defineProperty({}, "> ".concat(componentCls, "-submenu-title"), {
     color: colorItemTextSelected
-  })), defineProperty_defineProperty(_componentCls, "".concat(componentCls, "-item-disabled, ").concat(componentCls, "-submenu-disabled"), {
+  })), defineProperty_defineProperty(_$concat$concat4, "".concat(componentCls, "-item-disabled, ").concat(componentCls, "-submenu-disabled"), {
     color: "".concat(colorItemTextDisabled, " !important")
-  }), defineProperty_defineProperty(_componentCls, "".concat(componentCls, "-item:hover, ").concat(componentCls, "-submenu-title:hover"), defineProperty_defineProperty({}, "&:not(".concat(componentCls, "-item-selected):not(").concat(componentCls, "-submenu-selected)"), {
+  }), defineProperty_defineProperty(_$concat$concat4, "".concat(componentCls, "-item:hover, ").concat(componentCls, "-submenu-title:hover"), defineProperty_defineProperty({}, "&:not(".concat(componentCls, "-item-selected):not(").concat(componentCls, "-submenu-selected)"), {
     color: colorItemTextHover
-  })), defineProperty_defineProperty(_componentCls, "".concat(componentCls, "-item:active, ").concat(componentCls, "-submenu-title:active"), {
+  })), defineProperty_defineProperty(_$concat$concat4, "".concat(componentCls, "-item:active, ").concat(componentCls, "-submenu-title:active"), {
     background: colorItemBgActive
-  }), defineProperty_defineProperty(_componentCls, "".concat(componentCls, "-item-danger"), (_$concat3 = {
+  }), defineProperty_defineProperty(_$concat$concat4, "".concat(componentCls, "-item-danger"), (_$concat3 = {
     color: colorDangerItemText
   }, defineProperty_defineProperty(_$concat3, "&".concat(componentCls, "-item:hover"), defineProperty_defineProperty({}, "&:not(".concat(componentCls, "-item-selected):not(").concat(componentCls, "-submenu-selected)"), {
     color: colorDangerItemTextHover
   })), defineProperty_defineProperty(_$concat3, "&".concat(componentCls, "-item:active"), {
     background: colorDangerItemBgActive
-  }), _$concat3)), defineProperty_defineProperty(_componentCls, "".concat(componentCls, "-item a"), {
+  }), _$concat3)), defineProperty_defineProperty(_$concat$concat4, "".concat(componentCls, "-item a"), {
     '&, &:hover': {
       color: 'inherit'
     }
-  }), defineProperty_defineProperty(_componentCls, "".concat(componentCls, "-item-selected"), (_$concat4 = {
+  }), defineProperty_defineProperty(_$concat$concat4, "".concat(componentCls, "-item-selected"), (_$concat4 = {
     color: colorItemTextSelected
   }, defineProperty_defineProperty(_$concat4, "&".concat(componentCls, "-item-danger"), {
     color: colorDangerItemTextSelected
   }), defineProperty_defineProperty(_$concat4, "a, a:hover", {
     color: 'inherit'
-  }), _$concat4)), defineProperty_defineProperty(_componentCls, "&:not(".concat(componentCls, "-horizontal) ").concat(componentCls, "-item-selected"), defineProperty_defineProperty({
+  }), _$concat4)), defineProperty_defineProperty(_$concat$concat4, "&:not(".concat(componentCls, "-horizontal) ").concat(componentCls, "-item-selected"), defineProperty_defineProperty({
     backgroundColor: colorItemBgSelected
   }, "&".concat(componentCls, "-item-danger"), {
     backgroundColor: colorDangerItemBgSelected
-  })), defineProperty_defineProperty(_componentCls, "".concat(componentCls, "-item, ").concat(componentCls, "-submenu-title"), defineProperty_defineProperty({}, "&:not(".concat(componentCls, "-item-disabled):focus-visible"), extends_extends({}, accessibilityFocus(token)))), defineProperty_defineProperty(_componentCls, "&".concat(componentCls, "-submenu > ").concat(componentCls), {
+  })), defineProperty_defineProperty(_$concat$concat4, "".concat(componentCls, "-item, ").concat(componentCls, "-submenu-title"), defineProperty_defineProperty({}, "&:not(".concat(componentCls, "-item-disabled):focus-visible"), extends_extends({}, accessibilityFocus(token)))), defineProperty_defineProperty(_$concat$concat4, "&".concat(componentCls, "-submenu > ").concat(componentCls), {
     backgroundColor: colorItemBg
-  }), defineProperty_defineProperty(_componentCls, "&".concat(componentCls, "-popup > ").concat(componentCls), {
+  }), defineProperty_defineProperty(_$concat$concat4, "&".concat(componentCls, "-popup > ").concat(componentCls), {
     backgroundColor: colorItemBg
-  }), defineProperty_defineProperty(_componentCls, "&".concat(componentCls, "-horizontal"), defineProperty_defineProperty({}, "> ".concat(componentCls, "-item, > ").concat(componentCls, "-submenu"), (_$concat$concat3 = {
+  }), defineProperty_defineProperty(_$concat$concat4, "&".concat(componentCls, "-horizontal"), defineProperty_defineProperty({}, "> ".concat(componentCls, "-item, > ").concat(componentCls, "-submenu"), (_$concat$concat3 = {
     top: colorActiveBarBorderSize,
     marginTop: -colorActiveBarBorderSize,
     marginBottom: 0,
@@ -93573,9 +93703,9 @@ var getThemeStyle = function getThemeStyle(token) {
       borderWidth: "".concat(colorActiveBarHeight, "px"),
       borderBottomColor: colorItemTextSelected
     }
-  }), _$concat$concat3))), defineProperty_defineProperty(_componentCls, "&".concat(componentCls, "-root"), defineProperty_defineProperty({}, "&".concat(componentCls, "-inline, &").concat(componentCls, "-vertical"), {
+  }), _$concat$concat3))), defineProperty_defineProperty(_$concat$concat4, "&".concat(componentCls, "-root"), defineProperty_defineProperty({}, "&".concat(componentCls, "-inline, &").concat(componentCls, "-vertical"), {
     borderInlineEnd: "".concat(colorActiveBarBorderSize, "px ").concat(lineType, " ").concat(colorSplit)
-  })), defineProperty_defineProperty(_componentCls, "&".concat(componentCls, "-inline"), (_$concat8 = {}, defineProperty_defineProperty(_$concat8, "".concat(componentCls, "-sub").concat(componentCls, "-inline"), {
+  })), defineProperty_defineProperty(_$concat$concat4, "&".concat(componentCls, "-inline"), (_$concat8 = {}, defineProperty_defineProperty(_$concat8, "".concat(componentCls, "-sub").concat(componentCls, "-inline"), {
     background: colorSubItemBg
   }), defineProperty_defineProperty(_$concat8, "".concat(componentCls, "-item, ").concat(componentCls, "-submenu-title"), colorActiveBarBorderSize ? {
     width: "calc(100% + ".concat(colorActiveBarBorderSize, "px)")
@@ -93601,7 +93731,7 @@ var getThemeStyle = function getThemeStyle(token) {
       opacity: 1,
       transition: ["transform ".concat(motionDurationFast, " ").concat(motionEaseInOut), "opacity ".concat(motionDurationFast, " ").concat(motionEaseInOut)].join(',')
     }
-  }), _$concat8)), _componentCls));
+  }), _$concat8)), _$concat$concat4));
 };
 
 /* harmony default export */ var theme = (getThemeStyle);
@@ -93743,6 +93873,7 @@ var getVerticalStyle = function getVerticalStyle(token) {
 
 
 
+
  // =============================== Base ===============================
 
 var getBaseStyle = function getBaseStyle(token) {
@@ -93942,12 +94073,18 @@ var getBaseStyle = function getBaseStyle(token) {
 
 
 /* harmony default export */ var menu_style = (function (prefixCls, injectStyle) {
-  var useOriginHook = genComponentStyleHook('Menu', function (token) {
-    // Dropdown will handle menu style self. We do not need to handle this.
+  var useOriginHook = genComponentStyleHook('Menu', function (token, _ref5) {
+    var overrideComponentToken = _ref5.overrideComponentToken; // Dropdown will handle menu style self. We do not need to handle this.
+
     if (injectStyle === false) {
       return [];
     }
 
+    var colorPrimary = token.colorPrimary,
+        colorError = token.colorError,
+        colorErrorHover = token.colorErrorHover,
+        colorTextLightSolid = token.colorTextLightSolid,
+        colorTextSecondary = token.colorTextSecondary;
     var controlHeightLG = token.controlHeightLG,
         fontSize = token.fontSize;
     var menuArrowSize = fontSize / 7 * 5; // Menu Token
@@ -93962,11 +94099,32 @@ var getBaseStyle = function getBaseStyle(token) {
       menuPanelMaskInset: -7 // Still a hardcode here since it's offset by rc-align
 
     });
+    var menuDarkToken = statistic_merge(menuToken, {
+      colorItemText: new TinyColor(colorTextLightSolid).setAlpha(0.65).toRgbString(),
+      colorItemTextHover: colorTextLightSolid,
+      colorGroupTitle: colorTextSecondary,
+      colorItemTextSelected: colorTextLightSolid,
+      colorItemBg: '#001529',
+      colorSubItemBg: '#000c17',
+      colorItemBgActive: 'transparent',
+      colorItemBgSelected: colorPrimary,
+      colorActiveBarWidth: 0,
+      colorActiveBarHeight: 0,
+      colorActiveBarBorderSize: 0,
+      // Disabled
+      colorItemTextDisabled: new TinyColor(colorTextLightSolid).setAlpha(0.25).toRgbString(),
+      // Danger
+      colorDangerItemText: colorError,
+      colorDangerItemTextHover: colorErrorHover,
+      colorDangerItemTextSelected: colorTextLightSolid,
+      colorDangerItemBgActive: colorError,
+      colorDangerItemBgSelected: colorError
+    }, extends_extends({}, overrideComponentToken));
     return [// Basic
     getBaseStyle(menuToken), // Horizontal
     horizontal(menuToken), // Vertical
     vertical(menuToken), // Theme
-    theme(menuToken), // RTL
+    theme(menuToken, 'light'), theme(menuDarkToken, 'dark'), // RTL
     rtl(menuToken), // Motion
     collapse(menuToken), initSlideMotion(menuToken, 'slide-up'), initSlideMotion(menuToken, 'slide-down'), initZoomMotion(menuToken, 'zoom-big')];
   }, function (token) {
@@ -94397,11 +94555,6 @@ var Tooltip = function Tooltip(props, ref) {
 
 
 /* harmony default export */ var rc_tooltip_es = (es_Tooltip);
-;// CONCATENATED MODULE: ./node_modules/antd/es/_util/colors.js
-
-var PresetStatusColorTypes = tuple('success', 'processing', 'error', 'default', 'warning'); // eslint-disable-next-line import/prefer-default-export
-
-var PresetColorTypes = tuple('pink', 'red', 'yellow', 'orange', 'cyan', 'green', 'blue', 'purple', 'geekblue', 'magenta', 'volcano', 'gold', 'lime');
 ;// CONCATENATED MODULE: ./node_modules/antd/es/theme/interface.js
 var PresetColors = ['blue', 'purple', 'cyan', 'green', 'magenta', 'pink', 'red', 'orange', 'yellow', 'volcano', 'geekblue', 'lime', 'gold'];
 ;// CONCATENATED MODULE: ./node_modules/antd/es/tooltip/style/index.js
@@ -94522,6 +94675,39 @@ var genTooltipStyle = function genTooltipStyle(token) {
   });
   return useOriginHook(prefixCls);
 });
+;// CONCATENATED MODULE: ./node_modules/antd/es/_util/colors.js
+
+var PresetStatusColorTypes = tuple('success', 'processing', 'error', 'default', 'warning'); // eslint-disable-next-line import/prefer-default-export
+
+var PresetColorTypes = tuple('pink', 'red', 'yellow', 'orange', 'cyan', 'green', 'blue', 'purple', 'geekblue', 'magenta', 'volcano', 'gold', 'lime');
+;// CONCATENATED MODULE: ./node_modules/antd/es/tooltip/util.js
+
+/* eslint-disable import/prefer-default-export */
+
+
+
+var PresetColorRegex = new RegExp("^(".concat(PresetColorTypes.join('|'), ")(-inverse)?$"));
+function parseColor(prefixCls, color) {
+  var className = classnames_default()(defineProperty_defineProperty({}, "".concat(prefixCls, "-").concat(color), color && PresetColorRegex.test(color)));
+  var overlayStyle;
+  var arrowStyle;
+
+  if (color && !PresetColorRegex.test(color)) {
+    overlayStyle = {
+      background: color
+    }; // @ts-ignore
+
+    arrowStyle = {
+      '--antd-arrow-background-color': color
+    };
+  }
+
+  return {
+    className: className,
+    overlayStyle: overlayStyle,
+    arrowStyle: arrowStyle
+  };
+}
 ;// CONCATENATED MODULE: ./node_modules/antd/es/tooltip/PurePanel.js
 
 
@@ -94529,6 +94715,7 @@ var genTooltipStyle = function genTooltipStyle(token) {
 
 
 
+
  // ant-tooltip css-dev-only-do-not-override-w2s56n ant-tooltip-placement-top  ant-tooltip-hidden
 
 function PurePanel_PurePanel(props) {
@@ -94536,7 +94723,9 @@ function PurePanel_PurePanel(props) {
       className = props.className,
       _props$placement = props.placement,
       placement = _props$placement === void 0 ? 'top' : _props$placement,
-      title = props.title;
+      title = props.title,
+      color = props.color,
+      overlayInnerStyle = props.overlayInnerStyle;
 
   var _React$useContext = external_React_.useContext(context_ConfigContext),
       getPrefixCls = _React$useContext.getPrefixCls;
@@ -94546,13 +94735,21 @@ function PurePanel_PurePanel(props) {
   var _useStyle = tooltip_style(prefixCls, true),
       _useStyle2 = slicedToArray_slicedToArray(_useStyle, 2),
       wrapSSR = _useStyle2[0],
-      hashId = _useStyle2[1];
+      hashId = _useStyle2[1]; // Color
+
+
+  var colorInfo = parseColor(prefixCls, color);
 
+  var formattedOverlayInnerStyle = extends_extends(extends_extends({}, overlayInnerStyle), colorInfo.overlayStyle);
+
+  var arrowContentStyle = colorInfo.arrowStyle;
   return wrapSSR( /*#__PURE__*/external_React_.createElement("div", {
-    className: classnames_default()(hashId, prefixCls, "".concat(prefixCls, "-pure"), "".concat(prefixCls, "-placement-").concat(placement), className)
+    className: classnames_default()(hashId, prefixCls, "".concat(prefixCls, "-pure"), "".concat(prefixCls, "-placement-").concat(placement), className, colorInfo.className),
+    style: arrowContentStyle
   }, /*#__PURE__*/external_React_.createElement(Popup_Popup, extends_extends({}, props, {
     className: hashId,
-    prefixCls: prefixCls
+    prefixCls: prefixCls,
+    overlayInnerStyle: formattedOverlayInnerStyle
   }), title)));
 }
 ;// CONCATENATED MODULE: ./node_modules/antd/es/tooltip/index.js
@@ -94601,12 +94798,11 @@ var splitObject = function splitObject(obj, keys) {
     picked: picked,
     omitted: omitted
   };
-};
-
-var PresetColorRegex = new RegExp("^(".concat(PresetColorTypes.join('|'), ")(-inverse)?$")); // Fix Tooltip won't hide at disabled button
+}; // Fix Tooltip won't hide at disabled button
 // mouse events don't trigger at disabled button in Chrome
 // https://github.com/react-component/tooltip/issues/18
 
+
 function getDisabledCompatibleChildren(element, prefixCls) {
   var elementType = element.type;
 
@@ -94642,8 +94838,6 @@ function getDisabledCompatibleChildren(element, prefixCls) {
 }
 
 var tooltip_Tooltip = /*#__PURE__*/external_React_.forwardRef(function (props, ref) {
-  var _classNames2;
-
   var _a, _b;
 
   var customizePrefixCls = props.prefixCls,
@@ -94758,27 +94952,20 @@ var tooltip_Tooltip = /*#__PURE__*/external_React_.forwardRef(function (props, r
 
   var child = getDisabledCompatibleChildren(isValidElement(children) && !isFragment(children) ? children : /*#__PURE__*/external_React_.createElement("span", null, children), prefixCls);
   var childProps = child.props;
-  var childCls = classnames_default()(childProps.className, defineProperty_defineProperty({}, openClassName || "".concat(prefixCls, "-open"), true)); // Style
+  var childCls = !childProps.className || typeof childProps.className === 'string' ? classnames_default()(childProps.className, defineProperty_defineProperty({}, openClassName || "".concat(prefixCls, "-open"), true)) : childProps.className; // Style
 
   var _useStyle = tooltip_style(prefixCls, !injectFromPopover),
       _useStyle2 = slicedToArray_slicedToArray(_useStyle, 2),
       wrapSSR = _useStyle2[0],
-      hashId = _useStyle2[1];
+      hashId = _useStyle2[1]; // Color
 
-  var customOverlayClassName = classnames_default()(overlayClassName, (_classNames2 = {}, defineProperty_defineProperty(_classNames2, "".concat(prefixCls, "-rtl"), direction === 'rtl'), defineProperty_defineProperty(_classNames2, "".concat(prefixCls, "-").concat(color), color && PresetColorRegex.test(color)), _classNames2), hashId);
-  var formattedOverlayInnerStyle = overlayInnerStyle;
-  var arrowContentStyle;
 
-  if (color && !PresetColorRegex.test(color)) {
-    formattedOverlayInnerStyle = extends_extends(extends_extends({}, overlayInnerStyle), {
-      background: color
-    }); // @ts-ignore
+  var colorInfo = parseColor(prefixCls, color);
 
-    arrowContentStyle = {
-      '--antd-arrow-background-color': color
-    };
-  }
+  var formattedOverlayInnerStyle = extends_extends(extends_extends({}, overlayInnerStyle), colorInfo.overlayStyle);
 
+  var arrowContentStyle = colorInfo.arrowStyle;
+  var customOverlayClassName = classnames_default()(overlayClassName, defineProperty_defineProperty({}, "".concat(prefixCls, "-rtl"), direction === 'rtl'), colorInfo.className, hashId);
   return wrapSSR( /*#__PURE__*/external_React_.createElement(rc_tooltip_es, extends_extends({}, otherProps, {
     prefixCls: prefixCls,
     overlayClassName: customOverlayClassName,
@@ -94978,10 +95165,12 @@ function SubMenu_SubMenu(props) {
 
   var popupClassName = props.popupClassName,
       icon = props.icon,
-      title = props.title;
+      title = props.title,
+      customTheme = props.theme;
   var context = external_React_.useContext(menu_MenuContext);
   var prefixCls = context.prefixCls,
-      inlineCollapsed = context.inlineCollapsed;
+      inlineCollapsed = context.inlineCollapsed,
+      contextTheme = context.theme;
   var parentPath = useFullPath();
   var titleNode;
 
@@ -95011,7 +95200,7 @@ function SubMenu_SubMenu(props) {
     value: contextValue
   }, /*#__PURE__*/external_React_.createElement(SubMenu, extends_extends({}, omit_omit(props, ['icon']), {
     title: titleNode,
-    popupClassName: classnames_default()(prefixCls, popupClassName)
+    popupClassName: classnames_default()(prefixCls, popupClassName, "".concat(prefixCls, "-").concat(customTheme || contextTheme))
   })));
 }
 
@@ -95148,6 +95337,9 @@ var InternalMenu = /*#__PURE__*/(0,external_React_.forwardRef)(function (props,
   var rootPrefixCls = getPrefixCls();
 
   var customizePrefixCls = props.prefixCls,
+      className = props.className,
+      _props$theme = props.theme,
+      theme = _props$theme === void 0 ? 'light' : _props$theme,
       expandIcon = props.expandIcon,
       _internalDisableMenuItemTitleTooltip = props._internalDisableMenuItemTitleTooltip,
       inlineCollapsed = props.inlineCollapsed,
@@ -95158,7 +95350,7 @@ var InternalMenu = /*#__PURE__*/(0,external_React_.forwardRef)(function (props,
       mode = props.mode,
       selectable = props.selectable,
       onClick = props.onClick,
-      restProps = menu_rest(props, ["prefixCls", "expandIcon", "_internalDisableMenuItemTitleTooltip", "inlineCollapsed", "siderCollapsed", "items", "children", "rootClassName", "mode", "selectable", "onClick"]);
+      restProps = menu_rest(props, ["prefixCls", "className", "theme", "expandIcon", "_internalDisableMenuItemTitleTooltip", "inlineCollapsed", "siderCollapsed", "items", "children", "rootClassName", "mode", "selectable", "onClick"]);
 
   var passedProps = omit_omit(restProps, ['collapsedWidth']); // ========================= Items ===========================
 
@@ -95205,8 +95397,9 @@ var InternalMenu = /*#__PURE__*/(0,external_React_.forwardRef)(function (props,
   var _useStyle = menu_style(prefixCls, !override),
       _useStyle2 = slicedToArray_slicedToArray(_useStyle, 2),
       wrapSSR = _useStyle2[0],
-      hashId = _useStyle2[1]; // ====================== Expand Icon ========================
+      hashId = _useStyle2[1];
 
+  var menuClassName = classnames_default()("".concat(prefixCls, "-").concat(theme), className); // ====================== Expand Icon ========================
 
   var mergedExpandIcon;
 
@@ -95225,9 +95418,10 @@ var InternalMenu = /*#__PURE__*/(0,external_React_.forwardRef)(function (props,
       inlineCollapsed: mergedInlineCollapsed || false,
       direction: direction,
       firstLevel: true,
+      theme: theme,
       disableMenuItemTitleTooltip: _internalDisableMenuItemTitleTooltip
     };
-  }, [prefixCls, mergedInlineCollapsed, direction, _internalDisableMenuItemTitleTooltip]); // ========================= Render ==========================
+  }, [prefixCls, mergedInlineCollapsed, direction, _internalDisableMenuItemTitleTooltip, theme]); // ========================= Render ==========================
 
   return wrapSSR( /*#__PURE__*/external_React_.createElement(menu_OverrideContext.Provider, {
     value: null
@@ -95236,11 +95430,13 @@ var InternalMenu = /*#__PURE__*/(0,external_React_.forwardRef)(function (props,
   }, /*#__PURE__*/external_React_.createElement(rc_menu_es, extends_extends({
     getPopupContainer: getPopupContainer,
     overflowedIndicator: /*#__PURE__*/external_React_.createElement(icons_EllipsisOutlined, null),
+    overflowedIndicatorPopupClassName: "".concat(prefixCls, "-").concat(theme),
     mode: mergedMode,
     selectable: mergedSelectable,
     onClick: onItemClick
   }, passedProps, {
     inlineCollapsed: mergedInlineCollapsed,
+    className: menuClassName,
     prefixCls: prefixCls,
     direction: direction,
     defaultMotions: defaultMotions,
@@ -95254,41 +95450,15 @@ var InternalMenu = /*#__PURE__*/(0,external_React_.forwardRef)(function (props,
 
 
 
-var es_menu_rest = undefined && undefined.__rest || function (s, e) {
-  var t = {};
-
-  for (var p in s) {
-    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-  }
-
-  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
-  }
-  return t;
-};
-
-
-
-
-
-
-
 
 
 
 
 
-var ThemedMenu = /*#__PURE__*/(0,external_React_.forwardRef)(function (_a, ref) {
-  var _a$theme = _a.theme,
-      theme = _a$theme === void 0 ? 'light' : _a$theme,
-      rest = es_menu_rest(_a, ["theme"]);
 
+var menu_Menu = /*#__PURE__*/(0,external_React_.forwardRef)(function (props, ref) {
   var menuRef = (0,external_React_.useRef)(null);
-
-  var _useToken = theme_useToken(),
-      _useToken2 = slicedToArray_slicedToArray(_useToken, 2),
-      token = _useToken2[1];
-
+  var context = external_React_.useContext(SiderContext);
   (0,external_React_.useImperativeHandle)(ref, function () {
     return {
       focus: function focus(options) {
@@ -95299,51 +95469,10 @@ var ThemedMenu = /*#__PURE__*/(0,external_React_.forwardRef)(function (_a, ref)
       menu: menuRef.current
     };
   });
-  var colorTextLightSolid = token.colorTextLightSolid,
-      colorTextDescription = token.colorTextDescription,
-      colorPrimary = token.colorPrimary,
-      colorError = token.colorError,
-      colorErrorHover = token.colorErrorHover;
-  var darkThemeToken = (0,external_React_.useMemo)(function () {
-    if (theme === 'dark') {
-      return {
-        colorItemText: new TinyColor(colorTextLightSolid).setAlpha(0.65).toRgbString(),
-        colorItemTextHover: colorTextLightSolid,
-        colorGroupTitle: colorTextDescription,
-        colorItemTextSelected: colorTextLightSolid,
-        colorItemBg: '#001529',
-        colorSubItemBg: '#000c17',
-        colorItemBgActive: 'transparent',
-        colorItemBgSelected: colorPrimary,
-        colorActiveBarWidth: 0,
-        colorActiveBarHeight: 0,
-        colorActiveBarBorderSize: 0,
-        // Disabled
-        colorItemTextDisabled: new TinyColor(colorTextLightSolid).setAlpha(0.25).toRgbString(),
-        // Danger
-        colorDangerItemText: colorError,
-        colorDangerItemTextHover: colorErrorHover,
-        colorDangerItemTextSelected: colorTextLightSolid,
-        colorDangerItemBgActive: colorError,
-        colorDangerItemBgSelected: colorError
-      };
-    }
-
-    return {};
-  }, [theme]);
-  return /*#__PURE__*/external_React_.createElement(config_provider, {
-    theme: {
-      override: {
-        Menu: darkThemeToken
-      }
-    }
-  }, /*#__PURE__*/external_React_.createElement(SiderContext.Consumer, null, function (context) {
-    return /*#__PURE__*/external_React_.createElement(menu, extends_extends({
-      ref: menuRef
-    }, rest, context));
-  }));
+  return /*#__PURE__*/external_React_.createElement(menu, extends_extends({
+    ref: menuRef
+  }, props, context));
 });
-var menu_Menu = ThemedMenu;
 menu_Menu.Divider = menu_MenuDivider;
 menu_Menu.Item = MenuItem_MenuItem;
 menu_Menu.SubMenu = menu_SubMenu;
@@ -97536,17 +97665,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.9",
-  "@ant-design/pro-components": "2.3.12",
-  "@ant-design/pro-descriptions": "2.0.10",
-  "@ant-design/pro-field": "2.1.3",
-  "@ant-design/pro-form": "2.2.1",
-  "@ant-design/pro-layout": "7.1.2",
-  "@ant-design/pro-list": "2.0.10",
-  "@ant-design/pro-provider": "2.0.3",
+  "@ant-design/pro-card": "2.0.11",
+  "@ant-design/pro-components": "2.3.14",
+  "@ant-design/pro-descriptions": "2.0.12",
+  "@ant-design/pro-field": "2.1.5",
+  "@ant-design/pro-form": "2.2.3",
+  "@ant-design/pro-layout": "7.1.4",
+  "@ant-design/pro-list": "2.0.12",
+  "@ant-design/pro-provider": "2.0.5",
   "@ant-design/pro-skeleton": "2.0.3",
-  "@ant-design/pro-table": "3.0.10",
-  "@ant-design/pro-utils": "2.2.1"
+  "@ant-design/pro-table": "3.0.12",
+  "@ant-design/pro-utils": "2.2.3"
 };
 ;// CONCATENATED MODULE: ./packages/components/src/index.tsx