fix(CompositeLayer): 修复复合图层交互问题

- FillLayer: tooltipFields 会被 buildDefaultTooltipTemplate 默认模板遮蔽，导致按字段渲染失效；改为有字段无模板时返回 undefined，使 SchemaLayer 走字段表格分支
- SchemaLayer: hover popup 进入要素即显（原先需 mousemove 才触发）；Tooltip placement 由写死 top 改为 resolveHoverPlacement，贴近地图上边缘时翻转到 bottom 避免裁剪；并将该 helper 导出供其他图层复用
- IconLayer: 主图标层与降级圆点分支补 {...rest} 透传，恢复 events/zIndex/visible/autoFit 等 LayerSchema 字段（此前被静默丢弃，zIndex 等不生效）
- BubbleLayer: tooltipEffect 对齐 FillLayer 改为 hover Tooltip（原先走默认 click Popup，同名 prop 语义与 FillLayer 不一致）
- ArcFlowLayer: hover Tooltip 接入 resolveHoverPlacement 边缘翻转；修正 showTooltip/showNodePopup JSDoc 默认值（true→false）

Author: lzxue

packages/core/src/components/CompositeLayer/ArcFlowLayer.tsx

@@ -4,6 +4,8 @@ import { LineLayer } from '../Layer/LineLayer';
 import { PointLayer } from '../Layer/PointLayer';
 import { Tooltip } from '../Interaction/Tooltip';
 import { Popup } from '../Interaction/Popup';
+import { useScene } from '../../context/SceneContext';
+import { resolveHoverPlacement } from '../Layer/SchemaLayer';
 
 /**
  * 弧线形态
@@ -102,9 +104,9 @@ export interface ArcFlowLayerProps {
   nodePulse?: boolean;
 
   // ===== 交互 =====
-  /** 是否在 hover 弧线时显示 Tooltip，默认 true */
+  /** 是否在 hover 弧线时显示 Tooltip，默认 false */
   showTooltip?: boolean;
-  /** 是否在点击节点时显示 Popup，默认 true */
+  /** 是否在点击节点时显示 Popup，默认 false */
   showNodePopup?: boolean;
   /** hover 高亮色 */
   activeColor?: string;
@@ -176,6 +178,7 @@ export function ArcFlowLayer({
   onNodeClick,
   style: extraStyle,
 }: ArcFlowLayerProps) {
+  const scene = useScene();
   // 构建弧线 sourceConfig
   const arcSourceConfig = useMemo(() => {
     return sourceConfig ?? {
@@ -348,6 +351,7 @@ export function ArcFlowLayer({
           latitude={tooltipState.lat}
           visible
           variant="dark"
+          placement={scene ? resolveHoverPlacement(scene, tooltipState.lng, tooltipState.lat) : 'top'}
           items={[
             { label: '起点', value: tooltipState.from },
             { label: '终点', value: tooltipState.to },

packages/core/src/components/CompositeLayer/BubbleLayer.tsx

@@ -48,7 +48,7 @@ export interface BubbleLayerProps extends Omit<LayerSchema, 'type' | 'source' |
   hoverEffect?: boolean;
   /** 是否启用默认 click 选中反馈 */
   clickEffect?: boolean;
-  /** 是否启用默认 tooltip/popup（点击气泡弹出） */
+  /** 是否启用默认 tooltip（hover 显示），与 FillLayer 行为一致 */
   tooltipEffect?: boolean;
   /** tooltip 展示字段，不传则自动展示常见字段 */
   tooltipFields?: string[];
@@ -138,12 +138,15 @@ export function BubbleLayer({
   const defaultActive: ActiveConfig = { color: '#60a5fa', duration: 150 };
   const defaultSelect: SelectConfig = { color: '#1d4ed8', duration: 150 };
 
+  // 与 FillLayer 对齐：tooltipEffect → hover Tooltip；
+  // 传入 tooltipFields 但无模板时，让 SchemaLayer 按字段渲染表格（popupTemplate 为 undefined）。
   const resolvedEvents = (() => {
     const origin = rest.events;
     if (!tooltipEffect) return origin;
     return {
       ...origin,
       enablePopup: origin?.enablePopup ?? true,
+      popupTrigger: origin?.popupTrigger ?? 'hover',
       popupFields: origin?.popupFields ?? tooltipFields,
       popupTemplate: origin?.popupTemplate ?? tooltipTemplate,
     };

packages/core/src/components/CompositeLayer/FillLayer.tsx

@@ -145,10 +145,22 @@ export function FillLayer({
 
   const tooltipValueField = valueField ?? colorField ?? 'value';
   const tooltipNameField = nameField ?? labelField;
-  const resolvedTooltipTemplate = useMemo(
-    () => tooltipTemplate ?? buildDefaultTooltipTemplate(tooltipNameField, tooltipValueField, percentageField),
-    [tooltipTemplate, tooltipNameField, tooltipValueField, percentageField],
-  );
+
+  // 模板决策：
+  // 1) 用户显式传入 tooltipTemplate / events.popupTemplate → 优先使用
+  // 2) 用户传入 popupFields 但无模板 → 不注入默认模板，让 SchemaLayer 按字段渲染表格
+  //    （否则 formatPopupContent 会进入模板分支而忽略 popupFields，导致 tooltipFields 失效）
+  // 3) 均未指定 → 使用中文标签的默认模板
+  const resolvedTooltipTemplate = useMemo(() => {
+    const directTemplate = tooltipTemplate ?? events?.popupTemplate;
+    if (directTemplate) return directTemplate;
+
+    // 有字段、无模板时返回 undefined，触发 SchemaLayer 的"按字段渲染表格"分支
+    const fields = events?.popupFields ?? tooltipFields;
+    if (fields && fields.length > 0) return undefined;
+
+    return buildDefaultTooltipTemplate(tooltipNameField, tooltipValueField, percentageField);
+  }, [tooltipTemplate, events, tooltipFields, tooltipNameField, tooltipValueField, percentageField]);
 
   const defaultActive: ActiveConfig = { color: '', duration: 150 };
   const defaultSelect: SelectConfig = { color: '#0f172a', duration: 150 };

packages/core/src/components/CompositeLayer/IconLayer.tsx

@@ -151,6 +151,7 @@ export function IconLayer({
   if (shouldDegradeToPoint) {
     return (
       <PointLayer
+        {...rest}
         source={source}
         sourceType={sourceType}
         sourceConfig={sourceConfig}
@@ -166,6 +167,7 @@ export function IconLayer({
     <>
       {/* 图标图层 */}
       <PointLayer
+        {...rest}
         source={source}
         sourceType={sourceType}
         sourceConfig={sourceConfig}

packages/core/src/components/Layer/SchemaLayer.tsx

@@ -302,7 +302,7 @@ export function SchemaLayer({ schema, scene, eventHandlers, onLayerCreated }: Sc
       const needsDblclick = Boolean(eventHandlersRef.current?.onDblclick);
       const needsUndblclick = Boolean(eventHandlersRef.current?.onUndblclick);
       const needsMouseMove = Boolean(eventHandlersRef.current?.onMouseMove || layerEvents?.mousemove || (popupEnabled && popupTrigger === 'hover'));
-      const needsMouseEnter = Boolean(eventHandlersRef.current?.onMouseEnter || layerEvents?.mouseenter);
+      const needsMouseEnter = Boolean(eventHandlersRef.current?.onMouseEnter || layerEvents?.mouseenter || (popupEnabled && popupTrigger === 'hover'));
       const needsMouseLeave = Boolean(eventHandlersRef.current?.onMouseLeave || layerEvents?.mouseleave || (popupEnabled && popupTrigger === 'hover'));
 
       // L7 click 事件（普通单击，与 dblclick/undblclick 互斥）
@@ -350,6 +350,10 @@ export function SchemaLayer({ schema, scene, eventHandlers, onLayerCreated }: Sc
         layer.on('mouseenter', (evt: unknown) => {
           const payload = extractLayerPayload(layerId, schema.type, evt);
           eventHandlersRef.current?.onMouseEnter?.(payload);
+          // hover 触发时立即显示，避免进入要素后需移动鼠标才出现的延迟
+          if (popupEnabled && popupTrigger === 'hover') {
+            showPopup(payload);
+          }
           if (layerEvents?.mouseenter) {
             eventBus.emit(layerEvents.mouseenter, payload);
           }
@@ -431,7 +435,7 @@ export function SchemaLayer({ schema, scene, eventHandlers, onLayerCreated }: Sc
         latitude={popupState.lat}
         content={popupState.content}
         variant="dark"
-        placement="top"
+        placement={resolveHoverPlacement(scene, popupState.lng, popupState.lat)}
         visible={true}
       />
     );
@@ -489,6 +493,35 @@ function sortValue(value: unknown, seen: WeakSet<object>): unknown {
   return value;
 }
 
+/**
+ * hover Tooltip 朝向：锚点贴近地图上边缘时翻转到下方，避免被裁剪。
+ * 仅做上/下翻转（小尺寸 Tooltip 的常见需求）。
+ */
+export function resolveHoverPlacement(
+  scene: Scene,
+  lng: number,
+  lat: number,
+): 'top' | 'bottom' {
+  try {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const mapsService = (scene as any).mapService;
+    const container =
+      (mapsService?.getContainer?.() as HTMLElement | undefined) ??
+      ((scene as any).getContainer?.() as HTMLElement | undefined);
+    if (!container) return 'top';
+    const rect = container.getBoundingClientRect();
+    if (!rect || rect.height <= 0) return 'top';
+    const pos = mapsService
+      ? mapsService.lngLatToContainer([lng, lat])
+      : scene.lngLatToContainer([lng, lat]);
+    if (!pos || !Number.isFinite(pos.x) || !Number.isFinite(pos.y)) return 'top';
+    if (pos.y < 140) return 'bottom';
+  } catch {
+    // 场景/地图服务不可用时回退到上方
+  }
+  return 'top';
+}
+
 /**
  * 格式化 Popup 内容
  */