From b38c3876c69b585fd2e166a7034192fdf0d3955c Mon Sep 17 00:00:00 2001 From: pissang Date: Fri, 23 Oct 2020 11:23:35 +0800 Subject: [PATCH] fix(decal): fix decal not work on map --- src/component/helper/MapDraw.ts | 5 +++++ src/util/decal.ts | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/component/helper/MapDraw.ts b/src/component/helper/MapDraw.ts index ac44e3125..ceb1e32dd 100644 --- a/src/component/helper/MapDraw.ts +++ b/src/component/helper/MapDraw.ts @@ -38,6 +38,7 @@ import Model from '../../model/Model'; import Transformable from 'zrender/src/core/Transformable'; import { setLabelStyle, getLabelStatesModels } from '../../label/labelStyle'; import { getECData } from '../../util/innerStore'; +import { createOrUpdatePatternFromDecal } from '../../util/decal'; interface RegionsGroup extends graphic.Group { @@ -206,9 +207,13 @@ class MapDraw { // // Visual color for each series is for the symbol draw const style = data.getItemVisual(dataIdx, 'style'); + const decal = data.getItemVisual(dataIdx, 'decal'); if (isVisualEncodedByVisualMap && style.fill) { itemStyle.fill = style.fill; } + if (decal) { + itemStyle.decal = createOrUpdatePatternFromDecal(decal, api); + } } const sx = transformInfo.rawScaleX; diff --git a/src/util/decal.ts b/src/util/decal.ts index 0a96cf255..885354518 100644 --- a/src/util/decal.ts +++ b/src/util/decal.ts @@ -8,7 +8,6 @@ import {createSymbol} from './symbol'; import {util} from 'zrender/src/export'; import ExtensionAPI from '../ExtensionAPI'; import type SVGPainter from 'zrender/src/svg/Painter'; -import type CanvasPainter from 'zrender/src/canvas/Painter'; import { brushSingle } from 'zrender/src/canvas/graphic'; const decalMap = new WeakMap(); -- GitLab