Merge pull request #3724 from VisActor/perf/pictogram

Perf/pictogram
VisActor · Feb 14, 2025 · ee6304d · ee6304d
2 parents b0feae0 + 30d5e13
commit ee6304d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/common/changes/@visactor/vchart/perf-pictogram_2025-02-12-03-15.json b/common/changes/@visactor/vchart/perf-pictogram_2025-02-12-03-15.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vchart",
+      "comment": "refactor: optimize performance of pictogram",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vchart"
+}
diff --git a/packages/vchart/src/series/pictogram/pictogram.ts b/packages/vchart/src/series/pictogram/pictogram.ts
@@ -19,7 +19,7 @@ import type { IMatrix } from '@visactor/vutils';
 import { Bounds, Matrix, isValid, merge } from '@visactor/vutils';
 import type { Datum } from '../../typings';
 import { createRect } from '@visactor/vrender-core';
-import type { Group, IGraphic } from '@visactor/vrender-core';
+import type { Group } from '@visactor/vrender-core';
 import { VGRAMMAR_HOOK_EVENT } from '../../constant/event';
 import type { IHoverSpec, ISelectSpec } from '../../interaction/interface';
 import { STATE_VALUE_ENUM } from '../../compile/mark';
@@ -47,6 +47,8 @@ export class PictogramSeries<T extends IPictogramSeriesSpec = IPictogramSeriesSp
   protected _parsedSvgResult: SVGParserResult;
   private _labelMark: ITextMark;
 
+  private _idToMark: Map<string, IMark> = new Map();
+
   setAttrFromSpec() {
     super.setAttrFromSpec();
     this.svg = this._spec.svg;
@@ -149,7 +151,7 @@ export class PictogramSeries<T extends IPictogramSeriesSpec = IPictogramSeriesSp
           skipBeforeLayouted: true,
           dataView: this._mapViewData.getDataView(),
           dataProductId: this._mapViewData.getProductId(),
-          parent: (this._pictogramMark.getMarkInUserId(parent?._uniqueId) as IGroupMark) ?? this._pictogramMark
+          parent: (this._idToMark.get(parent?._uniqueId) as IGroupMark) ?? this._pictogramMark
         },
         {
           morph: shouldMarkDoMorph(this._spec, PictogramSeries.mark.pictogram.name)
@@ -158,6 +160,7 @@ export class PictogramSeries<T extends IPictogramSeriesSpec = IPictogramSeriesSp
 
       if (mark) {
         mark.setUserId(_uniqueId); // id 必须唯一，但无法控制 svg 中元素有重复 id， 这里做一个保护
+        this._idToMark.set(_uniqueId, mark);
         if (mark.type !== 'group') {
           mark.setMarkConfig({ graphicName: mark.name });
         }
@@ -243,7 +246,7 @@ export class PictogramSeries<T extends IPictogramSeriesSpec = IPictogramSeriesSp
     }
     for (const element of elements) {
       const { _uniqueId, _finalAttributes: attributes } = element as SVGParsedElementExtend;
-      const mark = this._pictogramMark.getMarkInUserId(_uniqueId);
+      const mark = this._idToMark.get(_uniqueId);
       const valid = this._validElement(element);
       if (mark) {
         // 描边粗细跟随缩放倍数
@@ -476,6 +479,12 @@ export class PictogramSeries<T extends IPictogramSeriesSpec = IPictogramSeriesSp
       } as ISeriesSeriesInfo;
     });
   }
+
+  release(): void {
+    this._parsedSvgResult = null;
+    this._idToMark.clear();
+    this._idToMark = null;
+  }
 }
 
 export const registerPictogramSeries = () => {