@zat-design/sisyphus-react 3.13.14-deta.2 → 4.0.0-beta.3

package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -1,17 +1,18 @@
-import "antd/es/menu/style";
-import _Menu from "antd/es/menu";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _cloneDeep from "lodash/cloneDeep";
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useMemo, useRef, useContext } from 'react';
+import { Menu } from 'antd';
 import { useDeepCompareEffect, useSetState } from 'ahooks';
 import { CaretDownOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
 import { Link } from 'react-router-dom';
-import { LayoutContext } from '../../../../index';
-import { getIdsByPathName } from '../../../../utils';
-import { Icon } from '../../index';
+import { cloneDeep } from 'lodash';
+import { LayoutContext } from "../../../../index";
+import { getIdsByPathName } from "../../../../utils";
+import { Icon } from "../../index";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var OpenMenu = function OpenMenu(props) {
   var _getIdsByPathName;
   var className = props.className,
@@ -42,40 +43,41 @@ var OpenMenu = function OpenMenu(props) {
   var cls = classnames(_defineProperty({
     'pro-layout-open-menu': true
   }, "".concat(className), className));
+
   // 默认激活菜单优先取activeMenu中，默认取pathName进行匹配
   var selectKeyIdPath = ((_getIdsByPathName = getIdsByPathName(menus, query.get('activeMenu'))) === null || _getIdsByPathName === void 0 ? void 0 : _getIdsByPathName.map(function (item) {
     return String(item);
   })) || [];
   var itemsTransform = useMemo(function () {
-    var result = _cloneDeep(menus);
+    var result = cloneDeep(menus);
     if (!Array.isArray(result) || !result.length) {
       return [];
     }
-    var _menuDeep = function menuDeep(data) {
+    var menuDeep = function menuDeep(data) {
       data.forEach(function (item) {
         var _item$keyIdPath, _item$keyIdPath2, _item$children;
         // 是否是第一级菜单，展开模式一级菜单有icon, 收起模式二级菜单有icon
         var isFirstMenu = ((_item$keyIdPath = item.keyIdPath) === null || _item$keyIdPath === void 0 ? void 0 : _item$keyIdPath.length) === 1 || sideMenu && ((_item$keyIdPath2 = item.keyIdPath) === null || _item$keyIdPath2 === void 0 ? void 0 : _item$keyIdPath2.length) === 2;
         // 第一级菜单显示icon
-        item.label = _jsxs("div", {
+        item.label = /*#__PURE__*/_jsxs("div", {
           className: classnames({
             'pro-layout-open-menu-lv1': isFirstMenu
           }),
-          children: [_jsx(_Fragment, {
-            children: item.imgUrl && isFirstMenu ? _jsx("img", {
+          children: [/*#__PURE__*/_jsx(_Fragment, {
+            children: item.imgUrl && isFirstMenu ? /*#__PURE__*/_jsx("img", {
               className: "pro-layout-icon",
               src: selectKeyIdPath[0] === String(item.id) ? item.imgActiveUrl || item.imgUrl : item.imgUrl,
               alt: "icon"
-            }) : item.icon && isFirstMenu ? _jsx(Icon, {
+            }) : item.icon && isFirstMenu ? /*#__PURE__*/_jsx(Icon, {
               type: item.icon || '',
               iconfontUrl: (dataSource === null || dataSource === void 0 ? void 0 : dataSource.iconfontUrl) || ''
-            }) : _jsx("span", {
+            }) : /*#__PURE__*/_jsx("span", {
               className: classnames({
                 'pro-layout-icon': true,
-                'pro-layout-icon-empty': isFirstMenu
+                'pro-layout-icon-empty': isFirstMenu || !item.icon && !item.imgUrl
               })
             })
-          }), _jsx("h2", {
+          }), /*#__PURE__*/_jsx("h2", {
             children: item.name
           })]
         });
@@ -86,13 +88,13 @@ var OpenMenu = function OpenMenu(props) {
         }).forEach(function (_keyItem) {
           delete item[_keyItem];
         });
-        if (Array.isArray(item === null || item === void 0 ? void 0 : item.children) && (item === null || item === void 0 ? void 0 : (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) > 0) {
+        if (Array.isArray(item === null || item === void 0 ? void 0 : item.children) && (item === null || item === void 0 || (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) > 0) {
           var _item = item === null || item === void 0 ? void 0 : item.children[0];
           // 移除不需要显示的菜单
-          if ((_item === null || _item === void 0 ? void 0 : _item.hideInMenu) || ['TAB', 'QUERY', 'BUTTON'].includes(_item === null || _item === void 0 ? void 0 : _item.type)) {
+          if (_item !== null && _item !== void 0 && _item.hideInMenu || ['TAB', 'QUERY', 'BUTTON'].includes(_item === null || _item === void 0 ? void 0 : _item.type)) {
             delete item.children;
           } else {
-            _menuDeep(item.children);
+            menuDeep(item.children);
           }
         } else {
           delete item.children;
@@ -100,7 +102,7 @@ var OpenMenu = function OpenMenu(props) {
       });
       return data;
     };
-    _menuDeep(result);
+    menuDeep(result);
     return result;
   }, [dataSource]);
   useDeepCompareEffect(function () {
@@ -111,6 +113,7 @@ var OpenMenu = function OpenMenu(props) {
       });
     }
   }, [menus, selectKeyIdPath]);
+
   // 折叠模式默认展开全部菜单
   useDeepCompareEffect(function () {
     if (sideMenu) {
@@ -122,18 +125,19 @@ var OpenMenu = function OpenMenu(props) {
       });
     }
   }, [sideMenu]);
-  return _jsxs("div", {
+  return /*#__PURE__*/_jsxs("div", {
     className: cls,
     style: style,
-    children: [_jsx(_Menu, {
-      mode: "inline",
+    children: [/*#__PURE__*/_jsx(Menu, {
+      mode: "inline"
       // @ts-ignore
+      ,
       theme: theme,
       selectedKeys: selectedKeys,
       openKeys: openKeys,
       items: itemsTransform,
       inlineIndent: 14,
-      expandIcon: _jsx(CaretDownOutlined, {}),
+      expandIcon: /*#__PURE__*/_jsx(CaretDownOutlined, {}),
       onOpenChange: function onOpenChange(openKeys) {
         setState({
           openKeys: openKeys
@@ -145,14 +149,14 @@ var OpenMenu = function OpenMenu(props) {
           keyPath = _ref2.keyPath;
         setState({
           selectedKeys: keyPath,
-          router: item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.router
+          router: item === null || item === void 0 || (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.router
         });
         onSelected({
-          selectedPath: item === null || item === void 0 ? void 0 : (_item$props2 = item.props) === null || _item$props2 === void 0 ? void 0 : _item$props2.router
+          selectedPath: item === null || item === void 0 || (_item$props2 = item.props) === null || _item$props2 === void 0 ? void 0 : _item$props2.router
         });
         if (target) {
           var _item$props3;
-          window.open(item === null || item === void 0 ? void 0 : (_item$props3 = item.props) === null || _item$props3 === void 0 ? void 0 : _item$props3.router, target);
+          window.open(item === null || item === void 0 || (_item$props3 = item.props) === null || _item$props3 === void 0 ? void 0 : _item$props3.router, target);
         } else {
           setTimeout(function () {
             // 路由变更，且不再demo文档中
@@ -166,7 +170,7 @@ var OpenMenu = function OpenMenu(props) {
         height: dataSource.sideMenu ? 'auto' : "calc(100vh - ".concat((dataSource === null || dataSource === void 0 ? void 0 : dataSource.height) || 0, "px)"),
         color: 'red'
       }
-    }), _jsx(Link, {
+    }), /*#__PURE__*/_jsx(Link, {
       to: router,
       ref: linkRef
     })]

package/es/ProLayout/components/Layout/Menu/OpenMenu/style/index.less

@@ -1,9 +1,10 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
-
 .pro-layout-open-menu {
   color: #fff;
 
+  .@{ant-prefix}-menu-root > .@{ant-prefix}-menu-submenu > .@{ant-prefix}-menu > .@{ant-prefix}-menu-item-only-child  {
+    padding-left: 16px !important;
+  }
+
   .@{ant-prefix}-menu-root {
     overflow-y: auto !important;
 
@@ -15,12 +16,17 @@
     & > .@{ant-prefix}-menu-submenu {
       .@{ant-prefix}-menu-sub {
         background: #1a202d;
+        .@{ant-prefix}-menu-submenu.@{ant-prefix}-menu-submenu-inline{
+          .@{ant-prefix}-menu-submenu-title{
+            padding-left: 16px !important;
+          }
+        }
       }
 
       & > .@{ant-prefix}-menu-sub > .@{ant-prefix}-menu-submenu > .@{ant-prefix}-menu-submenu-title,
       & > .@{ant-prefix}-menu-item-only-child,
       & > .@{ant-prefix}-menu-sub > .@{ant-prefix}-menu-item-only-child {
-        padding-left: 16px !important;
+        padding-left: 16px;
       }
     }
 
@@ -42,7 +48,7 @@
     }
 
     .@{ant-prefix}-menu-item {
-      padding-left: 30px !important;
+      padding-left: 24px !important;
 
       &::after {
         display: none;
@@ -95,7 +101,7 @@
     height: auto !important;
     min-height: 48px;
     margin: 0;
-    padding: 12px 0;
+    padding: 8px 0;
     line-height: initial !important;
     white-space: pre-wrap;
   }

package/es/ProLayout/components/Layout/Menu/SideMenu/index.js

@@ -1,8 +1,9 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useRef } from 'react';
 import classnames from 'classnames';
 import { useSize } from 'ahooks';
-import OpenMenu from '../OpenMenu';
+import OpenMenu from "../OpenMenu";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var SideMenu = function SideMenu(props) {
   var dataSource = props.dataSource;
   var ref = useRef(null);
@@ -15,13 +16,13 @@ var SideMenu = function SideMenu(props) {
   var cls = classnames({
     'pro-layout-sider-menu': true
   });
-  return _jsxs("div", {
+  return /*#__PURE__*/_jsxs("div", {
     className: cls,
-    children: [_jsx("h2", {
+    children: [/*#__PURE__*/_jsx("h2", {
       ref: ref,
       children: (menus === null || menus === void 0 ? void 0 : menus.name) || ''
-    }), _jsx("div", {
-      children: _jsx(OpenMenu, {
+    }), /*#__PURE__*/_jsx("div", {
+      children: /*#__PURE__*/_jsx(OpenMenu, {
         className: "pro-layout-sider-menu-list",
         theme: "light",
         dataSource: {

package/es/ProLayout/components/Layout/Menu/SideMenu/style/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-layout-sider-menu {
   width: 220px;
@@ -61,7 +61,7 @@
             display: none;
 
             & ~ h2 {
-              margin-left: var(--zaui-space-size-md, 16px);
+              margin-left: 32px;
             }
           }
         }
@@ -93,12 +93,16 @@
           color: #909090;
         }
 
+ 
+
         .@{ant-prefix}-menu-submenu-title,
         &.@{ant-prefix}-menu-root > .@{ant-prefix}-menu-item-only-child,
         &.@{ant-prefix}-menu-sub.@{ant-prefix}-menu-inline > .@{ant-prefix}-menu-item {
           min-height: 40px;
-          padding-top: 10px;
-          padding-bottom: 10px;
+          padding-top: 8px;
+          padding-bottom: 8px;
+          width: 100%;
+          border-radius: 0;
         }
       }
     }

package/es/ProLayout/components/Layout/Menu/index.js

@@ -1,7 +1,9 @@
-import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classnames from 'classnames';
-import OpenMenu from './OpenMenu';
-import FoldMenu from './FoldMenu'; // 折叠后菜单
+import OpenMenu from "./OpenMenu";
+import FoldMenu from "./FoldMenu"; // 折叠后菜单
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var Menu = function Menu(props) {
   var _ref = props || {},
     headerHeight = _ref.headerHeight,
@@ -24,15 +26,15 @@ var Menu = function Menu(props) {
   } else if (dataSource) {
     menus = dataSource === null || dataSource === void 0 ? void 0 : dataSource.menus;
   }
-  if (pure.leftMenu || pure === true) {
-    return _jsx(_Fragment, {});
+  if (pure !== null && pure !== void 0 && pure.leftMenu || pure === true) {
+    return /*#__PURE__*/_jsx(_Fragment, {});
   }
-  return _jsxs("div", {
+  return /*#__PURE__*/_jsxs("div", {
     className: menuCls,
     style: {
       top: notice ? 80 + headerHeight - 48 : headerHeight
     },
-    children: [sideMenuHeaderRender, _jsx(OpenMenu, {
+    children: [sideMenuHeaderRender, /*#__PURE__*/_jsx(OpenMenu, {
       dataSource: {
         menus: menus,
         iconfontUrl: iconfontUrl,
@@ -42,7 +44,7 @@ var Menu = function Menu(props) {
       style: {
         display: collapsed ? 'block' : 'none'
       }
-    }), _jsx(FoldMenu, {
+    }), /*#__PURE__*/_jsx(FoldMenu, {
       dataSource: {
         menus: menus,
         iconfontUrl: iconfontUrl,
@@ -55,10 +57,10 @@ var Menu = function Menu(props) {
         display: collapsed ? 'none' : 'block',
         height: "calc(100vh - ".concat(headerHeight + (notice ? 32 : 0) + 48 || 0, "px)")
       }
-    }), sideMenuFooterRender || _jsx("div", {
+    }), sideMenuFooterRender || /*#__PURE__*/_jsx("div", {
       className: "pro-layout-menu-collapsed",
       onClick: onToggle,
-      children: _jsx("div", {
+      children: /*#__PURE__*/_jsx("div", {
         className: "pro-layout-arrow "
       })
     })]

package/es/ProLayout/components/Layout/Menu/style/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 @import '../FoldMenu/style/index.less';
 @import '../OpenMenu/style/index.less';
 @import '../SideMenu/style/index.less';

package/es/ProLayout/components/Layout/Notice/index.js

@@ -1,7 +1,8 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import tipMsg from '../../../images/tipMsg.png';
-import close from '../../../images/close.png';
-import locale from '../../../../locale';
+import tipMsg from "../../../images/tipMsg.png";
+import close from "../../../images/close.png";
+import locale from "../../../../locale";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var Notice = function Notice(props) {
   var headerHeight = props.headerHeight,
     notice = props.notice,
@@ -9,18 +10,18 @@ var Notice = function Notice(props) {
   if (!notice) {
     return null;
   }
-  return _jsxs("div", {
+  return /*#__PURE__*/_jsxs("div", {
     className: "pro-layout-header-notice",
     style: {
       top: headerHeight
     },
-    children: [_jsx("img", {
+    children: [/*#__PURE__*/_jsx("img", {
       src: tipMsg,
       alt: "".concat(locale.ProLayout.tipAlt)
-    }), " ", notice, _jsx("span", {
+    }), " ", notice, /*#__PURE__*/_jsx("span", {
       className: "pro-layout-header-notice-close",
       onClick: onCancel,
-      children: _jsx("img", {
+      children: /*#__PURE__*/_jsx("img", {
         src: close,
         alt: "".concat(locale.ProLayout.closeAlt)
       })

package/es/ProLayout/components/Layout/Notice/style/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
   /** 告知区 */
   .pro-layout-header-notice {

package/es/ProLayout/components/Layout/index.js

@@ -1,4 +1,4 @@
-export { default as Header } from './Header';
-export { default as Notice } from './Notice';
-export { default as Menu } from './Menu';
-export { default as Icon } from './Icon';
+export { default as Header } from "./Header";
+export { default as Notice } from "./Notice";
+export { default as Menu } from "./Menu";
+export { default as Icon } from "./Icon";

package/es/ProLayout/components/ProCollapse/index.js

@@ -1,19 +1,14 @@
-import "antd/es/descriptions/style";
-import _Descriptions from "antd/es/descriptions";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/collapse/style";
-import _Collapse from "antd/es/collapse";
-import _isBoolean from "lodash/isBoolean";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useLayoutEffect } from 'react';
+import { Collapse, Descriptions, Space } from 'antd';
 import { CaretRightOutlined } from '@ant-design/icons';
 import classNames from 'classnames';
-import foldSvg from '../../../assets/fold.svg';
-import ProIcon from '../../../ProIcon/index';
-var Panel = _Collapse.Panel;
+import { isBoolean } from 'lodash';
+import foldSvg from "../../../assets/fold.svg";
+import ProIcon from "../../../ProIcon/index";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var ProCollapse = function ProCollapse(props) {
   var title = props.title,
     id = props.id,
@@ -40,6 +35,7 @@ var ProCollapse = function ProCollapse(props) {
     autoHeight = _props$autoHeight === void 0 ? true : _props$autoHeight,
     onChange = props.onChange,
     open = props.open;
+
   // 当同时设置了open和collapseProps.activeKey时，以collapseProps.activeKey为准
   // 这样保证了与已有代码的兼容性，并提供了更简便的控制面板展开状态的方式
   var finalCollapseProps = _objectSpread({}, collapseProps);
@@ -53,42 +49,34 @@ var ProCollapse = function ProCollapse(props) {
     'pro-collapse-no-title': !title,
     'pro-collapse-no-level1-title': !title && level !== '2'
   }, "".concat(className), className));
-  var content = _jsx("div", {
+  var content = /*#__PURE__*/_jsx("div", {
     className: "pro-collapse-content",
     style: contentStyle,
     children: children
   });
-  var renderPanel = function renderPanel() {
+
+  // 生成 Collapse items 配置
+  var getCollapseItems = function getCollapseItems() {
     var _title = title;
+    var panelClassName = 'pro-collapse-panel';
+    var panelProps = {};
     if (level === '2') {
-      var level2Panel = classNames({
+      panelClassName = classNames({
         'pro-collapse-level2-collapse': towCollapse,
         'pro-collapse-level2-no-collapse': !towCollapse,
         'pro-collapse-panel': true
       });
-      var hasCollapse = {};
       if (!towCollapse) {
-        hasCollapse.collapsible = 'disabled';
+        panelProps.collapsible = 'disabled';
       }
-      return _jsx(Panel, _objectSpread(_objectSpread(_objectSpread({
-        header: _title,
-        className: level2Panel,
-        extra: _jsx("div", {
-          className: "extra-info",
-          children: extra
-        }),
-        forceRender: true
-      }, hasCollapse), collapsePanelProps), {}, {
-        children: content
-      }), "1");
     }
     if (icon) {
-      _title = _jsxs(_Space, {
+      _title = /*#__PURE__*/_jsxs(Space, {
         size: 8,
         align: "center",
-        children: [_jsx("div", {
+        children: [/*#__PURE__*/_jsx("div", {
           className: "pro-collapse-icon",
-          children: _isBoolean(icon) ? _jsx(ProIcon, {
+          children: isBoolean(icon) ? /*#__PURE__*/_jsx(ProIcon, {
             src: foldSvg,
             actionMap: {
               fill: []
@@ -97,25 +85,25 @@ var ProCollapse = function ProCollapse(props) {
         }), title]
       });
     }
-    return _jsx(Panel, _objectSpread(_objectSpread({
-      header: _title,
-      className: "pro-collapse-panel",
-      extra: _jsx("div", {
+    return [_objectSpread(_objectSpread({
+      key: '1',
+      label: _title,
+      children: content,
+      extra: /*#__PURE__*/_jsx("div", {
         className: "extra-info",
         children: extra
       }),
+      className: panelClassName,
       forceRender: true
-    }, collapsePanelProps), {}, {
-      children: content
-    }), "1");
+    }, panelProps), collapsePanelProps)];
   };
   var renderTitleList = function renderTitleList() {
-    return _jsxs("div", {
+    return /*#__PURE__*/_jsxs("div", {
       className: cls,
-      children: [_jsx(_Descriptions, {
+      children: [/*#__PURE__*/_jsx(Descriptions, {
         column: column,
         children: titleList === null || titleList === void 0 ? void 0 : titleList.map(function (item) {
-          return _jsx(_Descriptions.Item, {
+          return /*#__PURE__*/_jsx(Descriptions.Item, {
             label: item.label,
             children: item.value || '-'
           }, item.label);
@@ -123,6 +111,7 @@ var ProCollapse = function ProCollapse(props) {
       }), content]
     });
   };
+
   // 当pro-layout-content只存在一个card时，高度动态计算
   useLayoutEffect(function () {
     if (!autoHeight) {
@@ -152,24 +141,23 @@ var ProCollapse = function ProCollapse(props) {
       }
     };
   });
-  return _jsx("div", {
+  return /*#__PURE__*/_jsx("div", {
     id: id,
     style: style,
-    children: Array.isArray(titleList) && titleList.length ? renderTitleList() : _jsx(_Collapse, _objectSpread(_objectSpread({
+    children: Array.isArray(titleList) && titleList.length ? renderTitleList() : /*#__PURE__*/_jsx(Collapse, _objectSpread({
       className: cls,
       bordered: false,
       expandIcon: function expandIcon(_ref) {
         var isActive = _ref.isActive;
-        return _jsx(CaretRightOutlined, {
+        return /*#__PURE__*/_jsx(CaretRightOutlined, {
           rotate: isActive ? -90 : 90
         });
       },
       expandIconPosition: "end",
       defaultActiveKey: folding ? [] : ['1'],
-      onChange: onChange
-    }, finalCollapseProps), {}, {
-      children: renderPanel()
-    }))
+      onChange: onChange,
+      items: getCollapseItems()
+    }, finalCollapseProps))
   });
 };
 export default ProCollapse;

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-collapse {
   .pro-collapse-icon{
@@ -118,7 +118,7 @@
 
       .@{ant-prefix}-collapse-extra {
         .extra-info {
-          margin-right: var(--zaui-space-size-lg, 32px);
+          margin-right: 4px;
         }
       }
     }

package/es/ProLayout/components/ProFooter/index.js

@@ -1,18 +1,17 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { jsx as _jsx } from "react/jsx-runtime";
 import { useSize } from 'ahooks';
+import { Space } from 'antd';
 import classnames from 'classnames';
 import { memo, useEffect } from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 var ProFooter = function ProFooter(props) {
   var _props$visible = props.visible,
     visible = _props$visible === void 0 ? true : _props$visible,
     className = props.className,
     children = props.children,
     _props$zIndex = props.zIndex,
-    zIndex = _props$zIndex === void 0 ? 99 : _props$zIndex,
+    zIndex = _props$zIndex === void 0 ? 98 : _props$zIndex,
     _props$sideDom = props.sideDom,
     sideDom = _props$sideDom === void 0 ? '.pro-layout-sider-nav' : _props$sideDom,
     _props$contentDom = props.contentDom,
@@ -37,13 +36,13 @@ var ProFooter = function ProFooter(props) {
   var cls = classnames(_defineProperty({
     'pro-footer': true
   }, "".concat(className), className));
-  return _jsx("div", {
+  return /*#__PURE__*/_jsx("div", {
     className: cls,
     style: _objectSpread({
       zIndex: zIndex,
       width: "calc(100% - ".concat(size === null || size === void 0 ? void 0 : size.width, "px)")
     }, props.style),
-    children: _jsx(_Space, {
+    children: /*#__PURE__*/_jsx(Space, {
       children: children
     })
   });

package/es/ProLayout/components/ProFooter/style/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-footer {
   position: fixed;

package/es/ProLayout/components/ProHeader/components/Copy/index.js

@@ -1,21 +1,20 @@
-import "antd/es/typography/style";
-import _Typography from "antd/es/typography";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Typography } from 'antd';
 import { ReactSVG } from 'react-svg';
 import { CheckOutlined } from '@ant-design/icons';
-import copySvg from '../../../../../assets/copy.svg';
-import locale from '../../../../../locale';
-var Paragraph = _Typography.Paragraph;
+import copySvg from "../../../../../assets/copy.svg";
+import locale from "../../../../../locale";
+import { jsx as _jsx } from "react/jsx-runtime";
+var Paragraph = Typography.Paragraph;
 var Copy = function Copy(_ref) {
   var text = _ref.text;
-  return _jsx(Paragraph, {
+  return /*#__PURE__*/_jsx(Paragraph, {
     className: "pro-header-copy",
     copyable: {
       text: text,
-      icon: [_jsx(ReactSVG, {
+      icon: [/*#__PURE__*/_jsx(ReactSVG, {
         className: "drag-icon",
         src: copySvg
-      }, "copy-icon"), _jsx(CheckOutlined, {}, "copied-icon")],
+      }, "copy-icon"), /*#__PURE__*/_jsx(CheckOutlined, {}, "copied-icon")],
       tooltips: ["".concat(locale.ProHeader.copyTooltips[0]), "".concat(locale.ProHeader.copyTooltips[1])]
     }
   });