Commit 3ac37ebe authored by Immortalt's avatar Immortalt Committed by 陈帅

change the default tickCount of Radar (#2896)

* change the default tickCount of Radar

solve the problem mentioned in issue #2881

* 词云修复鼠标移过时变色的偏移并支持Tooltip显示数量
parent 0745731b
...@@ -92,7 +92,7 @@ class Radar extends Component { ...@@ -92,7 +92,7 @@ class Radar extends Component {
title, title,
hasLegend = false, hasLegend = false,
forceFit = true, forceFit = true,
tickCount = 4, tickCount = 5,
padding = [35, 30, 16, 30], padding = [35, 30, 16, 30],
animate = true, animate = true,
colors = defaultColors, colors = defaultColors,
......
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Chart, Geom, Coord, Shape } from 'bizcharts'; import { Chart, Geom, Coord, Shape, Tooltip } from 'bizcharts';
import DataSet from '@antv/data-set'; import DataSet from '@antv/data-set';
import Debounce from 'lodash-decorators/debounce'; import Debounce from 'lodash-decorators/debounce';
import Bind from 'lodash-decorators/bind'; import Bind from 'lodash-decorators/bind';
...@@ -91,8 +91,8 @@ class TagCloud extends Component { ...@@ -91,8 +91,8 @@ class TagCloud extends Component {
return; return;
} }
const h = height * 4; const h = height;
const w = this.root.offsetWidth * 4; const w = this.root.offsetWidth;
const onload = () => { const onload = () => {
const dv = new DataSet.View().source(data); const dv = new DataSet.View().source(data);
...@@ -104,14 +104,14 @@ class TagCloud extends Component { ...@@ -104,14 +104,14 @@ class TagCloud extends Component {
imageMask: this.imageMask, imageMask: this.imageMask,
font: 'Verdana', font: 'Verdana',
size: [w, h], // 宽高设置最好根据 imageMask 做调整 size: [w, h], // 宽高设置最好根据 imageMask 做调整
padding: 5, padding: 0,
timeInterval: 5000, // max execute time timeInterval: 5000, // max execute time
rotate() { rotate() {
return 0; return 0;
}, },
fontSize(d) { fontSize(d) {
// eslint-disable-next-line // eslint-disable-next-line
return Math.pow((d.value - min) / (max - min), 2) * (70 - 20) + 20; return Math.pow((d.value - min) / (max - min), 2) * (17.5 - 5) + 5;
}, },
}); });
...@@ -158,8 +158,20 @@ class TagCloud extends Component { ...@@ -158,8 +158,20 @@ class TagCloud extends Component {
y: { nice: false }, y: { nice: false },
}} }}
> >
<Tooltip showTitle={false} />
<Coord reflect="y" /> <Coord reflect="y" />
<Geom type="point" position="x*y" color="text" shape="cloud" /> <Geom
type="point"
position="x*y"
color="text"
shape="cloud"
tooltip={[
'text*value',
function trans(text, value) {
return { name: text, value };
},
]}
/>
</Chart> </Chart>
)} )}
</div> </div>
......
.tagCloud { .tagCloud {
overflow: hidden; overflow: hidden;
canvas { canvas {
transform: scale(0.25);
transform-origin: 0 0; transform-origin: 0 0;
} }
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment