@rfkit/charts 1.2.2 → 1.2.4

package/index.js

@@ -7558,6 +7558,43 @@ function toggleSeriesMode(globalID, currentMode) {
     const nextMode = getNextMode(mode);
     setSeriesMode(globalID, nextMode);
 }
+function initSeriesSubscription(renderer) {
+    const { globalID } = renderer.state;
+    if (!globalID) {
+        console.warn("[Series] globalID is required for series subscription");
+        return null;
+    }
+    const subscriptions = [];
+    subscriptions.push(subscribeToSeries(globalID, events_SeriesEventName.UPDATED, (data)=>{
+        console.log("[Series\u8BA2\u9605] UPDATED\u4E8B\u4EF6\u6536\u5230:", {
+            seriesName: data.seriesName,
+            display: data.config.display,
+            globalID: data.globalID
+        });
+        renderer.setSeries(data.config, true);
+        console.log("[Series\u8BA2\u9605] \u8C03\u7528 draw()");
+        renderer.state.chart?.draw();
+    }));
+    subscriptions.push(subscribeToSeries(globalID, events_SeriesEventName.MODE_CHANGED, ()=>{
+        renderer.initSeries();
+    }));
+    subscriptions.push(subscribeToSeries(globalID, events_SeriesEventName.TYPE_OVERRIDE_CHANGED, ()=>{
+        renderer.initSeries();
+    }));
+    subscriptions.push(subscribeToSeries(globalID, events_SeriesEventName.BATCH_UPDATED, (data)=>{
+        data.configs.forEach((config)=>{
+            renderer.setSeries(config, true);
+        });
+        renderer.state.chart?.draw();
+    }));
+    subscriptions.push(subscribeToSeries(globalID, events_SeriesEventName.RESET, ()=>{
+        if (renderer.state.series) renderer.state.series = {};
+        renderer.initSeries();
+    }));
+    return ()=>{
+        for (const unsubscribe of subscriptions)unsubscribe();
+    };
+}
 const chartTypeSeriesOverrides = new Map();
 function setChartTypeSeriesOverride(globalID, seriesName, type) {
     if (!chartTypeSeriesOverrides.has(globalID)) chartTypeSeriesOverrides.set(globalID, new Map());
@@ -7644,11 +7681,23 @@ function mergeSeriesConfig(config, existing) {
 }
 function updateSeries(globalID, config) {
     if (!config?.name) return;
+    console.log("[updateSeries] \u5F00\u59CB\u66F4\u65B0:", {
+        globalID,
+        name: config.name,
+        display: config.display
+    });
     const manager = getSeriesManager(globalID);
     const existing = manager.getSeries(config.name);
+    console.log('[updateSeries] existing:', existing);
     const finalConfig = mergeSeriesConfig(config, existing);
+    console.log('[updateSeries] finalConfig:', finalConfig);
     if (existing) manager.removeSeries(config.name);
     manager.addSeries(finalConfig);
+    console.log("[updateSeries] \u53D1\u5E03 UPDATED \u4E8B\u4EF6:", {
+        globalID,
+        seriesName: config.name,
+        display: finalConfig.display
+    });
     events_emitSeriesEvent(events_SeriesEventName.UPDATED, {
         globalID,
         seriesName: config.name,
@@ -10113,29 +10162,7 @@ class Spectrum {
         this.initSeriesSubscription();
     }
     initSeriesSubscription() {
-        if (!this.state.globalID) return;
-        const subscriptions = [];
-        subscriptions.push(subscribeToSeries(this.state.globalID, events_SeriesEventName.UPDATED, (data)=>{
-            this.setSeries(data.config, true);
-        }));
-        subscriptions.push(subscribeToSeries(this.state.globalID, events_SeriesEventName.MODE_CHANGED, ()=>{
-            this.initSeries();
-        }));
-        subscriptions.push(subscribeToSeries(this.state.globalID, events_SeriesEventName.TYPE_OVERRIDE_CHANGED, ()=>{
-            this.initSeries();
-        }));
-        subscriptions.push(subscribeToSeries(this.state.globalID, events_SeriesEventName.BATCH_UPDATED, (data)=>{
-            data.configs.forEach((config)=>{
-                this.setSeries(config, true);
-            });
-        }));
-        subscriptions.push(subscribeToSeries(this.state.globalID, events_SeriesEventName.RESET, ()=>{
-            this.state.series = {};
-            this.initSeries();
-        }));
-        this.seriesUnsubscribe = ()=>{
-            for (const unsubscribe of subscriptions)unsubscribe();
-        };
+        this.seriesUnsubscribe = initSeriesSubscription(this) || void 0;
     }
     init() {
         const { id, renderRange } = this.state;
@@ -10214,10 +10241,17 @@ class Spectrum {
         const { chart, series, globalID } = this.state;
         const { name } = config;
         if (!chart || !name || !config) return;
-        const { type = type_GraphicType.Line, color = SERIES[name]?.color, thickness = 1, display = false } = {
+        console.log("[Spectrum.setSeries] \u6536\u5230\u914D\u7F6E:", {
+            name,
+            display: config.display,
+            skipEventEmit,
+            currentDisplay: series[name]?.display
+        });
+        const merged = {
             ...series[name],
             ...config
         };
+        const { type = type_GraphicType.Line, color = SERIES[name]?.color, thickness = 1, display = false } = merged;
         const c = {
             name,
             type,
@@ -10225,6 +10259,7 @@ class Spectrum {
             thickness,
             display
         };
+        console.log("[Spectrum.setSeries] \u5408\u5E76\u540E\u7684\u914D\u7F6E:", c, "\u539Fmerged:", merged);
         series[name] = c;
         chart.setSeries(c);
         if (!skipEventEmit && globalID) try {
@@ -15628,7 +15663,7 @@ const Zoom_Zoom = ()=>{
     return null;
 };
 const Zoom = Zoom_Zoom;
-const useMarkerPublish = ({ globalID })=>{
+const useMarkerPublish_useMarkerPublish = ({ globalID })=>{
     const handleMarkerPublish = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)((e)=>{
         if (!globalID) return;
         switch(e.pstype){
@@ -15650,7 +15685,7 @@ const useMarkerPublish = ({ globalID })=>{
         handleMarkerPublish
     };
 };
-const hooks_useMarkerPublish = useMarkerPublish;
+const useMarkerPublish = useMarkerPublish_useMarkerPublish;
 function useTemplateComparison() {
     const { state: { globalID, axisX: { frequencyFormat }, signal: { onChange } } } = useStore_useStore();
     const frequencyFormatRef = (0, __WEBPACK_EXTERNAL_MODULE_react__.useRef)(frequencyFormat);
@@ -16172,7 +16207,7 @@ const Spectrum_Chart_Chart = (props)=>{
         }
     });
     const handleSpectrumRule = useSpectrumRule();
-    const { handleMarkerPublish } = hooks_useMarkerPublish({
+    const { handleMarkerPublish } = useMarkerPublish({
         globalID
     });
     hooks_usePublish({

package/package.json

@@ -5,6 +5,6 @@
   "types": "index.d.ts",
   "author": "Hxgh",
   "license": "MIT",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "private": false
 }

package/utils/series/index.d.ts

@@ -58,6 +58,7 @@ export declare function resetSeries(globalID: string): void;
 export declare function batchUpdateSeries(globalID: string, configs: PartialSeriesConfig[]): void;
 export * from './events';
 export * from './modes';
+export * from './subscription';
 /**
  * 获取带有正确 GraphicType 的 series 配置
  * 优先级：ChartType 覆盖 > SeriesMode 配置 > 默认类型

package/utils/series/subscription.d.ts

@@ -0,0 +1,43 @@
+/**
+ * Series 订阅工具
+ * 提供可复用的 series 事件订阅函数
+ */
+import type { SeriesConfig } from './index';
+/**
+ * Series 渲染器接口
+ * 定义渲染器必须实现的方法
+ */
+export interface SeriesRenderer {
+    state: {
+        globalID?: string;
+        chart?: {
+            draw: () => void;
+        };
+        series?: Record<string, unknown>;
+    };
+    setSeries: (config: SeriesConfig, skipEvent?: boolean) => void;
+    initSeries: () => void;
+}
+/**
+ * 初始化 Series 事件订阅
+ *
+ * @param renderer 渲染器实例（必须实现 SeriesRenderer 接口）
+ * @returns 取消订阅函数
+ *
+ * @example
+ * ```typescript
+ * class MyRender implements SeriesRenderer {
+ *   private seriesUnsubscribe: (() => void) | null = null;
+ *
+ *   constructor(props: any) {
+ *     this.state = { chart: null, globalID: props.globalID };
+ *     this.seriesUnsubscribe = initSeriesSubscription(this);
+ *   }
+ *
+ *   destroy() {
+ *     this.seriesUnsubscribe?.();
+ *   }
+ * }
+ * ```
+ */
+export declare function initSeriesSubscription(renderer: SeriesRenderer): (() => void) | null;