@pisell/materials 1.0.987 → 1.0.989

package/es/components/PisellSteps/PisellSteps.less

@@ -5,17 +5,13 @@
 
 // ============ CSS 变量定义 ============
 .@{pisell-steps-prefix} {
-  // 图标相关
-  --pisell-steps-icon-size: 32px;
-  --pisell-steps-icon-color: inherit;
-  
   // 间距相关
   --pisell-steps-item-gap: 8px;
   --pisell-steps-margin: 16px;
-  
+
   // 栅格布局
   --pisell-steps-grid-columns: 3;
-  
+
   // 颜色变量
   --pisell-steps-primary-color: #7f56d9;
   --pisell-steps-primary-light: #f4ebff;
@@ -31,17 +27,24 @@
   position: relative;
   width: 100%;
 
+  // 默认尺寸（32px）- 当没有设置 size 或 size='default' 时
+  .ant-steps-item-icon {
+    width: 32px;
+    height: 32px;
+    line-height: 32px;
+  }
+
   // 覆盖 Ant Design 默认样式，使用自定义主题色
   .ant-steps-item-finish {
     .ant-steps-item-icon {
       background-color: var(--pisell-steps-primary-light);
-      border-color: var(--pisell-steps-primary-color);
-      
+      border-color: var(--pisell-steps-primary-light);
+
       > .ant-steps-icon {
         color: var(--pisell-steps-primary-color);
       }
     }
-    
+
     .ant-steps-item-tail::after {
       background-color: var(--pisell-steps-primary-color);
     }
@@ -51,7 +54,7 @@
     .ant-steps-item-icon {
       background-color: var(--pisell-steps-primary-color);
       border-color: var(--pisell-steps-primary-color);
-      
+
       > .ant-steps-icon {
         color: #ffffff;
       }
@@ -62,7 +65,7 @@
     .ant-steps-item-icon {
       background-color: var(--pisell-steps-border-color);
       border-color: var(--pisell-steps-border-color);
-      
+
       > .ant-steps-icon {
         color: var(--pisell-steps-text-secondary);
       }
@@ -73,7 +76,7 @@
     .ant-steps-item-icon {
       background-color: var(--pisell-steps-error-color);
       border-color: var(--pisell-steps-error-color);
-      
+
       > .ant-steps-icon {
         color: #ffffff;
       }
@@ -83,7 +86,8 @@
 
 // ============ 可点击样式 ============
 .@{pisell-steps-prefix}-clickable {
-  .ant-steps-item, .pisell-lowcode-steps-item {
+  .ant-steps-item,
+  .pisell-lowcode-steps-item {
     cursor: pointer;
     transition: all 0.3s ease;
 
@@ -111,29 +115,32 @@
     line-height: 24px;
     font-size: 12px;
   }
-  
+
   .ant-steps-item-title {
     font-size: 14px;
   }
-  
+
   .ant-steps-item-description {
-    font-size: 12px;
+    font-size: 14px;
   }
 }
 
 .@{pisell-steps-prefix}-large {
-  .ant-steps-item-icon {
-    width: 40px;
-    height: 40px;
-    line-height: 40px;
-    font-size: 18px;
+  .ant-steps-item-icon,
+  .pisell-lowcode-steps-item-icon {
+    width: 40px !important;
+    height: 40px !important;
+    line-height: 40px !important;
+    font-size: 16px !important;
   }
-  
-  .ant-steps-item-title {
-    font-size: 18px;
+
+  .ant-steps-item-title,
+  .pisell-lowcode-steps-item-title {
+    font-size: 16px;
   }
-  
-  .ant-steps-item-description {
+
+  .ant-steps-item-description,
+  .pisell-lowcode-steps-item-description {
     font-size: 16px;
   }
 }
@@ -144,7 +151,7 @@
   .ant-steps-item-icon {
     width: 8px;
     height: 8px;
-    
+
     .ant-steps-icon-dot {
       width: 8px;
       height: 8px;
@@ -156,7 +163,7 @@
 .@{pisell-steps-prefix}-navigation {
   .ant-steps-item {
     padding: 12px 24px;
-    
+
     &::before {
       content: '';
       position: absolute;
@@ -177,29 +184,29 @@
   @media (max-width: 768px) {
     overflow-x: auto;
     -webkit-overflow-scrolling: touch;
-    
+
     .ant-steps {
       min-width: max-content;
     }
-    
+
     .ant-steps-item {
       min-width: 120px;
       flex-shrink: 0;
     }
   }
-  
+
   @media (max-width: 480px) {
     .ant-steps-item {
       min-width: 100px;
-      
+
       .ant-steps-item-title {
         font-size: 12px;
       }
-      
+
       .ant-steps-item-description {
         display: none;
       }
-      
+
       .ant-steps-item-icon {
         width: 24px;
         height: 24px;
@@ -219,100 +226,63 @@
   }
 }
 
-// ============ 连接器位置 ============
-.@{pisell-steps-prefix}-connector-top {
-  .ant-steps-item-tail {
-    top: 8px;
-  }
-}
+// 连接器位置样式已移除
 
-.@{pisell-steps-prefix}-connector-bottom {
-  .ant-steps-item-tail {
-    top: auto;
-    bottom: 8px;
+// ============ 标识区和文本区间距 =============
+// 控制图标和文本之间的间距
+// 只有当设置了 itemGap 时才应用自定义间距，否则保持 antd 原样式
+.@{pisell-steps-prefix}-has-item-gap {
+  // 垂直布局时（labelPlacement='vertical'），控制内容区域的上边距
+  .ant-steps-label-vertical {
+    .ant-steps-item-content {
+      margin-top: var(--pisell-steps-item-gap);
+    }
   }
-}
 
-// ============ 项布局 ============
-.@{pisell-steps-prefix}-item-vertical {
+  // 水平布局时（labelPlacement='horizontal'），控制图标右侧的间距
   .ant-steps-item {
-    flex-direction: column;
-    
     .ant-steps-item-icon {
-      margin-bottom: var(--pisell-steps-item-gap);
+      margin-right: var(--pisell-steps-item-gap) !important;
     }
   }
-}
 
-// ============ 动画效果 ============
-.@{pisell-steps-prefix}-animated {
-  .ant-steps-item {
-    transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  }
-  
-  .ant-steps-item-icon {
-    transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  // 低代码平台中的样式支持 - 水平布局
+  .pisell-lowcode-steps-item-icon {
+    margin-right: var(--pisell-steps-item-gap) !important;
   }
-  
-  .ant-steps-item-tail::after {
-    transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+
+  // 低代码平台垂直布局 - 设置内容区域的上边距
+  &.pisell-lowcode-steps-label-vertical,
+  .pisell-lowcode-steps-label-vertical {
+    .pisell-lowcode-steps-item-content {
+      margin-top: var(--pisell-steps-item-gap);
+    }
   }
 }
 
+// 动画效果样式已移除
+
 // ============ 进度百分比显示 ============
-.@{pisell-steps-prefix}-progress-info {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  pointer-events: none;
-  
-  .@{pisell-steps-prefix}-progress-percent {
-    display: inline-block;
-    padding: 2px 8px;
-    background-color: var(--pisell-steps-primary-color);
-    color: #ffffff;
-    font-size: 12px;
-    border-radius: 10px;
-    font-weight: 500;
-  }
-}
+// 进度百分比样式已移除，直接使用 antd Steps 的默认进度条样式
 
 // ============ 竖向布局特殊样式 ============
 .@{pisell-steps-prefix}-vertical {
   .ant-steps-item {
     padding-bottom: var(--pisell-steps-margin);
-    
+
     &:last-child {
       padding-bottom: 0;
     }
   }
-  
-  .@{pisell-steps-prefix}-progress-info {
-    left: 16px;
-    transform: translateY(-50%);
-  }
 }
 
 // ============ 自定义图标尺寸 ============
-.@{pisell-steps-prefix} {
-  .ant-steps-item-icon {
-    width: var(--pisell-steps-icon-size);
-    height: var(--pisell-steps-icon-size);
-    line-height: var(--pisell-steps-icon-size);
-    
-    .ant-steps-icon {
-      color: var(--pisell-steps-icon-color);
-    }
-  }
-}
-
 // ============ 禁用状态 ============
 .@{pisell-steps-prefix} {
   .ant-steps-item-disabled {
     cursor: not-allowed;
     opacity: 0.5;
-    
+
     &:hover {
       .ant-steps-item-icon {
         transform: none;
@@ -348,3 +318,15 @@
     line-height: 28px;
   }
 }
+
+// ============ 滚动模式样式 ============
+.@{pisell-steps-prefix}-scroll-view {
+  width: 100%;
+  position: relative;
+
+  // 滚动内容容器
+  .@{pisell-steps-prefix}-scroll-content {
+    display: inline-flex;
+    min-width: max-content;
+  }
+}

package/es/components/PisellSteps/hooks/useAnchor.js

@@ -11,6 +11,11 @@ import { useEffect, useRef } from 'react';
 export function useAnchor(currentStep, enableAnchor, anchorContainer) {
   var previousStepRef = useRef(currentStep);
   useEffect(function () {
+    // SSR 环境下不执行
+    if (typeof window === 'undefined' || typeof document === 'undefined') {
+      return;
+    }
+
     // 未启用锚链接，直接返回
     if (!enableAnchor) {
       return;

package/es/components/PisellSteps/hooks/useStepsState.js

@@ -17,20 +17,26 @@ import { useState, useCallback, useEffect, useRef } from 'react';
 export function useStepsState(current) {
   var defaultCurrent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var onChange = arguments.length > 2 ? arguments[2] : undefined;
+  // 确保 defaultCurrent 是有效的数字
+  var safeDefaultCurrent = typeof defaultCurrent === 'number' && !isNaN(defaultCurrent) && defaultCurrent >= 0 ? defaultCurrent : 0;
+
+  // 确保 current 是有效的数字（如果提供）
+  var safeCurrent = current !== undefined && typeof current === 'number' && !isNaN(current) && current >= 0 ? current : undefined;
+
   // 内部状态（非受控模式使用）
-  var _useState = useState(defaultCurrent),
+  var _useState = useState(safeDefaultCurrent),
     _useState2 = _slicedToArray(_useState, 2),
     innerCurrent = _useState2[0],
     setInnerCurrent = _useState2[1];
 
   // 记录上一次的步骤，用于判断变更方向
-  var previousCurrentRef = useRef(defaultCurrent);
+  var previousCurrentRef = useRef(safeDefaultCurrent);
 
   // 判断是否为受控模式
-  var isControlled = current !== undefined;
+  var isControlled = safeCurrent !== undefined;
 
   // 当前步骤值
-  var currentStep = isControlled ? current : innerCurrent;
+  var currentStep = isControlled ? safeCurrent : innerCurrent;
 
   // 设置步骤的函数
   var setCurrentStep = useCallback(function (value) {
@@ -52,9 +58,9 @@ export function useStepsState(current) {
 
   // 受控模式下，同步更新 previousCurrentRef
   useEffect(function () {
-    if (isControlled && current !== undefined) {
-      previousCurrentRef.current = current;
+    if (isControlled && safeCurrent !== undefined) {
+      previousCurrentRef.current = safeCurrent;
     }
-  }, [current, isControlled]);
+  }, [safeCurrent, isControlled]);
   return [currentStep, setCurrentStep];
 }

package/es/components/PisellTabbar/PisellTabbar.js

@@ -11,7 +11,7 @@ import { useActiveKey, useExpand } from "./hooks";
 import { addDataSourceItemsByKey, getDefaultActiveKey } from "./utils";
 import { DEFAULT_LEVEL_CONFIG, LEVEL_ADD_ITEMS } from "./constants";
 import mock from "./mock";
-import PisellTabbar3 from "../PisellTabbar3";
+import PisellTabbar2 from "../PisellTabbar2";
 import "./PisellTabbar.less";
 
 /**
@@ -172,4 +172,4 @@ PisellTabbar.displayName = 'PisellTabbar';
 
 // PisellTabbar.Template1 = PisellTabbar2;
 
-export default PisellTabbar3;
+export default PisellTabbar2;

package/es/components/PisellTabbar2/PisellTabbar.js

@@ -76,8 +76,12 @@ var PisellTabbar = function PisellTabbar(props) {
    * 处理一级 Tab 切换
    */
   var handleLevel1Change = useCallback(function (key, item) {
-    var _item$children, _item$children$;
-    setActiveKey(0, key, item !== null && item !== void 0 && (_item$children = item.children) !== null && _item$children !== void 0 && _item$children.length ? item === null || item === void 0 || (_item$children$ = item.children[0]) === null || _item$children$ === void 0 ? void 0 : _item$children$.id : undefined);
+    if (item.childrenMaxLevel !== undefined && item.childrenMaxLevel < 2) {
+      setActiveKey(0, key, 0);
+    } else {
+      var _item$children, _item$children$;
+      setActiveKey(0, key, item !== null && item !== void 0 && (_item$children = item.children) !== null && _item$children !== void 0 && _item$children.length ? item === null || item === void 0 || (_item$children$ = item.children[0]) === null || _item$children$ === void 0 ? void 0 : _item$children$.id : undefined);
+    }
   }, [setActiveKey]);
 
   /**
@@ -111,7 +115,7 @@ var PisellTabbar = function PisellTabbar(props) {
 
     // 如果子级最大层级小于2，则渲染三级 Tabbar 样式
     if (childrenMaxLevel < 2) {
-      return renderLevel3(panelProps);
+      return renderLevel3(panelProps, true);
     }
     var _dataSource = panelProps.dataSource.children || [];
     if (_dataSource.length) {
@@ -163,7 +167,7 @@ var PisellTabbar = function PisellTabbar(props) {
   /**
    * 渲染三级 Tabbar
    */
-  var renderLevel3 = useCallback(function (panelProps2) {
+  var renderLevel3 = useCallback(function (panelProps2, isLevel2) {
     if (maxLevel < 3) return null;
     var _dataSource2 = panelProps2.dataSource.children || [];
     if (_dataSource2.length) {
@@ -172,21 +176,22 @@ var PisellTabbar = function PisellTabbar(props) {
     return /*#__PURE__*/React.createElement(TabbarLevel, {
       skuId: "sku-list-tabbar-".concat(panelProps2.dataSource.id),
       dataSource: _dataSource2,
-      activePanelKey: getActiveKey(2),
-      level: "level3",
-      setActivePanelKey: handleLevel3Change,
-      expand: getExpand('level3'),
+      activePanelKey: getActiveKey(isLevel2 ? 1 : 2),
+      level: 'level3',
+      setActivePanelKey: isLevel2 ? handleLevel2Change : handleLevel3Change,
+      expand: getExpand(isLevel2 ? 'level2' : 'level3'),
       handleExpand: function handleExpand() {
-        return toggleExpand('level3');
+        return toggleExpand(isLevel2 ? 'level2' : 'level3');
       },
       levelConfig: getLevelConfig('level3'),
       expandConfig: expandConfig,
-      positionId: getLevelConfig('level3').positionId
+      positionId: getLevelConfig(isLevel2 ? 'level2' : 'level3').positionId
     });
   }, [maxLevel, getActiveKey, handleLevel3Change, getExpand, toggleExpand, getLevelConfig, expandConfig]);
   useEffect(function () {
     document.body.id = 'body';
   }, []);
+  console.log('activeKeyactiveKey', activeKey);
   return dataSource.length ? /*#__PURE__*/React.createElement("div", {
     className: classNames('pisell-tabbar2', className),
     style: style
@@ -212,7 +217,10 @@ var PisellTabbar = function PisellTabbar(props) {
         gap: 12
       },
       panelStyle: {
-        height: '100%',
+        position: 'absolute',
+        top: 40,
+        right: 0,
+        height: 'calc(100% - 40px)',
         transition: '0.3s ease-in-out'
       },
       startSlot: null,
@@ -235,4 +243,39 @@ var PisellTabbar = function PisellTabbar(props) {
   })) : null;
 };
 PisellTabbar.displayName = 'PisellTabbar';
+PisellTabbar.getDefaultActiveKey = getDefaultActiveKey;
+
+// const Demo = () => {
+//   return (
+//     <div style={{ height: '100vh', width: '100%', display: 'flex' }}>
+//       <div className="" style={{ height: '100%', width: 'calc(100% - 100px)' }}>
+//         <div className="tabbar-level-3-wrap" style={{ width: '100%' }}></div>
+//         <div className="" style={{ height: '400px' }}>
+//           content
+//         </div>
+//       </div>
+//       <div
+//         className=""
+//         style={{
+//           height: '100%',
+//           width: '100px',
+//           display: 'flex',
+//           alignItems: 'flex-start',
+//         }}
+//       >
+//         <div
+//           className="tabbar-level-2-wrap"
+//           style={{
+//             height: '100%',
+//             position: 'relative',
+//           }}
+//         ></div>
+//         <div className="" style={{ height: '100%' }}>
+//           <PisellTabbar __designMode />
+//         </div>
+//       </div>
+//     </div>
+//   );
+// };
+
 export default PisellTabbar;

package/es/components/PisellTabbar2/PisellTabbar.less

@@ -4,6 +4,7 @@
 .pisell-tabbar2 {
   // height: 100vh;
   width: 96px;
+  height: 100%;
   // position: fixed;
   // top: 0;
   // right: 0;

package/es/components/PisellTabbar2/components/TabbarLevel.js

@@ -247,9 +247,16 @@ var TabbarLevel = /*#__PURE__*/memo(function (props) {
         onClick: handleExpand
       }));
     }
+    var panelStyle = {};
+    if (itemProps.dataSource.childrenMaxLevel >= 2) {
+      panelStyle = _objectSpread(_objectSpread({}, superTabsProps === null || superTabsProps === void 0 ? void 0 : superTabsProps.panelStyle), panelVisible !== undefined ? {
+        transform: panelVisible ? 'translateX(0)' : 'translateX(110%)'
+      } : {});
+    }
 
     // 普通项
     return /*#__PURE__*/React.createElement(PisellCards.MultilevelCard, _extends({}, itemProps, {
+      panelWidthMode: "auto",
       card: function card(cardProps) {
         if (level === 'level1') {
           return renderLevel1NormalCard(cardProps);
@@ -266,14 +273,12 @@ var TabbarLevel = /*#__PURE__*/memo(function (props) {
         }
         return null;
       },
-      panelStyle: _objectSpread(_objectSpread({}, superTabsProps === null || superTabsProps === void 0 ? void 0 : superTabsProps.panelStyle), panelVisible !== undefined ? {
-        transform: panelVisible ? 'translateX(0)' : 'translateX(110%)'
-      } : {}),
+      panelStyle: panelStyle,
       panelContainer: function panelContainer(panelProps) {
         var _panelProps$dataSourc2;
         var childrenMaxLevel = ((_panelProps$dataSourc2 = panelProps.dataSource) === null || _panelProps$dataSourc2 === void 0 ? void 0 : _panelProps$dataSourc2.childrenMaxLevel) || 2;
         var _positionId = positionId || '';
-        if (childrenMaxLevel < 2) {
+        if (level2PositionId && childrenMaxLevel < 2) {
           _positionId = level2PositionId;
         }
         if (_positionId) {