From b8eff71779424db5200a7ed3e116b37a13762d1b Mon Sep 17 00:00:00 2001 From: wushaochuan Date: Mon, 21 Aug 2023 10:23:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AF=8D=E4=BA=91=E5=9B=BE=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E5=A4=A7=E5=B0=8F=E5=8C=BA=E9=97=B4=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/chart.js | 3 ++- frontend/src/views/chart/chart/util.js | 6 +++++- .../views/chart/chart/wordCloud/word_cloud.js | 10 +++++++++- .../components/shapeAttr/SizeSelectorAntV.vue | 18 +++++++++++++++++- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js index de0a6870f9..4e965a5a17 100644 --- a/frontend/src/views/chart/chart/chart.js +++ b/frontend/src/views/chart/chart/chart.js @@ -146,7 +146,8 @@ export const DEFAULT_SIZE = { mapLineAnimate: true, mapLineAnimateDuration: 3, mapLineAnimateInterval: 1, - mapLineAnimateTrailLength: 1 + mapLineAnimateTrailLength: 1, + wordSizeRange: [8, 32] } export const DEFAULT_SUSPENSION = { show: true diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js index 16f1792aea..bf3043336e 100644 --- a/frontend/src/views/chart/chart/util.js +++ b/frontend/src/views/chart/chart/util.js @@ -1746,7 +1746,8 @@ export const TYPE_CONFIGS = [ properties: [ 'color-selector', 'tooltip-selector-ant-v', - 'title-selector-ant-v' + 'title-selector-ant-v', + 'size-selector-ant-v' ], propertyInner: { 'color-selector': [ @@ -1754,6 +1755,9 @@ export const TYPE_CONFIGS = [ 'custom', 'alpha' ], + 'size-selector-ant-v': [ + 'wordSizeRange' + ], 'tooltip-selector-ant-v': [ 'show', 'textStyle' diff --git a/frontend/src/views/chart/chart/wordCloud/word_cloud.js b/frontend/src/views/chart/chart/wordCloud/word_cloud.js index 81d507af5c..11e323f1ea 100644 --- a/frontend/src/views/chart/chart/wordCloud/word_cloud.js +++ b/frontend/src/views/chart/chart/wordCloud/word_cloud.js @@ -12,6 +12,14 @@ export function baseWordCloudOptionAntV(plot, container, chart, action) { const tooltip = getTooltip(chart) // data const data = chart.data.data + // size + let wordSizeRange = [8, 32] + if (chart.customAttr) { + const customAttr = JSON.parse(chart.customAttr) + if (customAttr?.size?.wordSizeRange) { + wordSizeRange = customAttr?.size?.wordSizeRange + } + } // options const options = { theme: theme, @@ -21,7 +29,7 @@ export function baseWordCloudOptionAntV(plot, container, chart, action) { colorField: 'field', wordStyle: { fontFamily: 'Verdana', - fontSize: [8, 32], + fontSize: wordSizeRange, rotation: [0, 0], padding: 6 }, diff --git a/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue b/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue index 5430009391..2eaddac109 100644 --- a/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue +++ b/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue @@ -1365,6 +1365,21 @@ @change="changeBarSizeCase('mapLineAnimateTrailLength')" /> + + + + + @@ -1574,8 +1589,9 @@ export default { this.sizeForm.mapLineAnimateInterval = this.sizeForm.mapLineAnimateInterval !== undefined ? this.sizeForm.mapLineAnimateInterval : DEFAULT_SIZE.mapLineAnimateInterval this.sizeForm.mapLineAnimateTrailLength = this.sizeForm.mapLineAnimateTrailLength !== undefined ? this.sizeForm.mapLineAnimateTrailLength : DEFAULT_SIZE.mapLineAnimateTrailLength if (this.sizeForm.gaugeAxisLine === null || this.sizeForm.gaugeAxisLine === undefined) { - this.sizeForm.gaugeAxisLine = DEFAULT_SIZE.gaugeAxisLine + this.sizeForm.gaugeAxisLine = DEFAULT_SIZE.gaugeAxisLin } + this.sizeForm.wordSizeRange = this.sizeForm !== undefined ? this.sizeForm.wordSizeRange : DEFAULTSIZE.wordSizeRange } } },