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
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@visactor/vchart",
"comment": "fix: duplicated categoryField data in funnel will result to unexpected rendering result",
"type": "none"
}
],
"packageName": "@visactor/vchart"
}
6 changes: 4 additions & 2 deletions packages/vchart/src/series/base/base-series.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1252,14 +1252,16 @@ export abstract class BaseSeries<T extends ISeriesSpec> extends BaseModel<T> imp
morph = false,
clip,
customShape,
stateSort
stateSort,
noSeparateStyle = false
} = option;
const m = super._createMark<M>(markInfo, {
key: key ?? this._getDataIdKey(),
support3d,
seriesId: this.id,
attributeContext: this._markAttributeContext,
componentType: option.componentType
componentType: option.componentType,
noSeparateStyle
});
if (isValid(m)) {
this._marks.addMark(m, { name: markInfo.name });
Expand Down
12 changes: 8 additions & 4 deletions packages/vchart/src/series/funnel/funnel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ export class FunnelSeries<T extends IFunnelSeriesSpec = IFunnelSeriesSpec>
groupKey: this._seriesField,
isSeriesMark: true,
customShape: this._spec.funnel?.customShape,
stateSort: this._spec.funnel?.stateSort
stateSort: this._spec.funnel?.stateSort,
noSeparateStyle: true
}
) as IPolygonMark;

Expand All @@ -202,7 +203,8 @@ export class FunnelSeries<T extends IFunnelSeriesSpec = IFunnelSeriesSpec>
dataView: this._viewDataTransform.getDataView(),
dataProductId: this._viewDataTransform.getProductId(),
customShape: this._spec.transform?.customShape,
stateSort: this._spec.transform?.stateSort
stateSort: this._spec.transform?.stateSort,
noSeparateStyle: true
}
);
}
Expand All @@ -214,13 +216,15 @@ export class FunnelSeries<T extends IFunnelSeriesSpec = IFunnelSeriesSpec>
this._funnelOuterLabelMark.label = this._createMark(FunnelSeries.mark.outerLabel, {
themeSpec: this._theme?.outerLabel,
markSpec: this._spec.outerLabel,
skipBeforeLayouted: true
skipBeforeLayouted: true,
noSeparateStyle: true
}) as ITextMark;

this._funnelOuterLabelMark.line = this._createMark(FunnelSeries.mark.outerLabelLine, {
themeSpec: lineTheme,
markSpec: line,
depend: [this._funnelOuterLabelMark.label]
depend: [this._funnelOuterLabelMark.label],
noSeparateStyle: true
}) as IRuleMark;
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/vchart/src/series/interface/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import type {
import type { IRegion } from '../../region/interface';
import type { RenderMode } from '../../typings/spec/common';
import type { ISeries } from './series';
import type { IMarkProgressiveConfig } from '../../mark/interface';
import type { IMarkOption, IMarkProgressiveConfig } from '../../mark/interface';
import type { ISeriesSpec, StringOrNumber } from '../../typings';
import type { TransformedLabelSpec } from '../../component/label';
import type { SeriesMarkNameEnum, SeriesTypeEnum } from './type';
Expand Down Expand Up @@ -69,7 +69,7 @@ export type ISeriesStyleItem = {
};
};

export interface ISeriesMarkInitOption {
export interface ISeriesMarkInitOption extends Partial<IMarkOption> {
/** theme spec */
themeSpec?: any;

Expand Down