diff --git a/src/components/Charts/Radar/index.js b/src/components/Charts/Radar/index.js index fdeed9e2d0e904b0fe032d3079635a9eb8594e60..a0aa7fab6ea82dde0e9202d5315d9df80e18e806 100644 --- a/src/components/Charts/Radar/index.js +++ b/src/components/Charts/Radar/index.js @@ -92,7 +92,7 @@ class Radar extends Component { title, hasLegend = false, forceFit = true, - tickCount = 4, + tickCount = 5, padding = [35, 30, 16, 30], animate = true, colors = defaultColors, diff --git a/src/components/Charts/TagCloud/index.js b/src/components/Charts/TagCloud/index.js index 49ebc94726ea85295a833b7ce473047152b4a268..d94699bd551c0c33319bd3d61eac2c4edb613bbe 100644 --- a/src/components/Charts/TagCloud/index.js +++ b/src/components/Charts/TagCloud/index.js @@ -1,5 +1,5 @@ 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 Debounce from 'lodash-decorators/debounce'; import Bind from 'lodash-decorators/bind'; @@ -91,8 +91,8 @@ class TagCloud extends Component { return; } - const h = height * 4; - const w = this.root.offsetWidth * 4; + const h = height; + const w = this.root.offsetWidth; const onload = () => { const dv = new DataSet.View().source(data); @@ -104,14 +104,14 @@ class TagCloud extends Component { imageMask: this.imageMask, font: 'Verdana', size: [w, h], // 宽高设置最好根据 imageMask 做调整 - padding: 5, + padding: 0, timeInterval: 5000, // max execute time rotate() { return 0; }, fontSize(d) { // 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 { y: { nice: false }, }} > + - + )} diff --git a/src/components/Charts/TagCloud/index.less b/src/components/Charts/TagCloud/index.less index f5c12ad45df20f9799decfa88dcdbfc46c71d04e..db8e4dabfdd3f1fd4566ff22f55962648c369c49 100644 --- a/src/components/Charts/TagCloud/index.less +++ b/src/components/Charts/TagCloud/index.less @@ -1,7 +1,6 @@ .tagCloud { overflow: hidden; canvas { - transform: scale(0.25); transform-origin: 0 0; } }