fix: collapsed menu DOM and submenu indicators

src/form/components/ColorPicker/index.tsx

@@ -1,15 +1,17 @@
-import type { PopoverProps, ColorPickerProps } from 'antd';
+import type { PopoverProps } from 'antd';
 import React from 'react';
 import { FieldColorPicker } from '../../../field';
 import { ProConfigProvider } from '../../../provider';
 import type { ProFormFieldItemProps } from '../../typing';
 import ProFromField from '../Field';
 
-export type ProFormColorPickerProps =
-  ProFormFieldItemProps<ColorPickerProps> & {
-    popoverProps?: PopoverProps;
-    colors?: string[];
-  };
+/** 使用宽松字段类型，避免 d.ts 生成时拉入 `@rc-component/color-picker` 导致 TS2742 */
+export type ProFormColorPickerProps = ProFormFieldItemProps<
+  Record<string, unknown>
+> & {
+  popoverProps?: PopoverProps;
+  colors?: string[];
+};
 
 /**
  * 颜色选择组件

src/layout/components/SiderMenu/BaseMenu.tsx

@@ -3,6 +3,8 @@ import { useControlledState } from '@rc-component/util';
 import { ConfigProvider, Skeleton, Tooltip } from 'antd';
 import { clsx } from 'clsx';
 import React, {
+  cloneElement,
+  isValidElement,
   useCallback,
   useContext,
   useEffect,
@@ -55,6 +57,34 @@ const MenuItemTooltip = (props: {
     return props.children as React.JSX.Element;
   }
 
+  /** 展开或过渡中：不包 Tooltip，避免多一层触发器 DOM */
+  if (!props.collapsed) {
+    return <>{props.children}</>;
+  }
+
+  const simpleTitle =
+    typeof props.title === 'string' || typeof props.title === 'number';
+
+  if (simpleTitle && isValidElement(props.children)) {
+    const t = String(props.title);
+    return cloneElement(props.children, {
+      title: t,
+      'aria-label': t,
+    } as React.HTMLAttributes<HTMLElement>);
+  }
+
+  if (simpleTitle) {
+    return (
+      <span
+        data-pro-layout-menu-item-title-wrap
+        title={String(props.title)}
+        aria-label={String(props.title)}
+      >
+        {props.children}
+      </span>
+    );
+  }
+
   return (
     <Tooltip
       title={props.title}
@@ -679,7 +709,7 @@ const BaseMenu: React.FC<BaseMenuProps & PrivateSiderMenuProps> = (props) => {
     return (
       <div
         style={
-          mode?.includes('inline')
+          mode !== 'horizontal'
             ? { padding: 24 }
             : {
                 marginBlockStart: 16,
@@ -690,7 +720,7 @@ const BaseMenu: React.FC<BaseMenuProps & PrivateSiderMenuProps> = (props) => {
           active
           title={false}
           paragraph={{
-            rows: mode?.includes('inline') ? 6 : 1,
+            rows: mode !== 'horizontal' ? 6 : 1,
           }}
         />
       </div>
@@ -715,7 +745,7 @@ const BaseMenu: React.FC<BaseMenuProps & PrivateSiderMenuProps> = (props) => {
   const { className: menuPropsClassName, style: menuPropsStyle, ...restMenuProps } =
     props.menuProps || {};
 
-  const inlineOpenKeys =
+  const navOpenKeys =
     propsOpenKeys === false
       ? []
       : openKeys === false
@@ -730,7 +760,7 @@ const BaseMenu: React.FC<BaseMenuProps & PrivateSiderMenuProps> = (props) => {
       mode={mode!}
       collapsed={props.collapsed}
       selectedKeys={(selectedKeys || []).map((k) => String(k))}
-      openKeys={inlineOpenKeys}
+      openKeys={navOpenKeys}
       defaultOpenKeys={defaultOpenKeysRef.current.map((k) => String(k))}
       nodes={menuUtils.getNavMenuItems(finallyData, 0, 0)}
       onOpenChange={(_openKeys) => {