@ant-design/pro-components 2.3.20 → 2.3.22

package/dist/components.js

@@ -7578,19 +7578,24 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
     h = "quarter",
     c = "year",
     d = "date",
-    $ = "Invalid Date",
-    l = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,
+    l = "Invalid Date",
+    $ = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,
     y = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,
     M = {
       name: "en",
       weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
-      months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_")
+      months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"),
+      ordinal: function ordinal(t) {
+        var e = ["th", "st", "nd", "rd"],
+          n = t % 100;
+        return "[" + t + (e[(n - 20) % 10] || e[n] || e[0]) + "]";
+      }
     },
     m = function m(t, e, n) {
       var r = String(t);
       return !r || r.length >= e ? t : "" + Array(e + 1 - r.length).join(n) + t;
     },
-    g = {
+    v = {
       s: m,
       z: function z(t) {
         var e = -t.utcOffset(),
@@ -7628,15 +7633,15 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
         return void 0 === t;
       }
     },
-    v = "en",
+    g = "en",
     D = {};
-  D[v] = M;
+  D[g] = M;
   var p = function p(t) {
       return t instanceof _;
     },
     S = function t(e, n, r) {
       var i;
-      if (!e) return v;
+      if (!e) return g;
       if ("string" == typeof e) {
         var s = e.toLowerCase();
         D[s] && (i = s), n && (D[s] = n, i = s);
@@ -7646,14 +7651,14 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
         var a = e.name;
         D[a] = e, i = a;
       }
-      return !r && i && (v = i), i || !r && v;
+      return !r && i && (g = i), i || !r && g;
     },
     w = function w(t, e) {
       if (p(t)) return t.clone();
       var n = "object" == typeof e ? e : {};
       return n.date = t, n.args = arguments, new _(n);
     },
-    O = g;
+    O = v;
   O.l = S, O.i = p, O.w = function (t, e) {
     return w(t, {
       locale: e.$L,
@@ -7675,7 +7680,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
           if (O.u(e)) return new Date();
           if (e instanceof Date) return new Date(e);
           if ("string" == typeof e && !/Z$/i.test(e)) {
-            var r = e.match(l);
+            var r = e.match($);
             if (r) {
               var i = r[2] - 1 || 0,
                 s = (r[7] || "0").substring(0, 3);
@@ -7690,7 +7695,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
       }, m.$utils = function () {
         return O;
       }, m.isValid = function () {
-        return !(this.$d.toString() === $);
+        return !(this.$d.toString() === l);
       }, m.isSame = function (t, e) {
         var n = w(t);
         return this.startOf(e) <= n && n <= this.endOf(e);
@@ -7708,35 +7713,35 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
         var n = this,
           r = !!O.u(e) || e,
           h = O.p(t),
-          $ = function $(t, e) {
+          l = function l(t, e) {
             var i = O.w(n.$u ? Date.UTC(n.$y, e, t) : new Date(n.$y, e, t), n);
             return r ? i : i.endOf(a);
           },
-          l = function l(t, e) {
+          $ = function $(t, e) {
             return O.w(n.toDate()[t].apply(n.toDate("s"), (r ? [0, 0, 0, 0] : [23, 59, 59, 999]).slice(e)), n);
           },
           y = this.$W,
           M = this.$M,
           m = this.$D,
-          g = "set" + (this.$u ? "UTC" : "");
+          v = "set" + (this.$u ? "UTC" : "");
         switch (h) {
           case c:
-            return r ? $(1, 0) : $(31, 11);
+            return r ? l(1, 0) : l(31, 11);
           case f:
-            return r ? $(1, M) : $(0, M + 1);
+            return r ? l(1, M) : l(0, M + 1);
           case o:
-            var v = this.$locale().weekStart || 0,
-              D = (y < v ? y + 7 : y) - v;
-            return $(r ? m - D : m + (6 - D), M);
+            var g = this.$locale().weekStart || 0,
+              D = (y < g ? y + 7 : y) - g;
+            return l(r ? m - D : m + (6 - D), M);
           case a:
           case d:
-            return l(g + "Hours", 0);
+            return $(v + "Hours", 0);
           case u:
-            return l(g + "Minutes", 1);
+            return $(v + "Minutes", 1);
           case s:
-            return l(g + "Seconds", 2);
+            return $(v + "Seconds", 2);
           case i:
-            return l(g + "Milliseconds", 3);
+            return $(v + "Milliseconds", 3);
           default:
             return this.clone();
         }
@@ -7746,12 +7751,12 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
         var n,
           o = O.p(t),
           h = "set" + (this.$u ? "UTC" : ""),
-          $ = (n = {}, n[a] = h + "Date", n[d] = h + "Date", n[f] = h + "Month", n[c] = h + "FullYear", n[u] = h + "Hours", n[s] = h + "Minutes", n[i] = h + "Seconds", n[r] = h + "Milliseconds", n)[o],
-          l = o === a ? this.$D + (e - this.$W) : e;
+          l = (n = {}, n[a] = h + "Date", n[d] = h + "Date", n[f] = h + "Month", n[c] = h + "FullYear", n[u] = h + "Hours", n[s] = h + "Minutes", n[i] = h + "Seconds", n[r] = h + "Milliseconds", n)[o],
+          $ = o === a ? this.$D + (e - this.$W) : e;
         if (o === f || o === c) {
           var y = this.clone().set(d, 1);
-          y.$d[$](l), y.init(), this.$d = y.set(d, Math.min(this.$D, y.daysInMonth())).$d;
-        } else $ && this.$d[$](l);
+          y.$d[l]($), y.init(), this.$d = y.set(d, Math.min(this.$D, y.daysInMonth())).$d;
+        } else l && this.$d[l]($);
         return this.init(), this;
       }, m.set = function (t, e) {
         return this.clone().$set(t, e);
@@ -7759,18 +7764,18 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
         return this[O.p(t)]();
       }, m.add = function (r, h) {
         var d,
-          $ = this;
+          l = this;
         r = Number(r);
-        var l = O.p(h),
+        var $ = O.p(h),
           y = function y(t) {
-            var e = w($);
-            return O.w(e.date(e.date() + Math.round(t * r)), $);
+            var e = w(l);
+            return O.w(e.date(e.date() + Math.round(t * r)), l);
           };
-        if (l === f) return this.set(f, this.$M + r);
-        if (l === c) return this.set(c, this.$y + r);
-        if (l === a) return y(1);
-        if (l === o) return y(7);
-        var M = (d = {}, d[s] = e, d[u] = n, d[i] = t, d)[l] || 1,
+        if ($ === f) return this.set(f, this.$M + r);
+        if ($ === c) return this.set(c, this.$y + r);
+        if ($ === a) return y(1);
+        if ($ === o) return y(7);
+        var M = (d = {}, d[s] = e, d[u] = n, d[i] = t, d)[$] || 1,
           m = this.$d.getTime() + r * M;
         return O.w(m, this);
       }, m.subtract = function (t, e) {
@@ -7778,7 +7783,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
       }, m.format = function (t) {
         var e = this,
           n = this.$locale();
-        if (!this.isValid()) return n.invalidDate || $;
+        if (!this.isValid()) return n.invalidDate || l;
         var r = t || "YYYY-MM-DDTHH:mm:ssZ",
           i = O.z(this),
           s = this.$H,
@@ -7796,7 +7801,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
             var r = t < 12 ? "AM" : "PM";
             return n ? r.toLowerCase() : r;
           },
-          l = {
+          $ = {
             YY: String(this.$y).slice(-2),
             YYYY: this.$y,
             M: a + 1,
@@ -7823,18 +7828,18 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
             Z: i
           };
         return r.replace(y, function (t, e) {
-          return e || l[t] || i.replace(":", "");
+          return e || $[t] || i.replace(":", "");
         });
       }, m.utcOffset = function () {
         return 15 * -Math.round(this.$d.getTimezoneOffset() / 15);
-      }, m.diff = function (r, d, $) {
-        var l,
+      }, m.diff = function (r, d, l) {
+        var $,
           y = O.p(d),
           M = w(r),
           m = (M.utcOffset() - this.utcOffset()) * e,
-          g = this - M,
-          v = O.m(this, M);
-        return v = (l = {}, l[c] = v / 12, l[f] = v, l[h] = v / 3, l[o] = (g - m) / 6048e5, l[a] = (g - m) / 864e5, l[u] = g / n, l[s] = g / e, l[i] = g / t, l)[y] || g, $ ? v : O.a(v);
+          v = this - M,
+          g = O.m(this, M);
+        return g = ($ = {}, $[c] = g / 12, $[f] = g, $[h] = g / 3, $[o] = (v - m) / 6048e5, $[a] = (v - m) / 864e5, $[u] = v / n, $[s] = v / e, $[i] = v / t, $)[y] || v, l ? g : O.a(g);
       }, m.daysInMonth = function () {
         return this.endOf(f).$D;
       }, m.$locale = function () {
@@ -7865,7 +7870,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
     return t.$i || (t(e, _, w), t.$i = !0), w;
   }, w.locale = S, w.isDayjs = p, w.unix = function (t) {
     return w(1e3 * t);
-  }, w.en = D[v], w.Ls = D, w.p = {}, w;
+  }, w.en = D[g], w.Ls = D, w.p = {}, w;
 });
 
 /***/ }),
@@ -20019,7 +20024,7 @@ __webpack_require__.d(__webpack_exports__, {
   "ProFormField": function() { return /* reexport */ components_Field; },
   "ProFormFieldSet": function() { return /* reexport */ components_FieldSet; },
   "ProFormGroup": function() { return /* reexport */ ProFormGroup; },
-  "ProFormItem": function() { return /* reexport */ components_FormItem; },
+  "ProFormItem": function() { return /* reexport */ FormItem; },
   "ProFormList": function() { return /* reexport */ ProFormList; },
   "ProFormMoney": function() { return /* reexport */ components_Money; },
   "ProFormRadio": function() { return /* reexport */ components_Radio; },
@@ -20090,7 +20095,7 @@ __webpack_require__.d(__webpack_exports__, {
   "jaJPIntl": function() { return /* reexport */ jaJPIntl; },
   "koKRIntl": function() { return /* reexport */ koKRIntl; },
   "lighten": function() { return /* reexport */ lighten; },
-  "merge": function() { return /* reexport */ merge; },
+  "merge": function() { return /* reexport */ merge_merge; },
   "mnMNIntl": function() { return /* reexport */ mnMNIntl; },
   "msMYIntl": function() { return /* reexport */ msMYIntl; },
   "nanoid": function() { return /* reexport */ nanoid; },
@@ -20135,7 +20140,7 @@ __webpack_require__.d(__webpack_exports__, {
   "zhTWIntl": function() { return /* reexport */ zhTWIntl; }
 });
 
-// NAMESPACE OBJECT: ./packages/utils/es/useStyle/token.js
+// NAMESPACE OBJECT: ./packages/provider/es/useStyle/token.js
 var token_namespaceObject = {};
 __webpack_require__.r(token_namespaceObject);
 __webpack_require__.d(token_namespaceObject, {
@@ -20143,7 +20148,7 @@ __webpack_require__.d(token_namespaceObject, {
   "defaultAlgorithm": function() { return defaultAlgorithm; },
   "defaultTheme": function() { return defaultTheme; },
   "token": function() { return token_token; },
-  "useToken": function() { return token_useToken; }
+  "useToken": function() { return useToken; }
 });
 
 ;// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js
@@ -20319,7 +20324,10 @@ function arrayMoveMutable(array, fromIndex, toIndex) {
  * @param  {number} toIndex
  * @returns T
  */
-function arrayMoveImmutable(array, fromIndex, toIndex) {
+function arrayMoveImmutable(_ref) {
+  var array = _ref.array,
+    fromIndex = _ref.fromIndex,
+    toIndex = _ref.toIndex;
   var newArray = toConsumableArray_toConsumableArray(array);
   arrayMoveMutable(newArray, fromIndex, toIndex);
   return newArray;
@@ -23322,268 +23330,6 @@ var useSWR = withArgs(useSWRHandler);
     close: '關閉'
   }
 });
-;// CONCATENATED MODULE: ./packages/provider/es/index.js
-
-
-
-//@ts-ignore
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _ref = external_antd_.theme || {
-    useToken: function useToken() {
-      return {
-        hashId: ''
-      };
-    }
-  },
-  useToken = _ref.useToken;
-/**
- * 安全的从一个对象中读取相应的值
- * @param source
- * @param path
- * @param defaultValue
- * @returns
- */
-function get(source, path, defaultValue) {
-  // a[3].b -> a.3.b
-  var paths = path.replace(/\[(\d+)\]/g, '.$1').split('.');
-  var result = source;
-  var message = defaultValue;
-  // eslint-disable-next-line no-restricted-syntax
-  var _iterator = _createForOfIteratorHelper(paths),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var p = _step.value;
-      message = Object(result)[p];
-      result = Object(result)[p];
-      if (message === undefined) {
-        return defaultValue;
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  return message;
-}
-/**
- * 创建一个国际化的操作函数
- *
- * @param locale
- * @param localeMap
- */
-var createIntl = function createIntl(locale, localeMap) {
-  return {
-    getMessage: function getMessage(id, defaultMessage) {
-      return get(localeMap, id, defaultMessage) || defaultMessage;
-    },
-    locale: locale
-  };
-};
-var mnMNIntl = createIntl('mn_MN', mn_MN);
-var arEGIntl = createIntl('ar_EG', ar_EG);
-var zhCNIntl = createIntl('zh_CN', provider_es_locale_zh_CN);
-var enUSIntl = createIntl('en_US', en_US);
-var enGBIntl = createIntl('en_GB', en_GB);
-var viVNIntl = createIntl('vi_VN', vi_VN);
-var itITIntl = createIntl('it_IT', it_IT);
-var jaJPIntl = createIntl('ja_JP', ja_JP);
-var esESIntl = createIntl('es_ES', es_ES);
-var caESIntl = createIntl('ca_ES', ca_ES);
-var ruRUIntl = createIntl('ru_RU', ru_RU);
-var srRSIntl = createIntl('sr_RS', sr_RS);
-var msMYIntl = createIntl('ms_MY', ms_MY);
-var zhTWIntl = createIntl('zh_TW', zh_TW);
-var frFRIntl = createIntl('fr_FR', fr_FR);
-var ptBRIntl = createIntl('pt_BR', pt_BR);
-var koKRIntl = createIntl('ko_KR', ko_KR);
-var idIDIntl = createIntl('id_ID', id_ID);
-var deDEIntl = createIntl('de_DE', de_DE);
-var faIRIntl = createIntl('fa_IR', fa_IR);
-var trTRIntl = createIntl('tr_TR', tr_TR);
-var plPLIntl = createIntl('pl_PL', pl_PL);
-var hrHRIntl = createIntl('hr_', hr_HR);
-var intlMap = {
-  'mn-MN': mnMNIntl,
-  'ar-EG': arEGIntl,
-  'zh-CN': zhCNIntl,
-  'en-US': enUSIntl,
-  'en-GB': enGBIntl,
-  'vi-VN': viVNIntl,
-  'it-IT': itITIntl,
-  'ja-JP': jaJPIntl,
-  'es-ES': esESIntl,
-  'ca-ES': caESIntl,
-  'ru-RU': ruRUIntl,
-  'sr-RS': srRSIntl,
-  'ms-MY': msMYIntl,
-  'zh-TW': zhTWIntl,
-  'fr-FR': frFRIntl,
-  'pt-BR': ptBRIntl,
-  'ko-KR': koKRIntl,
-  'id-ID': idIDIntl,
-  'de-DE': deDEIntl,
-  'fa-IR': faIRIntl,
-  'tr-TR': trTRIntl,
-  'pl-PL': plPLIntl,
-  'hr-HR': hrHRIntl
-};
-var intlMapKeys = Object.keys(intlMap);
-
-/* Creating a context object with the default values. */
-var es_ConfigContext = /*#__PURE__*/external_React_default().createContext({
-  intl: objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, zhCNIntl), {}, {
-    locale: 'default'
-  }),
-  isDeps: false,
-  valueTypeMap: {}
-});
-var ConfigConsumer = es_ConfigContext.Consumer,
-  ConfigProvider = es_ConfigContext.Provider;
-/**
- * 根据 antd 的 key 来找到的 locale 插件的 key
- *
- * @param localeKey
- */
-
-var findIntlKeyByAntdLocaleKey = function findIntlKeyByAntdLocaleKey(localeKey) {
-  if (!localeKey) {
-    return 'zh-CN';
-  }
-  var localeName = localeKey.toLocaleLowerCase();
-  return intlMapKeys.find(function (intlKey) {
-    var LowerCaseKey = intlKey.toLocaleLowerCase();
-    return LowerCaseKey.includes(localeName);
-  });
-};
-/**
- * 组件解除挂载后清空一下 cache
- *
- * @returns
- */
-var CacheClean = function CacheClean() {
-  var _useSWRConfig = useSWRConfig(),
-    cache = _useSWRConfig.cache;
-  (0,external_React_.useEffect)(function () {
-    return function () {
-      // is a map
-      // @ts-ignore
-      cache.clear();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  return null;
-};
-/**
- * 如果没有配置 locale，这里组件会根据 antd 的 key 来自动选择
- *
- * @param param0
- */
-var ConfigProviderWrap = function ConfigProviderWrap(_ref2) {
-  var children = _ref2.children,
-    _ref2$autoClearCache = _ref2.autoClearCache,
-    autoClearCache = _ref2$autoClearCache === void 0 ? false : _ref2$autoClearCache;
-  var _useContext = (0,external_React_.useContext)(external_antd_.ConfigProvider.ConfigContext),
-    locale = _useContext.locale,
-    getPrefixCls = _useContext.getPrefixCls;
-  var token = useToken === null || useToken === void 0 ? void 0 : useToken();
-  // 如果 locale 不存在自动注入的 AntdConfigProvider
-  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 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 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: 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
-    });
-  }, [Provider, autoClearCache, children, getPrefixCls, locale, proProvide.isDeps, proProvideValue, token.hashId]);
-  if (!autoClearCache) return configProviderDom;
-  return (0,jsx_runtime.jsx)(SWRConfig, {
-    value: {
-      provider: function provider() {
-        return new Map();
-      }
-    },
-    children: configProviderDom
-  });
-};
-/**
- * It returns the intl object from the context if it exists, otherwise it returns the intl object for
- * the current locale
- * @returns The return value of the function is the intl object.
- */
-function useIntl() {
-  var _useContext2 = (0,external_React_.useContext)(external_antd_.ConfigProvider.ConfigContext),
-    locale = _useContext2.locale;
-  var _useContext3 = (0,external_React_.useContext)(es_ConfigContext),
-    intl = _useContext3.intl;
-  if (intl && intl.locale !== 'default') {
-    return intl || zhCNIntl;
-  }
-  if (locale === null || locale === void 0 ? void 0 : locale.locale) {
-    return intlMap[findIntlKeyByAntdLocaleKey(locale.locale)] || zhCNIntl;
-  }
-  return zhCNIntl;
-}
-var ProProvider = es_ConfigContext;
-/* harmony default export */ var es = (es_ConfigContext);
-// EXTERNAL MODULE: ./node_modules/classnames/index.js
-var classnames = __webpack_require__(8266);
-var classnames_default = /*#__PURE__*/__webpack_require__.n(classnames);
 ;// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/typeof.js
 function typeof_typeof(obj) {
   "@babel/helpers - typeof";
@@ -25945,7 +25691,7 @@ function module_tinycolor(color, opts) {
   }
   return new TinyColor(color, opts);
 }
-;// CONCATENATED MODULE: ./packages/utils/es/useStyle/token.js
+;// CONCATENATED MODULE: ./packages/provider/es/useStyle/token.js
 
 
 var defaultTheme = {
@@ -26321,7 +26067,7 @@ var token_token = {
   token: defaultTheme,
   hashId: ''
 };
-var token_useToken = function useToken() {
+var useToken = function useToken() {
   var _useState = (0,external_React_.useState)(token_token),
     _useState2 = slicedToArray_slicedToArray(_useState, 1),
     stateToken = _useState2[0];
@@ -26333,7 +26079,8 @@ var darkAlgorithm = function darkAlgorithm() {
 var defaultAlgorithm = function defaultAlgorithm() {
   return defaultTheme;
 };
-;// CONCATENATED MODULE: ./packages/utils/es/useStyle/index.js
+;// CONCATENATED MODULE: ./packages/provider/es/useStyle/index.js
+
 
 
 
@@ -26394,17 +26141,32 @@ var operationUnit = function operationUnit(token) {
     }
   };
 };
+var hashCode = function hashCode(str) {
+  var seed = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+  var h1 = 0xdeadbeef ^ seed,
+    h2 = 0x41c6ce57 ^ seed;
+  for (var i = 0, ch; i < str.length; i++) {
+    ch = str.charCodeAt(i);
+    h1 = Math.imul(h1 ^ ch, 2654435761);
+    h2 = Math.imul(h2 ^ ch, 1597334677);
+  }
+  h1 = Math.imul(h1 ^ h1 >>> 16, 2246822507) ^ Math.imul(h2 ^ h2 >>> 13, 3266489909);
+  h2 = Math.imul(h2 ^ h2 >>> 16, 2246822507) ^ Math.imul(h1 ^ h1 >>> 13, 3266489909);
+  return 4294967296 * (2097151 & h2) + (h1 >>> 0);
+};
 /**
  * 封装了一下 antd 的 useStyle，支持了一下antd@4
  * @param componentName {string} 组件的名字
  * @param styleFn {GenerateStyle} 生成样式的函数
  * @returns {UseStyleResult}
  */
-function useStyle(componentName, styleFn, deps) {
+function useStyle(componentName, styleFn) {
   var _useToken = useStyle_useToken(),
     token = _useToken.token,
     hashId = _useToken.hashId,
     theme = _useToken.theme;
+  var proContext = (0,external_React_.useContext)(ProProvider);
+  var proHashId = hashCode(JSON.stringify(proContext.token || {}));
   var _useContext = (0,external_React_.useContext)(external_antd_.ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   /**
@@ -26416,11 +26178,11 @@ function useStyle(componentName, styleFn, deps) {
   return {
     wrapSSR: useStyleRegister({
       theme: theme,
-      token: objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, deps), token),
+      token: token,
       hashId: hashId,
-      path: [componentName]
+      path: [componentName, "pro-".concat(proHashId)]
     }, function () {
-      return styleFn(objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
+      return styleFn(objectSpread2_objectSpread2(objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), (proContext === null || proContext === void 0 ? void 0 : proContext.token) || {}), {}, {
         antCls: '.' + getPrefixCls(),
         proComponentsCls: proComponentsCls
       }));
@@ -26428,6 +26190,359 @@ function useStyle(componentName, styleFn, deps) {
     hashId: hashId
   };
 }
+;// CONCATENATED MODULE: ./packages/provider/es/typing/layoutToken.js
+
+
+var getLayoutDesignToken = function getLayoutDesignToken(designTokens, antdToken) {
+  var _finalDesignTokens$si, _finalDesignTokens$pa, _finalDesignTokens$pa2;
+  var finalDesignTokens = objectSpread2_objectSpread2({}, designTokens);
+  return objectSpread2_objectSpread2(objectSpread2_objectSpread2({
+    bgLayout: 'linear-gradient(#fff, #f7f8fa 28%)',
+    colorTextAppListIcon: '#666',
+    appListIconHoverBgColor: finalDesignTokens === null || finalDesignTokens === void 0 ? void 0 : (_finalDesignTokens$si = finalDesignTokens.sider) === null || _finalDesignTokens$si === void 0 ? void 0 : _finalDesignTokens$si.colorBgMenuItemSelected,
+    colorBgAppListIconHover: 'rgba(0, 0, 0, 0.04)',
+    colorTextAppListIconHover: antdToken.colorTextBase
+  }, finalDesignTokens), {}, {
+    header: objectSpread2_objectSpread2({
+      colorBgHeader: 'rgba(240, 242, 245, 0.4)',
+      colorHeaderTitle: antdToken.colorText,
+      colorBgMenuItemHover: setAlpha(antdToken.colorTextBase, 0.03),
+      colorBgMenuItemSelected: 'transparent',
+      colorTextMenuSelected: setAlpha(antdToken.colorTextBase, 0.95),
+      colorBgRightActionsItemHover: setAlpha(antdToken.colorTextBase, 0.03),
+      colorTextRightActionsItem: antdToken.colorTextTertiary,
+      heightLayoutHeader: 56,
+      colorTextMenu: setAlpha(antdToken.colorTextBase, 0.65),
+      colorTextMenuSecondary: antdToken.colorTextTertiary,
+      colorTextMenuTitle: antdToken.colorText,
+      colorTextMenuActive: antdToken.colorText
+    }, finalDesignTokens.header),
+    sider: objectSpread2_objectSpread2({
+      paddingInlineLayoutMenu: 8,
+      paddingBlockLayoutMenu: 8,
+      colorBgCollapsedButton: '#fff',
+      colorTextCollapsedButtonHover: antdToken.colorTextSecondary,
+      colorTextCollapsedButton: setAlpha(antdToken.colorTextBase, 0.25),
+      colorMenuBackground: 'transparent',
+      colorBgMenuItemCollapsedHover: 'rgba(90, 75, 75, 0.03)',
+      colorBgMenuItemCollapsedSelected: setAlpha(antdToken.colorTextBase, 0.04),
+      colorMenuItemDivider: setAlpha(antdToken.colorTextBase, 0.06),
+      colorBgMenuItemHover: setAlpha(antdToken.colorTextBase, 0.03),
+      colorBgMenuItemSelected: setAlpha(antdToken.colorTextBase, 0.04),
+      colorTextMenuSelected: setAlpha(antdToken.colorTextBase, 0.95),
+      colorTextMenuActive: antdToken.colorText,
+      colorTextMenu: setAlpha(antdToken.colorTextBase, 0.65),
+      colorTextMenuSecondary: antdToken.colorTextTertiary,
+      colorTextMenuTitle: antdToken.colorText,
+      colorTextSubMenuSelected: setAlpha(antdToken.colorTextBase, 0.95)
+    }, finalDesignTokens.sider),
+    pageContainer: objectSpread2_objectSpread2({
+      colorBgPageContainer: 'transparent',
+      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)
+  });
+};
+;// CONCATENATED MODULE: ./packages/provider/es/utils/merge.js
+
+
+var merge = function merge() {
+  var obj = {};
+  for (var _len = arguments.length, rest = new Array(_len), _key = 0; _key < _len; _key++) {
+    rest[_key] = arguments[_key];
+  }
+  var il = rest.length;
+  var key;
+  var i = 0;
+  for (; i < il; i += 1) {
+    // eslint-disable-next-line no-restricted-syntax
+    for (key in rest[i]) {
+      if (rest[i].hasOwnProperty(key)) {
+        if (typeof_typeof(obj[key]) === 'object' && typeof_typeof(rest[i][key]) === 'object' && obj[key] !== undefined && obj[key] !== null && !Array.isArray(obj[key]) && !Array.isArray(rest[i][key])) {
+          obj[key] = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, obj[key]), rest[i][key]);
+        } else {
+          obj[key] = rest[i][key];
+        }
+      }
+    }
+  }
+  return obj;
+};
+;// CONCATENATED MODULE: ./packages/provider/es/index.js
+
+
+
+//@ts-ignore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var _ref = external_antd_.theme || {
+    useToken: function useToken() {
+      return {
+        hashId: ''
+      };
+    }
+  },
+  es_useToken = _ref.useToken;
+/**
+ * 安全的从一个对象中读取相应的值
+ * @param source
+ * @param path
+ * @param defaultValue
+ * @returns
+ */
+function get(source, path, defaultValue) {
+  // a[3].b -> a.3.b
+  var paths = path.replace(/\[(\d+)\]/g, '.$1').split('.');
+  var result = source;
+  var message = defaultValue;
+  // eslint-disable-next-line no-restricted-syntax
+  var _iterator = _createForOfIteratorHelper(paths),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var p = _step.value;
+      message = Object(result)[p];
+      result = Object(result)[p];
+      if (message === undefined) {
+        return defaultValue;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return message;
+}
+/**
+ * 创建一个国际化的操作函数
+ *
+ * @param locale
+ * @param localeMap
+ */
+var createIntl = function createIntl(locale, localeMap) {
+  return {
+    getMessage: function getMessage(id, defaultMessage) {
+      return get(localeMap, id, defaultMessage) || defaultMessage;
+    },
+    locale: locale
+  };
+};
+var mnMNIntl = createIntl('mn_MN', mn_MN);
+var arEGIntl = createIntl('ar_EG', ar_EG);
+var zhCNIntl = createIntl('zh_CN', provider_es_locale_zh_CN);
+var enUSIntl = createIntl('en_US', en_US);
+var enGBIntl = createIntl('en_GB', en_GB);
+var viVNIntl = createIntl('vi_VN', vi_VN);
+var itITIntl = createIntl('it_IT', it_IT);
+var jaJPIntl = createIntl('ja_JP', ja_JP);
+var esESIntl = createIntl('es_ES', es_ES);
+var caESIntl = createIntl('ca_ES', ca_ES);
+var ruRUIntl = createIntl('ru_RU', ru_RU);
+var srRSIntl = createIntl('sr_RS', sr_RS);
+var msMYIntl = createIntl('ms_MY', ms_MY);
+var zhTWIntl = createIntl('zh_TW', zh_TW);
+var frFRIntl = createIntl('fr_FR', fr_FR);
+var ptBRIntl = createIntl('pt_BR', pt_BR);
+var koKRIntl = createIntl('ko_KR', ko_KR);
+var idIDIntl = createIntl('id_ID', id_ID);
+var deDEIntl = createIntl('de_DE', de_DE);
+var faIRIntl = createIntl('fa_IR', fa_IR);
+var trTRIntl = createIntl('tr_TR', tr_TR);
+var plPLIntl = createIntl('pl_PL', pl_PL);
+var hrHRIntl = createIntl('hr_', hr_HR);
+var intlMap = {
+  'mn-MN': mnMNIntl,
+  'ar-EG': arEGIntl,
+  'zh-CN': zhCNIntl,
+  'en-US': enUSIntl,
+  'en-GB': enGBIntl,
+  'vi-VN': viVNIntl,
+  'it-IT': itITIntl,
+  'ja-JP': jaJPIntl,
+  'es-ES': esESIntl,
+  'ca-ES': caESIntl,
+  'ru-RU': ruRUIntl,
+  'sr-RS': srRSIntl,
+  'ms-MY': msMYIntl,
+  'zh-TW': zhTWIntl,
+  'fr-FR': frFRIntl,
+  'pt-BR': ptBRIntl,
+  'ko-KR': koKRIntl,
+  'id-ID': idIDIntl,
+  'de-DE': deDEIntl,
+  'fa-IR': faIRIntl,
+  'tr-TR': trTRIntl,
+  'pl-PL': plPLIntl,
+  'hr-HR': hrHRIntl
+};
+var intlMapKeys = Object.keys(intlMap);
+
+/* Creating a context object with the default values. */
+var es_ConfigContext = /*#__PURE__*/external_React_default().createContext({
+  intl: objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, zhCNIntl), {}, {
+    locale: 'default'
+  }),
+  isDeps: false,
+  valueTypeMap: {}
+});
+var ConfigConsumer = es_ConfigContext.Consumer,
+  ConfigProvider = es_ConfigContext.Provider;
+/**
+ * 根据 antd 的 key 来找到的 locale 插件的 key
+ *
+ * @param localeKey
+ */
+
+var findIntlKeyByAntdLocaleKey = function findIntlKeyByAntdLocaleKey(localeKey) {
+  if (!localeKey) {
+    return 'zh-CN';
+  }
+  var localeName = localeKey.toLocaleLowerCase();
+  return intlMapKeys.find(function (intlKey) {
+    var LowerCaseKey = intlKey.toLocaleLowerCase();
+    return LowerCaseKey.includes(localeName);
+  });
+};
+/**
+ * 组件解除挂载后清空一下 cache
+ *
+ * @returns
+ */
+var CacheClean = function CacheClean() {
+  var _useSWRConfig = useSWRConfig(),
+    cache = _useSWRConfig.cache;
+  (0,external_React_.useEffect)(function () {
+    return function () {
+      // is a map
+      // @ts-ignore
+      cache.clear();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  return null;
+};
+/**
+ * 如果没有配置 locale，这里组件会根据 antd 的 key 来自动选择
+ *
+ * @param param0
+ */
+var ConfigProviderWrap = function ConfigProviderWrap(_ref2) {
+  var children = _ref2.children,
+    _ref2$autoClearCache = _ref2.autoClearCache,
+    autoClearCache = _ref2$autoClearCache === void 0 ? false : _ref2$autoClearCache,
+    propsToken = _ref2.token;
+  var _useContext = (0,external_React_.useContext)(external_antd_.ConfigProvider.ConfigContext),
+    locale = _useContext.locale,
+    getPrefixCls = _useContext.getPrefixCls;
+  var tokenContext = es_useToken === null || es_useToken === void 0 ? void 0 : es_useToken();
+  // 如果 locale 不存在自动注入的 AntdConfigProvider
+  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, _proProvide$token;
+    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];
+    /**
+     * 合并一下token，不然导致嵌套 token 失效
+     */
+    var proLayoutTokenMerge = merge(((_proProvide$token = proProvide.token) === null || _proProvide$token === void 0 ? void 0 : _proProvide$token.layout) || {}, getLayoutDesignToken((propsToken === null || propsToken === void 0 ? void 0 : propsToken.layout) || {}, tokenContext.token));
+    return objectSpread2_objectSpread2(objectSpread2_objectSpread2({
+      token: objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, proProvide.token), {}, {
+        layout: proLayoutTokenMerge
+      })
+    }, proProvide), {}, {
+      isDeps: true,
+      intl: intl || zhCNIntl
+    });
+  }, [locale === null || locale === void 0 ? void 0 : locale.locale, proProvide, tokenContext, propsToken]);
+  var configProviderDom = (0,external_React_.useMemo)(function () {
+    var _process$env$NODE_ENV;
+    // 自动注入 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 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(tokenContext.hashId),
+      children: provide
+    });
+  }, [Provider, autoClearCache, children, getPrefixCls, locale, proProvide.isDeps, proProvideValue, tokenContext.hashId]);
+  if (!autoClearCache) return configProviderDom;
+  return (0,jsx_runtime.jsx)(SWRConfig, {
+    value: {
+      provider: function provider() {
+        return new Map();
+      }
+    },
+    children: configProviderDom
+  });
+};
+/**
+ * It returns the intl object from the context if it exists, otherwise it returns the intl object for
+ * the current locale
+ * @returns The return value of the function is the intl object.
+ */
+function useIntl() {
+  var _useContext2 = (0,external_React_.useContext)(external_antd_.ConfigProvider.ConfigContext),
+    locale = _useContext2.locale;
+  var _useContext3 = (0,external_React_.useContext)(es_ConfigContext),
+    intl = _useContext3.intl;
+  if (intl && intl.locale !== 'default') {
+    return intl || zhCNIntl;
+  }
+  if (locale === null || locale === void 0 ? void 0 : locale.locale) {
+    return intlMap[findIntlKeyByAntdLocaleKey(locale.locale)] || zhCNIntl;
+  }
+  return zhCNIntl;
+}
+var ProProvider = es_ConfigContext;
+/* harmony default export */ var es = (es_ConfigContext);
+// EXTERNAL MODULE: ./node_modules/classnames/index.js
+var classnames = __webpack_require__(8266);
+var classnames_default = /*#__PURE__*/__webpack_require__.n(classnames);
 ;// CONCATENATED MODULE: ./packages/utils/es/components/DropdownFooter/style.js
 
 
@@ -28706,7 +28821,7 @@ var isUrl = function isUrl(path) {
  * @param  {any[]} ...rest
  * @returns T
  */
-var merge = function merge() {
+var merge_merge = function merge() {
   var obj = {};
   for (var _len = arguments.length, rest = new Array(_len), _key = 0; _key < _len; _key++) {
     rest[_key] = arguments[_key];
@@ -28972,7 +29087,7 @@ var transformKeySubmitValue = function transformKeySubmitValue(values, dataForma
     // namePath、transform在omit为false时需正常返回 https://github.com/ant-design/pro-components/issues/2901#issue-908097115
     return omit ? result : tempValues;
   };
-  finalValues = Array.isArray(values) && Array.isArray(finalValues) ? toConsumableArray_toConsumableArray(gen(values)) : merge({}, gen(values), finalValues);
+  finalValues = Array.isArray(values) && Array.isArray(finalValues) ? toConsumableArray_toConsumableArray(gen(values)) : merge_merge({}, gen(values), finalValues);
   return finalValues;
 };
 ;// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/toArray.js
@@ -28990,7 +29105,8 @@ function useLazyKVMap(data, childrenColumnName, getRowKey) {
   var mapCacheRef = external_React_.useRef({});
   function getRecordByKey(key) {
     if (!mapCacheRef.current || mapCacheRef.current.data !== data || mapCacheRef.current.childrenColumnName !== childrenColumnName || mapCacheRef.current.getRowKey !== getRowKey) {
-      /* eslint-disable no-inner-declarations */var dig = function dig(records) {
+      /* eslint-disable no-inner-declarations */
+      var dig = function dig(records) {
         records.forEach(function (record, index) {
           var rowKey = getRowKey(record, index);
           kvMap.set(rowKey, record);
@@ -28998,7 +29114,8 @@ function useLazyKVMap(data, childrenColumnName, getRowKey) {
             dig(record[childrenColumnName] || []);
           }
         });
-      }; /* eslint-enable */
+      };
+      /* eslint-enable */
       var kvMap = new Map();
       dig(data);
       mapCacheRef.current = {
@@ -29217,7 +29334,7 @@ function SaveEditableAction(_ref) {
                 return onSave === null || onSave === void 0 ? void 0 : onSave(recordKey,
                 // 如果是 map 模式，fields 就是一个值，所以需要set 到对象中
                 // 数据模式 fields 是一个对象，所以不需要
-                merge({}, row, data), row, newLineConfig);
+                merge_merge({}, row, data), row, newLineConfig);
               case 13:
                 res = _context.sent;
                 setLoading(false);
@@ -29481,7 +29598,8 @@ function useEditableArray(props) {
           switch (_context4.prev = _context4.next) {
             case 0:
               relayKey = recordKeyToString(recordKey).toString();
-              key = dataSourceKeyIndexMapRef.current.get(relayKey); /** 如果没找到key，转化一下再去找 */
+              key = dataSourceKeyIndexMapRef.current.get(relayKey);
+              /** 如果没找到key，转化一下再去找 */
               if (!(!editableKeysSet.has(relayKey) && key && (needReTry !== null && needReTry !== void 0 ? needReTry : true) && props.tableName)) {
                 _context4.next = 5;
                 break;
@@ -30626,7 +30744,7 @@ QuestionCircleOutlined_QuestionCircleOutlined.displayName = 'QuestionCircleOutli
 
 
 var Statistic_style_genProStyle = function genProStyle(token) {
-  var _layoutHorizontal, _layoutInline, _token$componentCls;
+  var _layoutHorizonta, _layoutInline, _token$componentCls;
   return defineProperty_defineProperty({}, token.componentCls, (_token$componentCls = {
     display: 'flex',
     fontSize: token.fontSize,
@@ -30636,10 +30754,12 @@ var Statistic_style_genProStyle = function genProStyle(token) {
     '&-tip': {
       marginInlineStart: 4
     },
-    '&-wrapper': {
+    '&-wrapper': defineProperty_defineProperty({
       display: 'flex',
       width: '100%'
-    },
+    }, "".concat(token.componentCls, "-status"), {
+      width: '14px'
+    }),
     '&-icon': {
       marginInlineEnd: 16
     },
@@ -30672,16 +30792,16 @@ var Statistic_style_genProStyle = function genProStyle(token) {
     color: '#389e0d'
   }, "".concat(token.componentCls, "-trend-icon"), {
     borderBlockEndColor: '#52c41a'
-  }))), defineProperty_defineProperty(_token$componentCls, '&-layout-horizontal', (_layoutHorizontal = {
+  }))), defineProperty_defineProperty(_token$componentCls, '& &-layout-horizontal', (_layoutHorizonta = {
     display: 'flex',
     justifyContent: 'space-between'
-  }, defineProperty_defineProperty(_layoutHorizontal, "".concat(token.antCls, "-statistic-title"), {
+  }, defineProperty_defineProperty(_layoutHorizonta, "".concat(token.antCls, "-statistic-title"), {
     marginBlockEnd: 0
-  }), defineProperty_defineProperty(_layoutHorizontal, "".concat(token.antCls, "-statistic-content-value"), {
+  }), defineProperty_defineProperty(_layoutHorizonta, "".concat(token.antCls, "-statistic-content-value"), {
     fontWeight: 500
-  }), defineProperty_defineProperty(_layoutHorizontal, "".concat(token.antCls, "-statistic-title,").concat(token.antCls, "-statistic-content,").concat(token.antCls, "-statistic-content-suffix,").concat(token.antCls, "-statistic-content-prefix,").concat(token.antCls, "-statistic-content-value-decimal"), {
+  }), defineProperty_defineProperty(_layoutHorizonta, "".concat(token.antCls, "-statistic-title,").concat(token.antCls, "-statistic-content,").concat(token.antCls, "-statistic-content-suffix,").concat(token.antCls, "-statistic-content-prefix,").concat(token.antCls, "-statistic-content-value-decimal"), {
     fontSize: token.fontSizeBase
-  }), _layoutHorizontal)), defineProperty_defineProperty(_token$componentCls, '&-layout-inline', (_layoutInline = {
+  }), _layoutHorizonta)), defineProperty_defineProperty(_token$componentCls, '& &-layout-inline', (_layoutInline = {
     display: 'inline-flex',
     color: token.colorTextSecondary
   }, defineProperty_defineProperty(_layoutInline, "".concat(token.antCls, "-statistic-title"), {
@@ -30734,12 +30854,14 @@ var Statistic = function Statistic(props) {
   var _useStyle = Statistic_style_useStyle(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
-  var classString = classnames_default()(prefixCls, className);
-  var statusClass = classnames_default()("".concat(prefixCls, "-status"));
-  var iconClass = classnames_default()("".concat(prefixCls, "-icon"));
-  var wrapperClass = classnames_default()("".concat(prefixCls, "-wrapper"));
-  var contentClass = classnames_default()("".concat(prefixCls, "-content"));
-  var statisticClassName = classnames_default()((_classNames = {}, defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-layout-").concat(layout), layout), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-trend-").concat(trend), trend), defineProperty_defineProperty(_classNames, "hashId", hashId), _classNames));
+  var classString = classnames_default()(prefixCls, className, hashId);
+  var statusClass = classnames_default()("".concat(prefixCls, "-status"), hashId);
+  var iconClass = classnames_default()("".concat(prefixCls, "-icon"), hashId);
+  var wrapperClass = classnames_default()("".concat(prefixCls, "-wrapper"), hashId);
+  var contentClass = classnames_default()("".concat(prefixCls, "-content"), hashId);
+  var statisticClassName = classnames_default()((_classNames = {
+    hashId: hashId
+  }, defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-layout-").concat(layout), layout), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-trend-").concat(trend), trend), _classNames));
   var tipDom = tip && (0,jsx_runtime.jsx)(external_antd_.Tooltip, {
     title: tip,
     children: (0,jsx_runtime.jsx)(icons_QuestionCircleOutlined, {
@@ -30761,6 +30883,7 @@ var Statistic = function Statistic(props) {
     className: iconClass,
     children: icon
   });
+  console.log('classString', classString);
   return wrapSSR((0,jsx_runtime.jsxs)("div", {
     className: classString,
     style: style,
@@ -31708,8 +31831,9 @@ var ProCardOperation = function ProCardOperation(props) {
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('pro-card-operation');
   var _useStyle = Operation_style_useStyle(prefixCls),
-    wrapSSR = _useStyle.wrapSSR;
-  var classString = classnames_default()(prefixCls, className);
+    wrapSSR = _useStyle.wrapSSR,
+    hashId = _useStyle.hashId;
+  var classString = classnames_default()(prefixCls, className, hashId);
   return wrapSSR((0,jsx_runtime.jsx)("div", {
     className: classString,
     style: style,
@@ -36017,9 +36141,9 @@ function createField(Field, config) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     isDeepEqualReact(prefRest, rest, ['onChange', 'onBlur', 'onFocus', 'record']) ? undefined : {}]);
     // 使用useMemo包裹避免不必要的re-render
-    var FormItem = (0,external_React_.useMemo)(function () {
+    var formItem = (0,external_React_.useMemo)(function () {
       var _field$props$allowCle, _field$props, _field$props2, _otherProps$name;
-      return (0,jsx_runtime.jsx)(components_FormItem
+      return (0,jsx_runtime.jsx)(FormItem
       // 全局的提供一个 tip 功能，可以减少代码量
       // 轻量模式下不通过 FormItem 显示 label
       , objectSpread2_objectSpread2(objectSpread2_objectSpread2({
@@ -36054,7 +36178,7 @@ function createField(Field, config) {
     var _useGridHelpers = useGridHelpers(rest),
       ColWrapper = _useGridHelpers.ColWrapper;
     return (0,jsx_runtime.jsx)(ColWrapper, {
-      children: FormItem
+      children: formItem
     });
   };
   var DependencyWrapper = function DependencyWrapper(props) {
@@ -40024,8 +40148,10 @@ var FieldDigit = function FieldDigit(_ref, ref) {
       val = Number(val);
     }
     if (typeof val === 'number') {
-      var _val, _val$toFixed, _fieldProps$precision;
-      val = (_val = val) === null || _val === void 0 ? void 0 : (_val$toFixed = _val.toFixed) === null || _val$toFixed === void 0 ? void 0 : _val$toFixed.call(_val, (_fieldProps$precision = fieldProps.precision) !== null && _fieldProps$precision !== void 0 ? _fieldProps$precision : 0);
+      if (fieldProps.precision) {
+        var _val, _val$toFixed, _fieldProps$precision;
+        val = (_val = val) === null || _val === void 0 ? void 0 : (_val$toFixed = _val.toFixed) === null || _val$toFixed === void 0 ? void 0 : _val$toFixed.call(_val, (_fieldProps$precision = fieldProps.precision) !== null && _fieldProps$precision !== void 0 ? _fieldProps$precision : 0);
+      }
       val = Number(val);
     }
     return fieldProps === null || fieldProps === void 0 ? void 0 : (_fieldProps$onChange = fieldProps.onChange) === null || _fieldProps$onChange === void 0 ? void 0 : _fieldProps$onChange.call(fieldProps, val);
@@ -43899,7 +44025,7 @@ var ProFormDependency = function ProFormDependency(_ref) {
         var value = (_context$getFieldForm = context.getFieldFormatValueObject) === null || _context$getFieldForm === void 0 ? void 0 : _context$getFieldForm.call(context, pathToGet);
         if (value && Object.keys(value).length) {
           // transform 会生成多余的value，这里需要注入一下
-          values = merge({}, values, value);
+          values = merge_merge({}, values, value);
           if ((0,utils_get["default"])(value, pathToGet)) {
             values = (0,set/* default */.Z)(values, finalName, (0,utils_get["default"])(value, pathToGet), false);
           }
@@ -44341,7 +44467,7 @@ var ProFormItem = function ProFormItem(props) {
   }), rest.proFormFieldKey || ((_rest$name4 = rest.name) === null || _rest$name4 === void 0 ? void 0 : _rest$name4.toString()));
 };
 
-/* harmony default export */ var components_FormItem = (ProFormItem);
+/* harmony default export */ var FormItem = (ProFormItem);
 ;// CONCATENATED MODULE: ./packages/form/es/components/Group/style.js
 
 
@@ -47457,7 +47583,7 @@ function StepsForm(props) {
               return _context.abrupt("return");
             case 3:
               setLoading(true);
-              values = merge.apply(void 0, [{}].concat(toConsumableArray_toConsumableArray(Array.from(formDataRef.current.values()))));
+              values = merge_merge.apply(void 0, [{}].concat(toConsumableArray_toConsumableArray(Array.from(formDataRef.current.values()))));
               _context.prev = 5;
               _context.next = 8;
               return onFinish(values);
@@ -49454,7 +49580,7 @@ function ProForm(props) {
 }
 ProForm.Group = components_Group;
 ProForm.useForm = external_antd_.Form.useForm;
-ProForm.Item = components_FormItem;
+ProForm.Item = FormItem;
 ProForm.useWatch = external_antd_.Form.useWatch;
 ProForm.ErrorList = external_antd_.Form.ErrorList;
 ProForm.Provider = external_antd_.Form.Provider;
@@ -51435,75 +51561,6 @@ var GridContent = function GridContent(props) {
   }));
 };
 
-;// CONCATENATED MODULE: ./packages/layout/es/context/ProLayoutContext.js
-
-
-
-
-var getLayoutDesignToken = function getLayoutDesignToken(designTokens, antdToken) {
-  var _finalDesignTokens$si, _finalDesignTokens$pa, _finalDesignTokens$pa2;
-  var finalDesignTokens = objectSpread2_objectSpread2({}, designTokens);
-  return objectSpread2_objectSpread2(objectSpread2_objectSpread2({
-    bgLayout: 'linear-gradient(#fff, #f7f8fa 28%)',
-    colorTextAppListIcon: '#666',
-    appListIconHoverBgColor: finalDesignTokens === null || finalDesignTokens === void 0 ? void 0 : (_finalDesignTokens$si = finalDesignTokens.sider) === null || _finalDesignTokens$si === void 0 ? void 0 : _finalDesignTokens$si.colorBgMenuItemSelected,
-    colorBgAppListIconHover: 'rgba(0, 0, 0, 0.04)',
-    colorTextAppListIconHover: antdToken.colorTextBase
-  }, finalDesignTokens), {}, {
-    header: objectSpread2_objectSpread2({
-      colorBgHeader: 'rgba(240, 242, 245, 0.4)',
-      colorHeaderTitle: antdToken.colorText,
-      colorBgMenuItemHover: setAlpha(antdToken.colorTextBase, 0.03),
-      colorBgMenuItemSelected: 'transparent',
-      colorTextMenuSelected: setAlpha(antdToken.colorTextBase, 0.95),
-      colorBgRightActionsItemHover: setAlpha(antdToken.colorTextBase, 0.03),
-      colorTextRightActionsItem: antdToken.colorTextTertiary,
-      heightLayoutHeader: 56,
-      colorTextMenu: setAlpha(antdToken.colorTextBase, 0.65),
-      colorTextMenuSecondary: antdToken.colorTextTertiary,
-      colorTextMenuTitle: antdToken.colorText,
-      colorTextMenuActive: antdToken.colorText
-    }, finalDesignTokens.header),
-    sider: objectSpread2_objectSpread2({
-      paddingInlineLayoutMenu: 8,
-      paddingBlockLayoutMenu: 8,
-      colorBgCollapsedButton: '#fff',
-      colorTextCollapsedButtonHover: antdToken.colorTextSecondary,
-      colorTextCollapsedButton: setAlpha(antdToken.colorTextBase, 0.25),
-      colorMenuBackground: 'transparent',
-      colorBgMenuItemCollapsedHover: 'rgba(90, 75, 75, 0.03)',
-      colorBgMenuItemCollapsedSelected: setAlpha(antdToken.colorTextBase, 0.04),
-      colorMenuItemDivider: setAlpha(antdToken.colorTextBase, 0.06),
-      colorBgMenuItemHover: setAlpha(antdToken.colorTextBase, 0.03),
-      colorBgMenuItemSelected: setAlpha(antdToken.colorTextBase, 0.04),
-      colorTextMenuSelected: setAlpha(antdToken.colorTextBase, 0.95),
-      colorTextMenuActive: antdToken.colorText,
-      colorTextMenu: setAlpha(antdToken.colorTextBase, 0.65),
-      colorTextMenuSecondary: antdToken.colorTextTertiary,
-      colorTextMenuTitle: antdToken.colorText,
-      colorTextSubMenuSelected: setAlpha(antdToken.colorTextBase, 0.95)
-    }, finalDesignTokens.sider),
-    pageContainer: objectSpread2_objectSpread2({
-      colorBgPageContainer: 'transparent',
-      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)
-  });
-};
-var defaultToken = getLayoutDesignToken({}, {});
-var ProLayoutContext = /*#__PURE__*/external_React_default().createContext(defaultToken);
-var ProLayoutProvider = function ProLayoutProvider(props) {
-  var _useToken = useStyle_useToken(),
-    token = _useToken.token,
-    hashId = _useToken.hashId;
-  return (0,jsx_runtime.jsx)(ProLayoutContext.Provider, {
-    value: objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, getLayoutDesignToken((props === null || props === void 0 ? void 0 : props.token) || {}, token)), {}, {
-      hashId: hashId
-    }),
-    children: props.children
-  });
-};
 // EXTERNAL MODULE: ./node_modules/@ant-design/icons/ArrowLeftOutlined.js
 var ArrowLeftOutlined = __webpack_require__(2997);
 var ArrowLeftOutlined_default = /*#__PURE__*/__webpack_require__.n(ArrowLeftOutlined);
@@ -51840,7 +51897,7 @@ var getPixelRatio = function getPixelRatio(context) {
   if (!context) {
     return 1;
   }
-  var backingStore = context.backingStorePixelRatio || context.webkitBackingStorePixelRatio || context.mozBackingStorePixelRatio || context.msBackingStorePixelRatio || context.oBackingStorePixelRatio || context.backingStorePixelRatio || 1;
+  var backingStore = context.backingStorePixelRatio || context.webkitBackingStorePixelRatio || context.mozBackingStorePixelRatio || context.msBackingStorePixelRatio || context.oBackingStorePixelRatio || 1;
   return (window.devicePixelRatio || 1) / backingStore;
 };
 var WaterMark = function WaterMark(props) {
@@ -51956,8 +52013,6 @@ var WaterMark = function WaterMark(props) {
 
 
 
-
-
 var _map = [576, 768, 992, 1200].map(function (bp) {
     return "@media (min-width: ".concat(bp, "px)");
   }),
@@ -51967,24 +52022,24 @@ var _map = [576, 768, 992, 1200].map(function (bp) {
   lg = _map2[2],
   xl = _map2[3];
 var genPageContainerStyle = function genPageContainerStyle(token) {
-  var _extraContent, _token$componentCls;
+  var _token$layout, _token$layout$pageCon, _token$layout2, _token$layout2$pageCo, _token$layout3, _token$layout3$pageCo, _token$layout$pageCon2, _token$layout4, _token$layout4$pageCo, _token$layout5, _token$layout5$pageCo, _token$layout6, _token$layout6$pageCo, _token$layout$pageCon3, _token$layout7, _token$layout7$pageCo, _extraContent, _token$componentCls;
   return defineProperty_defineProperty({}, token.componentCls, (_token$componentCls = {
     position: 'relative',
     '&-children-content': {
-      paddingBlock: token.paddingBlockPageContainerContent,
-      paddingInline: token.paddingInlinePageContainerContent
+      paddingBlock: (_token$layout = token.layout) === null || _token$layout === void 0 ? void 0 : (_token$layout$pageCon = _token$layout.pageContainer) === null || _token$layout$pageCon === void 0 ? void 0 : _token$layout$pageCon.paddingBlockPageContainerContent,
+      paddingInline: (_token$layout2 = token.layout) === null || _token$layout2 === void 0 ? void 0 : (_token$layout2$pageCo = _token$layout2.pageContainer) === null || _token$layout2$pageCo === void 0 ? void 0 : _token$layout2$pageCo.paddingInlinePageContainerContent
     },
     '&-affix': defineProperty_defineProperty({}, "".concat(token.antCls, "-affix"), defineProperty_defineProperty({}, "".concat(token.componentCls, "-warp"), {
-      backgroundColor: token.colorBgPageContainerFixed,
+      backgroundColor: (_token$layout3 = token.layout) === null || _token$layout3 === void 0 ? void 0 : (_token$layout3$pageCo = _token$layout3.pageContainer) === null || _token$layout3$pageCo === void 0 ? void 0 : _token$layout3$pageCo.colorBgPageContainerFixed,
       transition: 'background-color 0.3s',
       boxShadow: '0 2px 8px #f0f1f2'
     }))
   }, defineProperty_defineProperty(_token$componentCls, '& &-warp-page-header', defineProperty_defineProperty({
-    paddingBlockEnd: token.paddingBlockPageContainerContent / 2,
-    paddingInlineStart: token.paddingInlinePageContainerContent,
-    paddingInlineEnd: token.paddingInlinePageContainerContent
+    paddingBlockEnd: ((_token$layout$pageCon2 = (_token$layout4 = token.layout) === null || _token$layout4 === void 0 ? void 0 : (_token$layout4$pageCo = _token$layout4.pageContainer) === null || _token$layout4$pageCo === void 0 ? void 0 : _token$layout4$pageCo.paddingBlockPageContainerContent) !== null && _token$layout$pageCon2 !== void 0 ? _token$layout$pageCon2 : 40) / 2,
+    paddingInlineStart: (_token$layout5 = token.layout) === null || _token$layout5 === void 0 ? void 0 : (_token$layout5$pageCo = _token$layout5.pageContainer) === null || _token$layout5$pageCo === void 0 ? void 0 : _token$layout5$pageCo.paddingInlinePageContainerContent,
+    paddingInlineEnd: (_token$layout6 = token.layout) === null || _token$layout6 === void 0 ? void 0 : (_token$layout6$pageCo = _token$layout6.pageContainer) === null || _token$layout6$pageCo === void 0 ? void 0 : _token$layout6$pageCo.paddingInlinePageContainerContent
   }, "& ~ ".concat(token.proComponentsCls, "-grid-content"), defineProperty_defineProperty({}, "".concat(token.proComponentsCls, "-page-container-children-content"), {
-    paddingBlock: token.paddingBlockPageContainerContent / 3
+    paddingBlock: ((_token$layout$pageCon3 = (_token$layout7 = token.layout) === null || _token$layout7 === void 0 ? void 0 : (_token$layout7$pageCo = _token$layout7.pageContainer) === null || _token$layout7$pageCo === void 0 ? void 0 : _token$layout7$pageCo.paddingBlockPageContainerContent) !== null && _token$layout$pageCon3 !== void 0 ? _token$layout$pageCon3 : 24) / 3
   }))), defineProperty_defineProperty(_token$componentCls, '&-detail', defineProperty_defineProperty({
     display: 'flex'
   }, sm, {
@@ -52016,16 +52071,12 @@ var genPageContainerStyle = function genPageContainerStyle(token) {
   }), _extraContent)), _token$componentCls));
 };
 function PageContainer_style_useStyle(prefixCls, componentsToken) {
-  var _useContext = (0,external_React_.useContext)(ProLayoutContext),
-    pageContainer = _useContext.pageContainer;
   return useStyle('PageContainer', function (token) {
-    var proCardToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
+    var proCardToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
       componentCls: ".".concat(prefixCls)
-    }, pageContainer), componentsToken);
+    }, componentsToken);
     return [genPageContainerStyle(proCardToken)];
-  },
-  // 触发一下更新
-  componentsToken);
+  });
 }
 ;// CONCATENATED MODULE: ./packages/layout/es/components/PageContainer/index.js
 
@@ -52046,7 +52097,6 @@ var PageContainer_excluded = ["title", "content", "pageHeaderRender", "header",
 
 
 
-
 function genLoading(spinProps) {
   if (typeof_typeof(spinProps) === 'object') {
     return spinProps;
@@ -52191,7 +52241,7 @@ var memoRenderPageHeader = function memoRenderPageHeader(props) {
   }));
 };
 var PageContainer = function PageContainer(props) {
-  var _restProps$header2, _classNames;
+  var _restProps$header2, _token$layout2, _token$layout2$pageCo, _classNames, _token$layout3, _token$layout3$header;
   var children = props.children,
     _props$loading = props.loading,
     loading = _props$loading === void 0 ? false : _props$loading,
@@ -52221,8 +52271,8 @@ var PageContainer = function PageContainer(props) {
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var _useContext = (0,external_React_.useContext)(ProLayoutContext),
-    pageContainer = _useContext.pageContainer;
+  var _useContext = (0,external_React_.useContext)(ProProvider),
+    token = _useContext.token;
   var _useContext2 = (0,external_React_.useContext)(external_antd_.ConfigProvider.ConfigContext),
     getPrefixCls = _useContext2.getPrefixCls;
   var prefixCls = props.prefixCls || getPrefixCls('pro');
@@ -52258,6 +52308,7 @@ var PageContainer = function PageContainer(props) {
     return spinProps.spinning ? (0,jsx_runtime.jsx)(PageLoading, objectSpread2_objectSpread2({}, spinProps)) : null;
   }, [loading]);
   var content = (0,external_React_.useMemo)(function () {
+    var _token$layout, _token$layout$pageCon;
     return children ? (0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
       children: [(0,jsx_runtime.jsx)("div", {
         className: classnames_default()("".concat(basePageContainer, "-children-content ").concat(hashId)),
@@ -52269,11 +52320,11 @@ var PageContainer = function PageContainer(props) {
       }), value.hasFooterToolbar && (0,jsx_runtime.jsx)("div", {
         style: {
           height: 64,
-          marginBlockStart: pageContainer.paddingBlockPageContainerContent
+          marginBlockStart: token === null || token === void 0 ? void 0 : (_token$layout = token.layout) === null || _token$layout === void 0 ? void 0 : (_token$layout$pageCon = _token$layout.pageContainer) === null || _token$layout$pageCon === void 0 ? void 0 : _token$layout$pageCon.paddingBlockPageContainerContent
         }
       })]
     }) : null;
-  }, [children, basePageContainer, hashId, propsToken === null || propsToken === void 0 ? void 0 : propsToken.paddingBlockPageContainerContent, propsToken === null || propsToken === void 0 ? void 0 : propsToken.paddingInlinePageContainerContent, value.hasFooterToolbar, pageContainer.paddingBlockPageContainerContent]);
+  }, [children, basePageContainer, hashId, propsToken === null || propsToken === void 0 ? void 0 : propsToken.paddingBlockPageContainerContent, propsToken === null || propsToken === void 0 ? void 0 : propsToken.paddingInlinePageContainerContent, value.hasFooterToolbar, token === null || token === void 0 ? void 0 : (_token$layout2 = token.layout) === null || _token$layout2 === void 0 ? void 0 : (_token$layout2$pageCo = _token$layout2.pageContainer) === null || _token$layout2$pageCo === void 0 ? void 0 : _token$layout2$pageCo.paddingBlockPageContainerContent]);
   var renderContentDom = (0,external_React_.useMemo)(function () {
     // 只要loadingDom非空我们就渲染loadingDom,否则渲染内容
     var dom = loadingDom || content;
@@ -52286,7 +52337,6 @@ 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, "-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", {
       style: style,
@@ -52294,7 +52344,7 @@ var PageContainer = function PageContainer(props) {
       children: [fixedHeader && pageHeaderDom ?
       // 在 hasHeader 且 fixedHeader 的情况下，才需要设置高度
       (0,jsx_runtime.jsx)(external_antd_.Affix, objectSpread2_objectSpread2(objectSpread2_objectSpread2({
-        offsetTop: value.hasHeader && value.fixedHeader ? token.header.heightLayoutHeader : 0
+        offsetTop: value.hasHeader && value.fixedHeader ? token === null || token === void 0 ? void 0 : (_token$layout3 = token.layout) === null || _token$layout3 === void 0 ? void 0 : (_token$layout3$header = _token$layout3.header) === null || _token$layout3$header === void 0 ? void 0 : _token$layout3$header.heightLayoutHeader : 0
       }, affixProps), {}, {
         className: "".concat(basePageContainer, "-affix ").concat(hashId),
         children: (0,jsx_runtime.jsx)("div", {
@@ -52468,19 +52518,18 @@ var DefaultFooter = function DefaultFooter(_ref) {
 
 
 
-
-
 var genProLayoutHeaderStyle = function genProLayoutHeaderStyle(token) {
+  var _token$layout, _token$layout$header, _token$layout2, _token$layout2$header, _token$layout3, _token$layout3$header;
   return defineProperty_defineProperty({}, token.proLayoutCls, defineProperty_defineProperty({}, ".ant-layout-header".concat(token.componentCls), {
-    height: token.ProLayoutHeaderHeaderHeight,
-    lineHeight: "".concat(token.ProLayoutHeaderHeaderHeight, "px"),
+    height: (token === null || token === void 0 ? void 0 : (_token$layout = token.layout) === null || _token$layout === void 0 ? void 0 : (_token$layout$header = _token$layout.header) === null || _token$layout$header === void 0 ? void 0 : _token$layout$header.heightLayoutHeader) || 56,
+    lineHeight: "".concat((token === null || token === void 0 ? void 0 : (_token$layout2 = token.layout) === null || _token$layout2 === void 0 ? void 0 : (_token$layout2$header = _token$layout2.header) === null || _token$layout2$header === void 0 ? void 0 : _token$layout2$header.heightLayoutHeader) || 56, "px"),
     // hitu 用了这个属性，不能删除哦 @南取
     zIndex: 19,
     width: '100%',
     paddingBlock: 0,
     paddingInline: 8,
     borderBlockEnd: "1px solid ".concat(token.colorSplit),
-    backgroundColor: token.colorBgHeader || 'rgba(255, 255, 255, 0.4)',
+    backgroundColor: (token === null || token === void 0 ? void 0 : (_token$layout3 = token.layout) === null || _token$layout3 === void 0 ? void 0 : (_token$layout3$header = _token$layout3.header) === null || _token$layout3$header === void 0 ? void 0 : _token$layout3$header.colorBgHeader) || 'rgba(255, 255, 255, 0.4)',
     WebkitBackdropFilter: 'blur(8px)',
     backdropFilter: 'blur(8px)',
     '&-fixed-header': {
@@ -52512,14 +52561,11 @@ var genProLayoutHeaderStyle = function genProLayoutHeaderStyle(token) {
   }));
 };
 function header_useStyle(prefixCls, props) {
-  var _useContext = (0,external_React_.useContext)(ProLayoutContext),
-    header = _useContext.header;
   return useStyle('ProLayoutHeader', function (token) {
     var ProLayoutHeaderToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
       componentCls: ".".concat(prefixCls),
-      proLayoutCls: ".".concat(props.proLayoutCls),
-      ProLayoutHeaderHeaderHeight: header.heightLayoutHeader
-    }, header);
+      proLayoutCls: ".".concat(props.proLayoutCls)
+    });
     return [genProLayoutHeaderStyle(ProLayoutHeaderToken)];
   });
 }
@@ -52909,10 +52955,8 @@ var genAppsLogoComponentsSimpleListStyle = function genAppsLogoComponentsSimpleL
 
 
 
-
-
 var genAppsLogoComponentsStyle = function genAppsLogoComponentsStyle(token) {
-  var _popover;
+  var _token$layout, _token$layout2, _token$layout3, _token$layout4, _token$layout5, _popover;
   return defineProperty_defineProperty({}, token.componentCls, {
     '&-icon': {
       display: 'inline-flex',
@@ -52925,14 +52969,14 @@ var genAppsLogoComponentsStyle = function genAppsLogoComponentsStyle(token) {
       height: 28,
       width: 28,
       cursor: 'pointer',
-      color: token.colorTextAppListIcon,
+      color: token === null || token === void 0 ? void 0 : (_token$layout = token.layout) === null || _token$layout === void 0 ? void 0 : _token$layout.colorTextAppListIcon,
       '&:hover': {
-        color: token.colorTextAppListIconHover,
-        backgroundColor: token.colorBgAppListIconHover
+        color: token === null || token === void 0 ? void 0 : (_token$layout2 = token.layout) === null || _token$layout2 === void 0 ? void 0 : _token$layout2.colorTextAppListIconHover,
+        backgroundColor: token === null || token === void 0 ? void 0 : (_token$layout3 = token.layout) === null || _token$layout3 === void 0 ? void 0 : _token$layout3.colorBgAppListIconHover
       },
       '&-active': {
-        color: token.colorTextAppListIconHover,
-        backgroundColor: token.colorBgAppListIconHover
+        color: token === null || token === void 0 ? void 0 : (_token$layout4 = token.layout) === null || _token$layout4 === void 0 ? void 0 : _token$layout4.colorTextAppListIconHover,
+        backgroundColor: token === null || token === void 0 ? void 0 : (_token$layout5 = token.layout) === null || _token$layout5 === void 0 ? void 0 : _token$layout5.colorBgAppListIconHover
       }
     },
     '&-popover': (_popover = {}, defineProperty_defineProperty(_popover, "".concat(token.antCls, "-popover-arrow"), {
@@ -52946,11 +52990,10 @@ var genAppsLogoComponentsStyle = function genAppsLogoComponentsStyle(token) {
   });
 };
 function AppsLogoComponents_style_useStyle(prefixCls) {
-  var proToken = (0,external_React_.useContext)(ProLayoutContext);
   return useStyle('AppsLogoComponents', function (token) {
     var proCardToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
       componentCls: ".".concat(prefixCls)
-    }, proToken);
+    });
     return [genAppsLogoComponentsStyle(proCardToken)];
   });
 }
@@ -53079,9 +53122,8 @@ function ArrowSvgIcon() {
 
 
 
-
-
 var genSiderMenuStyle = function genSiderMenuStyle(token) {
+  var _token$layout, _token$layout$sider, _token$layout2, _token$layout2$sider, _token$layout3, _token$layout3$sider;
   return defineProperty_defineProperty({}, token.componentCls, {
     position: 'absolute',
     insetBlockStart: '18px',
@@ -53097,11 +53139,11 @@ var genSiderMenuStyle = function genSiderMenuStyle(token) {
     alignItems: 'center',
     justifyContent: 'center',
     cursor: 'pointer',
-    color: token.colorTextCollapsedButton,
-    backgroundColor: token.colorBgCollapsedButton,
+    color: token === null || token === void 0 ? void 0 : (_token$layout = token.layout) === null || _token$layout === void 0 ? void 0 : (_token$layout$sider = _token$layout.sider) === null || _token$layout$sider === void 0 ? void 0 : _token$layout$sider.colorTextCollapsedButton,
+    backgroundColor: token === null || token === void 0 ? void 0 : (_token$layout2 = token.layout) === null || _token$layout2 === void 0 ? void 0 : (_token$layout2$sider = _token$layout2.sider) === null || _token$layout2$sider === void 0 ? void 0 : _token$layout2$sider.colorBgCollapsedButton,
     boxShadow: '0 2px 8px -2px rgba(0,0,0,0.05), 0 1px 4px -1px rgba(25,15,15,0.07), 0 0 1px 0 rgba(0,0,0,0.08)',
     '&:hover': {
-      color: token.colorTextCollapsedButtonHover,
+      color: token === null || token === void 0 ? void 0 : (_token$layout3 = token.layout) === null || _token$layout3 === void 0 ? void 0 : (_token$layout3$sider = _token$layout3.sider) === null || _token$layout3$sider === void 0 ? void 0 : _token$layout3$sider.colorTextCollapsedButtonHover,
       boxShadow: '0 4px 16px -4px rgba(0,0,0,0.05), 0 2px 8px -2px rgba(25,15,15,0.07), 0 1px 2px 0 rgba(0,0,0,0.08)'
     },
     '.anticon': {
@@ -53119,12 +53161,10 @@ var genSiderMenuStyle = function genSiderMenuStyle(token) {
   });
 };
 function CollapsedIcon_style_useStyle(prefixCls) {
-  var _useContext = (0,external_React_.useContext)(ProLayoutContext),
-    sider = _useContext.sider;
   return useStyle('SiderMenuCollapsedIcon', function (token) {
     var siderMenuToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
       componentCls: ".".concat(prefixCls)
-    }, sider);
+    });
     return [genSiderMenuStyle(siderMenuToken)];
   });
 }
@@ -53354,10 +53394,8 @@ var MenuCounter = createContainer(useMenuCounter);
 
 
 
-
-
 var genProLayoutBaseMenuStyle = function genProLayoutBaseMenuStyle(token) {
-  var _collapsed, _collapsed2, _$concat2, _$concat4;
+  var _token$layout, _token$layout$sider, _collapsed, _collapsed2, _$concat2, _$concat4;
   return defineProperty_defineProperty({}, "".concat(token.componentCls), (_$concat4 = {
     background: 'transparent',
     border: 'none'
@@ -53366,7 +53404,7 @@ var genProLayoutBaseMenuStyle = function genProLayoutBaseMenuStyle(token) {
     height: 'auto !important',
     marginBlock: '8px !important'
   }), defineProperty_defineProperty(_collapsed, "".concat(token.antCls, "-menu-item-group > ").concat(token.antCls, "-menu-item-group-list > ").concat(token.antCls, "-menu-submenu-selected > ").concat(token.antCls, "-menu-submenu-title, \n        ").concat(token.antCls, "-menu-submenu-selected > ").concat(token.antCls, "-menu-submenu-title"), {
-    backgroundColor: token.colorBgMenuItemSelected,
+    backgroundColor: (_token$layout = token.layout) === null || _token$layout === void 0 ? void 0 : (_token$layout$sider = _token$layout.sider) === null || _token$layout$sider === void 0 ? void 0 : _token$layout$sider.colorBgMenuItemSelected,
     borderRadius: token.radiusBase
   }), defineProperty_defineProperty(_collapsed, "".concat(token.componentCls, "-group"), defineProperty_defineProperty({}, "".concat(token.antCls, "-menu-item-group-title"), {
     paddingInline: 0
@@ -53429,12 +53467,10 @@ var genProLayoutBaseMenuStyle = function genProLayoutBaseMenuStyle(token) {
   }), _$concat4));
 };
 function menu_useStyle(prefixCls) {
-  var _useContext = (0,external_React_.useContext)(ProLayoutContext),
-    sider = _useContext.sider;
   return useStyle('ProLayoutBaseMenu', function (token) {
     var proLayoutMenuToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
       componentCls: ".".concat(prefixCls)
-    }, sider);
+    });
     return [genProLayoutBaseMenuStyle(proLayoutMenuToken)];
   });
 }
@@ -53521,7 +53557,7 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(props) {
     var children = (item === null || item === void 0 ? void 0 : item.children) || (item === null || item === void 0 ? void 0 : item.routes);
     var menuType = isGroup && level === 0 ? 'group' : undefined;
     if (Array.isArray(children) && children.length > 0) {
-      var _this$props2, _this$props3, _classNames, _this$props4, _this$props5, _designToken$sider;
+      var _this$props2, _this$props3, _classNames, _this$props4, _this$props5, _designToken$layout, _designToken$layout$s;
       /** Menu 第一级可以有icon，或者 isGroup 时第二级别也要有 */
       var shouldHasIcon = level === 0 || isGroup && level === 1;
       //  get defaultTitle by menuItemRender
@@ -53567,7 +53603,7 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(props) {
           borderBlockEnd: 0,
           margin: _this.props.collapsed ? '4px' : '6px 16px',
           marginBlockStart: _this.props.collapsed ? 4 : 8,
-          borderColor: designToken === null || designToken === void 0 ? void 0 : (_designToken$sider = designToken.sider) === null || _designToken$sider === void 0 ? void 0 : _designToken$sider.colorMenuItemDivider
+          borderColor: designToken === null || designToken === void 0 ? void 0 : (_designToken$layout = designToken.layout) === null || _designToken$layout === void 0 ? void 0 : (_designToken$layout$s = _designToken$layout.sider) === null || _designToken$layout$s === void 0 ? void 0 : _designToken$layout$s.colorMenuItemDivider
         }
       } : undefined].filter(Boolean);
     }
@@ -53669,11 +53705,12 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(props) {
     return "/".concat(path || '').replace(/\/+/g, '/');
   };
   this.props = props;
-}); /**
-     * 生成openKeys 的对象，因为设置了openKeys 就会变成受控，所以需要一个空对象
-     *
-     * @param BaseMenuProps
-     */
+});
+/**
+ * 生成openKeys 的对象，因为设置了openKeys 就会变成受控，所以需要一个空对象
+ *
+ * @param BaseMenuProps
+ */
 var getOpenKeysProps = function getOpenKeysProps(openKeys, _ref) {
   var layout = _ref.layout,
     collapsed = _ref.collapsed;
@@ -53700,7 +53737,8 @@ var BaseMenu = function BaseMenu(props) {
     onSelect = props.onSelect,
     menuRenderType = props.menuRenderType,
     propsOpenKeys = props.openKeys;
-  var designToken = (0,external_React_.useContext)(ProLayoutContext);
+  var _useContext = (0,external_React_.useContext)(ProProvider),
+    designToken = _useContext.token;
   var baseClassName = "".concat(prefixCls, "-base-menu");
   // 用于减少 defaultOpenKeys 计算的组件
   var defaultOpenKeysRef = (0,external_React_.useRef)([]);
@@ -53888,7 +53926,7 @@ var renderLogoAndTitle = function renderLogoAndTitle(props) {
   }, "title");
 };
 var SiderMenu = function SiderMenu(props) {
-  var _classNames, _props$menu2;
+  var _classNames, _props$menu2, _process$env$NODE_ENV, _token$layout, _token$layout$sider, _token$layout2, _token$layout2$sider, _token$layout3, _token$layout3$sider, _token$layout4, _token$layout4$sider, _token$layout5, _token$layout5$sider;
   var collapsed = props.collapsed,
     originCollapsed = props.originCollapsed,
     fixSiderbar = props.fixSiderbar,
@@ -54051,8 +54089,8 @@ var SiderMenu = function SiderMenu(props) {
       children: menuFooterDom
     })]
   });
-  var _useContext = (0,external_React_.useContext)(ProLayoutContext),
-    sider = _useContext.sider;
+  var _useContext = (0,external_React_.useContext)(ProProvider),
+    token = _useContext.token;
   return (0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
     children: [fixSiderbar && !isMobile && !hideMenuWhenCollapsedClassName && (0,jsx_runtime.jsx)("div", {
       style: objectSpread2_objectSpread2({
@@ -54082,18 +54120,18 @@ var SiderMenu = function SiderMenu(props) {
       , {
         // @ts-ignore
         theme: {
-          hashed: false,
+          hashed: ((_process$env$NODE_ENV = "production") === null || _process$env$NODE_ENV === void 0 ? void 0 : _process$env$NODE_ENV.toLowerCase()) !== 'test',
           components: {
             Menu: {
               radiusItem: 4,
-              colorItemBgSelected: sider.colorBgMenuItemSelected || 'rgba(0, 0, 0, 0.04)',
-              colorItemBgActive: sider.colorBgMenuItemHover || 'rgba(0, 0, 0, 0.04)',
+              colorItemBgSelected: (token === null || token === void 0 ? void 0 : (_token$layout = token.layout) === null || _token$layout === void 0 ? void 0 : (_token$layout$sider = _token$layout.sider) === null || _token$layout$sider === void 0 ? void 0 : _token$layout$sider.colorBgMenuItemSelected) || 'rgba(0, 0, 0, 0.04)',
+              colorItemBgActive: (token === null || token === void 0 ? void 0 : (_token$layout2 = token.layout) === null || _token$layout2 === void 0 ? void 0 : (_token$layout2$sider = _token$layout2.sider) === null || _token$layout2$sider === void 0 ? void 0 : _token$layout2$sider.colorBgMenuItemHover) || 'rgba(0, 0, 0, 0.04)',
               colorActiveBarWidth: 0,
               colorActiveBarHeight: 0,
               colorActiveBarBorderSize: 0,
-              colorItemText: sider.colorTextMenu || 'rgba(0, 0, 0, 0.65)',
-              colorItemTextHover: sider.colorTextMenuActive || 'rgba(0, 0, 0, 0.85)',
-              colorItemTextSelected: sider.colorTextMenuSelected || 'rgba(0, 0, 0, 1)',
+              colorItemText: (token === null || token === void 0 ? void 0 : (_token$layout3 = token.layout) === null || _token$layout3 === void 0 ? void 0 : (_token$layout3$sider = _token$layout3.sider) === null || _token$layout3$sider === void 0 ? void 0 : _token$layout3$sider.colorTextMenu) || 'rgba(0, 0, 0, 0.65)',
+              colorItemTextHover: (token === null || token === void 0 ? void 0 : (_token$layout4 = token.layout) === null || _token$layout4 === void 0 ? void 0 : (_token$layout4$sider = _token$layout4.sider) === null || _token$layout4$sider === void 0 ? void 0 : _token$layout4$sider.colorTextMenuActive) || 'rgba(0, 0, 0, 0.85)',
+              colorItemTextSelected: (token === null || token === void 0 ? void 0 : (_token$layout5 = token.layout) === null || _token$layout5 === void 0 ? void 0 : (_token$layout5$sider = _token$layout5.sider) === null || _token$layout5$sider === void 0 ? void 0 : _token$layout5$sider.colorTextMenuSelected) || 'rgba(0, 0, 0, 1)',
               colorItemBg: 'transparent',
               colorSubItemBg: 'transparent'
             }
@@ -54117,9 +54155,8 @@ var SiderMenu = function SiderMenu(props) {
 
 
 
-
-
 var genTopNavHeaderStyle = function genTopNavHeaderStyle(token) {
+  var _token$layout, _token$layout$header, _token$layout2, _token$layout2$header;
   return defineProperty_defineProperty({}, token.componentCls, {
     '&-header-actions': {
       display: 'flex',
@@ -54130,7 +54167,7 @@ var genTopNavHeaderStyle = function genTopNavHeaderStyle(token) {
         justifyContent: 'center',
         paddingBlock: 0,
         paddingInline: 2,
-        color: token.colorTextRightActionsItem,
+        color: token === null || token === void 0 ? void 0 : (_token$layout = token.layout) === null || _token$layout === void 0 ? void 0 : (_token$layout$header = _token$layout.header) === null || _token$layout$header === void 0 ? void 0 : _token$layout$header.colorTextRightActionsItem,
         fontSize: '16px',
         cursor: 'pointer',
         borderRadius: token.radiusBase,
@@ -54139,7 +54176,7 @@ var genTopNavHeaderStyle = function genTopNavHeaderStyle(token) {
           paddingBlock: 6,
           borderRadius: token.radiusBase,
           '&:hover': {
-            backgroundColor: token.colorBgRightActionsItemHover
+            backgroundColor: token === null || token === void 0 ? void 0 : (_token$layout2 = token.layout) === null || _token$layout2 === void 0 ? void 0 : (_token$layout2$header = _token$layout2.header) === null || _token$layout2$header === void 0 ? void 0 : _token$layout2$header.colorBgRightActionsItemHover
           }
         }
       },
@@ -54169,12 +54206,10 @@ var genTopNavHeaderStyle = function genTopNavHeaderStyle(token) {
   });
 };
 function rightContentStyle_useStyle(prefixCls) {
-  var _useContext = (0,external_React_.useContext)(ProLayoutContext),
-    header = _useContext.header;
   return useStyle('RightContent', function (token) {
     var proToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
       componentCls: ".".concat(prefixCls)
-    }, header);
+    });
     return [genTopNavHeaderStyle(proToken)];
   });
 }
@@ -54310,9 +54345,9 @@ var RightContent = function RightContent(_ref) {
 
 
 
-
-
 var style_genTopNavHeaderStyle = function genTopNavHeaderStyle(token) {
+  var _token$layout, _token$layout$header, _token$layout2, _token$layout2$header;
+  console.log(token.layout);
   return defineProperty_defineProperty({}, token.componentCls, {
     position: 'relative',
     width: '100%',
@@ -54360,7 +54395,7 @@ var style_genTopNavHeaderStyle = function genTopNavHeaderStyle(token) {
         marginInlineStart: 6,
         fontWeight: '600',
         fontSize: '16px',
-        color: token === null || token === void 0 ? void 0 : token.colorHeaderTitle,
+        color: token === null || token === void 0 ? void 0 : (_token$layout = token.layout) === null || _token$layout === void 0 ? void 0 : (_token$layout$header = _token$layout.header) === null || _token$layout$header === void 0 ? void 0 : _token$layout$header.colorHeaderTitle,
         verticalAlign: 'top'
       }
     },
@@ -54370,17 +54405,15 @@ var style_genTopNavHeaderStyle = function genTopNavHeaderStyle(token) {
       alignItems: 'center',
       paddingInline: 6,
       paddingBlock: 6,
-      lineHeight: "".concat(token.heightLayoutHeader - 12, "px")
+      lineHeight: "".concat(((token === null || token === void 0 ? void 0 : (_token$layout2 = token.layout) === null || _token$layout2 === void 0 ? void 0 : (_token$layout2$header = _token$layout2.header) === null || _token$layout2$header === void 0 ? void 0 : _token$layout2$header.heightLayoutHeader) || 56) - 12, "px")
     }
   });
 };
 function TopNavHeader_style_useStyle(prefixCls) {
-  var _useContext = (0,external_React_.useContext)(ProLayoutContext),
-    header = _useContext.header;
   return useStyle('ProLayoutTopNavHeader', function (token) {
     var topNavHeaderToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
       componentCls: ".".concat(prefixCls)
-    }, header);
+    });
     return [style_genTopNavHeaderStyle(topNavHeaderToken)];
   });
 }
@@ -54398,6 +54431,7 @@ function TopNavHeader_style_useStyle(prefixCls) {
 
 
 var TopNavHeader = function TopNavHeader(props) {
+  var _token$layout9, _token$layout9$header, _token$layout10, _token$layout10$heade, _token$layout11, _token$layout11$heade, _token$layout12, _token$layout12$heade, _token$layout13, _token$layout13$heade, _token$layout14, _token$layout14$heade;
   var ref = (0,external_React_.useRef)(null);
   var onMenuHeaderClick = props.onMenuHeaderClick,
     contentWidth = props.contentWidth,
@@ -54409,8 +54443,8 @@ var TopNavHeader = function TopNavHeader(props) {
     actionsRender = props.actionsRender;
   var _useContext = (0,external_React_.useContext)(external_antd_.ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
-  var _useContext2 = (0,external_React_.useContext)(ProLayoutContext),
-    header = _useContext2.header;
+  var _useContext2 = (0,external_React_.useContext)(ProProvider),
+    token = _useContext2.token;
   var prefixCls = "".concat(props.prefixCls || getPrefixCls('pro'), "-top-nav-header");
   var _useStyle = TopNavHeader_style_useStyle(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
@@ -54419,24 +54453,24 @@ var TopNavHeader = function TopNavHeader(props) {
     collapsed: false
   }), layout === 'mix' ? 'headerTitleRender' : undefined);
   var contentDom = (0,external_React_.useMemo)(function () {
-    var _process$env$NODE_ENV, _props$menuProps;
+    var _process$env$NODE_ENV, _token$layout, _token$layout$header, _token$layout2, _token$layout2$header, _token$layout3, _token$layout3$header, _token$layout4, _token$layout4$header, _token$layout5, _token$layout5$header, _token$layout6, _token$layout6$header, _token$layout7, _token$layout7$header, _token$layout8, _token$layout8$header, _props$menuProps;
     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',
         components: {
           Menu: {
-            colorItemBg: header.colorBgHeader || 'transparent',
-            colorSubItemBg: header.colorBgHeader || 'transparent',
+            colorItemBg: (token === null || token === void 0 ? void 0 : (_token$layout = token.layout) === null || _token$layout === void 0 ? void 0 : (_token$layout$header = _token$layout.header) === null || _token$layout$header === void 0 ? void 0 : _token$layout$header.colorBgHeader) || 'transparent',
+            colorSubItemBg: (token === null || token === void 0 ? void 0 : (_token$layout2 = token.layout) === null || _token$layout2 === void 0 ? void 0 : (_token$layout2$header = _token$layout2.header) === null || _token$layout2$header === void 0 ? void 0 : _token$layout2$header.colorBgHeader) || 'transparent',
             radiusItem: 4,
-            colorItemBgSelected: header.colorBgMenuItemSelected || 'rgba(0, 0, 0, 0.04)',
-            colorItemBgActive: header.colorBgMenuItemHover || 'rgba(0, 0, 0, 0.04)',
-            colorItemBgSelectedHorizontal: header.colorBgMenuItemSelected || 'rgba(0, 0, 0, 0.04)',
+            colorItemBgSelected: (token === null || token === void 0 ? void 0 : (_token$layout3 = token.layout) === null || _token$layout3 === void 0 ? void 0 : (_token$layout3$header = _token$layout3.header) === null || _token$layout3$header === void 0 ? void 0 : _token$layout3$header.colorBgMenuItemSelected) || 'rgba(0, 0, 0, 0.04)',
+            colorItemBgActive: (token === null || token === void 0 ? void 0 : (_token$layout4 = token.layout) === null || _token$layout4 === void 0 ? void 0 : (_token$layout4$header = _token$layout4.header) === null || _token$layout4$header === void 0 ? void 0 : _token$layout4$header.colorBgMenuItemHover) || 'rgba(0, 0, 0, 0.04)',
+            colorItemBgSelectedHorizontal: (token === null || token === void 0 ? void 0 : (_token$layout5 = token.layout) === null || _token$layout5 === void 0 ? void 0 : (_token$layout5$header = _token$layout5.header) === null || _token$layout5$header === void 0 ? void 0 : _token$layout5$header.colorBgMenuItemSelected) || 'rgba(0, 0, 0, 0.04)',
             colorActiveBarWidth: 0,
             colorActiveBarHeight: 0,
             colorActiveBarBorderSize: 0,
-            colorItemText: header.colorTextMenu || 'rgba(0, 0, 0, 0.65)',
-            colorItemTextHover: header.colorTextMenuActive || 'rgba(0, 0, 0, 0.85)',
-            colorItemTextSelected: header.colorTextMenuSelected || 'rgba(0, 0, 0, 1)'
+            colorItemText: (token === null || token === void 0 ? void 0 : (_token$layout6 = token.layout) === null || _token$layout6 === void 0 ? void 0 : (_token$layout6$header = _token$layout6.header) === null || _token$layout6$header === void 0 ? void 0 : _token$layout6$header.colorTextMenu) || 'rgba(0, 0, 0, 0.65)',
+            colorItemTextHover: (token === null || token === void 0 ? void 0 : (_token$layout7 = token.layout) === null || _token$layout7 === void 0 ? void 0 : (_token$layout7$header = _token$layout7.header) === null || _token$layout7$header === void 0 ? void 0 : _token$layout7$header.colorTextMenuActive) || 'rgba(0, 0, 0, 0.85)',
+            colorItemTextSelected: (token === null || token === void 0 ? void 0 : (_token$layout8 = token.layout) === null || _token$layout8 === void 0 ? void 0 : (_token$layout8$header = _token$layout8.header) === null || _token$layout8$header === void 0 ? void 0 : _token$layout8$header.colorTextMenuSelected) || 'rgba(0, 0, 0, 1)'
           }
         }
       },
@@ -54457,7 +54491,7 @@ var TopNavHeader = function TopNavHeader(props) {
       return headerContentRender(props, defaultDom);
     }
     return defaultDom;
-  }, [hashId, header.colorBgHeader, header.colorBgMenuItemHover, header.colorBgMenuItemSelected, header.colorTextMenu, header.colorTextMenuActive, header.colorTextMenuSelected, headerContentRender, prefixCls, props]);
+  }, [hashId, token === null || token === void 0 ? void 0 : (_token$layout9 = token.layout) === null || _token$layout9 === void 0 ? void 0 : (_token$layout9$header = _token$layout9.header) === null || _token$layout9$header === void 0 ? void 0 : _token$layout9$header.colorBgHeader, token === null || token === void 0 ? void 0 : (_token$layout10 = token.layout) === null || _token$layout10 === void 0 ? void 0 : (_token$layout10$heade = _token$layout10.header) === null || _token$layout10$heade === void 0 ? void 0 : _token$layout10$heade.colorBgMenuItemHover, token === null || token === void 0 ? void 0 : (_token$layout11 = token.layout) === null || _token$layout11 === void 0 ? void 0 : (_token$layout11$heade = _token$layout11.header) === null || _token$layout11$heade === void 0 ? void 0 : _token$layout11$heade.colorBgMenuItemSelected, token === null || token === void 0 ? void 0 : (_token$layout12 = token.layout) === null || _token$layout12 === void 0 ? void 0 : (_token$layout12$heade = _token$layout12.header) === null || _token$layout12$heade === void 0 ? void 0 : _token$layout12$heade.colorTextMenu, token === null || token === void 0 ? void 0 : (_token$layout13 = token.layout) === null || _token$layout13 === void 0 ? void 0 : (_token$layout13$heade = _token$layout13.header) === null || _token$layout13$heade === void 0 ? void 0 : _token$layout13$heade.colorTextMenuActive, token === null || token === void 0 ? void 0 : (_token$layout14 = token.layout) === null || _token$layout14 === void 0 ? void 0 : (_token$layout14$heade = _token$layout14.header) === null || _token$layout14$heade === void 0 ? void 0 : _token$layout14$heade.colorTextMenuSelected, headerContentRender, prefixCls, props]);
   return wrapSSR((0,jsx_runtime.jsx)("div", {
     className: classnames_default()(prefixCls, hashId, propsClassName, defineProperty_defineProperty({}, "".concat(prefixCls, "-light"), true)),
     style: style,
@@ -54491,10 +54525,8 @@ var TopNavHeader = function TopNavHeader(props) {
 
 
 
-
-
 var genGlobalHeaderStyle = function genGlobalHeaderStyle(token) {
-  var _token$componentCls;
+  var _token$layout, _token$layout$header, _token$layout2, _token$layout2$header, _token$componentCls;
   return defineProperty_defineProperty({}, token.componentCls, (_token$componentCls = {
     position: 'relative',
     background: 'transparent',
@@ -54502,7 +54534,7 @@ var genGlobalHeaderStyle = function genGlobalHeaderStyle(token) {
     alignItems: 'center',
     marginBlock: 0,
     marginInline: 16,
-    height: token.heightLayoutHeader,
+    height: ((_token$layout = token.layout) === null || _token$layout === void 0 ? void 0 : (_token$layout$header = _token$layout.header) === null || _token$layout$header === void 0 ? void 0 : _token$layout$header.heightLayoutHeader) || 56,
     boxSizing: 'border-box',
     '> a': {
       height: '100%'
@@ -54511,7 +54543,7 @@ var genGlobalHeaderStyle = function genGlobalHeaderStyle(token) {
     marginInlineEnd: 16
   }), defineProperty_defineProperty(_token$componentCls, '&-collapsed-button', {
     minHeight: '22px',
-    color: token.colorHeaderTitle,
+    color: token === null || token === void 0 ? void 0 : (_token$layout2 = token.layout) === null || _token$layout2 === void 0 ? void 0 : (_token$layout2$header = _token$layout2.header) === null || _token$layout2$header === void 0 ? void 0 : _token$layout2$header.colorHeaderTitle,
     fontSize: '22px',
     marginInlineStart: '16px'
   }), defineProperty_defineProperty(_token$componentCls, '&-logo', {
@@ -54548,13 +54580,9 @@ var genGlobalHeaderStyle = function genGlobalHeaderStyle(token) {
   }), _token$componentCls));
 };
 function GlobalHeader_style_useStyle(prefixCls) {
-  var _useContext = (0,external_React_.useContext)(ProLayoutContext),
-    header = _useContext.header;
   return useStyle('ProLayoutGlobalHeader', function (token) {
     var GlobalHeaderToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
-      componentCls: ".".concat(prefixCls),
-      heightLayoutHeader: header.heightLayoutHeader,
-      colorHeaderTitle: header.colorHeaderTitle
+      componentCls: ".".concat(prefixCls)
     });
     return [genGlobalHeaderStyle(GlobalHeaderToken)];
   });
@@ -54669,7 +54697,7 @@ var GlobalHeader = function GlobalHeader(props) {
 
 var Header = external_antd_.Layout.Header;
 var DefaultHeader = function DefaultHeader(props) {
-  var _classNames, _process$env$NODE_ENV;
+  var _classNames, _process$env$NODE_ENV, _token$layout, _token$layout$header, _token$layout2, _token$layout2$header;
   var isMobile = props.isMobile,
     fixedHeader = props.fixedHeader,
     propsClassName = props.className,
@@ -54680,8 +54708,8 @@ var DefaultHeader = function DefaultHeader(props) {
     layout = props.layout,
     headerRender = props.headerRender,
     headerContentRender = props.headerContentRender;
-  var _useContext = (0,external_React_.useContext)(ProLayoutContext),
-    header = _useContext.header;
+  var _useContext = (0,external_React_.useContext)(ProProvider),
+    token = _useContext.token;
   var renderContent = (0,external_React_.useCallback)(function () {
     var isTop = layout === 'top';
     var clearMenuData = clearMenuItem(props.menuData || []);
@@ -54730,8 +54758,8 @@ var DefaultHeader = function DefaultHeader(props) {
       },
       children: [needFixedHeader && (0,jsx_runtime.jsx)(Header, {
         style: objectSpread2_objectSpread2({
-          height: header.heightLayoutHeader,
-          lineHeight: "".concat(header.heightLayoutHeader, "px"),
+          height: (token === null || token === void 0 ? void 0 : (_token$layout = token.layout) === null || _token$layout === void 0 ? void 0 : (_token$layout$header = _token$layout.header) === null || _token$layout$header === void 0 ? void 0 : _token$layout$header.heightLayoutHeader) || 56,
+          lineHeight: "".concat((token === null || token === void 0 ? void 0 : (_token$layout2 = token.layout) === null || _token$layout2 === void 0 ? void 0 : (_token$layout2$header = _token$layout2.header) === null || _token$layout2$header === void 0 ? void 0 : _token$layout2$header.heightLayoutHeader) || 56, "px"),
           backgroundColor: 'transparent',
           zIndex: 19
         }, style)
@@ -55905,7 +55933,7 @@ var initState = function initState(urlParams, settings, onSettingChange) {
       replaceSetting[key] = urlParams[key];
     }
   });
-  var newSettings = merge({}, settings, replaceSetting);
+  var newSettings = merge_merge({}, settings, replaceSetting);
   delete newSettings.menu;
   delete newSettings.title;
   delete newSettings.iconfontUrl;
@@ -57655,6 +57683,7 @@ function formatter(props) {
     if (notNullArray(item[childrenPropsName])) return true;
     if (notNullArray(item.children)) return true;
     if (item.path) return true;
+    if (item.originPath) return true;
     if (item.layout) return true; // 重定向
 
     if (item.redirect) return false;
@@ -57685,6 +57714,9 @@ function formatter(props) {
     if (item.path === '/*') {
       item.path = '.';
     }
+    if (!item.path && item.originPath) {
+      item.path = item.originPath;
+    }
     return item;
   }).map(function () {
     var item = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
@@ -58137,13 +58169,11 @@ var Logo = function Logo() {
 
 
 
-
-
 var style_genSiderMenuStyle = function genSiderMenuStyle(token) {
-  var _token$componentCls;
+  var _token$layout, _token$layout$sider, _token$layout2, _token$layout2$sider, _token$layout3, _token$layout3$sider, _token$layout4, _token$layout4$sider, _token$layout5, _token$layout5$sider, _token$layout6, _token$layout6$sider, _token$layout7, _token$layout7$sider, _token$layout8, _token$layout8$sider, _token$layout9, _token$layout9$header, _token$layout10, _token$layout10$heade, _token$layout11, _token$layout11$sider, _token$componentCls;
   return defineProperty_defineProperty({}, token.proComponentsCls, defineProperty_defineProperty({}, "".concat(token.proComponentsCls, "-layout"), defineProperty_defineProperty({}, token.componentCls, (_token$componentCls = {
     position: 'relative',
-    background: token.colorMenuBackground || 'transparent',
+    background: ((_token$layout = token.layout) === null || _token$layout === void 0 ? void 0 : (_token$layout$sider = _token$layout.sider) === null || _token$layout$sider === void 0 ? void 0 : _token$layout$sider.colorMenuBackground) || 'transparent',
     boxSizing: 'border-box',
     '&-menu': {
       position: 'relative',
@@ -58162,8 +58192,8 @@ var style_genSiderMenuStyle = function genSiderMenuStyle(token) {
     display: 'flex',
     flexDirection: 'column',
     height: '100%',
-    paddingInline: token.paddingInlineLayoutMenu,
-    paddingBlock: token.paddingBlockLayoutMenu,
+    paddingInline: (_token$layout2 = token.layout) === null || _token$layout2 === void 0 ? void 0 : (_token$layout2$sider = _token$layout2.sider) === null || _token$layout2$sider === void 0 ? void 0 : _token$layout2$sider.paddingInlineLayoutMenu,
+    paddingBlock: (_token$layout3 = token.layout) === null || _token$layout3 === void 0 ? void 0 : (_token$layout3$sider = _token$layout3.sider) === null || _token$layout3$sider === void 0 ? void 0 : _token$layout3$sider.paddingBlockLayoutMenu,
     borderInlineEnd: "1px solid ".concat(token.colorSplit)
   }), defineProperty_defineProperty(_token$componentCls, "".concat(token.antCls, "-menu"), defineProperty_defineProperty({}, "".concat(token.antCls, "-menu-item-group-title"), {
     fontSize: token.fontSizeSM,
@@ -58175,9 +58205,9 @@ var style_genSiderMenuStyle = function genSiderMenuStyle(token) {
     justifyContent: 'space-between',
     paddingInline: 12,
     paddingBlock: 16,
-    color: token.colorTextMenu,
+    color: (_token$layout4 = token.layout) === null || _token$layout4 === void 0 ? void 0 : (_token$layout4$sider = _token$layout4.sider) === null || _token$layout4$sider === void 0 ? void 0 : _token$layout4$sider.colorTextMenu,
     cursor: 'pointer',
-    borderBlockEnd: "1px solid ".concat(token.colorMenuItemDivider),
+    borderBlockEnd: "1px solid ".concat((_token$layout5 = token.layout) === null || _token$layout5 === void 0 ? void 0 : (_token$layout5$sider = _token$layout5.sider) === null || _token$layout5$sider === void 0 ? void 0 : _token$layout5$sider.colorMenuItemDivider),
     '> a': {
       display: 'flex',
       alignItems: 'center',
@@ -58195,7 +58225,7 @@ var style_genSiderMenuStyle = function genSiderMenuStyle(token) {
         marginBlock: 0,
         marginInlineEnd: 0,
         marginInlineStart: 6,
-        color: token.colorTextMenuTitle,
+        color: (_token$layout6 = token.layout) === null || _token$layout6 === void 0 ? void 0 : (_token$layout6$sider = _token$layout6.sider) === null || _token$layout6$sider === void 0 ? void 0 : _token$layout6$sider.colorTextMenuTitle,
         fontWeight: 600,
         fontSize: 16,
         lineHeight: '22px',
@@ -58217,7 +58247,7 @@ var style_genSiderMenuStyle = function genSiderMenuStyle(token) {
     justifyContent: 'space-between',
     marginBlock: 4,
     marginInline: 0,
-    color: token.colorTextMenu,
+    color: (_token$layout7 = token.layout) === null || _token$layout7 === void 0 ? void 0 : (_token$layout7$sider = _token$layout7.sider) === null || _token$layout7$sider === void 0 ? void 0 : _token$layout7$sider.colorTextMenu,
     '&-collapsed': {
       flexDirection: 'column-reverse',
       paddingBlock: 0,
@@ -58226,7 +58256,7 @@ var style_genSiderMenuStyle = function genSiderMenuStyle(token) {
       transition: 'font-size 0.3s ease-in-out'
     },
     '&-list': {
-      color: token.colorTextMenuSecondary,
+      color: (_token$layout8 = token.layout) === null || _token$layout8 === void 0 ? void 0 : (_token$layout8$sider = _token$layout8.sider) === null || _token$layout8$sider === void 0 ? void 0 : _token$layout8$sider.colorTextMenuSecondary,
       '&-collapsed': {
         marginBlockEnd: 8,
         animation: 'none'
@@ -58259,8 +58289,8 @@ var style_genSiderMenuStyle = function genSiderMenuStyle(token) {
     insetInlineStart: "-".concat(token.proLayoutCollapsedWidth - 12, "px"),
     position: 'absolute'
   }), defineProperty_defineProperty(_token$componentCls, '&-mix', {
-    height: "calc(100% - ".concat(token.heightLayoutHeader, "px)"),
-    insetBlockStart: "".concat(token.heightLayoutHeader, "px")
+    height: "calc(100% - ".concat((token === null || token === void 0 ? void 0 : (_token$layout9 = token.layout) === null || _token$layout9 === void 0 ? void 0 : (_token$layout9$header = _token$layout9.header) === null || _token$layout9$header === void 0 ? void 0 : _token$layout9$header.heightLayoutHeader) || 56, "px)"),
+    insetBlockStart: "".concat((token === null || token === void 0 ? void 0 : (_token$layout10 = token.layout) === null || _token$layout10 === void 0 ? void 0 : (_token$layout10$heade = _token$layout10.header) === null || _token$layout10$heade === void 0 ? void 0 : _token$layout10$heade.heightLayoutHeader) || 56, "px")
   }), defineProperty_defineProperty(_token$componentCls, '&-extra', {
     marginBlockEnd: 16,
     marginBlock: 0,
@@ -58278,22 +58308,18 @@ var style_genSiderMenuStyle = function genSiderMenuStyle(token) {
     boxShadow: 'none',
     background: 'transparent'
   }), defineProperty_defineProperty(_token$componentCls, '&-footer', {
-    color: token.colorTextMenuSecondary,
+    color: (_token$layout11 = token.layout) === null || _token$layout11 === void 0 ? void 0 : (_token$layout11$sider = _token$layout11.sider) === null || _token$layout11$sider === void 0 ? void 0 : _token$layout11$sider.colorTextMenuSecondary,
     paddingBlockEnd: 16,
     fontSize: token.fontSize
   }), _token$componentCls))));
 };
 function SiderMenu_style_useStyle(prefixCls, _ref2) {
   var proLayoutCollapsedWidth = _ref2.proLayoutCollapsedWidth;
-  var _useContext = (0,external_React_.useContext)(ProLayoutContext),
-    sider = _useContext.sider,
-    header = _useContext.header;
   return useStyle('ProLayoutSiderMenu', function (token) {
     var siderMenuToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
       componentCls: ".".concat(prefixCls),
-      proLayoutCollapsedWidth: proLayoutCollapsedWidth,
-      heightLayoutHeader: header.heightLayoutHeader
-    }, sider);
+      proLayoutCollapsedWidth: proLayoutCollapsedWidth
+    });
     return [style_genSiderMenuStyle(siderMenuToken)];
   });
 }
@@ -58396,8 +58422,6 @@ var SiderMenuWrapper = function SiderMenuWrapper(props) {
 
 
 
-
-
 /**
  * 主要区别：
  * 需要手动引入 import 'antd/dist/antd.css';
@@ -58406,7 +58430,7 @@ var SiderMenuWrapper = function SiderMenuWrapper(props) {
  * @returns
  */
 var compatibleStyle = function compatibleStyle(token) {
-  var _$concat$concat, _$concat5, _$concat6, _$concat8, _$concat9, _token$componentCls, _$concat$concat2, _$concat11, _ref;
+  var _token$layout, _token$layout$sider, _token$layout2, _token$layout2$sider, _token$layout3, _token$layout3$sider, _token$layout4, _token$layout4$sider, _token$layout5, _token$layout5$sider, _token$layout6, _token$layout6$sider, _token$layout7, _token$layout7$sider, _token$layout8, _token$layout8$sider, _token$layout9, _token$layout9$sider, _$concat$concat, _token$layout10, _token$layout10$sider, _token$layout11, _token$layout11$sider, _token$layout12, _token$layout12$sider, _token$layout13, _token$layout13$sider, _token$layout14, _token$layout14$sider, _token$layout15, _token$layout15$heade, _token$layout16, _token$layout16$heade, _token$layout17, _token$layout17$heade, _token$layout18, _token$layout18$heade, _token$layout19, _token$layout19$heade, _$concat5, _$concat6, _token$layout20, _token$layout20$heade, _token$layout21, _token$layout21$heade, _token$layout22, _token$layout22$heade, _token$layout23, _token$layout23$heade, _token$layout24, _token$layout24$heade, _token$layout25, _token$layout25$heade, _$concat8, _$concat9, _token$componentCls, _token$layout26, _token$layout26$sider, _token$layout27, _token$layout27$sider, _token$layout28, _token$layout28$sider, _token$layout29, _token$layout29$sider, _token$layout30, _token$layout30$sider, _$concat$concat2, _$concat11, _ref;
   if (external_antd_.version.startsWith('5')) {
     return {};
   }
@@ -58417,16 +58441,16 @@ var compatibleStyle = function compatibleStyle(token) {
     width: '100%',
     height: '100%'
   }, defineProperty_defineProperty(_token$componentCls, "".concat(token.proComponentsCls, "-base-menu"), (_$concat6 = {
-    color: token.sider.colorTextMenu
+    color: token === null || token === void 0 ? void 0 : (_token$layout = token.layout) === null || _token$layout === void 0 ? void 0 : (_token$layout$sider = _token$layout.sider) === null || _token$layout$sider === void 0 ? void 0 : _token$layout$sider.colorTextMenu
   }, defineProperty_defineProperty(_$concat6, "".concat(token.antCls, "-menu-sub"), {
-    color: token.sider.colorTextMenu
+    color: token === null || token === void 0 ? void 0 : (_token$layout2 = token.layout) === null || _token$layout2 === void 0 ? void 0 : (_token$layout2$sider = _token$layout2.sider) === null || _token$layout2$sider === void 0 ? void 0 : _token$layout2$sider.colorTextMenu
   }), defineProperty_defineProperty(_$concat6, "& ".concat(token.antCls, "-layout"), {
     backgroundColor: 'transparent',
     width: '100%'
   }), defineProperty_defineProperty(_$concat6, "".concat(token.antCls, "-menu-submenu-expand-icon, ").concat(token.antCls, "-menu-submenu-arrow"), {
     color: 'inherit'
   }), defineProperty_defineProperty(_$concat6, "&".concat(token.antCls, "-menu"), defineProperty_defineProperty({
-    color: token.sider.colorTextMenu
+    color: token === null || token === void 0 ? void 0 : (_token$layout3 = token.layout) === null || _token$layout3 === void 0 ? void 0 : (_token$layout3$sider = _token$layout3.sider) === null || _token$layout3$sider === void 0 ? void 0 : _token$layout3$sider.colorTextMenu
   }, "".concat(token.antCls, "-menu-item a"), {
     color: 'inherit'
   })), defineProperty_defineProperty(_$concat6, "&".concat(token.antCls, "-menu-inline"), defineProperty_defineProperty({}, "".concat(token.antCls, "-menu-selected::after,").concat(token.antCls, "-menu-item-selected::after"), {
@@ -58436,59 +58460,59 @@ var compatibleStyle = function compatibleStyle(token) {
   }), defineProperty_defineProperty(_$concat6, "".concat(token.antCls, "-menu-item:active, \n        ").concat(token.antCls, "-menu-submenu-title:active"), {
     backgroundColor: 'transparent!important'
   }), defineProperty_defineProperty(_$concat6, "&".concat(token.antCls, "-menu-light"), defineProperty_defineProperty({}, "".concat(token.antCls, "-menu-item:hover, \n            ").concat(token.antCls, "-menu-item-active,\n            ").concat(token.antCls, "-menu-submenu-active, \n            ").concat(token.antCls, "-menu-submenu-title:hover"), defineProperty_defineProperty({
-    color: token.sider.colorTextMenuActive,
+    color: token === null || token === void 0 ? void 0 : (_token$layout4 = token.layout) === null || _token$layout4 === void 0 ? void 0 : (_token$layout4$sider = _token$layout4.sider) === null || _token$layout4$sider === void 0 ? void 0 : _token$layout4$sider.colorTextMenuActive,
     borderRadius: token.radiusBase
   }, "".concat(token.antCls, "-menu-submenu-arrow"), {
-    color: token.sider.colorTextMenuActive
+    color: token === null || token === void 0 ? void 0 : (_token$layout5 = token.layout) === null || _token$layout5 === void 0 ? void 0 : (_token$layout5$sider = _token$layout5.sider) === null || _token$layout5$sider === void 0 ? void 0 : _token$layout5$sider.colorTextMenuActive
   }))), defineProperty_defineProperty(_$concat6, "&".concat(token.antCls, "-menu:not(").concat(token.antCls, "-menu-horizontal)"), (_$concat$concat = {}, defineProperty_defineProperty(_$concat$concat, "".concat(token.antCls, "-menu-item-selected"), {
-    backgroundColor: token.sider.colorBgMenuItemSelected,
+    backgroundColor: token === null || token === void 0 ? void 0 : (_token$layout6 = token.layout) === null || _token$layout6 === void 0 ? void 0 : (_token$layout6$sider = _token$layout6.sider) === null || _token$layout6$sider === void 0 ? void 0 : _token$layout6$sider.colorBgMenuItemSelected,
     borderRadius: token.radiusBase
   }), defineProperty_defineProperty(_$concat$concat, "".concat(token.antCls, "-menu-item:hover, \n            ").concat(token.antCls, "-menu-item-active,\n            ").concat(token.antCls, "-menu-submenu-title:hover"), defineProperty_defineProperty({
-    color: token.sider.colorTextMenuActive,
+    color: token === null || token === void 0 ? void 0 : (_token$layout7 = token.layout) === null || _token$layout7 === void 0 ? void 0 : (_token$layout7$sider = _token$layout7.sider) === null || _token$layout7$sider === void 0 ? void 0 : _token$layout7$sider.colorTextMenuActive,
     borderRadius: token.radiusBase,
-    backgroundColor: token.sider.colorBgMenuItemHover
+    backgroundColor: token === null || token === void 0 ? void 0 : (_token$layout8 = token.layout) === null || _token$layout8 === void 0 ? void 0 : (_token$layout8$sider = _token$layout8.sider) === null || _token$layout8$sider === void 0 ? void 0 : _token$layout8$sider.colorBgMenuItemHover
   }, "".concat(token.antCls, "-menu-submenu-arrow"), {
-    color: token.sider.colorTextMenuActive
+    color: token === null || token === void 0 ? void 0 : (_token$layout9 = token.layout) === null || _token$layout9 === void 0 ? void 0 : (_token$layout9$sider = _token$layout9.sider) === null || _token$layout9$sider === void 0 ? void 0 : _token$layout9$sider.colorTextMenuActive
   })), _$concat$concat)), defineProperty_defineProperty(_$concat6, "".concat(token.antCls, "-menu-item-selected"), {
-    color: token.sider.colorTextMenuSelected
+    color: token === null || token === void 0 ? void 0 : (_token$layout10 = token.layout) === null || _token$layout10 === void 0 ? void 0 : (_token$layout10$sider = _token$layout10.sider) === null || _token$layout10$sider === void 0 ? void 0 : _token$layout10$sider.colorTextMenuSelected
   }), defineProperty_defineProperty(_$concat6, "".concat(token.antCls, "-menu-submenu-selected"), {
-    color: token.sider.colorTextMenuSelected
+    color: token === null || token === void 0 ? void 0 : (_token$layout11 = token.layout) === null || _token$layout11 === void 0 ? void 0 : (_token$layout11$sider = _token$layout11.sider) === null || _token$layout11$sider === void 0 ? void 0 : _token$layout11$sider.colorTextMenuSelected
   }), defineProperty_defineProperty(_$concat6, "&".concat(token.antCls, "-menu:not(").concat(token.antCls, "-menu-inline) ").concat(token.antCls, "-menu-submenu-open"), {
-    color: token.sider.colorTextMenuSelected
+    color: token === null || token === void 0 ? void 0 : (_token$layout12 = token.layout) === null || _token$layout12 === void 0 ? void 0 : (_token$layout12$sider = _token$layout12.sider) === null || _token$layout12$sider === void 0 ? void 0 : _token$layout12$sider.colorTextMenuSelected
   }), defineProperty_defineProperty(_$concat6, "&".concat(token.antCls, "-menu-vertical"), defineProperty_defineProperty({}, "".concat(token.antCls, "-menu-submenu-selected"), {
     borderRadius: token.radiusBase,
-    color: token.sider.colorTextMenuSelected
+    color: token === null || token === void 0 ? void 0 : (_token$layout13 = token.layout) === null || _token$layout13 === void 0 ? void 0 : (_token$layout13$sider = _token$layout13.sider) === null || _token$layout13$sider === void 0 ? void 0 : _token$layout13$sider.colorTextMenuSelected
   })), defineProperty_defineProperty(_$concat6, "".concat(token.antCls, "-menu-submenu:hover > ").concat(token.antCls, "-menu-submenu-title > ").concat(token.antCls, "-menu-submenu-arrow"), {
-    color: token.sider.colorTextMenuActive
+    color: token === null || token === void 0 ? void 0 : (_token$layout14 = token.layout) === null || _token$layout14 === void 0 ? void 0 : (_token$layout14$sider = _token$layout14.sider) === null || _token$layout14$sider === void 0 ? void 0 : _token$layout14$sider.colorTextMenuActive
   }), defineProperty_defineProperty(_$concat6, "&".concat(token.antCls, "-menu-horizontal"), (_$concat5 = {}, defineProperty_defineProperty(_$concat5, "".concat(token.antCls, "-menu-item:hover,\n          ").concat(token.antCls, "-menu-submenu:hover,\n          ").concat(token.antCls, "-menu-item-active,\n          ").concat(token.antCls, "-menu-submenu-active"), {
     borderRadius: 4,
-    color: token.header.colorTextMenuActive,
-    backgroundColor: token.header.colorBgMenuItemHover
+    color: token === null || token === void 0 ? void 0 : (_token$layout15 = token.layout) === null || _token$layout15 === void 0 ? void 0 : (_token$layout15$heade = _token$layout15.header) === null || _token$layout15$heade === void 0 ? void 0 : _token$layout15$heade.colorTextMenuActive,
+    backgroundColor: token === null || token === void 0 ? void 0 : (_token$layout16 = token.layout) === null || _token$layout16 === void 0 ? void 0 : (_token$layout16$heade = _token$layout16.header) === null || _token$layout16$heade === void 0 ? void 0 : _token$layout16$heade.colorBgMenuItemHover
   }), defineProperty_defineProperty(_$concat5, "".concat(token.antCls, "-menu-item-open,\n          ").concat(token.antCls, "-menu-submenu-open,\n          ").concat(token.antCls, "-menu-item-selected,\n          ").concat(token.antCls, "-menu-submenu-selected"), defineProperty_defineProperty({
-    backgroundColor: token.header.colorBgMenuItemSelected,
+    backgroundColor: token === null || token === void 0 ? void 0 : (_token$layout17 = token.layout) === null || _token$layout17 === void 0 ? void 0 : (_token$layout17$heade = _token$layout17.header) === null || _token$layout17$heade === void 0 ? void 0 : _token$layout17$heade.colorBgMenuItemSelected,
     borderRadius: token.radiusBase,
-    color: token.header.colorTextMenuSelected
+    color: token === null || token === void 0 ? void 0 : (_token$layout18 = token.layout) === null || _token$layout18 === void 0 ? void 0 : (_token$layout18$heade = _token$layout18.header) === null || _token$layout18$heade === void 0 ? void 0 : _token$layout18$heade.colorTextMenuSelected
   }, "".concat(token.antCls, "-menu-submenu-arrow"), {
-    color: token.header.colorTextMenuSelected
+    color: token === null || token === void 0 ? void 0 : (_token$layout19 = token.layout) === null || _token$layout19 === void 0 ? void 0 : (_token$layout19$heade = _token$layout19.header) === null || _token$layout19$heade === void 0 ? void 0 : _token$layout19$heade.colorTextMenuSelected
   })), defineProperty_defineProperty(_$concat5, "> ".concat(token.antCls, "-menu-item, > ").concat(token.antCls, "-menu-submenu"), {
     paddingInline: 16,
     marginInline: 4
   }), defineProperty_defineProperty(_$concat5, "> ".concat(token.antCls, "-menu-item::after, > ").concat(token.antCls, "-menu-submenu::after"), {
     display: 'none'
   }), _$concat5)), _$concat6)), defineProperty_defineProperty(_token$componentCls, "".concat(token.proComponentsCls, "-top-nav-header-base-menu"), (_$concat9 = {}, defineProperty_defineProperty(_$concat9, "&".concat(token.antCls, "-menu"), defineProperty_defineProperty({
-    color: token.header.colorTextMenu
+    color: token === null || token === void 0 ? void 0 : (_token$layout20 = token.layout) === null || _token$layout20 === void 0 ? void 0 : (_token$layout20$heade = _token$layout20.header) === null || _token$layout20$heade === void 0 ? void 0 : _token$layout20$heade.colorTextMenu
   }, "".concat(token.antCls, "-menu-item a"), {
     color: 'inherit'
   })), defineProperty_defineProperty(_$concat9, "&".concat(token.antCls, "-menu-light"), (_$concat8 = {}, defineProperty_defineProperty(_$concat8, "".concat(token.antCls, "-menu-item:hover, \n            ").concat(token.antCls, "-menu-item-active,\n            ").concat(token.antCls, "-menu-submenu-active, \n            ").concat(token.antCls, "-menu-submenu-title:hover"), defineProperty_defineProperty({
-    color: token.header.colorTextMenuActive,
+    color: token === null || token === void 0 ? void 0 : (_token$layout21 = token.layout) === null || _token$layout21 === void 0 ? void 0 : (_token$layout21$heade = _token$layout21.header) === null || _token$layout21$heade === void 0 ? void 0 : _token$layout21$heade.colorTextMenuActive,
     borderRadius: token.radiusBase,
-    backgroundColor: token.header.colorBgMenuItemSelected
+    backgroundColor: token === null || token === void 0 ? void 0 : (_token$layout22 = token.layout) === null || _token$layout22 === void 0 ? void 0 : (_token$layout22$heade = _token$layout22.header) === null || _token$layout22$heade === void 0 ? void 0 : _token$layout22$heade.colorBgMenuItemSelected
   }, "".concat(token.antCls, "-menu-submenu-arrow"), {
-    color: token.header.colorTextMenuActive
+    color: token === null || token === void 0 ? void 0 : (_token$layout23 = token.layout) === null || _token$layout23 === void 0 ? void 0 : (_token$layout23$heade = _token$layout23.header) === null || _token$layout23$heade === void 0 ? void 0 : _token$layout23$heade.colorTextMenuActive
   })), defineProperty_defineProperty(_$concat8, "".concat(token.antCls, "-menu-item-selected"), {
-    color: token.header.colorTextMenuSelected,
+    color: token === null || token === void 0 ? void 0 : (_token$layout24 = token.layout) === null || _token$layout24 === void 0 ? void 0 : (_token$layout24$heade = _token$layout24.header) === null || _token$layout24$heade === void 0 ? void 0 : _token$layout24$heade.colorTextMenuSelected,
     borderRadius: token.radiusBase,
-    backgroundColor: token.header.colorBgMenuItemSelected
+    backgroundColor: token === null || token === void 0 ? void 0 : (_token$layout25 = token.layout) === null || _token$layout25 === void 0 ? void 0 : (_token$layout25$heade = _token$layout25.header) === null || _token$layout25$heade === void 0 ? void 0 : _token$layout25$heade.colorBgMenuItemSelected
   }), _$concat8)), _$concat9)), _token$componentCls)), defineProperty_defineProperty(_ref, "".concat(token.antCls, "-menu-sub").concat(token.antCls, "-menu-inline"), {
     backgroundColor: 'transparent!important'
   }), defineProperty_defineProperty(_ref, "".concat(token.antCls, "-menu-submenu-popup"), (_$concat11 = {
@@ -58501,22 +58525,22 @@ var compatibleStyle = function compatibleStyle(token) {
   }, "".concat(token.antCls, "-menu-item:active, \n        ").concat(token.antCls, "-menu-submenu-title:active"), {
     backgroundColor: 'transparent!important'
   })), defineProperty_defineProperty(_$concat11, "".concat(token.antCls, "-menu-item-selected"), {
-    color: token.sider.colorTextMenuSelected
+    color: token === null || token === void 0 ? void 0 : (_token$layout26 = token.layout) === null || _token$layout26 === void 0 ? void 0 : (_token$layout26$sider = _token$layout26.sider) === null || _token$layout26$sider === void 0 ? void 0 : _token$layout26$sider.colorTextMenuSelected
   }), defineProperty_defineProperty(_$concat11, "".concat(token.antCls, "-menu-submenu-selected"), {
-    color: token.sider.colorTextMenuSelected
+    color: token === null || token === void 0 ? void 0 : (_token$layout27 = token.layout) === null || _token$layout27 === void 0 ? void 0 : (_token$layout27$sider = _token$layout27.sider) === null || _token$layout27$sider === void 0 ? void 0 : _token$layout27$sider.colorTextMenuSelected
   }), defineProperty_defineProperty(_$concat11, "".concat(token.antCls, "-menu:not(").concat(token.antCls, "-menu-horizontal)"), (_$concat$concat2 = {}, defineProperty_defineProperty(_$concat$concat2, "".concat(token.antCls, "-menu-item-selected"), {
     backgroundColor: 'rgba(0, 0, 0, 0.04)',
     borderRadius: token.radiusBase,
-    color: token.sider.colorTextMenuSelected
+    color: token === null || token === void 0 ? void 0 : (_token$layout28 = token.layout) === null || _token$layout28 === void 0 ? void 0 : (_token$layout28$sider = _token$layout28.sider) === null || _token$layout28$sider === void 0 ? void 0 : _token$layout28$sider.colorTextMenuSelected
   }), defineProperty_defineProperty(_$concat$concat2, "".concat(token.antCls, "-menu-item:hover, \n          ").concat(token.antCls, "-menu-item-active,\n          ").concat(token.antCls, "-menu-submenu-title:hover"), defineProperty_defineProperty({
-    color: token.sider.colorTextMenuActive,
+    color: token === null || token === void 0 ? void 0 : (_token$layout29 = token.layout) === null || _token$layout29 === void 0 ? void 0 : (_token$layout29$sider = _token$layout29.sider) === null || _token$layout29$sider === void 0 ? void 0 : _token$layout29$sider.colorTextMenuActive,
     borderRadius: token.radiusBase
   }, "".concat(token.antCls, "-menu-submenu-arrow"), {
-    color: token.sider.colorTextMenuActive
+    color: token === null || token === void 0 ? void 0 : (_token$layout30 = token.layout) === null || _token$layout30 === void 0 ? void 0 : (_token$layout30$sider = _token$layout30.sider) === null || _token$layout30$sider === void 0 ? void 0 : _token$layout30$sider.colorTextMenuActive
   })), _$concat$concat2)), _$concat11)), _ref;
 };
 var genProLayoutStyle = function genProLayoutStyle(token) {
-  var _$concat12, _token$proComponentsC;
+  var _token$layout31, _token$layout31$pageC, _token$layout32, _token$layout32$pageC, _token$layout33, _token$layout33$pageC, _token$layout34, _$concat12, _token$proComponentsC;
   return defineProperty_defineProperty({
     body: {
       paddingBlock: 0,
@@ -58535,13 +58559,13 @@ var genProLayoutStyle = function genProLayoutStyle(token) {
     display: 'flex',
     flexDirection: 'column',
     width: '100%',
-    backgroundColor: token.pageContainer.colorBgPageContainer || 'transparent',
+    backgroundColor: (token === null || token === void 0 ? void 0 : (_token$layout31 = token.layout) === null || _token$layout31 === void 0 ? void 0 : (_token$layout31$pageC = _token$layout31.pageContainer) === null || _token$layout31$pageC === void 0 ? void 0 : _token$layout31$pageC.colorBgPageContainer) || 'transparent',
     position: 'relative',
     '*': {
       boxSizing: 'border-box'
     },
-    paddingBlock: token.pageContainer.paddingBlockPageContainerContent,
-    paddingInline: token.pageContainer.paddingInlinePageContainerContent,
+    paddingBlock: token === null || token === void 0 ? void 0 : (_token$layout32 = token.layout) === null || _token$layout32 === void 0 ? void 0 : (_token$layout32$pageC = _token$layout32.pageContainer) === null || _token$layout32$pageC === void 0 ? void 0 : _token$layout32$pageC.paddingBlockPageContainerContent,
+    paddingInline: token === null || token === void 0 ? void 0 : (_token$layout33 = token.layout) === null || _token$layout33 === void 0 ? void 0 : (_token$layout33$pageC = _token$layout33.pageContainer) === null || _token$layout33$pageC === void 0 ? void 0 : _token$layout33$pageC.paddingInlinePageContainerContent,
     '&-has-page-container': {
       padding: 0
     }
@@ -58560,7 +58584,7 @@ var genProLayoutStyle = function genProLayoutStyle(token) {
     zIndex: 0,
     height: '100%',
     width: '100%',
-    background: token.bgLayout
+    background: token === null || token === void 0 ? void 0 : (_token$layout34 = token.layout) === null || _token$layout34 === void 0 ? void 0 : _token$layout34.bgLayout
   }), _$concat12)), defineProperty_defineProperty(_token$proComponentsC, "".concat(token.antCls, "-menu-submenu-popup"), {
     backgroundColor: 'rgba(255, 255, 255, 0.42)',
     '-webkit-backdrop-filter': 'blur(8px)',
@@ -58568,11 +58592,10 @@ var genProLayoutStyle = function genProLayoutStyle(token) {
   }), _token$proComponentsC));
 };
 function es_style_useStyle(prefixCls) {
-  var proToken = (0,external_React_.useContext)(ProLayoutContext);
   return useStyle('ProLayout', function (token) {
     var proLayoutToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
       componentCls: ".".concat(prefixCls)
-    }, proToken);
+    });
     return [genProLayoutStyle(proLayoutToken), compatibleStyle(proLayoutToken)];
   });
 }
@@ -59234,6 +59257,7 @@ BaseProLayout.defaultProps = objectSpread2_objectSpread2(objectSpread2_objectSpr
 var ProLayout_ProLayout = function ProLayout(props) {
   var _process$env$NODE_ENV;
   var colorPrimary = props.colorPrimary;
+  var tokenContext = (0,external_React_.useContext)(ProProvider);
   return (0,jsx_runtime.jsx)(external_antd_.ConfigProvider
   // @ts-ignore
   , {
@@ -59249,10 +59273,10 @@ var ProLayout_ProLayout = function ProLayout(props) {
     },
     children: (0,jsx_runtime.jsx)(ConfigProviderWrap, {
       autoClearCache: true,
-      children: (0,jsx_runtime.jsx)(ProLayoutProvider, {
-        token: props.token,
-        children: (0,jsx_runtime.jsx)(BaseProLayout, objectSpread2_objectSpread2({}, props))
-      })
+      token: objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, tokenContext.token), {}, {
+        layout: props.token
+      }),
+      children: (0,jsx_runtime.jsx)(BaseProLayout, objectSpread2_objectSpread2({}, props))
     })
   });
 };
@@ -60738,24 +60762,29 @@ function sortableElement(WrappedComponent) {
 
 
 var Alert_style_genProStyle = function genProStyle(token) {
-  var _token$componentCls;
-  return defineProperty_defineProperty({}, token.componentCls, (_token$componentCls = {
-    marginBlockEnd: 16
-  }, defineProperty_defineProperty(_token$componentCls, "".concat(token.antCls, "-alert ").concat(token.antCls, "-alert-no-icon"), {
-    paddingBlock: token.paddingSM,
-    paddingInline: token.paddingLG
-  }), defineProperty_defineProperty(_token$componentCls, '&-info', {
-    display: 'flex',
-    alignItems: 'center',
-    transition: 'all 0.3s',
-    '&-content': {
-      flex: 1
+  return defineProperty_defineProperty({}, token.componentCls, {
+    marginBlockEnd: 16,
+    backgroundColor: 'rgba(0,0,0,0.02)',
+    borderRadius: token.radiusBase,
+    border: '0.5px solid #BFBFBF',
+    '&-container': {
+      paddingBlock: token.paddingSM,
+      paddingInline: token.paddingLG
     },
-    '&-option': {
-      minWidth: 48,
-      paddingInlineStart: 16
+    '&-info': {
+      display: 'flex',
+      alignItems: 'center',
+      transition: 'all 0.3s',
+      color: token.colorTextSecondary,
+      '&-content': {
+        flex: 1
+      },
+      '&-option': {
+        minWidth: 48,
+        paddingInlineStart: 16
+      }
     }
-  }), _token$componentCls));
+  });
 };
 function Alert_style_useStyle(prefixCls) {
   return useStyle('ProTableAlert', function (token) {
@@ -60820,9 +60849,10 @@ function TableAlert(_ref) {
     return null;
   }
   return wrapSSR((0,jsx_runtime.jsx)("div", {
-    className: className,
-    children: (0,jsx_runtime.jsx)(external_antd_.Alert, {
-      message: (0,jsx_runtime.jsxs)("div", {
+    className: "".concat(className, " ").concat(hashId),
+    children: (0,jsx_runtime.jsx)("div", {
+      className: "".concat(className, "-container ").concat(hashId),
+      children: (0,jsx_runtime.jsxs)("div", {
         className: "".concat(className, "-info ").concat(hashId),
         children: [(0,jsx_runtime.jsx)("div", {
           className: "".concat(className, "-info-content ").concat(hashId),
@@ -60831,8 +60861,7 @@ function TableAlert(_ref) {
           className: "".concat(className, "-info-option ").concat(hashId),
           children: option
         }) : null]
-      }),
-      type: "info"
+      })
     })
   }));
 }
@@ -61095,7 +61124,11 @@ function sortData(_ref, data) {
   var oldIndex = _ref.oldIndex,
     newIndex = _ref.newIndex;
   if (oldIndex !== newIndex) {
-    var newData = arrayMoveImmutable(toConsumableArray_toConsumableArray(data || []), oldIndex, newIndex).filter(function (el) {
+    var newData = arrayMoveImmutable({
+      array: toConsumableArray_toConsumableArray(data || []),
+      fromIndex: oldIndex,
+      toIndex: newIndex
+    }).filter(function (el) {
       return !!el;
     });
     return toConsumableArray_toConsumableArray(newData);
@@ -62285,7 +62318,10 @@ function ColumnSetting(props) {
 
 
 
+
 var HeaderMenu = function HeaderMenu(props) {
+  var _useToken = useStyle_useToken(),
+    hashId = _useToken.hashId;
   var _props$items = props.items,
     items = _props$items === void 0 ? [] : _props$items,
     _props$type = props.type,
@@ -62307,13 +62343,13 @@ var HeaderMenu = function HeaderMenu(props) {
   }) || items[0];
   if (type === 'inline') {
     return (0,jsx_runtime.jsx)("div", {
-      className: classnames_default()("".concat(prefixCls, "-menu"), "".concat(prefixCls, "-inline-menu")),
+      className: classnames_default()("".concat(prefixCls, "-menu"), "".concat(prefixCls, "-inline-menu"), hashId),
       children: items.map(function (item, index) {
         return (0,jsx_runtime.jsx)("div", {
           onClick: function onClick() {
             setActiveKey(item.key);
           },
-          className: classnames_default()("".concat(prefixCls, "-inline-menu-item"), activeItem.key === item.key ? "".concat(prefixCls, "-inline-menu-item-active") : undefined),
+          className: classnames_default()("".concat(prefixCls, "-inline-menu-item"), activeItem.key === item.key ? "".concat(prefixCls, "-inline-menu-item-active") : undefined, hashId),
           children: item.label
         }, item.key || index);
       })
@@ -62698,12 +62734,12 @@ var ListToolBar = function ListToolBar(_ref2) {
     return (0,jsx_runtime.jsxs)(external_antd_.Space, {
       className: "".concat(prefixCls, "-right ").concat(hashId),
       direction: isMobile ? 'vertical' : 'horizontal',
-      size: 16,
+      size: 8,
       align: isMobile ? 'end' : 'center',
-      children: [hasTitle && searchNode ? (0,jsx_runtime.jsx)("div", {
+      children: [!multipleLine ? filtersNode : null, hasTitle && searchNode ? (0,jsx_runtime.jsx)("div", {
         className: "".concat(prefixCls, "-search ").concat(hashId),
         children: searchNode
-      }) : null, !multipleLine ? filtersNode : null, actionDom, (settings === null || settings === void 0 ? void 0 : settings.length) ? (0,jsx_runtime.jsx)(external_antd_.Space, {
+      }) : null, actionDom, (settings === null || settings === void 0 ? void 0 : settings.length) ? (0,jsx_runtime.jsx)(external_antd_.Space, {
         size: 12,
         align: "center",
         className: "".concat(prefixCls, "-setting-items ").concat(hashId),
@@ -63238,7 +63274,7 @@ var style_genProListStyle = function genProListStyle(token) {
   }), defineProperty_defineProperty(_search, '&-light-filter', {
     marginBlockEnd: 0,
     paddingBlock: 0,
-    paddingInline: 8
+    paddingInline: 0
   }), defineProperty_defineProperty(_search, '&-form-option', (_formOption = {}, defineProperty_defineProperty(_formOption, "".concat(token.antCls, "-form-item"), {}), defineProperty_defineProperty(_formOption, "".concat(token.antCls, "-form-item-label"), {}), defineProperty_defineProperty(_formOption, "".concat(token.antCls, "-form-item-control-input"), {}), _formOption)), defineProperty_defineProperty(_search, '@media (max-width: 575px)', defineProperty_defineProperty({}, token.componentCls, defineProperty_defineProperty({
     height: 'auto !important',
     paddingBlockEnd: '24px'
@@ -64193,7 +64229,6 @@ var Table_excluded = ["rowKey", "tableClassName", "action", "tableColumn", "type
 
 // 兼容代码-----------
 
-
 //----------------------
 
 
@@ -70289,10 +70324,10 @@ var genLinkStyle = function genLinkStyle(token) {
     }), _a)
   };
 };
-var genCommonStyle = function genCommonStyle(token, rootPrefixCls) {
+var genCommonStyle = function genCommonStyle(token, componentPrefixCls) {
   var fontFamily = token.fontFamily,
     fontSize = token.fontSize;
-  var rootPrefixSelector = "[class^=\"".concat(rootPrefixCls, "-\"], [class*=\" ").concat(rootPrefixCls, "-\"]");
+  var rootPrefixSelector = "[class^=\"".concat(componentPrefixCls, "\"], [class*=\" ").concat(componentPrefixCls, "\"]");
   return defineProperty_defineProperty({}, rootPrefixSelector, defineProperty_defineProperty({
     fontFamily: fontFamily,
     fontSize: fontSize,
@@ -70320,7 +70355,7 @@ var genFocusStyle = function genFocusStyle(token) {
   };
 };
 ;// CONCATENATED MODULE: ./node_modules/antd/es/version/version.js
-/* harmony default export */ var version = ('5.0.0-alpha.2');
+/* harmony default export */ var version = ('5.0.0-alpha.4');
 ;// CONCATENATED MODULE: ./node_modules/antd/es/version/index.js
 /* eslint import/no-unresolved: 0 */
 // @ts-ignore
@@ -70898,7 +70933,6 @@ function theme_useToken() {
 
 
 
-
 function genComponentStyleHook(component, styleFn, getDefaultToken) {
   return function (prefixCls) {
     var _useToken = theme_useToken(),
@@ -70910,7 +70944,6 @@ function genComponentStyleHook(component, styleFn, getDefaultToken) {
       getPrefixCls = _useContext.getPrefixCls,
       iconPrefixCls = _useContext.iconPrefixCls;
     var rootPrefixCls = getPrefixCls();
-    if (false) {}
     // Generate style for all a tags in antd component.
     useStyleRegister({
       theme: theme,
@@ -70921,7 +70954,7 @@ function genComponentStyleHook(component, styleFn, getDefaultToken) {
       return [{
         // Link
         '&': genLinkStyle(token)
-      }, genCommonStyle(token, rootPrefixCls)];
+      }];
     });
     return [useStyleRegister({
       theme: theme,
@@ -70949,7 +70982,7 @@ function genComponentStyleHook(component, styleFn, getDefaultToken) {
         overrideComponentToken: token[component]
       });
       flush(component, mergedComponentToken);
-      return styleInterpolation;
+      return [genCommonStyle(token, prefixCls), styleInterpolation];
     }), hashId];
   };
 }
@@ -76173,24 +76206,24 @@ function registerTheme(globalPrefixCls, theme) {
 
 
 
+
 function useTheme(theme, parentTheme) {
   var themeConfig = theme || {};
-  var parentThemeConfig = parentTheme || {};
+  var parentThemeConfig = parentTheme || theme_defaultConfig;
   var mergedTheme = useMemo_useMemo(function () {
     if (!theme) {
       return parentTheme;
     }
     // Override
-    var mergedOverride = extends_extends({}, parentThemeConfig.components);
+    var mergedComponents = extends_extends({}, parentThemeConfig.components);
     Object.keys(theme.components || {}).forEach(function (componentName) {
-      mergedOverride[componentName] = extends_extends(extends_extends({}, mergedOverride[componentName]), theme.components[componentName]);
+      mergedComponents[componentName] = extends_extends(extends_extends({}, mergedComponents[componentName]), theme.components[componentName]);
     });
     // Base token
-    var merged = extends_extends(extends_extends(extends_extends({}, parentThemeConfig), themeConfig), {
+    return extends_extends(extends_extends(extends_extends({}, parentThemeConfig), themeConfig), {
       token: extends_extends(extends_extends({}, parentThemeConfig.token), themeConfig.token),
-      override: mergedOverride
+      components: mergedComponents
     });
-    return merged;
   }, [themeConfig, parentThemeConfig], function (prev, next) {
     return prev.some(function (prevTheme, index) {
       var nextTheme = next[index];
@@ -76672,7 +76705,7 @@ function getPlacements(config) {
 var isValidElement = external_React_.isValidElement;
 
 function isFragment(child) {
-  return child && child.type === external_React_.Fragment;
+  return child && isValidElement(child) && child.type === external_React_.Fragment;
 }
 function replaceElement(element, replacement, props) {
   if (!isValidElement(element)) {
@@ -81345,14 +81378,14 @@ var accessibilityFocus = function accessibilityFocus(token) {
   return extends_extends({}, genFocusOutline(token));
 };
 var getThemeStyle = function getThemeStyle(token, themeSuffix) {
-  var _$concat3, _$concat4, _$concat$concat3, _$concat8, _$concat$concat4;
+  var _not$concat, _$concat3, _$concat4, _$concat$concat3, _$concat8, _$concat$concat4;
   var componentCls = token.componentCls,
     colorItemText = token.colorItemText,
     colorItemTextSelected = token.colorItemTextSelected,
+    colorItemTextSelectedHorizontal = token.colorItemTextSelectedHorizontal,
     colorGroupTitle = token.colorGroupTitle,
     colorItemBg = token.colorItemBg,
     colorSubItemBg = token.colorSubItemBg,
-    colorItemBgActive = token.colorItemBgActive,
     colorItemBgSelectedHorizontal = token.colorItemBgSelectedHorizontal,
     colorItemBgSelected = token.colorItemBgSelected,
     colorActiveBarHeight = token.colorActiveBarHeight,
@@ -81362,16 +81395,20 @@ var getThemeStyle = function getThemeStyle(token, themeSuffix) {
     motionEaseInOut = token.motionEaseInOut,
     motionEaseOut = token.motionEaseOut,
     menuItemPaddingInline = token.menuItemPaddingInline,
+    itemMarginInline = token.itemMarginInline,
     motionDurationFast = token.motionDurationFast,
     colorItemTextHover = token.colorItemTextHover,
     lineType = token.lineType,
     colorSplit = token.colorSplit,
+    colorItemBgActive = token.colorItemBgActive,
     colorItemTextDisabled = token.colorItemTextDisabled,
     colorDangerItemText = token.colorDangerItemText,
     colorDangerItemTextHover = token.colorDangerItemTextHover,
     colorDangerItemTextSelected = token.colorDangerItemTextSelected,
     colorDangerItemBgActive = token.colorDangerItemBgActive,
-    colorDangerItemBgSelected = token.colorDangerItemBgSelected;
+    colorDangerItemBgSelected = token.colorDangerItemBgSelected,
+    radiusItem = token.radiusItem,
+    colorItemBgHover = token.colorItemBgHover;
   return defineProperty_defineProperty({}, "".concat(componentCls, "-").concat(themeSuffix), (_$concat$concat4 = {
     color: colorItemText,
     background: colorItemBg
@@ -81383,9 +81420,49 @@ var getThemeStyle = function getThemeStyle(token, themeSuffix) {
     color: "".concat(colorItemTextDisabled, " !important")
   }), 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(_$concat$concat4, "".concat(componentCls, "-item:active, ").concat(componentCls, "-submenu-title:active"), {
-    background: colorItemBgActive
-  }), defineProperty_defineProperty(_$concat$concat4, "".concat(componentCls, "-item-danger"), (_$concat3 = {
+  })), defineProperty_defineProperty(_$concat$concat4, "&:not(".concat(componentCls, "-horizontal)"), (_not$concat = {}, defineProperty_defineProperty(_not$concat, "".concat(componentCls, "-item:not(").concat(componentCls, "-item-selected)"), {
+    '&:hover': {
+      backgroundColor: colorItemBgHover
+    },
+    '&:active::before': {
+      content: '""',
+      position: 'absolute',
+      insetInlineStart: 0,
+      top: 0,
+      width: "100%",
+      height: '100%',
+      flex: 1,
+      borderRadius: radiusItem,
+      backgroundColor: colorItemBgActive,
+      transition: "background-color ".concat(motionDurationFast)
+    }
+  }), defineProperty_defineProperty(_not$concat, "".concat(componentCls, "-submenu-title"), {
+    '&::before': {
+      content: '""',
+      position: 'absolute',
+      insetInlineStart: itemMarginInline,
+      top: 0,
+      width: "calc(100% - ".concat(itemMarginInline * 2, "px)"),
+      height: '100%',
+      borderRadius: radiusItem,
+      backgroundColor: 'transparent',
+      transition: "background-color ".concat(motionDurationFast)
+    },
+    '&:hover::before': {
+      backgroundColor: colorItemBgHover
+    },
+    '&:active::after': {
+      content: '""',
+      position: 'absolute',
+      insetInlineStart: itemMarginInline,
+      top: 0,
+      width: "calc(100% - ".concat(itemMarginInline * 2, "px)"),
+      height: '100%',
+      borderRadius: radiusItem,
+      backgroundColor: colorItemBgActive,
+      transition: "background-color ".concat(motionDurationFast)
+    }
+  }), _not$concat)), 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
@@ -81423,23 +81500,23 @@ var getThemeStyle = function getThemeStyle(token, themeSuffix) {
       content: '""'
     }
   }, defineProperty_defineProperty(_$concat$concat3, "&:hover, &-active, &-open", {
-    color: colorItemTextSelected,
+    color: colorItemTextSelectedHorizontal,
     '&::after': {
       borderWidth: "".concat(colorActiveBarHeight, "px"),
-      borderBottomColor: colorItemTextSelected
+      borderBottomColor: colorItemTextSelectedHorizontal
     }
   }), defineProperty_defineProperty(_$concat$concat3, "&-selected", {
-    color: colorItemTextSelected,
+    color: colorItemTextSelectedHorizontal,
     backgroundColor: colorItemBgSelectedHorizontal,
     '&::after': {
       borderWidth: "".concat(colorActiveBarHeight, "px"),
-      borderBottomColor: colorItemTextSelected
+      borderBottomColor: colorItemTextSelectedHorizontal
     }
   }), _$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(_$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 ? {
+  }), defineProperty_defineProperty(_$concat8, "".concat(componentCls, "-item, ").concat(componentCls, "-submenu-title"), colorActiveBarBorderSize && colorActiveBarWidth ? {
     width: "calc(100% + ".concat(colorActiveBarBorderSize, "px)")
   } : {}), defineProperty_defineProperty(_$concat8, "".concat(componentCls, "-item"), defineProperty_defineProperty({
     position: 'relative',
@@ -81474,6 +81551,7 @@ var getVerticalInlineStyle = function getVerticalInlineStyle(token) {
   var componentCls = token.componentCls,
     menuItemHeight = token.menuItemHeight,
     menuItemMarginInline = token.menuItemMarginInline,
+    itemMarginInline = token.itemMarginInline,
     padding = token.padding,
     menuArrowSize = token.menuArrowSize,
     fontSize = token.fontSize;
@@ -81483,10 +81561,15 @@ var getVerticalInlineStyle = function getVerticalInlineStyle(token) {
   }), defineProperty_defineProperty(_ref, "".concat(componentCls, "-item, ").concat(componentCls, "-submenu-title"), {
     height: menuItemHeight,
     lineHeight: "".concat(menuItemHeight, "px"),
-    marginBlock: menuItemMarginInline,
     paddingInline: padding,
     overflow: 'hidden',
     textOverflow: 'ellipsis'
+  }), defineProperty_defineProperty(_ref, "".concat(componentCls, "-item"), {
+    marginInline: itemMarginInline,
+    marginBlock: menuItemMarginInline,
+    width: "calc(100% - ".concat(itemMarginInline * 2, "px)")
+  }), defineProperty_defineProperty(_ref, "".concat(componentCls, "-submenu-title"), {
+    marginBlock: menuItemMarginInline
   }), defineProperty_defineProperty(_ref, "".concat(componentCls, "-submenu"), {
     paddingBottom: 0.02
   }), defineProperty_defineProperty(_ref, "> ".concat(componentCls, "-item,\n            > ").concat(componentCls, "-submenu > ").concat(componentCls, "-submenu-title"), {
@@ -81606,7 +81689,7 @@ var getVerticalStyle = function getVerticalStyle(token) {
 
 // =============================== Base ===============================
 var getBaseStyle = function getBaseStyle(token) {
-  var _$concat$concat, _$concat5, _extends3;
+  var _$concat$concat, _$concat4, _$concat5, _extends3;
   var antCls = token.antCls,
     componentCls = token.componentCls,
     fontSize = token.fontSize,
@@ -81622,6 +81705,8 @@ var getBaseStyle = function getBaseStyle(token) {
     iconCls = token.iconCls,
     zIndexPopup = token.zIndexPopup,
     radiusBase = token.radiusBase,
+    radiusLG = token.radiusLG,
+    radiusSubMenuItem = token.radiusSubMenuItem,
     menuArrowSize = token.menuArrowSize,
     controlHeightSM = token.controlHeightSM,
     menuArrowOffset = token.menuArrowOffset,
@@ -81654,7 +81739,7 @@ var getBaseStyle = function getBaseStyle(token) {
     display: 'flex'
   }, "".concat(componentCls, "-item"), {
     flex: 'none'
-  })), defineProperty_defineProperty(_extends3, "".concat(componentCls, "-item,").concat(componentCls, "-submenu,"), {
+  })), defineProperty_defineProperty(_extends3, "".concat(componentCls, "-item, ").concat(componentCls, "-submenu"), {
     borderRadius: token.radiusItem
   }), defineProperty_defineProperty(_extends3, "".concat(componentCls, "-item-group-title"), {
     padding: "".concat(paddingXS, "px ").concat(padding, "px"),
@@ -81730,7 +81815,7 @@ var getBaseStyle = function getBaseStyle(token) {
       position: 'absolute',
       zIndex: zIndexPopup,
       background: 'transparent',
-      borderRadius: radiusBase,
+      borderRadius: radiusLG,
       boxShadow: 'none',
       transformOrigin: '0 0',
       // https://github.com/ant-design/ant-design/issues/13955
@@ -81749,11 +81834,13 @@ var getBaseStyle = function getBaseStyle(token) {
       top: 0,
       insetInlineStart: menuPanelMaskInset
     }
-  }, "> ".concat(componentCls), defineProperty_defineProperty({
-    borderRadius: radiusBase
-  }, "".concat(componentCls, "-submenu-title::after"), {
+  }, "> ".concat(componentCls), (_$concat4 = {
+    borderRadius: radiusLG
+  }, defineProperty_defineProperty(_$concat4, "> ".concat(componentCls, "-item"), {
+    borderRadius: radiusSubMenuItem
+  }), defineProperty_defineProperty(_$concat4, "".concat(componentCls, "-submenu-title::after"), {
     transition: "transform ".concat(motionDurationSlow, " ").concat(motionEaseInOut)
-  }))), defineProperty_defineProperty(_extends3, "".concat(componentCls, "-submenu"), (_$concat5 = {}, defineProperty_defineProperty(_$concat5, "&-expand-icon, &-arrow", {
+  }), _$concat4))), defineProperty_defineProperty(_extends3, "".concat(componentCls, "-submenu"), (_$concat5 = {}, defineProperty_defineProperty(_$concat5, "&-expand-icon, &-arrow", {
     position: 'absolute',
     top: '50%',
     insetInlineEnd: token.margin,
@@ -81871,23 +81958,29 @@ var getBaseStyle = function getBaseStyle(token) {
       colorTextDescription = token.colorTextDescription,
       colorBgContainer = token.colorBgContainer,
       colorFillAlter = token.colorFillAlter,
-      controlItemBgActive = token.controlItemBgActive,
+      colorFillContent = token.colorFillContent,
       lineWidth = token.lineWidth,
-      lineWidthBold = token.lineWidthBold;
+      lineWidthBold = token.lineWidthBold,
+      controlItemBgActiveHover = token.controlItemBgActiveHover,
+      colorBgTextHover = token.colorBgTextHover;
     return {
       dropdownWidth: 160,
       zIndexPopup: token.zIndexPopupBase + 50,
-      radiusItem: 0,
+      radiusItem: token.radiusLG,
+      radiusSubMenuItem: token.radiusSM,
       colorItemText: colorText,
-      colorItemTextHover: colorPrimary,
+      colorItemTextHover: colorText,
+      colorItemTextHoverHorizontal: colorPrimary,
       colorGroupTitle: colorTextDescription,
-      colorItemTextSelected: colorPrimary,
+      colorItemTextSelected: colorText,
+      colorItemTextSelectedHorizontal: colorPrimary,
       colorItemBg: colorBgContainer,
+      colorItemBgHover: colorBgTextHover,
+      colorItemBgActive: colorFillContent,
       colorSubItemBg: colorFillAlter,
-      colorItemBgActive: controlItemBgActive,
-      colorItemBgSelected: controlItemBgActive,
+      colorItemBgSelected: controlItemBgActiveHover,
       colorItemBgSelectedHorizontal: 'transparent',
-      colorActiveBarWidth: lineWidthBold + lineWidth,
+      colorActiveBarWidth: 0,
       colorActiveBarHeight: lineWidthBold,
       colorActiveBarBorderSize: lineWidth,
       // Disabled
@@ -81897,7 +81990,8 @@ var getBaseStyle = function getBaseStyle(token) {
       colorDangerItemTextHover: colorError,
       colorDangerItemTextSelected: colorError,
       colorDangerItemBgActive: colorErrorBg,
-      colorDangerItemBgSelected: colorErrorBg
+      colorDangerItemBgSelected: colorErrorBg,
+      itemMarginInline: token.marginXXS
     };
   });
   return useOriginHook(prefixCls);
@@ -85062,17 +85156,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.14",
-  "@ant-design/pro-components": "2.3.19",
-  "@ant-design/pro-descriptions": "2.0.16",
-  "@ant-design/pro-field": "2.1.9",
-  "@ant-design/pro-form": "2.2.7",
-  "@ant-design/pro-layout": "7.1.8",
-  "@ant-design/pro-list": "2.0.16",
-  "@ant-design/pro-provider": "2.0.6",
+  "@ant-design/pro-card": "2.0.16",
+  "@ant-design/pro-components": "2.3.21",
+  "@ant-design/pro-descriptions": "2.0.18",
+  "@ant-design/pro-field": "2.1.11",
+  "@ant-design/pro-form": "2.2.9",
+  "@ant-design/pro-layout": "7.1.10",
+  "@ant-design/pro-list": "2.0.18",
+  "@ant-design/pro-provider": "2.0.8",
   "@ant-design/pro-skeleton": "2.0.4",
-  "@ant-design/pro-table": "3.0.16",
-  "@ant-design/pro-utils": "2.2.6"
+  "@ant-design/pro-table": "3.0.18",
+  "@ant-design/pro-utils": "2.2.8"
 };
 ;// CONCATENATED MODULE: ./packages/components/src/index.tsx