Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/vchart/src/chart/base/base-chart.ts
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,9 @@ export class BaseChart<T extends IChartSpec> extends CompilableBase implements I
globalScale: this._globalScale,
onError: this._option?.onError,
disableTriggerEvent: this._option?.disableTriggerEvent === true,
getSeriesData: this._chartData.getSeriesData.bind(this._chartData)
getSeriesData: this._chartData.getSeriesData.bind(this._chartData),
// @ts-ignore
dispatchEvent: (eType, params) => this._option.globalInstance.event.emit(eType, params)
};

if ((this as any)._setModelOption) {
Expand Down
4 changes: 3 additions & 1 deletion packages/vchart/src/constant/event.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,9 @@ export enum ChartEvent {
afterRender = 'afterRender',
// layout
afterLayout = 'afterLayout',
afterMarkLayoutEnd = 'afterMarkLayoutEnd'
afterMarkLayoutEnd = 'afterMarkLayoutEnd',
// wordcloud
afterWordcloudShapeDraw = 'afterWordcloudShapeDraw'
}

export enum Event_Source_Type {
Expand Down
3 changes: 3 additions & 0 deletions packages/vchart/src/core/vchart.ts
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,9 @@ export class VChart implements IVChart {
private _chartSpecTransformer!: Maybe<IChartSpecTransformer>;
private _compiler: Compiler;
private _event: Maybe<IEvent>;
get event() {
return this._event;
}
private _userEvents: {
eType: EventType;
query: EventQuery | EventCallback<EventParamsDefinition[EventType]>;
Expand Down
2 changes: 2 additions & 0 deletions packages/vchart/src/model/interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ export interface IModelOption extends ICompilableInitOption {
getDimensionInfo?: (chart: IChart | undefined, pos: ILayoutPoint, isTooltip?: boolean) => IDimensionInfo[] | null;
getDimensionInfoByValue?: (axis: IAxis, value: any) => IDimensionInfo | null;
getRectByDimensionData?: (dimensionData: IDimensionData, layoutStartPoint: ILayoutPoint) => any;

dispatchEvent?: (key: string, params?: any) => void;
}

export interface IModelSpecInfo<T extends Record<string, unknown> = any> {
Expand Down
27 changes: 22 additions & 5 deletions packages/vchart/src/series/word-cloud/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import type { ITransformSpec } from '../../compile/interface';
import { vglobal, getTextBounds, createImage } from '@visactor/vrender-core';
import { wordCloud } from '../../theme/builtin/common/series/word-cloud';
import { LayoutZIndex } from '../../constant/layout';
import { ChartEvent } from '../../core';

export type IBaseWordCloudSeriesSpec = Omit<IWordCloudSeriesSpec, 'type'> & { type: string };

Expand Down Expand Up @@ -383,11 +384,27 @@ export class BaseWordCloudSeries<T extends IBaseWordCloudSeriesSpec = IBaseWordC
}
: this._maskShape,
onUpdateMaskCanvas: this.handleMaskCanvasUpdate,
onLayoutFinished: () =>
this._option.globalInstance
.getChart()
.getOption()
.performanceHook?.afterWordcloudShapeDraw?.(this._option.globalInstance),
onLayoutFinished: () => {
const afterWordcloudShapeDraw = () => {
// 需要等到真正渲染完成
this._option.globalInstance.getStage().hooks.afterRender.taps = this._option.globalInstance
.getStage()
.hooks.afterRender.taps.filter(tap => tap.fn !== afterWordcloudShapeDraw);

this._option.dispatchEvent?.(ChartEvent.afterWordcloudShapeDraw, {
instance: this._option.globalInstance
});
this._option.globalInstance
.getChart()
.getOption()
.performanceHook?.afterWordcloudShapeDraw?.(this._option.globalInstance);
};
this._option.globalInstance.getStage().hooks.afterRender.taps.push({
type: 'sync',
name: 'afterWordcloudShapeDraw',
fn: afterWordcloudShapeDraw
});
},
dataIndexKey: DEFAULT_DATA_KEY,
text: wordSpec.formatMethod
? (datum: Datum) => {
Expand Down
Loading