@zat-design/sisyphus-react 4.3.0 → 4.3.1

package/es/ProForm/components/combination/Group/utils/index.d.ts

@@ -75,33 +75,36 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     confirm?: boolean | import("antd").ModalFuncProps | import("../../../render/propsType").FunctionArgs<any, boolean | import("antd").ModalFuncProps>;
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
-    id?: string;
     className?: string;
-    hidden?: boolean;
     style?: React.CSSProperties;
+    trim?: boolean;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
+    hidden?: boolean;
+    id?: string;
     onReset?: () => void;
     prefixCls?: string;
     rootClassName?: string;
-    status?: "" | "warning" | "error" | "success" | "validating";
     vertical?: boolean;
+    htmlFor?: string;
+    layout?: import("antd/es/form/Form").FormItemLayout;
+    help?: React.ReactNode;
+    preserve?: boolean;
+    trigger?: string;
     isView?: boolean;
+    status?: "" | "warning" | "error" | "success" | "validating";
+    validateTrigger?: string | false | string[];
     colon?: boolean;
-    htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
-    trigger?: string;
-    validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
     getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     messageVariables?: Record<string, string>;
     initialValue?: any;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
-    preserve?: boolean;
     isListField?: boolean;
     isList?: boolean;
     noStyle?: boolean;
@@ -109,9 +112,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
     validateStatus?: "" | "warning" | "error" | "success" | "validating";
-    layout?: import("antd/es/form/Form").FormItemLayout;
     wrapperCol?: import("antd").ColProps;
-    help?: React.ReactNode;
     fieldId?: string;
     valueType?: import("../../../render/propsType").ProFormValueType;
     switchValue?: [any, any];
@@ -121,7 +122,6 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         index?: number;
     }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
-    trim?: boolean;
     upperCase?: boolean;
     toISOString?: boolean;
     toCSTString?: boolean;

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

@@ -2,7 +2,7 @@ import { useContext } from 'react';
 import { Popover, Tooltip } from 'antd';
 import classnames from 'classnames';
 import { Link as RouterLink } from 'react-router-dom';
-import { Icon } from "../../index";
+import ProIcon from "../../../../../ProIcon";
 import SideMenu from "../SideMenu";
 import { LayoutContext } from "../../../../index";
 import { getUrlParams, getPathNameKey, findMenuItemByKey } from "../../../../utils";
@@ -79,9 +79,11 @@ const FoldMenu = props => {
               className: "pro-layout-icon",
               src: pathNamePrefix === url ? imgActiveUrl || imgUrl : imgUrl,
               alt: "icon"
-            }) : /*#__PURE__*/_jsx(Icon, {
+            }) : /*#__PURE__*/_jsx(ProIcon, {
               type: icon || '',
-              iconfontUrl: iconfontUrl || ''
+              size: "20px",
+              buttonIcon: false,
+              color: currentKeyIdPath.includes(id) ? '#fff' : undefined
             }), /*#__PURE__*/_jsx("h2", {
               children: name
             })]

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

@@ -25,6 +25,13 @@
         color: #fff;
       }
 
+      .anticon {
+        flex: 0 0 20px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+
       h2 {
         display: none;
         flex-grow: 1;

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

@@ -8,7 +8,7 @@ import { Link as RouterLink } from 'react-router-dom';
 import { LayoutContext } from "../../../../index";
 import { getIdsByPathName, findMenuItemByKey } from "../../../../utils";
 import { canOpenAsTab } from "../../../TabsManager/utils";
-import { Icon } from "../../index";
+import ProIcon from "../../../../../ProIcon";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 const Link = RouterLink;
 const OpenMenu = props => {
@@ -68,9 +68,10 @@ const OpenMenu = props => {
               className: "pro-layout-icon",
               src: selectKeyIdPath[0] === String(item.id) ? item.imgActiveUrl || item.imgUrl : item.imgUrl,
               alt: "icon"
-            }) : item.icon && isFirstMenu ? /*#__PURE__*/_jsx(Icon, {
+            }) : item.icon && isFirstMenu ? /*#__PURE__*/_jsx(ProIcon, {
               type: item.icon || '',
-              iconfontUrl: dataSource?.iconfontUrl || ''
+              size: "20px",
+              buttonIcon: false
             }) : /*#__PURE__*/_jsx("span", {
               className: classnames({
                 'pro-layout-icon': true,
@@ -186,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/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/Layout/Menu/index.js

@@ -3,6 +3,16 @@ import classnames from 'classnames';
 import OpenMenu from "./OpenMenu";
 import FoldMenu from "./FoldMenu"; // 折叠后菜单
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const iconfontCache = new Set();
+const loadIconfontScript = url => {
+  if (!url || iconfontCache.has(url)) return;
+  if (typeof document === 'undefined') return;
+  const script = document.createElement('script');
+  script.setAttribute('src', url);
+  iconfontCache.add(url);
+  document.body.appendChild(script);
+};
+
 // 菜单宽度配置
 const MENU_CONFIG = {
   TRANSITION_DURATION: 300,
@@ -33,6 +43,9 @@ const Menu = props => {
     hasTriggered: false
   });
   const [isOpenMenuTextVisible, setIsOpenMenuTextVisible] = useState(false);
+  useEffect(() => {
+    loadIconfontScript(iconfontUrl);
+  }, [iconfontUrl]);
 
   // 提取清理逻辑
   const cleanupAnimation = useCallback(() => {

package/es/ProLayout/components/Layout/index.d.ts

@@ -1,4 +1,3 @@
 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/Layout/index.js

@@ -1,4 +1,3 @@
 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 Menu } from "./Menu";

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

@@ -1,4 +1,3 @@
 @import './Header/style/index.less';
-@import './Icon/style/index.less';
 @import './Menu/style/index.less';
 @import './Notice/style/index.less';

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-top: none;
     }
   }
 

package/package.json

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

package/es/ProLayout/components/Layout/Icon/Icon.d.ts

@@ -1,10 +0,0 @@
-import type { FC } from 'react';
-import React from 'react';
-export interface IconProps {
-    type: string;
-    iconfontUrl: string;
-    style?: any;
-    onClick?: React.MouseEventHandler<SVGSVGElement>;
-}
-declare const Icon: FC<IconProps>;
-export default Icon;

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

@@ -1,34 +0,0 @@
-import React, { useEffect } from 'react';
-import { jsx as _jsx } from "react/jsx-runtime";
-const customCache = new Set();
-const Icon = props => {
-  // @ts-ignore
-  const {
-    type,
-    onClick,
-    style,
-    iconfontUrl = '//at.alicdn.com/t/font_3000529_v88n7r0v7ae.js'
-  } = props;
-  const loadSymbol = scriptUrl => {
-    if (typeof document !== 'undefined' && typeof window !== 'undefined' && typeof document.createElement === 'function' && typeof scriptUrl === 'string' && scriptUrl.length && !customCache.has(scriptUrl)) {
-      const script = document.createElement('script');
-      script.setAttribute('src', scriptUrl);
-      script.setAttribute('data-namespace', scriptUrl);
-      customCache.add(scriptUrl);
-      document.body.appendChild(script);
-    }
-  };
-  useEffect(() => {
-    loadSymbol(iconfontUrl);
-  }, []);
-  return /*#__PURE__*/_jsx("svg", {
-    className: "pro-layout-icon",
-    "aria-hidden": "true",
-    onClick: onClick,
-    style: style,
-    children: /*#__PURE__*/_jsx("use", {
-      xlinkHref: `#icon-${type}`
-    })
-  });
-};
-export default Icon;

package/es/ProLayout/components/Layout/Icon/index.d.ts

@@ -1,2 +0,0 @@
-import Icon from './Icon';
-export default Icon;

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

@@ -1,2 +0,0 @@
-import Icon from "./Icon";
-export default Icon;

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

@@ -1,7 +0,0 @@
-.pro-layout-icon {
-  width: 20px;
-  height: 20px;
-  overflow: hidden;
-  vertical-align: middle;
-  fill: currentcolor;
-}