@zat-design/sisyphus-react 4.3.1-beta.1 → 4.3.2-beta.1

package/es/ProForm/components/combination/Group/style/index.less

@@ -108,6 +108,12 @@
         flex: 1;
         margin-right: 0;
         margin-bottom: 0;
+        position: relative;
+
+        &:hover,
+        &:focus-within {
+          z-index: 2;
+        }
 
         // 第一个元素后面的所有元素都左移1px以实现紧密连接
         &:not(:first-child) {
@@ -311,6 +317,12 @@
         flex: 1;
         margin-right: 0;
         margin-bottom: 0;
+        position: relative;
+
+        &:hover,
+        &:focus-within {
+          z-index: 2;
+        }
 
         // 第一个元素后面的所有元素都左移1px以实现紧密连接
         &:not(:first-child) {
@@ -475,6 +487,15 @@
     border-radius: 0 !important;
   }
 
+  > .pro-group-form-item {
+    position: relative;
+
+    &:hover,
+    &:focus-within {
+      z-index: 2;
+    }
+  }
+
   > .pro-group-form-item:not(:first-child) {
     .@{ant-prefix}-input,
     .@{ant-prefix}-select,

package/es/ProForm/components/combination/ProModalSelect/style/index.less

@@ -90,24 +90,9 @@
     ):not(.@{ant-prefix}-btn-compact-item-rtl) {
     &:hover {
       position: relative;
-      z-index: 1;
-      transition: none;
-      border-color: var(--ant-primary-color-hover, #1677ff) !important;
-      &::before {
-        opacity: 1;
-      }
-    }
-    &::before {
-      content: '';
-      position: absolute;
-      top: -1px;
-      left: -1px;
-      width: 1px;
-      height: calc(100% + 2px);
-      background: var(--ant-primary-color-hover, #1677ff);
-      opacity: 0;
-      display: block;
       z-index: 2;
+      border-color: var(--zaui-brand-hover, #3387ff) !important;
+      box-shadow: -1px 0 0 0 var(--zaui-brand-hover, #3387ff);
     }
   }
 

package/es/ProForm/components/combination/ProTimeLimit/style/index.less

@@ -26,13 +26,13 @@ span.@{ant-prefix}-input-group-compact,
 
     .@{ant-prefix}-picker {
       flex: 1;
-      border-right: 0;
       border-top-right-radius: 0 !important;
       border-bottom-right-radius: 0 !important;
     }
 
-    .@{ant-prefix}-picker-focused {
-      z-index: 1;
+    .@{ant-prefix}-picker-focused,
+    .@{ant-prefix}-picker:not(.@{ant-prefix}-picker-disabled):hover {
+      z-index: 2;
     }
 
     .forever-checkbox {
@@ -50,12 +50,14 @@ span.@{ant-prefix}-input-group-compact,
         padding: 4px 11px;
         background-color: #ffffff;
         border: 1px solid #d9d9d9;
-        margin-left: 1px;
+        margin-left: 0;
+        position: relative;
         border-top-right-radius: 6px !important;
         border-bottom-right-radius: 6px !important;
         transition: all 0.2s;
 
         &:hover {
+          z-index: 2;
           border-color: #40a9ff;
         }
 
@@ -79,21 +81,18 @@ span.@{ant-prefix}-input-group-compact,
 
     // 确保焦点状态下的边框连接正确
     .@{ant-prefix}-picker:focus {
-      z-index: 1;
-      border-right: 0;
+      z-index: 2;
     }
 
     .forever-checkbox.@{ant-prefix}-input:focus {
-      z-index: 1;
+      z-index: 2;
       border-color: #40a9ff;
-      border-left: 0;
       box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
     }
 
     // 当日期选择器聚焦时，复选框也要有相应的样式
     .@{ant-prefix}-picker-focused + .forever-checkbox.@{ant-prefix}-input {
       border-color: #40a9ff;
-      border-left: 0;
     }
   }
 }

package/es/ProIcon/index.js

@@ -310,26 +310,20 @@ const ProIcon = props => {
     children: /*#__PURE__*/_jsx(Tooltip, {
       title: iconText,
       children: buttonIcon && !willBeWrappedByButton ? /*#__PURE__*/_jsx(Button, {
+        className: "pro-icon-btn-inner",
         style: {
           width: size,
-          height: size,
-          border: 'none',
-          borderRadius: 0,
-          padding: 0,
-          verticalAlign: 'baseline'
+          height: size
         },
         type: "text",
         icon: icon,
         ...buttonProps
       }) : /*#__PURE__*/_jsx(Space, {
         children: /*#__PURE__*/_jsx("span", {
+          className: "pro-icon-wrapper",
           style: {
             width: size,
-            height: size,
-            border: 'none',
-            borderRadius: 0,
-            padding: 0,
-            verticalAlign: 'baseline'
+            height: size
           },
           children: icon
         })

package/es/ProIcon/style/index.less

@@ -12,6 +12,17 @@
   }
 }
 
+// 内层图标容器（buttonIcon=false 时的 span，buttonIcon=true 时的 Button）
+// 静态样式统一在此，动态 width/height 通过内联 style 传入
+.pro-icon-wrapper,
+.pro-icon-btn-inner {
+  display: inline-block;
+  border: none;
+  border-radius: 0;
+  padding: 0;
+  vertical-align: baseline;
+}
+
 .pro-icon-btn {
   .anticon {
     display: inline-block;
@@ -20,8 +31,6 @@
   &.@{ant-prefix}-btn-icon-only {
     width: auto;
     height: auto;
-    padding: 0;
     vertical-align: 0;
-    border: 0;
   }
 }

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

@@ -187,8 +187,7 @@ const OpenMenu = props => {
         }
       },
       style: {
-        height: dataSource.sideMenu ? 'auto' : `calc(100vh - ${dataSource?.height || 0}px)`,
-        color: 'red'
+        height: dataSource.sideMenu ? 'auto' : `calc(100vh - ${dataSource?.height || 0}px)`
       }
     }), /*#__PURE__*/_jsx(Link, {
       to: router,

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

@@ -165,8 +165,9 @@
       background: transparent !important;
 
       .@{ant-prefix}-menu-title-content div {
-        .pro-layout-icon {
-          color: var(--zaui-text, #343434);
+        .pro-layout-icon,
+        .anticon {
+          color: var(--zaui-text, #343434) !important;
         }
 
         h2 {

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

@@ -65,6 +65,15 @@
           }
         }
 
+        // ProIcon 渲染为 .anticon 包裹层，需单独处理间距和颜色锁定
+        .@{ant-prefix}-menu-title-content div .anticon {
+          flex: 0 0 20px;
+          width: 20px;
+          height: 20px;
+          margin-right: 12px;
+          color: var(--zaui-text, #343434) !important;
+        }
+
         .pro-layout-icon {
           color: var(--zaui-text, #343434) !important;
           fill: currentcolor;

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

@@ -170,6 +170,7 @@
       margin-left: 0;
       background: #e7e8ee;
       transition: none;
+      border-color: #e7e8ee;
       &.@{ant-prefix}-tabs-tab-active {
         background: #ffffff;
         border-top: 2px solid var(--zaui-brand, #006aff);

package/es/ProLayout/index.js

@@ -191,6 +191,10 @@ const ProLayout = props => {
   });
   const noticeHeight = notice ? 32 : 0;
 
+  // pure 模式下 Header 不渲染，有效头部高度为 0
+  const isPureHeader = typeof pure === 'boolean' ? pure : !!pure?.topMenu;
+  const effectiveHeaderHeight = isPureHeader ? 0 : headerHeight;
+
   // 为Header组件创建专门的props对象
   const headerProps = {
     headerHeight,
@@ -238,7 +242,7 @@ const ProLayout = props => {
     }),
     style: {
       '--header-bg-image': `url(${headerBg})`,
-      '--pro-layout-header-height': `${headerHeight}px`
+      '--pro-layout-header-height': `${effectiveHeaderHeight}px`
     },
     children: [/*#__PURE__*/_jsx(Header, {
       ...headerProps
@@ -248,7 +252,7 @@ const ProLayout = props => {
       ref: setTabsBarEl,
       className: `pro-layout-tabs-bar-wrapper${hasTabs ? ' tabs-visible' : ''}${collapsed ? ' tabs-menu-open' : ''}`,
       style: {
-        marginTop: headerHeight + noticeHeight
+        marginTop: effectiveHeaderHeight + noticeHeight
       }
     }), /*#__PURE__*/_jsxs("div", {
       className: contentCls,

package/es/ProLayout/style/index.less

@@ -365,6 +365,7 @@
     .pro-layout-content {
       margin: 0 !important;
       background: #fff;
+      border: none;
     }
   }
 

package/es/ProTreeModal/style/index.less

@@ -52,13 +52,13 @@
     }
   }
 
-  &:hover {
-    .pro-enum-input-addonAfter:not(.trigger-no-hover):not(.pro-enum-input-addonAfter-not-allowed) {
-      border-color: var(--zaui-brand-hover, #3387ff);
-      color: var(--zaui-brand-hover, #3387ff);
-    }
-    .pro-enum-input-addonAfter:not(.trigger-no-hover):not(.pro-enum-input-addonAfter-not-allowed)
-      .pro-tree-modal-view-svg-active {
+  .pro-enum-input-addonAfter:not(.trigger-no-hover):not(.pro-enum-input-addonAfter-not-allowed):hover {
+    z-index: 2;
+    border-color: var(--zaui-brand-hover, #3387ff);
+    color: var(--zaui-brand-hover, #3387ff);
+    box-shadow: -1px 0 0 0 var(--zaui-brand-hover, #3387ff);
+
+    .pro-tree-modal-view-svg-active {
       color: var(--zaui-brand-hover, #3387ff);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.3.1-beta.1",
+  "version": "4.3.2-beta.1",
   "license": "MIT",
   "files": [
     "es",