Skip to content

Commit

Permalink
fix: fix path of type define
Browse files Browse the repository at this point in the history
  • Loading branch information
xile611 committed Dec 19, 2024
1 parent 7212cf6 commit 7da528e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 19 deletions.
17 changes: 1 addition & 16 deletions packages/vchart/src/mark/group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,14 @@ import type { Maybe } from '../typings';
import { warn } from '../util/debug';
import type { IGroupMarkSpec } from '../typings/visual';
import { BaseMark } from './base/base-mark';
import type { IMark, IMarkRaw, IMarkStyle, MarkType } from './interface';
import type { IGroupMark, IMark, IMarkStyle, MarkType } from './interface';
// eslint-disable-next-line no-duplicate-imports
import { MarkTypeEnum } from './interface/type';
import type { IGroupMark as IVGrammarGroupMark } from '@visactor/vgrammar-core';
// eslint-disable-next-line no-duplicate-imports
import { registerGroupGraphic } from '@visactor/vgrammar-core';
import type { IMarkCompileOption } from '../compile/mark';

export interface IGroupMark extends IMarkRaw<IGroupMarkSpec> {
// groupMark的zIndex只能配在外层,encode里不生效,且无法写成signal
// {type:'group', zIndex: 100} ✅
// {type:'group', encode:{enter:{zIndex:{value:100}}}} ❌
// {type:'group', zIndex: {signal: }} ❌

addMark: (m: IMark) => boolean;
removeMark: (m: IMark) => boolean;
// TODO: 这里可能会出现mark嵌套的问题
getMarks: () => IMark[];
getMarkInType: (type: MarkType) => IMark[];
getMarkInId: (id: number) => IMark | undefined;
getMarkInName: (name: string) => IMark[];
}

export class GroupMark extends BaseMark<IGroupMarkSpec> implements IGroupMark {
static readonly type = MarkTypeEnum.group;
readonly type = GroupMark.type;
Expand Down
2 changes: 1 addition & 1 deletion packages/vchart/src/mark/interface/mark.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,5 @@ export interface IGroupMark extends IMarkRaw<IGroupMarkSpec> {
getMarks: () => IMark[];
getMarkInType: (type: MarkType) => IMark[];
getMarkInId: (id: number) => IMark | undefined;
getMarkInName: (name: string) => IMark | undefined;
getMarkInName: (name: string) => IMark[] | undefined;
}
3 changes: 1 addition & 2 deletions packages/vchart/src/series/pictogram/interface.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import type { IPathMarkSpec, ITextMarkSpec } from '../../typings/visual';
import type { IPathMarkSpec } from '../../typings/visual';
import type { IMarkSpec, IMarkTheme, ISeriesSpec } from '../../typings/spec/common';
import type { IAnimationSpec } from '../../animation/spec';
import { ILabelSpec } from '../../component';

export interface IPictogramSeriesSpec extends ISeriesSpec, IAnimationSpec<'pictogram', 'fadeIn'> {
/**
Expand Down

0 comments on commit 7da528e

Please sign in to comment.