Skip to content

fix: issue#16749 colorAlpha check #16760

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

Closed
jiawulin001 wants to merge 2 commits into from
Closed

fix: issue#16749 colorAlpha check #16760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9da097c
fix: issue#16749 colorAlpha check
jiawulin001 Mar 28, 2022
ef5edb8
colorAlpha testcase added
jiawulin001 Mar 28, 2022
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
2 changes: 1 addition & 1 deletion src/chart/treemap/treemapVisual.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ function buildVisuals(
return visuals;
}

function calculateColor(visuals: TreemapVisual) {
export function calculateColor(visuals: TreemapVisual) {
let color = getValueVisualDefine(visuals, 'color') as ColorString;

if (color) {
Expand Down
4 changes: 4 additions & 0 deletions src/model/Model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import GlobalModel from './Global';
import { AnimationOptionMixin, ModelOption } from '../util/types';
import { Dictionary } from 'zrender/src/core/types';
import { mixin, clone, merge } from 'zrender/src/core/util';
import { calculateColor } from '../chart/treemap/treemapVisual';

// Since model.option can be not only `Dictionary` but also primary types,
// we do this conditional type to avoid getting type 'never';
Expand Down Expand Up @@ -123,6 +124,9 @@ class Model<Opt = ModelOption> { // TODO: TYPE use unknown instead of any?
const option = this.option;

let val = option == null ? option : option[key];
if (val && key === 'color' && ('colorAlpha' in option)){
val = ((calculateColor(option)) as unknown) as Opt[R];
}
if (val == null && !ignoreParent) {
const parentModel = this.parentModel;
if (parentModel) {
Expand Down
121 changes: 121 additions & 0 deletions test/treemap-itemStyle-colorAlpha.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.