@antv/g2
Advanced tools
Comparing version 3.0.0-rc5.4 to 3.0.0-rc5.5
{ | ||
"name": "@antv/g2", | ||
"version": "3.0.0-rc5.4", | ||
"version": "3.0.0-rc5.5", | ||
"description": "the Grammar of Graphics in Javascript", | ||
@@ -5,0 +5,0 @@ "main": "build/g2.js", |
@@ -76,10 +76,9 @@ /** | ||
const canvas = this._getCanvas(); | ||
const point = canvas.getPointByClient(event.clientX, event.clientY); | ||
const pixelRatio = canvas.get('pixelRatio'); | ||
const point = { | ||
x: event.x / pixelRatio, | ||
y: event.y / pixelRatio | ||
}; | ||
point.x = point.x / pixelRatio; | ||
point.y = point.y / pixelRatio; | ||
const views = chart.getViewsByPoint(point); | ||
event.views = views; | ||
return event; | ||
point.views = views; | ||
return point; | ||
} | ||
@@ -86,0 +85,0 @@ |
@@ -356,3 +356,4 @@ /** | ||
const value = self._formatItemValue(item.value); | ||
const color = checked ? item.marker.fill : unCheckedColor; | ||
const markerColor = item.marker.fill || item.marker.stroke; | ||
const color = checked ? markerColor : unCheckedColor; | ||
let domStr; | ||
@@ -369,3 +370,3 @@ if (Util.isFunction(itemTpl)) { | ||
color, | ||
originColor: item.marker.fill, | ||
originColor: markerColor, | ||
originValue: item.value | ||
@@ -372,0 +373,0 @@ }); |
@@ -10,3 +10,3 @@ /** | ||
const Default = { | ||
version: '3.0.0-rc5.4', | ||
version: '3.0.0-rc5.5', | ||
trackable: true, | ||
@@ -13,0 +13,0 @@ animate: true, |
@@ -10,2 +10,3 @@ /** | ||
const TOOLTIP_CONTAINER_CLASS = 'g2-tooltip'; | ||
const LEGEND_CONTAINER_CLASS = 'g2-legend'; | ||
@@ -145,2 +146,7 @@ const DarkTheme = Util.defaultsDeep({ | ||
unCheckColor: '#bfbfbf' | ||
}, | ||
html: { | ||
[`${LEGEND_CONTAINER_CLASS}`]: { | ||
color: '#D9D9D9' | ||
} | ||
} | ||
@@ -147,0 +153,0 @@ }, |
@@ -31,3 +31,2 @@ /** | ||
const Theme = { | ||
@@ -329,3 +328,7 @@ defaultColor: DEFAULT_COLOR, // 默认主题色 | ||
position: 'absolute', | ||
overflow: 'scroll' | ||
overflow: 'scroll', | ||
fontSize: '12px', | ||
fontFamily: FONT_FAMILY, | ||
lineHeight: '20px', | ||
color: '#8C8C8C' | ||
}, | ||
@@ -342,3 +345,2 @@ [`${LEGEND_TITLE_CLASS}`]: { | ||
cursor: 'pointer', | ||
fontSize: '12px', | ||
marginBottom: '5px', | ||
@@ -348,4 +350,4 @@ marginRight: '24px' | ||
[`${LEGEND_MARKER_CLASS}`]: { | ||
width: '10px', | ||
height: '10px', | ||
width: '8px', | ||
height: '8px', | ||
borderRadius: '50%', | ||
@@ -400,5 +402,8 @@ display: 'inline-block', | ||
ctx.fillStyle = color; | ||
ctx.lineWidth = 1; | ||
ctx.strokeStyle = '#fff'; | ||
ctx.beginPath(); | ||
ctx.arc(x, y, r, 0, Math.PI * 2, false); | ||
ctx.fill(); | ||
ctx.stroke(); | ||
@@ -409,5 +414,5 @@ ctx.save(); | ||
ctx.strokeStyle = color; | ||
ctx.globalAlpha = 0.3; | ||
ctx.lineWidth = 4; | ||
ctx.arc(x, y, 7, 0, Math.PI * 2, false); | ||
ctx.globalAlpha = 0.2; | ||
ctx.lineWidth = 3; | ||
ctx.arc(x, y, 6, 0, Math.PI * 2, false); | ||
ctx.stroke(); | ||
@@ -448,6 +453,2 @@ ctx.restore(); | ||
}, | ||
pie: { | ||
lineWidth: 1, | ||
stroke: '#fff' | ||
}, | ||
hollowInterval: { | ||
@@ -454,0 +455,0 @@ fill: '#fff', |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
18734405
64963