@rfkit/charts 1.1.14 → 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[], arg2?: string) => void, operationType?: string): 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/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/index.js

@@ -8633,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);
@@ -8657,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() {
@@ -8666,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, operationType) {
-        this.state.markers[id] = JSON.parse(JSON.stringify(markers));
-        const mix = [];
-        Object.values(this.state.markers).forEach((i)=>{
-            mix.push(...i);
-        });
-        onChange?.(markers, mix, operationType);
+        this.state.include = include.filter((item)=>!cache.includes(item));
     }
     setState(p) {
         this.state = {
@@ -8682,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;
@@ -8819,8 +8820,12 @@ class Markers {
     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);
@@ -9043,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;
@@ -9052,9 +9057,10 @@ 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: constants_MarkerEventType.Add,
                 data: r
@@ -9995,6 +10001,7 @@ class LineMarkers extends Markers {
     }
 }
 class Selecter {
+    state;
     constructor(){
         this.state = {
             onChange: [],
@@ -10014,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
@@ -10025,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: {}

package/package.json

@@ -5,6 +5,6 @@
   "types": "index.d.ts",
   "author": "Hxgh",
   "license": "MIT",
-  "version": "1.1.14",
+  "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;