@rfkit/charts 1.1.13 → 1.1.15

package/components/Markers/lib/Counter.d.ts

@@ -1,25 +1,38 @@
+interface CounterState {
+    id: string;
+    count: number;
+    all: string[];
+    include: string[];
+    markers: Record<string | number, unknown[]>;
+}
+interface CounterProps {
+    id?: string;
+    count?: number;
+    all?: string[];
+    include?: string[];
+    markers?: Record<string | number, unknown[]>;
+}
 export default class Counter {
-    [x: string]: any;
-    constructor(props: any);
-    add(): any;
-    remove(no: any): boolean;
+    private state;
+    constructor(props?: CounterProps);
+    add(): string | false;
+    remove(no: string): boolean;
     clear(): void;
-    destroy(cache: string | any[]): void;
+    destroy(cache: string[]): void;
     /**
      * 混合onChange，可能包含多个markers实例公用counter
      *
-     * @memberof Counter
+     * @param id 实例ID
+     * @param markers 标记数组
+     * @param onChange 变更回调函数
+     * @param operationType 操作类型
      */
-    onMixChange(id: string | number, markers: any, onChange: (arg0: any, arg1: any[]) => void): void;
     /**
      * 更新状态
      *
-     * @param {*} p
-     * @memberof Range
+     * @param p 状态更新参数
      */
-    setState(p: {
-        all: any;
-        include: any;
-        count: any;
-    }): void;
+    setState(p: Partial<CounterState>): void;
+    onMixChange(id: string | number, markers: unknown[], onChange: (markers: unknown[], mix: unknown[], operationType?: string) => void, operationType?: string): void;
 }
+export {};

package/components/Markers/lib/Markers.d.ts

@@ -39,7 +39,7 @@ export default class Markers {
      *
      * @memberof Markers
      */
-    onChange(isDel?: boolean): void;
+    onChange(isDel?: boolean, operationType?: string): void;
     /**
      * 卸载计数器
      */

package/components/Markers/lib/Selecter.d.ts

@@ -1,28 +1,35 @@
 /**
  * 处理唯一选中
  */
+type SelecterCallback = (event: {
+    select: boolean;
+    parentID: string;
+    attribute: Record<string, unknown>;
+}) => void;
+interface MarkerAttribute {
+    select: boolean;
+    [key: string]: unknown;
+}
 export default class Selecter {
-    [x: string]: any;
+    private state;
     constructor();
     /**
      * 设置当前选中
      *
-     * @param {*} parentID 实例的id
-     * @param {*} id 被选中的marker的id
-     * @returns
-     * @memberof Select
+     * @param parentID 实例的id
+     * @param id 被选中的marker的id
+     * @param attribute 标记属性
      */
-    set(parentID: string, id: any, attribute: {
-        select: any;
-    }): void;
+    set(parentID: string, id: string, attribute: MarkerAttribute): void;
     /**
      * 取消选中
-     * @param {*} parentID
+     * @param parentID 实例的id
      */
-    cancel(parentID: string | number): void;
+    cancel(parentID: string): void;
     /**
      * 订阅变更
-     * @param {*} func
+     * @param func 回调函数
      */
-    subscription(func: any): void;
+    subscription(func: SelecterCallback): void;
 }
+export {};

package/components/Markers/lib/tools.d.ts

@@ -53,10 +53,14 @@ export declare const setMarkerMove: (e: MarkerType, segments: SegmentsType, func
  */
 export declare const setMarkerBatchAdd: (e: {
     data: any;
+    clear?: boolean;
+    [key: string]: any;
 }, segments: SegmentsType, func: (arg0: {
     pstype: string;
     event: string;
     data: number[];
+    clear?: boolean;
+    [key: string]: any;
 }) => void) => void;
 /**
  * 峰值算法

package/config/constants.d.ts

@@ -71,7 +71,15 @@ export declare enum MarkerEventType {
     Add = "add",
     Del = "del",
     Reset = "reset",
-    Move = "move"
+    Move = "move",
+    Clear = "clear",
+    Hover = "hover",
+    Update = "update",
+    Format = "format",
+    Dashed = "dashed",
+    Center = "center",
+    Ref = "ref",
+    Flow = "flow"
 }
 export declare enum ToolType {
     AxisX = "axisX",

package/index.js

@@ -3904,6 +3904,14 @@ var constants_MarkerEventType = /*#__PURE__*/ function(MarkerEventType) {
     MarkerEventType["Del"] = "del";
     MarkerEventType["Reset"] = "reset";
     MarkerEventType["Move"] = "move";
+    MarkerEventType["Clear"] = "clear";
+    MarkerEventType["Hover"] = "hover";
+    MarkerEventType["Update"] = "update";
+    MarkerEventType["Format"] = "format";
+    MarkerEventType["Dashed"] = "dashed";
+    MarkerEventType["Center"] = "center";
+    MarkerEventType["Ref"] = "ref";
+    MarkerEventType["Flow"] = "flow";
     return MarkerEventType;
 }({});
 var constants_ToolType = /*#__PURE__*/ function(ToolType) {
@@ -8453,7 +8461,7 @@ const Board = ({ markers, heatmapMode, onChange })=>{
                                     e.stopPropagation();
                                     onChange({
                                         id: i.id,
-                                        event: 'flow'
+                                        event: constants_MarkerEventType.Flow
                                     });
                                 }
                             },
@@ -8500,7 +8508,7 @@ const Board = ({ markers, heatmapMode, onChange })=>{
                                 setActive(null);
                                 onChange({
                                     id: i.id,
-                                    event: 'del'
+                                    event: constants_MarkerEventType.Del
                                 });
                             },
                             children: "x"
@@ -8625,20 +8633,21 @@ const Dot = ({ heatmapMode, markers })=>{
 };
 const Markers_Dot = /*#__PURE__*/ __WEBPACK_EXTERNAL_MODULE_react__["default"].memo(Dot);
 class Counter {
-    constructor(props){
-        this.setState({
+    state;
+    constructor(props = {}){
+        this.state = {
             id: 'id',
             count: 10,
             all: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
             include: [],
             markers: {},
             ...props
-        });
+        };
     }
     add() {
         const { all, include, count } = this.state;
         if (include.length >= count) return false;
-        const difference = all.filter((i)=>-1 === include.indexOf(i));
+        const difference = all.filter((item)=>!include.includes(item));
         const atom = difference[0];
         if (atom) {
             include.push(atom);
@@ -8649,7 +8658,7 @@ class Counter {
     remove(no) {
         const { include } = this.state;
         if (!no || 0 === include.length) return false;
-        this.state.include = include.filter((i)=>i !== no);
+        this.state.include = include.filter((item)=>item !== no);
         return true;
     }
     clear() {
@@ -8658,15 +8667,7 @@ class Counter {
     destroy(cache) {
         if (!cache || 0 === cache.length) return;
         const { include } = this.state;
-        this.state.include = include.filter((i)=>!cache.includes(i));
-    }
-    onMixChange(id, markers, onChange) {
-        this.state.markers[id] = JSON.parse(JSON.stringify(markers));
-        const mix = [];
-        Object.values(this.state.markers).forEach((i)=>{
-            mix.push(...i);
-        });
-        onChange?.(markers, mix);
+        this.state.include = include.filter((item)=>!cache.includes(item));
     }
     setState(p) {
         this.state = {
@@ -8674,6 +8675,14 @@ class Counter {
             ...p
         };
     }
+    onMixChange(id, markers, onChange, operationType) {
+        this.state.markers[id] = JSON.parse(JSON.stringify(markers));
+        const mix = [];
+        Object.values(this.state.markers).forEach((markerArray)=>{
+            mix.push(...markerArray);
+        });
+        onChange?.(markers, mix, operationType);
+    }
 }
 const markerColors = getConfig('marker');
 const Markers_COMPONENT_KEY = constants_ToolType.Markers;
@@ -8749,7 +8758,7 @@ class Markers {
                     }, 'update');
                     info.peak = false;
                     markers[index] = info;
-                    this.onChange();
+                    this.onChange(false, constants_MarkerEventType.Move);
                 }
             }
         });
@@ -8805,14 +8814,18 @@ class Markers {
                 id: ee.id,
                 select: true
             });
-            this.onChange();
+            this.onChange(false, constants_MarkerEventType.Add);
         }
     }
     updateAttribute(attr) {
         const attribute = attr;
         const { markers, counter, selecter, id: parentID, onDel, heatmapMode } = this.state;
-        const { id, peak, select, event, data, refId } = attribute;
+        const { id, peak, select, event, data, refId, clear } = attribute;
         if (event === constants_MarkerEventType.Add) {
+            if (clear) {
+                counter.clear();
+                markers.splice(0, markers.length);
+            }
             if (data?.length) for(let i = 0; i < data.length; i += 1)this.create({
                 left: data[i]
             }, true);
@@ -8834,19 +8847,19 @@ class Markers {
                 onDel();
             }
         }
-        if ('clear' === event) {
+        if (event === constants_MarkerEventType.Clear) {
             markers.forEach((_, index)=>{
                 counter.remove(markers[index].label);
             });
             markers.splice(0, markers.length);
             isDel = true;
         }
-        if ('dashed' === event) for(let index = 0; index < markers.length; index += 1){
+        if (event === constants_MarkerEventType.Dashed) for(let index = 0; index < markers.length; index += 1){
             const item = markers[index];
             item.dashed = false;
             if (data.includes(item.id)) item.dashed = true;
         }
-        if ('center' === event) {
+        if (event === constants_MarkerEventType.Center) {
             const index = markers.findIndex((i)=>i.id === id);
             const center = 50;
             if (index >= 0) {
@@ -8870,7 +8883,7 @@ class Markers {
                 }
             }
         }
-        if ('format' === event) {
+        if (event === constants_MarkerEventType.Format) {
             const index = markers.findIndex((i)=>i.id === id);
             const { left } = attribute;
             if (index >= 0 && void 0 !== left) markers[index] = this.formatMarker({
@@ -8878,7 +8891,7 @@ class Markers {
                 left
             });
         }
-        if ('ref' === event) {
+        if (event === constants_MarkerEventType.Ref) {
             const index = markers.findIndex((i)=>i.id === id);
             if (index >= 0) {
                 markers[index].refId = refId;
@@ -8908,14 +8921,20 @@ class Markers {
             }
         }
         if (void 0 !== peak && true === peak) return void this.updateByData();
-        this.onChange(isDel);
+        let operationType = constants_MarkerEventType.Update;
+        if (event === constants_MarkerEventType.Add) operationType = constants_MarkerEventType.Add;
+        else if (event === constants_MarkerEventType.Del) operationType = constants_MarkerEventType.Del;
+        else if (event === constants_MarkerEventType.Clear) operationType = constants_MarkerEventType.Clear;
+        else if (event === constants_MarkerEventType.Center) operationType = constants_MarkerEventType.Move;
+        else if (event === constants_MarkerEventType.Format) operationType = constants_MarkerEventType.Move;
+        this.onChange(isDel, operationType);
     }
     updateByData(data = this.state.data) {
         this.state.data = data;
         this.formatPeaks?.();
         const { markers } = this.state;
         this.state.markers = markers.map((marker)=>this.formatMarker(marker, 'update'));
-        this.onChange();
+        this.onChange(false, constants_MarkerEventType.Update);
     }
     updateParams(e) {
         this.state = {
@@ -8927,7 +8946,7 @@ class Markers {
         const { show } = this.state;
         if (!show) this.reset();
     }
-    onChange(isDel = false) {
+    onChange(isDel = false, operationType) {
         const { id, markers, onChange, counter } = this.state;
         if (!isDel) this.state.markers = markers.map((marker)=>{
             const { refId, frequency, level, timestamp } = marker;
@@ -8945,7 +8964,7 @@ class Markers {
                 ...refData
             };
         });
-        if (markers.length || isDel) counter.onMixChange(id, markers, onChange);
+        if (markers.length || isDel) counter.onMixChange(id, markers, onChange, operationType);
     }
     destroyCounter() {
         const { counter, labelCache } = this.state;
@@ -8959,12 +8978,12 @@ class Markers {
             hoverChange = item.hover;
             item.hover = false;
         }
-        if (hoverChange) this.onChange();
+        if (hoverChange) this.onChange(false, constants_MarkerEventType.Reset);
     }
     reset() {
         this.state.markers = [];
         this.state.counter.clear();
-        this.onChange(true);
+        this.onChange(true, constants_MarkerEventType.Reset);
     }
 }
 const MARKER_UPDATE_PARAMS = (id, func)=>subscription_createSubscriptionManager(`MARKER_UPDATE_PARAMS-${id}`, '0', func);
@@ -9021,7 +9040,7 @@ const setMarkerMove = (e, segments, func)=>{
             const left = (frequency - start) * 100 / width;
             func?.({
                 pstype: constants_PSType.Marker,
-                event: 'format',
+                event: constants_MarkerEventType.Format,
                 id,
                 left
             });
@@ -9029,7 +9048,7 @@ const setMarkerMove = (e, segments, func)=>{
     }
 };
 const setMarkerBatchAdd = (e, segments, func)=>{
-    const { data } = e;
+    const { data, ...otherProps } = e;
     const seg = segments[0];
     if (data?.length && seg) {
         const { start, stop } = seg;
@@ -9038,11 +9057,12 @@ const setMarkerBatchAdd = (e, segments, func)=>{
             const r = [];
             for(let i = 0; i < data.length; i += 1){
                 const frequency = data[i];
-                if (frequency < stop && frequency > start) r.push((frequency - start) * 100 / width);
+                if (frequency <= stop && frequency >= start) r.push((frequency - start) * 100 / width);
             }
             func?.({
+                ...otherProps,
                 pstype: constants_PSType.Marker,
-                event: 'add',
+                event: constants_MarkerEventType.Add,
                 data: r
             });
         }
@@ -9153,7 +9173,7 @@ class FreeMarkers extends Markers {
                     }
                 }
             }
-            if (hoverChange) this.onChange();
+            if (hoverChange) this.onChange(false, constants_MarkerEventType.Hover);
         }
         return isHover;
     }
@@ -9947,7 +9967,7 @@ class LineMarkers extends Markers {
                     }
                 }
             }
-            if (hoverChange) this.onChange();
+            if (hoverChange) this.onChange(false, constants_MarkerEventType.Hover);
         }
         return isHover;
     }
@@ -9971,7 +9991,7 @@ class LineMarkers extends Markers {
         const attribute = attr;
         const { markers } = this.state;
         const { event, id } = attribute;
-        if ('flow' === event) {
+        if (event === constants_MarkerEventType.Flow) {
             const index = markers.findIndex((i)=>i.id === id);
             markers[index].flow = {
                 name: SERIES.realData.name,
@@ -9981,6 +10001,7 @@ class LineMarkers extends Markers {
     }
 }
 class Selecter {
+    state;
     constructor(){
         this.state = {
             onChange: [],
@@ -10000,7 +10021,7 @@ class Selecter {
             }
         });
         this.state.marker[parentID] = id;
-        if (attribute.select) this.state.onChange.forEach((i)=>i?.({
+        if (attribute.select) this.state.onChange.forEach((callback)=>callback?.({
                 select: true,
                 parentID,
                 attribute
@@ -10011,7 +10032,7 @@ class Selecter {
         const { marker } = this.state;
         const all = Object.entries(marker).every(([, v])=>!v);
         if (all) {
-            this.state.onChange.forEach((i)=>i?.({
+            this.state.onChange.forEach((callback)=>callback?.({
                     select: false,
                     parentID,
                     attribute: {}
@@ -10027,13 +10048,15 @@ const Markers_Markers = ({ id, counter, selecter, heatmapMode = false })=>{
     const [markers, setMarkers] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)([]);
     const { state: { marker, axisX, axisY, zoom, segments, globalID }, dispatch } = useStore_useStore();
     const { show: markerShow, display, count, onChange, dot: { fixed }, selectMax } = marker;
-    const managerOnChange = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)((e, mix)=>{
+    const managerOnChange = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)((e, mix, operationType)=>{
         const m = mix;
         setMarkers(JSON.parse(JSON.stringify(e)));
         m.heatmapMode = heatmapMode;
+        m.operationType = operationType;
         onChange?.(m);
     }, [
-        onChange
+        onChange,
+        heatmapMode
     ]);
     const [manager] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)(()=>new (heatmapMode ? FreeMarkers : LineMarkers)({
             id,
@@ -10158,7 +10181,7 @@ const Markers_Markers = ({ id, counter, selecter, heatmapMode = false })=>{
                         manager?.updateAttribute({
                             id: m.id,
                             left: m.left,
-                            event: 'format'
+                            event: constants_MarkerEventType.Format
                         });
                     }
                     if ('ArrowRight' === key) {
@@ -10168,7 +10191,7 @@ const Markers_Markers = ({ id, counter, selecter, heatmapMode = false })=>{
                         manager?.updateAttribute({
                             id: m.id,
                             left: m.left,
-                            event: 'format'
+                            event: constants_MarkerEventType.Format
                         });
                     }
                 }

package/package.json

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

package/types/publish.d.ts

@@ -40,6 +40,7 @@ export interface SetMarker {
     event: MarkerEventType;
     data: number[];
     heatmapMode?: boolean;
+    clear?: boolean;
 }
 export interface SpectrumExtraData {
     [key: string]: Float32Array;