diff --git a/src/components/Charts/TagCloud/index.js b/src/components/Charts/TagCloud/index.js index 88a8d7bd332d2a14f61fd4fe641708ee63117ce5..ef4eb2a1b296517b3e07c39b163391acc5e8b6e3 100644 --- a/src/components/Charts/TagCloud/index.js +++ b/src/components/Charts/TagCloud/index.js @@ -6,6 +6,9 @@ import Cloud from 'g-cloud'; /* eslint no-param-reassign: 0 */ /* eslint no-return-assign: 0 */ +const imgUrl = 'https://gw.alipayobjects.com/zos/rmsportal/SQlwcHhAbFVjjbDCLROB.png'; +// const imgUrl = 'https://zos.alipayobjects.com/rmsportal/EEFqYWuloqIHRnh.jpg'; + class TagCloud extends PureComponent { componentDidMount() { this.initTagCloud(); @@ -25,7 +28,8 @@ class TagCloud extends PureComponent { const textAttrs = Util.mix(true, {}, { fillOpacity: cfg.opacity, fontSize: cfg.size, - rotate: 0, // cfg.origin._origin.rotate, + // rotate: 0, // cfg.origin._origin.rotate, + rotate: cfg.origin._origin.rotate, text: cfg.origin._origin.text, textAlign: 'center', fill: cfg.color, @@ -78,45 +82,47 @@ class TagCloud extends PureComponent { height, // 设定文字大小配置函数(默认为12-40px的随机大小) - size: words => (((words.value - min) / (max - min)) * 12) + 6, + size: words => (((words.value - min) / (max - min)) * 4) + 10, // 设定文字内容 text: words => words.name, }); - // 执行词云布局函数,并在回调函数中调用G2对结果进行绘制 - layout.exec((texts) => { - const chart = new G2.Chart({ - container: this.node, - width, - height, - plotCfg: { - margin: 0, - }, - }); - - chart.legend(false); - chart.axis(false); - chart.tooltip(false); - - chart.source(texts); - - // 将词云坐标系调整为G2的坐标系 - chart.coord().reflect(); - - chart - .point() - .position('x*y') - .color('text') - .size('size', size => size) - .shape('cloud') - .style({ - fontStyle: texts[0].style, - fontFamily: texts[0].font, - fontWeight: texts[0].weight, + layout.image(imgUrl, (imageCloud) => { + // 执行词云布局函数,并在回调函数中调用G2对结果进行绘制 + imageCloud.exec((texts) => { + const chart = new G2.Chart({ + container: this.node, + width, + height, + plotCfg: { + margin: 0, + }, }); - chart.render(); + chart.legend(false); + chart.axis(false); + chart.tooltip(false); + + chart.source(texts); + + // 将词云坐标系调整为G2的坐标系 + chart.coord().reflect(); + + chart + .point() + .position('x*y') + .color('text') + .size('size', size => size) + .shape('cloud') + .style({ + fontStyle: texts[0].style, + fontFamily: texts[0].font, + fontWeight: texts[0].weight, + }); + + chart.render(); + }); }); } diff --git a/src/components/DescriptionList/index.less b/src/components/DescriptionList/index.less index 9f8d8ff2ecccdedd70df81c5123039d7ba799722..0259c0f1741092889e4bdd5b368fe003e191ede9 100644 --- a/src/components/DescriptionList/index.less +++ b/src/components/DescriptionList/index.less @@ -10,6 +10,7 @@ } .title { + font-size: 14px; color: @heading-color; font-weight: 500; margin-bottom: 16px; @@ -59,10 +60,7 @@ } } .descriptionListLarge { - .large { - margin-bottom: 24px; - } - .term { - padding-bottom: 24px; + .title { + font-size: 16px; } } diff --git a/src/routes/Profile/BasicProfile.js b/src/routes/Profile/BasicProfile.js index 9685ff57739e333e5d1c54f28a1c049c5b736eae..2efa34cda7c71159bdbc3701a7b67250becb3355 100644 --- a/src/routes/Profile/BasicProfile.js +++ b/src/routes/Profile/BasicProfile.js @@ -127,14 +127,14 @@ export default class BasicProfile extends Component { return ( - + 1000000000 已取货 1234123421 3214321432 - + 付小小 18100000000 菜鸟仓储 diff --git a/src/routes/Profile/BasicProfile.less b/src/routes/Profile/BasicProfile.less index 3829cf69c4b93179da52a09f9cd97462a1f8c44a..2b543976b3bc4cdf3b3b7608ff8abc6b44e1425d 100644 --- a/src/routes/Profile/BasicProfile.less +++ b/src/routes/Profile/BasicProfile.less @@ -2,6 +2,7 @@ .title { color: @heading-color; + font-size: 16px; font-weight: 500; margin-bottom: 16px; }