@ant-design/pro-components 2.3.24 → 2.3.25

package/dist/components.js

@@ -26478,16 +26478,12 @@ var ConfigProviderWrap = function ConfigProviderWrap(props) {
     /**
      * 合并一下token，不然导致嵌套 token 失效
      */
-    var proLayoutTokenMerge = propsToken ? 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)) : {};
+    var proLayoutTokenMerge = propsToken ? 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)) : getLayoutDesignToken({}, defaultTheme);
     return objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, proProvide), {}, {
-      token: propsToken ? objectSpread2_objectSpread2(objectSpread2_objectSpread2({
+      token: objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, proProvide.token), {}, {
         proComponentsCls: proComponentsCls,
-        antCls: antCls
-      }, proProvide.token), {}, {
+        antCls: antCls,
         layout: proLayoutTokenMerge
-      }) : objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, proProvide.token), {}, {
-        proComponentsCls: proComponentsCls,
-        antCls: antCls
       }),
       isDeps: true,
       intl: intl || zhCNIntl
@@ -51869,9 +51865,7 @@ var PageHeader = function PageHeader(props) {
     prefixCls: prefixCls
   }), defaultBreadcrumbDom)) !== null && _breadcrumbRender !== void 0 ? _breadcrumbRender : defaultBreadcrumbDom;
   var breadcrumbDom = isBreadcrumbComponent ? breadcrumb : breadcrumbRenderDomFromProps;
-  var className = classnames_default()(prefixCls, customizeClassName, (_classNames = {
-    hashId: hashId
-  }, defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-has-breadcrumb"), !!breadcrumbDom), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-has-footer"), !!footer), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-rtl"), direction === 'rtl'), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-compact"), compact), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-ghost"), true), _classNames));
+  var className = classnames_default()(prefixCls, hashId, customizeClassName, (_classNames = {}, defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-has-breadcrumb"), !!breadcrumbDom), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-has-footer"), !!footer), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-rtl"), direction === 'rtl'), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-compact"), compact), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-ghost"), true), _classNames));
   var title = renderTitle(prefixCls, props, direction, hashId);
   var childDom = children && renderChildren(prefixCls, children, hashId);
   var footerDom = renderFooter(prefixCls, footer, hashId);
@@ -52055,6 +52049,7 @@ var _map = [576, 768, 992, 1200].map(function (bp) {
   xl = _map2[3];
 var genPageContainerStyle = function genPageContainerStyle(token) {
   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;
+  console.log(token.layout);
   return defineProperty_defineProperty({}, token.componentCls, (_token$componentCls = {
     position: 'relative',
     '&-children-content': {
@@ -52272,7 +52267,7 @@ var memoRenderPageHeader = function memoRenderPageHeader(props) {
     children: (header === null || header === void 0 ? void 0 : header.children) || renderPageHeader(content, extraContent, prefixedClassName, hashId)
   }));
 };
-var PageContainer = function PageContainer(props) {
+var PageContainerBase = function PageContainerBase(props) {
   var _restProps$header2, _token$layout2, _token$layout2$pageCo, _classNames, _token$layout3, _token$layout3$header;
   var children = props.children,
     _props$loading = props.loading,
@@ -52369,8 +52364,7 @@ var PageContainer = function PageContainer(props) {
     return dom;
   }, [props.waterMarkProps, value.waterMarkProps, loadingDom, content]);
   var containerClassName = classnames_default()(basePageContainer, hashId, className, (_classNames = {}, defineProperty_defineProperty(_classNames, "".concat(basePageContainer, "-with-footer"), footer), defineProperty_defineProperty(_classNames, "".concat(basePageContainer, "-with-affix"), fixedHeader && pageHeaderDom), _classNames));
-  return wrapSSR((0,jsx_runtime.jsxs)(ConfigProviderWrap, {
-    needDeps: true,
+  return wrapSSR((0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
     children: [(0,jsx_runtime.jsxs)("div", {
       style: style,
       className: containerClassName,
@@ -52393,6 +52387,12 @@ var PageContainer = function PageContainer(props) {
     })]
   }));
 };
+var PageContainer = function PageContainer(props) {
+  return (0,jsx_runtime.jsx)(ConfigProviderWrap, {
+    needDeps: true,
+    children: (0,jsx_runtime.jsx)(PageContainerBase, objectSpread2_objectSpread2({}, props))
+  });
+};
 var ProPageHeader = function ProPageHeader(props) {
   var value = (0,external_React_.useContext)(RouteContext);
   return memoRenderPageHeader(objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, props), {}, {
@@ -85196,17 +85196,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.17",
-  "@ant-design/pro-components": "2.3.23",
-  "@ant-design/pro-descriptions": "2.0.19",
-  "@ant-design/pro-field": "2.1.12",
-  "@ant-design/pro-form": "2.2.10",
-  "@ant-design/pro-layout": "7.1.11",
-  "@ant-design/pro-list": "2.0.20",
-  "@ant-design/pro-provider": "2.0.9",
+  "@ant-design/pro-card": "2.0.18",
+  "@ant-design/pro-components": "2.3.24",
+  "@ant-design/pro-descriptions": "2.0.20",
+  "@ant-design/pro-field": "2.1.13",
+  "@ant-design/pro-form": "2.2.11",
+  "@ant-design/pro-layout": "7.1.12",
+  "@ant-design/pro-list": "2.0.21",
+  "@ant-design/pro-provider": "2.0.10",
   "@ant-design/pro-skeleton": "2.0.4",
-  "@ant-design/pro-table": "3.0.20",
-  "@ant-design/pro-utils": "2.2.9"
+  "@ant-design/pro-table": "3.0.21",
+  "@ant-design/pro-utils": "2.2.10"
 };
 ;// CONCATENATED MODULE: ./packages/components/src/index.tsx