From 7113d24a8225f13e896eaa48c9cf63d4655fa0d0 Mon Sep 17 00:00:00 2001 From: Ovilia Date: Mon, 14 Sep 2020 11:49:43 +0800 Subject: [PATCH] feat: legend.itemStyle has higher priority --- src/chart/helper/EffectLine.ts | 2 - src/chart/helper/LargeSymbolDraw.ts | 10 -- src/chart/helper/Line.ts | 4 +- src/chart/helper/Symbol.ts | 12 +- src/chart/line/LineView.ts | 4 + src/chart/radar/RadarView.ts | 1 - src/component/legend/LegendView.ts | 34 ++--- src/component/timeline/SliderTimelineView.ts | 1 - src/util/symbol.ts | 33 +---- src/visual/style.ts | 6 + test/area-large.html | 2 +- test/axes.html | 10 +- test/axis-interval2.html | 1 - test/legend-style.html | 136 ++++++++++++++++++- 14 files changed, 174 insertions(+), 82 deletions(-) diff --git a/src/chart/helper/EffectLine.ts b/src/chart/helper/EffectLine.ts index d269faad9..9cd76f0d9 100644 --- a/src/chart/helper/EffectLine.ts +++ b/src/chart/helper/EffectLine.ts @@ -98,8 +98,6 @@ class EffectLine extends graphic.Group { symbol.scaleX = size[0]; symbol.scaleY = size[1]; - symbol.setColor(color); - this._symbolType = symbolType; this._symbolScale = size; diff --git a/src/chart/helper/LargeSymbolDraw.ts b/src/chart/helper/LargeSymbolDraw.ts index 381beea04..76d6b3fb2 100644 --- a/src/chart/helper/LargeSymbolDraw.ts +++ b/src/chart/helper/LargeSymbolDraw.ts @@ -68,8 +68,6 @@ class LargeSymbolPath extends graphic.Path { return new LargeSymbolPathShape(); } - setColor: ECSymbol['setColor']; - buildPath(path: PathProxy | CanvasRenderingContext2D, shape: LargeSymbolPathShape) { const points = shape.points; const size = shape.size; @@ -274,8 +272,6 @@ class LargeSymbolDraw { symbolEl.symbolProxy = createSymbol( data.getVisual('symbol'), 0, 0, 0, 0 ); - // Use symbolProxy setColor method - symbolEl.setColor = symbolEl.symbolProxy.setColor; const extrudeShadow = symbolEl.shape.size[0] < BOOST_SIZE_THRESHOLD; symbolEl.useStyle( @@ -285,12 +281,6 @@ class LargeSymbolDraw { ) ); - const globalStyle = data.getVisual('style'); - const visualColor = globalStyle && globalStyle.fill; - if (visualColor) { - symbolEl.setColor(visualColor); - } - if (!isIncremental) { const ecData = getECData(symbolEl); // Enable tooltip diff --git a/src/chart/helper/Line.ts b/src/chart/helper/Line.ts index dbc09c035..3f0a2cd17 100644 --- a/src/chart/helper/Line.ts +++ b/src/chart/helper/Line.ts @@ -219,7 +219,7 @@ class Line extends graphic.Group { const symbol = this.childOfName(symbolCategory) as ECSymbol; if (symbol) { // Share opacity and color with line. - symbol.setColor(visualColor); + symbol.style.fill = visualColor; symbol.style.opacity = lineStyle.opacity; for (let i = 0; i < SPECIAL_STATES.length; i++) { @@ -230,7 +230,7 @@ class Line extends graphic.Group { const state = symbol.ensureState(stateName); const stateStyle = state.style || (state.style = {}); if (lineStateStyle.stroke != null) { - stateStyle[symbol.__isEmptyBrush ? 'stroke' : 'fill'] = lineStateStyle.stroke; + stateStyle.fill = lineStateStyle.stroke; } if (lineStateStyle.opacity != null) { stateStyle.opacity = lineStateStyle.opacity; diff --git a/src/chart/helper/Symbol.ts b/src/chart/helper/Symbol.ts index 0ddb15788..7053b8ded 100644 --- a/src/chart/helper/Symbol.ts +++ b/src/chart/helper/Symbol.ts @@ -272,18 +272,8 @@ class Symbol extends graphic.Group { }, symbolStyle)); } else { - if (symbolPath.__isEmptyBrush) { - // fill and stroke will be swapped if it's empty. - // So we cloned a new style to avoid it affecting the original style in visual storage. - // TODO Better implementation. No empty logic! - symbolPath.useStyle(extend({}, symbolStyle)); - } - else { - symbolPath.useStyle(symbolStyle); - } - symbolPath.setColor(visualColor, opts && opts.symbolInnerColor); + symbolPath.useStyle(symbolStyle); symbolPath.style.strokeNoScale = true; - } const liftZ = data.getItemVisual(idx, 'liftZ'); const z2Origin = this._z2; diff --git a/src/chart/line/LineView.ts b/src/chart/line/LineView.ts index 2c77752d3..b38cf9aec 100644 --- a/src/chart/line/LineView.ts +++ b/src/chart/line/LineView.ts @@ -548,6 +548,10 @@ class LineView extends ChartView { } )); + if (polyline.style.stroke === 'auto') { + polyline.style.stroke = seriesModel.getColorFromPalette(name, null); + } + setStatesStylesFromModel(polyline, seriesModel, 'lineStyle'); const shouldBolderOnEmphasis = seriesModel.get(['emphasis', 'lineStyle', 'width']) === 'bolder'; diff --git a/src/chart/radar/RadarView.ts b/src/chart/radar/RadarView.ts index dd266ece3..daa519f9c 100644 --- a/src/chart/radar/RadarView.ts +++ b/src/chart/radar/RadarView.ts @@ -237,7 +237,6 @@ class RadarView extends ChartView { } else { symbolPath.useStyle(itemStyle); - symbolPath.setColor(color); } const pathEmphasisState = symbolPath.ensureState('emphasis'); diff --git a/src/component/legend/LegendView.ts b/src/component/legend/LegendView.ts index 88d16690e..f9c25b335 100644 --- a/src/component/legend/LegendView.ts +++ b/src/component/legend/LegendView.ts @@ -44,8 +44,6 @@ import Displayable, { DisplayableState } from 'zrender/src/graphic/Displayable'; import { PathStyleProps } from 'zrender/src/graphic/Path'; import { parse, stringify } from 'zrender/src/tool/color'; import SeriesModel from '../../model/Series'; -import {LineStyleMixin} from '../../model/mixin/lineStyle'; -import {LineDrawModelOption} from '../../chart/helper/LineDraw'; const curry = zrUtil.curry; const each = zrUtil.each; @@ -172,6 +170,7 @@ class LegendView extends ComponentView { const contentGroup = this.getContentGroup(); const legendDrawnMap = zrUtil.createHashMap(); const selectMode = legendModel.get('selectedMode'); + const legendItemStyle = legendModel.get('itemStyle'); const excludeSeriesId: string[] = []; ecModel.eachRawSeries(function (seriesModel) { @@ -204,19 +203,24 @@ class LegendView extends ComponentView { const data = seriesModel.getData(); const style = data.getVisual('style'); const color = style[data.getVisual('drawType')] || style.fill; + const fillColor = style.fill; const borderColor = style.stroke; const borderWidth = style.lineWidth; // Using rect symbol defaultly const legendSymbolType = data.getVisual('legendSymbol') || 'roundRect'; - const legendSymbolStyle = data.getVisual('legendSymbolStyle') || {}; + const legendSymbolStyle = zrUtil.defaults( + data.getVisual('legendSymbolStyle'), + legendItemStyle, + true + ); const symbolType = data.getVisual('symbol'); const symbolSize = seriesModel.get('symbolSize'); const itemGroup = this._createItem( name, dataIndex, itemModel, legendModel, legendSymbolType, symbolType, symbolSize, - itemAlign, color, borderColor, borderWidth, + itemAlign, color, fillColor, borderColor, borderWidth, legendSymbolStyle, selectMode ); @@ -261,7 +265,7 @@ class LegendView extends ComponentView { const itemGroup = this._createItem( name, dataIndex, itemModel, legendModel, legendSymbolType, null, null, - itemAlign, color, borderColor, borderWidth, + itemAlign, color, color, borderColor, borderWidth, {}, selectMode ); @@ -343,6 +347,7 @@ class LegendView extends ComponentView { symbolSize: number | number[], itemAlign: LegendOption['align'], color: ZRColor, + fillColor: ZRColor, borderColor: ZRColor, borderWidth: number, legendSymbolStyle: ItemStyleOption, @@ -408,7 +413,7 @@ class LegendView extends ComponentView { (itemHeight - size) / 2, size, size, - isSelected ? color : inactiveColor, + isSelected ? fillColor : inactiveColor, // symbolKeepAspect default true for legend symbolKeepAspect == null ? true : symbolKeepAspect ); @@ -575,17 +580,12 @@ function setSymbolStyle( isSelected: boolean ) { let itemStyle; - if (symbolType.indexOf('empty') < 0) { - itemStyle = legendModelItemStyle.getItemStyle(); - itemStyle.lineWidth = borderWidth; - // itemStyle. - itemStyle.stroke = borderColor; - if (!isSelected) { - itemStyle.stroke = inactiveBorderColor; - } - } - else { - itemStyle = legendModelItemStyle.getItemStyle(['borderWidth', 'borderColor']); + itemStyle = legendModelItemStyle.getItemStyle(); + itemStyle.lineWidth = borderWidth; + // itemStyle. + itemStyle.stroke = borderColor; + if (!isSelected) { + itemStyle.stroke = inactiveBorderColor; } (symbol as Displayable).setStyle(itemStyle); return symbol; diff --git a/src/component/timeline/SliderTimelineView.ts b/src/component/timeline/SliderTimelineView.ts index e8688f8a7..53d9b1119 100644 --- a/src/component/timeline/SliderTimelineView.ts +++ b/src/component/timeline/SliderTimelineView.ts @@ -800,7 +800,6 @@ function giveSymbol( callback && callback.onCreate(symbol); } else { - symbol.setColor(color); group.add(symbol); // Group may be new, also need to add. callback && callback.onUpdate(symbol); } diff --git a/src/util/symbol.ts b/src/util/symbol.ts index 4fe0c8b31..8ce7a8abb 100644 --- a/src/util/symbol.ts +++ b/src/util/symbol.ts @@ -26,11 +26,7 @@ import {calculateTextPosition} from 'zrender/src/contain/text'; import { Dictionary } from 'zrender/src/core/types'; import { ZRColor } from './types'; -type ECSymbol = graphic.Path & { - __isEmptyBrush?: boolean - setColor: (color: ZRColor, innerColor?: string) => void - getColor: () => ZRColor -}; +type ECSymbol = graphic.Path; type SymbolCtor = { new(): ECSymbol }; type SymbolShapeMaker = (x: number, y: number, w: number, h: number, shape: Dictionary) => void; @@ -304,21 +300,6 @@ const SymbolClz = graphic.Path.extend({ } }); -// Provide setColor helper method to avoid determine if set the fill or stroke outside -function symbolPathSetColor(this: ECSymbol, color: ZRColor, innerColor?: string) { - if (this.type !== 'image') { - const symbolStyle = this.style; - if (this.__isEmptyBrush) { - symbolStyle.stroke = color; - symbolStyle.fill = innerColor || '#fff'; - } - else { - symbolStyle.fill = color; - } - this.markRedraw(); - } -} - /** * Create a symbol element with given symbol configuration: shape, x, y, width, height, color */ @@ -342,7 +323,8 @@ export function createSymbol( } let symbolPath: ECSymbol | graphic.Image; - if (symbolType.indexOf('image://') === 0) { + const isImage = symbolType.indexOf('image://') === 0; + if (isImage) { symbolPath = graphic.makeImage( symbolType.slice(8), new BoundingRect(x, y, w, h), @@ -369,13 +351,8 @@ export function createSymbol( }) as unknown as ECSymbol; } - (symbolPath as ECSymbol).__isEmptyBrush = isEmpty; - - // TODO Should deprecate setColor - (symbolPath as ECSymbol).setColor = symbolPathSetColor; - - if (color) { - (symbolPath as ECSymbol).setColor(color); + if (color && !isImage) { + (symbolPath as ECSymbol).style.fill = color; } return symbolPath as ECSymbol; diff --git a/src/visual/style.ts b/src/visual/style.ts index caa5d155c..b380d42f8 100644 --- a/src/visual/style.ts +++ b/src/visual/style.ts @@ -88,8 +88,14 @@ const seriesStyleTask: StageHandler = { // TODO series count changed. seriesModel.name, null, ecModel.getSeriesCount() ); + globalStyle.fill = globalStyle.fill === 'auto' ? colorPalette : globalStyle.fill; globalStyle.stroke = globalStyle.stroke === 'auto' ? colorPalette : globalStyle.stroke; + + if (!globalStyle[colorKey]) { + globalStyle[colorKey] = colorPalette; + } + data.setVisual('colorFromPalette', true); } diff --git a/test/area-large.html b/test/area-large.html index 152d1632c..321256942 100644 --- a/test/area-large.html +++ b/test/area-large.html @@ -154,7 +154,7 @@ under the License. sampling: 'average', itemStyle: { normal: { - color: 'rgb(255, 70, 131)' + borderColor: 'rgb(255, 70, 131)' } }, areaStyle: { diff --git a/test/axes.html b/test/axes.html index a379586d7..d4c688c73 100644 --- a/test/axes.html +++ b/test/axes.html @@ -493,10 +493,11 @@ under the License. data: data1, itemStyle: { normal: { - borderColor: 'white', borderWidth: 3, - lineStyle: {width: 1} } + }, + lineStyle: { + width: 1 } }] }; @@ -543,10 +544,11 @@ under the License. data: data1, itemStyle: { normal: { - borderColor: 'white', borderWidth: 3, - lineStyle: {width: 1} } + }, + lineStyle: { + width: 1 } }] }; diff --git a/test/axis-interval2.html b/test/axis-interval2.html index fef05b338..f0c1659e7 100644 --- a/test/axis-interval2.html +++ b/test/axis-interval2.html @@ -98,7 +98,6 @@ under the License. var itemStyle = { normal: { - borderColor: 'white', borderWidth: 3, lineStyle: { width: 1 diff --git a/test/legend-style.html b/test/legend-style.html index 3022a5cb3..952b32ff3 100644 --- a/test/legend-style.html +++ b/test/legend-style.html @@ -37,7 +37,8 @@ under the License.
- +
+ + + -- GitLab