diff --git a/src/chart/helper/EffectLine.ts b/src/chart/helper/EffectLine.ts index d269faad9d..9cd76f0d97 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 381beea049..76d6b3fb20 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 dbc09c0350..3f0a2cd178 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 0ddb15788f..7053b8ded0 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.ts b/src/chart/line.ts index 541b481e84..421a718142 100644 --- a/src/chart/line.ts +++ b/src/chart/line.ts @@ -27,9 +27,24 @@ import dataSample from '../processor/dataSample'; // In case developer forget to include grid component import '../component/gridSimple'; +import LineSeriesModel from './line/LineSeries'; echarts.registerLayout(layoutPoints('line')); +echarts.registerVisual({ + seriesType: 'line', + reset: function (seriesModel: LineSeriesModel) { + // Visual coding for legend + const lineStyle = seriesModel.getModel('lineStyle'); + if (lineStyle) { + seriesModel.getData().setVisual('legendSymbolStyle', { + color: lineStyle.get('color'), + borderWidth: lineStyle.get('width') + }); + } + } +}); + // Down sample after filter echarts.registerProcessor( echarts.PRIORITY.PROCESSOR.STATISTIC, diff --git a/src/chart/line/LineSeries.ts b/src/chart/line/LineSeries.ts index 9715908a5c..f4c0aab1fb 100644 --- a/src/chart/line/LineSeries.ts +++ b/src/chart/line/LineSeries.ts @@ -36,6 +36,9 @@ import { import List from '../../data/List'; import type Cartesian2D from '../../coord/cartesian/Cartesian2D'; import type Polar from '../../coord/polar/Polar'; +import makeStyleMapper from '../../model/mixin/makeStyleMapper'; +import {ITEM_STYLE_KEY_MAP} from '../../model/mixin/itemStyle'; +import {LINE_STYLE_KEY_MAP} from '../../model/mixin/lineStyle'; type LineDataValue = OptionDataValue | OptionDataValue[]; @@ -117,6 +120,8 @@ class LineSeriesModel extends SeriesModel { hasSymbolVisual = true; legendSymbol = 'line'; + visualDrawType = 'stroke' as const; + getInitialData(option: LineSeriesOption): List { if (__DEV__) { const coordSys = option.coordinateSystem; @@ -141,6 +146,12 @@ class LineSeriesModel extends SeriesModel { position: 'top' }, + itemStyle: { + color: 'white', + borderColor: 'auto', + borderWidth: 1 + }, + lineStyle: { width: 2, type: 'solid' @@ -165,7 +176,7 @@ class LineSeriesModel extends SeriesModel { // Disabled if step is true smooth: false, smoothMonotone: null, - symbol: 'emptyCircle', + symbol: 'circle', symbolSize: 4, symbolRotate: null, diff --git a/src/chart/line/LineView.ts b/src/chart/line/LineView.ts index 2c77752d3f..b38cf9aec5 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 dd266ece37..daa519f9cd 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/LegendModel.ts b/src/component/legend/LegendModel.ts index 4ee162bf45..42496c85cb 100644 --- a/src/component/legend/LegendModel.ts +++ b/src/component/legend/LegendModel.ts @@ -397,7 +397,6 @@ class LegendModel extends ComponentMode inactiveBorderColor: '#ccc', itemStyle: { - borderWidth: 0 }, textStyle: { diff --git a/src/component/legend/LegendView.ts b/src/component/legend/LegendView.ts index 54a2f38ef0..f9c25b335e 100644 --- a/src/component/legend/LegendView.ts +++ b/src/component/legend/LegendView.ts @@ -35,12 +35,15 @@ import { ZRRectLike, ECElement, CommonTooltipOption, - ColorString + ColorString, + SeriesOption, + SymbolOptionMixin } from '../../util/types'; import Model from '../../model/Model'; 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'; const curry = zrUtil.curry; const each = zrUtil.each; @@ -167,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) { @@ -186,7 +190,8 @@ class LegendView extends ComponentView { } // Representitive series. - const seriesModel = ecModel.getSeriesByName(name)[0]; + const seriesModel = ecModel.getSeriesByName(name)[0] as + SeriesModel; if (legendDrawnMap.get(name)) { // Have been drawed @@ -198,17 +203,25 @@ 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 = 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, - itemAlign, color, borderColor, - selectMode + legendSymbolType, symbolType, symbolSize, + itemAlign, color, fillColor, borderColor, borderWidth, + legendSymbolStyle, selectMode ); itemGroup.on('click', curry(dispatchSelectAction, name, null, api, excludeSeriesId)) @@ -236,6 +249,7 @@ class LegendView extends ComponentView { const style = provider.getItemVisual(idx, 'style') as PathStyleProps; const borderColor = style.stroke; + const borderWidth = style.lineWidth; let color = style.fill; const colorArr = parse(style.fill as ColorString); // Color may be set to transparent in visualMap when data is out of range. @@ -250,9 +264,9 @@ class LegendView extends ComponentView { const itemGroup = this._createItem( name, dataIndex, itemModel, legendModel, - legendSymbolType, null, - itemAlign, color, borderColor, - selectMode + legendSymbolType, null, null, + itemAlign, color, color, borderColor, borderWidth, + {}, selectMode ); // FIXME: consider different series has items with the same name. @@ -330,11 +344,20 @@ class LegendView extends ComponentView { legendModel: LegendModel, legendSymbolType: string, symbolType: string, + symbolSize: number | number[], itemAlign: LegendOption['align'], color: ZRColor, + fillColor: ZRColor, borderColor: ZRColor, + borderWidth: number, + legendSymbolStyle: ItemStyleOption, selectMode: LegendOption['selectedMode'] ) { + if (symbolSize != null && typeof symbolSize === 'object') { + // Use symbol height as symbol size if it's an array + symbolSize = symbolSize[1]; + } + const itemWidth = legendModel.get('itemWidth'); const itemHeight = legendModel.get('itemHeight'); const inactiveColor = legendModel.get('inactiveColor'); @@ -367,7 +390,8 @@ class LegendView extends ComponentView { itemGroup.add( setSymbolStyle( legendSymbol, legendSymbolType, legendModelItemStyle, - borderColor, inactiveBorderColor, isSelected + legendSymbolStyle.color || borderColor, legendSymbolStyle.borderWidth || borderWidth, + inactiveBorderColor, isSelected ) ); @@ -377,7 +401,9 @@ class LegendView extends ComponentView { // At least show one symbol, can't be all none && ((symbolType !== legendSymbolType) || symbolType === 'none') ) { - const size = itemHeight * 0.8; + const size = symbolSize == null + ? itemHeight * 0.8 + : Math.min(itemHeight, symbolSize as number); if (symbolType === 'none') { symbolType = 'circle'; } @@ -387,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 ); @@ -395,7 +421,7 @@ class LegendView extends ComponentView { itemGroup.add( setSymbolStyle( legendSymbolCenter, symbolType, legendModelItemStyle, - borderColor, inactiveBorderColor, isSelected + borderColor, borderWidth, inactiveBorderColor, isSelected ) ); } @@ -549,19 +575,17 @@ function setSymbolStyle( symbolType: string, legendModelItemStyle: Model, borderColor: ZRColor, + borderWidth: number, inactiveBorderColor: ZRColor, isSelected: boolean ) { let itemStyle; - if (symbolType !== 'line' && symbolType.indexOf('empty') < 0) { - itemStyle = legendModelItemStyle.getItemStyle(); - (symbol as graphic.Path).style.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 e8688f8a7b..53d9b11193 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/data/List.ts b/src/data/List.ts index 1f0d0a81b3..ab59d63953 100644 --- a/src/data/List.ts +++ b/src/data/List.ts @@ -34,7 +34,7 @@ import Element from 'zrender/src/Element'; import { DimensionIndex, DimensionName, DimensionLoose, OptionDataItem, ParsedValue, ParsedValueNumeric, OrdinalNumber, DimensionUserOuput, - ModelOption, SeriesDataType, OrdinalRawValue + ModelOption, SeriesDataType, OrdinalRawValue, ItemStyleOption } from '../util/types'; import {isDataItemOption, convertOptionIdName} from '../util/model'; import { getECData } from '../util/ecData'; @@ -137,6 +137,7 @@ export interface DefaultDataVisual { liftZ?: number // For legend. legendSymbol?: string + legendSymbolStyle?: ItemStyleOption // visualMap will inject visualMeta data visualMeta?: VisualMeta[] diff --git a/src/util/symbol.ts b/src/util/symbol.ts index 8b5dc28483..8ce7a8abbb 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; @@ -174,9 +170,7 @@ const Arrow = graphic.Path.extend({ */ // TODO Use function to build symbol path. const symbolCtors: Dictionary = { - // Use small height rect to simulate line. - // Avoid using stroke. - line: graphic.Rect as unknown as SymbolCtor, + line: graphic.Line as unknown as SymbolCtor, rect: graphic.Rect as unknown as SymbolCtor, @@ -195,17 +189,13 @@ const symbolCtors: Dictionary = { triangle: Triangle as unknown as SymbolCtor }; - -// NOTICE Only use fill. No line! const symbolShapeMakers: Dictionary = { - line: function (x, y, w, h, shape: graphic.Rect['shape']) { - const thickness = 2; - // A thin line - shape.x = x; - shape.y = y + h / 2 - thickness / 2; - shape.width = w; - shape.height = thickness; + line: function (x, y, w, h, shape: graphic.Line['shape']) { + shape.x1 = x; + shape.y1 = y + h / 2; + shape.x2 = x + w; + shape.y2 = y + h / 2; }, rect: function (x, y, w, h, shape: graphic.Rect['shape']) { @@ -310,23 +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'; - // TODO Same width with lineStyle in LineView. - symbolStyle.lineWidth = 2; - } - else { - symbolStyle.fill = color; - } - this.markRedraw(); - } -} - /** * Create a symbol element with given symbol configuration: shape, x, y, width, height, color */ @@ -344,11 +317,14 @@ export function createSymbol( const isEmpty = symbolType.indexOf('empty') === 0; if (isEmpty) { - symbolType = symbolType.substr(5, 1).toLowerCase() + symbolType.substr(6); + const realSymbolType = symbolType.substr(5, 1).toLowerCase() + symbolType.substr(6); + console.warn(`[DEPRECATED] Shape "${symbolType}" is deprecated. Please use "${realSymbolType}" with "fill" as "white" instead.`); + symbolType = realSymbolType; } 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), @@ -375,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 2b3d006e15..b380d42f82 100644 --- a/src/visual/style.ts +++ b/src/visual/style.ts @@ -18,7 +18,7 @@ */ import { isFunction, extend, createHashMap } from 'zrender/src/core/util'; -import { StageHandler, CallbackDataParams, ZRColor, Dictionary } from '../util/types'; +import { StageHandler, CallbackDataParams, ZRColor, Dictionary, SeriesOption, SymbolOptionMixin } from '../util/types'; import makeStyleMapper from '../model/mixin/makeStyleMapper'; import { ITEM_STYLE_KEY_MAP } from '../model/mixin/itemStyle'; import { LINE_STYLE_KEY_MAP } from '../model/mixin/lineStyle'; @@ -83,11 +83,19 @@ const seriesStyleTask: StageHandler = { // TODO style callback const colorCallback = isFunction(color) ? color as unknown as ColorCallback : null; // Get from color palette by default. - if (!globalStyle[colorKey] || colorCallback) { - globalStyle[colorKey] = seriesModel.getColorFromPalette( + if (!globalStyle[colorKey] || colorCallback || globalStyle.fill === 'auto' || globalStyle.stroke) { + var colorPalette = seriesModel.getColorFromPalette( // 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 152d1632c4..3212569420 100644 --- a/test/area-large.html +++ b/test/area-large.html @@ -154,7 +154,7 @@ 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 a379586d71..d4c688c731 100644 --- a/test/axes.html +++ b/test/axes.html @@ -493,10 +493,11 @@ data: data1, itemStyle: { normal: { - borderColor: 'white', borderWidth: 3, - lineStyle: {width: 1} } + }, + lineStyle: { + width: 1 } }] }; @@ -543,10 +544,11 @@ 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 fef05b338b..f0c1659e78 100644 --- a/test/axis-interval2.html +++ b/test/axis-interval2.html @@ -98,7 +98,6 @@ var itemStyle = { normal: { - borderColor: 'white', borderWidth: 3, lineStyle: { width: 1 diff --git a/test/legend-style.html b/test/legend-style.html new file mode 100644 index 0000000000..952b32ff33 --- /dev/null +++ b/test/legend-style.html @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + +