@zat-design/sisyphus-react 3.14.0-beta.2 → 4.0.0-beta.10

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

@@ -1,20 +1,13 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/modal/style";
-import _Modal from "antd/es/modal";
-import "antd/es/breadcrumb/style";
-import _Breadcrumb from "antd/es/breadcrumb";
-import "antd/es/divider/style";
-import _Divider from "antd/es/divider";
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+var _excluded = ["width"];
 /* eslint-disable react/no-array-index-key */
+import { Space, Divider, Breadcrumb, Tooltip, Modal } from 'antd';
 import React, { memo, useEffect, useState, useRef } from 'react';
 import { tools } from '@zat-design/utils';
 import classnames from 'classnames';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { useToggle, useSize } from 'ahooks';
 import { isFunction, isEmpty, isNumber, isString } from 'lodash';
 import { ReactSVG } from 'react-svg';
@@ -28,12 +21,8 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 var formatAmount = tools.formatAmount;
 var ProHeader = props => {
-  var _props$breadcrumbList = props.breadcrumbList,
-    breadcrumbList = _props$breadcrumbList === void 0 ? [] : _props$breadcrumbList,
-    breadcrumbColumns = props.breadcrumbColumns,
+  var breadcrumbColumns = props.breadcrumbColumns,
     actionRender = props.actionRender,
-    _props$describeList = props.describeList,
-    describeList = _props$describeList === void 0 ? [] : _props$describeList,
     describeColumns = props.describeColumns,
     subDescribeColumns = props.subDescribeColumns,
     onBack = props.onBack,
@@ -46,7 +35,7 @@ var ProHeader = props => {
     _props$showShadow = props.showShadow,
     showShadow = _props$showShadow === void 0 ? false : _props$showShadow,
     _props$zIndex = props.zIndex,
-    zIndex = _props$zIndex === void 0 ? 100 : _props$zIndex,
+    zIndex = _props$zIndex === void 0 ? 98 : _props$zIndex,
     title = props.title,
     _props$autoBack = props.autoBack,
     autoBack = _props$autoBack === void 0 ? 2 : _props$autoBack,
@@ -70,10 +59,10 @@ var ProHeader = props => {
   var _title = title;
 
   // 面包屑配置数据源
-  var _breadcrumbColumns = breadcrumbColumns || breadcrumbList;
+  var _breadcrumbColumns = breadcrumbColumns || [];
 
   // 次级配置数据源
-  var _subDescribeColumns = subDescribeColumns || describeList;
+  var _subDescribeColumns = subDescribeColumns || [];
   useEffect(() => {
     if (bodyOverFlowHidden) {
       var bodyElement = document.querySelector('body');
@@ -123,7 +112,7 @@ var ProHeader = props => {
         var onlyTag = tag && !label && !value;
         var tagRender = params => {
           if (Array.isArray(params === null || params === void 0 ? void 0 : params.tag) && params !== null && params !== void 0 && params.tag.length) {
-            return /*#__PURE__*/_jsx(_Space, {
+            return /*#__PURE__*/_jsx(Space, {
               size: 4,
               children: params.tag.map((tagItem, index) => {
                 return /*#__PURE__*/_jsx("div", {
@@ -141,7 +130,7 @@ var ProHeader = props => {
 
         /** 单行渲染 */
         var valueRender = params => {
-          return /*#__PURE__*/_jsxs(_Space, {
+          return /*#__PURE__*/_jsxs(Space, {
             size: 4,
             align: params !== null && params !== void 0 && params.tag ? 'baseline' : 'center',
             children: [params !== null && params !== void 0 && params.link ?
@@ -189,9 +178,11 @@ var ProHeader = props => {
                 }, index);
               })
             });
-            return /*#__PURE__*/_jsx(_Tooltip, {
+            return /*#__PURE__*/_jsx(Tooltip, {
               placement: "bottomLeft",
-              overlayClassName: "pro-header-describe-items-tip",
+              classNames: {
+                root: 'pro-header-describe-items-tip'
+              },
               title: tipResult,
               children: result
             });
@@ -207,7 +198,7 @@ var ProHeader = props => {
           style: {
             width
           },
-          children: /*#__PURE__*/_jsxs(_Space, {
+          children: /*#__PURE__*/_jsxs(Space, {
             size: 4,
             children: [label ? /*#__PURE__*/_jsx("span", {
               className: "pro-header-describe-label",
@@ -233,7 +224,7 @@ var ProHeader = props => {
    * 次级描述数据渲染
    */
   var subDescribeRender = describeData => {
-    var _moment, _moment2;
+    var _dayjs, _dayjs2;
     var value = describeData.value,
       type = describeData.type,
       valueType = describeData.valueType,
@@ -264,11 +255,11 @@ var ProHeader = props => {
         break;
       case 'date':
         // 年月日
-        result = value ? (_moment = moment(value)) === null || _moment === void 0 ? void 0 : _moment.format('YYYY-MM-DD') : '-';
+        result = value ? (_dayjs = dayjs(value)) === null || _dayjs === void 0 ? void 0 : _dayjs.format('YYYY-MM-DD') : '-';
         break;
       case 'dateTime':
         // 年月日 时分秒
-        result = value ? (_moment2 = moment(value)) === null || _moment2 === void 0 ? void 0 : _moment2.format('YYYY-MM-DD HH:mm:ss') : '-';
+        result = value ? (_dayjs2 = dayjs(value)) === null || _dayjs2 === void 0 ? void 0 : _dayjs2.format('YYYY-MM-DD HH:mm:ss') : '-';
         break;
       default:
         result = String(value).includes('undefined') || !value ? '-' : value;
@@ -289,8 +280,8 @@ var ProHeader = props => {
    */
   var actionsRender = () => {
     if (Array.isArray(actionRender) && actionRender.length) {
-      return /*#__PURE__*/_jsx(_Space, {
-        split: /*#__PURE__*/_jsx(_Divider, {
+      return /*#__PURE__*/_jsx(Space, {
+        split: /*#__PURE__*/_jsx(Divider, {
           type: "vertical"
         }),
         children: actionRender.map((item, index) => {
@@ -318,7 +309,7 @@ var ProHeader = props => {
    */
   var breadcrumbRender = () => {
     if (Array.isArray(_breadcrumbColumns) && !_breadcrumbColumns.length) {
-      return '';
+      return [];
     }
     var list = _breadcrumbColumns === null || _breadcrumbColumns === void 0 ? void 0 : _breadcrumbColumns.filter(item => {
       return item.type === 'breadcrumb';
@@ -331,7 +322,7 @@ var ProHeader = props => {
         tag = item.tag;
       var tagRender = () => {
         if (Array.isArray(tag) && tag.length) {
-          return /*#__PURE__*/_jsx(_Space, {
+          return /*#__PURE__*/_jsx(Space, {
             size: 8,
             children: tag.map((tagItem, index) => {
               return /*#__PURE__*/_jsx("div", {
@@ -349,19 +340,20 @@ var ProHeader = props => {
 
       // show或者值不存在为false直接隐藏¸
       if (!show || !value) {
-        return '';
+        return null;
       }
       // 判断第一层dom节点为空
       if (value !== null && value !== void 0 && value.type && !(value !== null && value !== void 0 && (_value$props = value.props) !== null && _value$props !== void 0 && _value$props.children)) {
-        return '';
+        return null;
       }
-      return /*#__PURE__*/_jsx(_Breadcrumb.Item, {
-        children: /*#__PURE__*/_jsxs(_Space, {
+      return {
+        key: index,
+        title: /*#__PURE__*/_jsxs(Space, {
           size: 4,
           children: [value, " ", tagRender()]
         })
-      }, index);
-    });
+      };
+    }).filter(Boolean); // 过滤掉null值
   };
 
   /**
@@ -413,7 +405,7 @@ var ProHeader = props => {
             style: {
               width
             },
-            children: /*#__PURE__*/_jsxs(_Space, {
+            children: /*#__PURE__*/_jsxs(Space, {
               size: 4,
               children: [val, " ", tag ? /*#__PURE__*/_jsx("div", {
                 className: "pro-header-tag",
@@ -423,7 +415,7 @@ var ProHeader = props => {
           });
           if (type === 'copy') {
             return valRender = /*#__PURE__*/_jsxs(_Fragment, {
-              children: [width ? /*#__PURE__*/_jsx(_Tooltip, {
+              children: [width ? /*#__PURE__*/_jsx(Tooltip, {
                 title: val,
                 children: valRender
               }) : valRender, /*#__PURE__*/_jsx(Copy, {
@@ -432,7 +424,7 @@ var ProHeader = props => {
             });
           }
           if (width) {
-            return /*#__PURE__*/_jsx(_Tooltip, {
+            return /*#__PURE__*/_jsx(Tooltip, {
               title: val,
               children: valRender
             });
@@ -479,14 +471,20 @@ var ProHeader = props => {
       }
       return false;
     }
-    _Modal.confirm(_objectSpread({
+    // 处理 Modal.confirm 的 width 类型兼容性问题
+    var _ref = isConfirmBackModalProps || {},
+      width = _ref.width,
+      restModalProps = _objectWithoutProperties(_ref, _excluded);
+    Modal.confirm(_objectSpread(_objectSpread({
       title: `${locale.ProHeader.confirmTitle}`,
       okText: `${locale.ProHeader.confirm}`,
       cancelText: `${locale.ProHeader.cancel}`,
       onOk: () => {
         onBack && onBack();
       }
-    }, isConfirmBackModalProps));
+    }, width && (typeof width === 'string' || typeof width === 'number') ? {
+      width
+    } : {}), restModalProps));
   };
   return /*#__PURE__*/_jsx("div", {
     className: cls,
@@ -505,13 +503,13 @@ var ProHeader = props => {
             'pro-header-left': true,
             'pro-header-left-space': !backState
           }),
-          children: /*#__PURE__*/_jsxs(_Space, {
+          children: /*#__PURE__*/_jsxs(Space, {
             size: backState ? 4 : 0,
             children: [backState ? /*#__PURE__*/_jsx(ProBackBtn, {
               onBack: onConfirm
-            }) : null, /*#__PURE__*/_jsx(_Breadcrumb, {
+            }) : null, /*#__PURE__*/_jsx(Breadcrumb, {
               separator: ">",
-              children: breadcrumbRender()
+              items: breadcrumbRender()
             }), infoRender()]
           })
         }), /*#__PURE__*/_jsx("div", {

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

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 @import '../components/ProBackBtn/style/index';
 
 .pro-header {

package/es/ProLayout/components/TabsManager/components/TabContextMenu.js

@@ -1,7 +1,6 @@
-import "antd/es/dropdown/style";
-import _Dropdown from "antd/es/dropdown";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useState, useCallback } from 'react';
+import { Dropdown } from 'antd';
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * 右键菜单组件 - 兼容Antd 4.x和5.x
@@ -77,7 +76,7 @@ function TabContextMenu(_ref) {
   var menuItems = customMenuItems && customMenuItems.length > 0 ? [...defaultMenuItems, {
     type: 'divider'
   }, ...customMenuItems] : defaultMenuItems;
-  return /*#__PURE__*/_jsx(_Dropdown, {
+  return /*#__PURE__*/_jsx(Dropdown, {
     menu: {
       items: menuItems,
       onClick: _ref2 => {

package/es/ProLayout/components/TabsManager/hooks/useTabsState.js

@@ -192,7 +192,6 @@ export var useTabsState = options => {
 
         // 直接调用 onTabChange，因为 useEffect 会被跳过
         if (finalConfig.onTabChange) {
-          console.log('[useTabsState] removeTab: Calling onTabChange with empty state');
           setTimeout(() => {
             finalConfig.onTabChange('', undefined, []);
           }, 0);
@@ -280,7 +279,6 @@ export var useTabsState = options => {
 
       // 如果关闭后没有标签页了，直接调用 onTabChange
       if (newTabs.length === 0 && finalConfig.onTabChange) {
-        console.log('[useTabsState] closeAllTabs: Calling onTabChange with empty state');
         setTimeout(() => {
           finalConfig.onTabChange('', undefined, []);
         }, 0);

package/es/ProLayout/index.js

@@ -1,10 +1,9 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/message/style";
-import _message from "antd/es/message";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /* eslint-disable func-call-spacing */
 /* eslint-disable no-spaced-func */
-import { createContext, useCallback, useMemo, useRef } from 'react';
+import { message } from 'antd';
+import { createContext, useMemo, useRef, useCallback } from 'react';
 import classNames from 'classnames';
 import { useSetState, useToggle, useDeepCompareEffect } from 'ahooks';
 import { ProWaterMark } from "../index";
@@ -26,9 +25,12 @@ var ProLayout = props => {
   var children = props.children,
     _props$className = props.className,
     className = _props$className === void 0 ? '' : _props$className,
-    pure = props.pure,
-    headerHeight = props.headerHeight,
-    contentStyle = props.contentStyle,
+    _props$pure = props.pure,
+    pure = _props$pure === void 0 ? false : _props$pure,
+    _props$headerHeight = props.headerHeight,
+    headerHeight = _props$headerHeight === void 0 ? 48 : _props$headerHeight,
+    _props$contentStyle = props.contentStyle,
+    contentStyle = _props$contentStyle === void 0 ? {} : _props$contentStyle,
     _props$waterMarkProps = props.waterMarkProps,
     waterMarkProps = _props$waterMarkProps === void 0 ? {} : _props$waterMarkProps,
     headerNotice = props.headerNotice,
@@ -36,10 +38,21 @@ var ProLayout = props => {
     dataSource = props.dataSource,
     _props$pathPrefix = props.pathPrefix,
     pathPrefix = _props$pathPrefix === void 0 ? '' : _props$pathPrefix,
-    theme = props.theme,
+    _props$theme = props.theme,
+    theme = _props$theme === void 0 ? 'dark' : _props$theme,
     target = props.target,
     onCollapsedChange = props.onCollapsedChange,
+    _props$collapsed = props.collapsed,
+    propsCollapsed = _props$collapsed === void 0 ? false : _props$collapsed,
     onMenuClick = props.onMenuClick,
+    headerTitleRender = props.headerTitleRender,
+    headerContentRender = props.headerContentRender,
+    rightContentRender = props.rightContentRender,
+    title = props.title,
+    logo = props.logo,
+    iconfontUrl = props.iconfontUrl,
+    sideMenuFooterRender = props.sideMenuFooterRender,
+    sideMenuHeaderRender = props.sideMenuHeaderRender,
     _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'normal' : _props$mode,
     tabs = props.tabs;
@@ -68,7 +81,7 @@ var ProLayout = props => {
   }, [props.collapsed]);
   useDeepCompareEffect(() => {
     if (Array.isArray(dataSource) && !dataSource.length) {
-      return _message.warning('Warning: Missing menu data source, or menu data source is not an array');
+      return message.warning('Warning: Missing menu data source, or menu data source is not an array');
     }
     var userData = transformMenus(dataSource, pathPrefix);
     // 确保 menus 始终是一个数组
@@ -80,24 +93,6 @@ var ProLayout = props => {
   var menuDataSource = useMemo(() => Array.isArray(menus) ? {
     menus
   } : menus, [menus]);
-  var handleMenuClick = useCallback(params => {
-    if (isTabsLayout) {
-      var _tabsManagerRef$curre, _tabsManagerRef$curre2;
-      // 只有最后一级菜单（叶子节点）才设置选中路径
-      if (params.item && isLeafMenuItem(params.item)) {
-        var _params$item, _params$item2, _params$item3;
-        var targetPath = ((_params$item = params.item) === null || _params$item === void 0 ? void 0 : _params$item.url) || ((_params$item2 = params.item) === null || _params$item2 === void 0 ? void 0 : _params$item2.redirectUrl) || ((_params$item3 = params.item) === null || _params$item3 === void 0 ? void 0 : _params$item3.router);
-        if (targetPath && targetPath !== selectedPath) {
-          setState({
-            selectedPath: targetPath
-          });
-        }
-      }
-      (_tabsManagerRef$curre = tabsManagerRef.current) === null || _tabsManagerRef$curre === void 0 || (_tabsManagerRef$curre2 = _tabsManagerRef$curre.handleMenuClick) === null || _tabsManagerRef$curre2 === void 0 || _tabsManagerRef$curre2.call(_tabsManagerRef$curre, params);
-      return;
-    }
-    onMenuClick === null || onMenuClick === void 0 || onMenuClick(params);
-  }, [isTabsLayout, onMenuClick, selectedPath, setState]);
   var enhancedTabsConfig = useMemo(() => {
     if (!isTabsLayout || !tabs) {
       return tabs;
@@ -121,7 +116,7 @@ var ProLayout = props => {
         (_tabs$onTabChange = tabs.onTabChange) === null || _tabs$onTabChange === void 0 || _tabs$onTabChange.call(tabs, activeKey, activeTab, allTabs);
       }
     });
-  }, [isTabsLayout, tabs, selectedPath, setState]);
+  }, [isTabsLayout, tabs, selectedPath]);
   var renderContent = () => {
     if (!isTabsLayout || !enhancedTabsConfig) {
       return /*#__PURE__*/_jsx("div", {
@@ -136,6 +131,24 @@ var ProLayout = props => {
       children: children
     });
   };
+  var handleMenuClick = useCallback(params => {
+    if (isTabsLayout) {
+      var _tabsManagerRef$curre, _tabsManagerRef$curre2;
+      // 只有最后一级菜单（叶子节点）才设置选中路径
+      if (params.item && isLeafMenuItem(params.item)) {
+        var _params$item, _params$item2, _params$item3;
+        var targetPath = ((_params$item = params.item) === null || _params$item === void 0 ? void 0 : _params$item.url) || ((_params$item2 = params.item) === null || _params$item2 === void 0 ? void 0 : _params$item2.redirectUrl) || ((_params$item3 = params.item) === null || _params$item3 === void 0 ? void 0 : _params$item3.router);
+        if (targetPath && targetPath !== selectedPath) {
+          setState({
+            selectedPath: targetPath
+          });
+        }
+      }
+      (_tabsManagerRef$curre = tabsManagerRef.current) === null || _tabsManagerRef$curre === void 0 || (_tabsManagerRef$curre2 = _tabsManagerRef$curre.handleMenuClick) === null || _tabsManagerRef$curre2 === void 0 || _tabsManagerRef$curre2.call(_tabsManagerRef$curre, params);
+      return;
+    }
+    onMenuClick === null || onMenuClick === void 0 || onMenuClick(params);
+  }, [isTabsLayout, onMenuClick, selectedPath, setState]);
 
   /**
    * 关闭提示框
@@ -153,6 +166,44 @@ var ProLayout = props => {
     'pro-layout-row-left-pure': typeof pure !== 'boolean' && pure.leftMenu
   });
   var noticeHeight = notice ? 32 : 0;
+
+  // 为Header组件创建专门的props对象
+  var headerProps = {
+    headerHeight,
+    pure,
+    headerTitleRender,
+    headerContentRender,
+    rightContentRender,
+    title,
+    logo
+  };
+
+  // 为Notice组件创建专门的props对象
+  var noticeProps = {
+    headerHeight,
+    notice,
+    onCancel: onCancelNotice
+  };
+
+  // 为Menu组件创建专门的props对象
+  var menuProps = {
+    headerHeight,
+    dataSource: Array.isArray(menus) ? {
+      menus
+    } : menus,
+    iconfontUrl,
+    collapsed,
+    notice,
+    onToggle: () => {
+      toggle();
+      onCollapsedChange && onCollapsedChange(!collapsed);
+    },
+    pure,
+    theme,
+    sideMenuFooterRender,
+    sideMenuHeaderRender,
+    onMenuClick: handleMenuClick
+  };
   var layoutDom = /*#__PURE__*/_jsxs("div", {
     className: classNames({
       'pro-layout': true,
@@ -160,21 +211,9 @@ var ProLayout = props => {
       'pro-layout-light': theme === 'light',
       [`${className}`]: className
     }),
-    children: [/*#__PURE__*/_jsx(Header, _objectSpread({}, props)), /*#__PURE__*/_jsx(Notice, _objectSpread(_objectSpread({}, props), {}, {
-      notice: notice,
-      onCancel: onCancelNotice
-    })), /*#__PURE__*/_jsxs("div", {
+    children: [/*#__PURE__*/_jsx(Header, _objectSpread({}, headerProps)), /*#__PURE__*/_jsx(Notice, _objectSpread({}, noticeProps)), /*#__PURE__*/_jsxs("div", {
       className: contentCls,
-      children: [/*#__PURE__*/_jsx(Menu, _objectSpread(_objectSpread({}, props), {}, {
-        dataSource: menuDataSource,
-        notice: notice,
-        collapsed: collapsed,
-        onMenuClick: handleMenuClick,
-        onToggle: () => {
-          toggle();
-          onCollapsedChange && onCollapsedChange(!collapsed);
-        }
-      })), /*#__PURE__*/_jsx("div", {
+      children: [/*#__PURE__*/_jsx(Menu, _objectSpread({}, menuProps)), /*#__PURE__*/_jsx("div", {
         className: "pro-layout-content",
         style: _objectSpread(_objectSpread({}, contentStyle), {}, {
           marginTop: headerHeight + noticeHeight

package/es/ProLayout/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 @import '../components/Layout/index.less';
 @import '../components/ProCollapse/style/index.less';
@@ -204,6 +202,7 @@
 
     .anticon-caret-down {
       color: #999 !important;
+      inset-inline-end: 8px;
     }
 
     .pro-layout-row .pro-layout-menu {
@@ -236,7 +235,7 @@
       &:before {
         position: absolute;
         left: var(--zaui-space-size-sm, 8px);
-        width: calc(100% - 16px);
+        width: calc(100% - 8px);
         min-height: 38px;
         height: 80%;
         background-color: var(--zaui-brand, #006aff);

package/es/ProSelect/components/AdaptiveTooltip.js

@@ -1,6 +1,5 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { Tooltip } from 'antd';
 import { useEffect, useState } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -29,7 +28,7 @@ var AdaptiveTooltip = _ref => {
       window.removeEventListener('resize', handleResize);
     };
   }, [children]);
-  return /*#__PURE__*/_jsx(_Tooltip, {
+  return /*#__PURE__*/_jsx(Tooltip, {
     placement: placement,
     title: /*#__PURE__*/_jsx("div", {
       onMouseDown: e => e.stopPropagation(),

package/es/ProSelect/index.js

@@ -1,16 +1,9 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import "antd/es/input/style";
-import _Input from "antd/es/input";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/message/style";
-import _message from "antd/es/message";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import "antd/es/select/style";
-import _Select from "antd/es/select";
 var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
+import { Input, message, Select, Space } from 'antd';
 import React, { useImperativeHandle, useState, forwardRef, isValidElement, useCallback } from 'react';
 import { isFunction, isObject, isString, omit, isNumber } from 'lodash';
 import { useProConfig } from "../ProConfigProvider";
@@ -21,7 +14,7 @@ import locale from "../locale";
 import { getSelectList } from "./utils";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
-var Option = _Select.Option;
+var Option = Select.Option;
 export var ProSelect = (props, ref) => {
   var _selectProps$showCode, _useRequest$options3, _locale$ProSelect;
   var _ref = useProConfig('ProSelect') || {},
@@ -84,7 +77,7 @@ export var ProSelect = (props, ref) => {
       msg = res.message,
       data = res.data;
     if (status !== 200) {
-      _message.error(msg);
+      message.error(msg);
       return;
     }
     setSelectList(data || []);
@@ -99,7 +92,7 @@ export var ProSelect = (props, ref) => {
       msg = _ref3.message,
       data = _ref3.data;
     if (status !== 200) {
-      _message.error(msg);
+      message.error(msg);
       return;
     }
     return data;
@@ -168,7 +161,7 @@ export var ProSelect = (props, ref) => {
   if (defaultDisableValue) {
     return /*#__PURE__*/_jsx("span", {
       title: defaultDisableValue,
-      children: /*#__PURE__*/_jsx(_Input, {
+      children: /*#__PURE__*/_jsx(Input, {
         disabled: true,
         defaultValue: defaultDisableValue,
         style: props === null || props === void 0 ? void 0 : props.style
@@ -209,7 +202,7 @@ export var ProSelect = (props, ref) => {
       record.forEach(item => {
         arr.push(props.optionRender(item));
       });
-      return /*#__PURE__*/_jsx(_Space, {
+      return /*#__PURE__*/_jsx(Space, {
         direction: "vertical",
         size: 4,
         children: arr.map(item => /*#__PURE__*/_jsx(React.Fragment, {
@@ -319,10 +312,9 @@ export var ProSelect = (props, ref) => {
   return /*#__PURE__*/_jsx("div", {
     style: props.style,
     className: "pro-select",
-    children: /*#__PURE__*/_jsx(_Select, _objectSpread(_objectSpread({
+    children: /*#__PURE__*/_jsx(Select, _objectSpread(_objectSpread({
       placeholder: locale === null || locale === void 0 || (_locale$ProSelect = locale.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
       allowClear: true,
-      showArrow: true,
       loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
       onChange: handleChange,
       showSearch: true,

package/es/ProSelect/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-select-ellipse {
   display: block;

package/es/ProSelect/propsType.d.ts

@@ -10,7 +10,7 @@ export interface DataOptionType {
      * @description 展示标签
      * @default -
      */
-    label?: string;
+    label?: ReactNode;
     /**
      * @description 选项值
      * @default -

package/es/ProStep/components/Anchor/index.js

@@ -1,6 +1,5 @@
-import "antd/es/badge/style";
-import _Badge from "antd/es/badge";
 import cn from 'classnames';
+import { Badge } from 'antd';
 import { handleScroll } from "../../utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -101,7 +100,7 @@ export var MenuItem = props => {
       className: "pro-step-checked-status",
       children: [isChecked && /*#__PURE__*/_jsx(SuccessSvg, {}), errorNum > 0 && /*#__PURE__*/_jsx("div", {
         className: "pro-step-error-dot",
-        children: /*#__PURE__*/_jsx(_Badge, {
+        children: /*#__PURE__*/_jsx(Badge, {
           count: errorNum
         })
       })]

package/es/ProStep/components/Item/index.js

@@ -1,6 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["id", "title", "collapse", "children", "lazyLoad", "order"];
+// @ts-nocheck
 import { useEffect } from 'react';
 import LazyLoad, { forceCheck } from 'react-lazyload';
 import { isBoolean } from 'lodash';

package/es/ProStep/components/Step/index.js

@@ -62,6 +62,7 @@ export var Step = _ref => {
       children: [/*#__PURE__*/_jsx(ProIcon, {
         src: catalogSvg,
         className: "pro-step-menu-icon",
+        size: 48,
         actionMap: {}
       }), onOff && /*#__PURE__*/_jsx("div", {
         children: locale === null || locale === void 0 || (_locale$ProStep = locale.ProStep) === null || _locale$ProStep === void 0 ? void 0 : _locale$ProStep.catalogue

package/es/ProStep/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-step-wrapper {
   padding-right: 48px;
@@ -8,7 +6,7 @@
 .pro-step {
   position: fixed;
   right: 0;
-  z-index: 999;
+  z-index: 99;
   min-width: 48px;
   min-height: 48px;
   overflow-x: hidden;
@@ -33,7 +31,7 @@
       justify-content: center;
       width: 48px;
       height: 24px;
-      > .pro-step-menu-icon {
+      .pro-step-menu-icon {
         width: auto !important;
         height: auto !important;
         font-size: var(--zaui-font-size-lg-title, 24px);