Skip to content

refactor: add mark api hasAnimationByState #3840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xile611 merged 1 commit into from
Mar 25, 2025
Merged

refactor: add mark api hasAnimationByState #3840

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 17 additions & 6 deletions packages/vchart/src/mark/base/base-mark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import { computeActualDataScheme, getDataScheme } from '../../theme/color-scheme
import type { ISeries } from '../../series/interface';
import { MarkStateManager } from '../../compile/mark';
import type { ICompilableMark, IMarkCompileOption, IMarkConfig, StateValueType } from '../../compile/mark';
import { array, degreeToRadian, isArray, isBoolean, isFunction, isNil, isValid } from '@visactor/vutils';
import { array, degreeToRadian, isArray, isBoolean, isFunction, isNil, isObject, isValid } from '@visactor/vutils';
import { curveTypeTransform, groupData, runEncoder } from '../utils/common';
import type { ICompilableInitOption } from '../../compile/interface';
import { LayoutState } from '../../compile/interface';
Expand All @@ -59,7 +59,7 @@ import { GrammarItem } from '../../compile/grammar-item';
import { LayoutZIndex } from '../../constant/layout';
import type { IModel } from '../../model/interface';
import type { ICompilableData } from '../../compile/data/interface';
import { AnimationStateEnum, type MarkAnimationSpec } from '../../animation/interface';
import { AnimationStateEnum, IAnimationConfig, type MarkAnimationSpec } from '../../animation/interface';
import { CompilableData } from '../../compile/data/compilable-data';
import { log } from '../../util';

Expand Down Expand Up @@ -1314,8 +1314,11 @@ export class BaseMark<T extends ICommonSpec> extends GrammarItem implements IMar
this._graphicMap.set(g.context.uniqueKey, g);
}
} else {
// todo @zxy 这里需要补充动画更新逻辑
g.setAttributes(finalAttrs);
if (this.hasAnimationByState(g.context.animationState)) {
// todo 执行动画 @zxy
} else {
g.setAttributes(finalAttrs);
}
}

this._setStateOfGraphic(g);
Expand Down Expand Up @@ -1482,9 +1485,9 @@ export class BaseMark<T extends ICommonSpec> extends GrammarItem implements IMar

this._graphics.forEach(g => {
if (this.state.checkOneState(g, g.context.data, stateInfo) === 'in') {
g.addState(key, true);
g.addState(key, true, this.hasAnimationByState('state'));
} else {
g.removeState(key);
g.removeState(key, this.hasAnimationByState('state'));
}
});
}
Expand Down Expand Up @@ -1685,4 +1688,12 @@ export class BaseMark<T extends ICommonSpec> extends GrammarItem implements IMar
this._graphics.forEach(g => (g.context.animationState = callback(g)));
}
}

hasAnimationByState(state: string) {
if (!state || !this._animationConfig || !this._animationConfig[state]) {
return false;
}
const stateAnimationConfig = this._animationConfig[state];
return (stateAnimationConfig as IAnimationConfig[]).length > 0 || isObject(stateAnimationConfig);
}
}