forked from github/dataease
feat: 词云图字间距调整
This commit is contained in:
parent
b8eff71779
commit
4491c2e925
@ -1561,7 +1561,9 @@ export default {
|
|||||||
map_line_color_source_color: 'Starting Color',
|
map_line_color_source_color: 'Starting Color',
|
||||||
map_line_color_target_color: 'End Color',
|
map_line_color_target_color: 'End Color',
|
||||||
map_line_theta_offset: 'Radian',
|
map_line_theta_offset: 'Radian',
|
||||||
gauge_axis_label: 'Axis Label'
|
gauge_axis_label: 'Axis Label',
|
||||||
|
word_size_range: 'Word Size Range',
|
||||||
|
word_spacing: 'Word Spacing'
|
||||||
},
|
},
|
||||||
dataset: {
|
dataset: {
|
||||||
scope_edit: 'Effective only when editing',
|
scope_edit: 'Effective only when editing',
|
||||||
|
@ -1555,7 +1555,9 @@ export default {
|
|||||||
map_line_color_source_color: '起始顏色',
|
map_line_color_source_color: '起始顏色',
|
||||||
map_line_color_target_color: '結束顏色',
|
map_line_color_target_color: '結束顏色',
|
||||||
map_line_theta_offset: '弧度',
|
map_line_theta_offset: '弧度',
|
||||||
gauge_axis_label: '刻度標籤'
|
gauge_axis_label: '刻度標籤',
|
||||||
|
word_size_range: '字號區間',
|
||||||
|
word_spacing: '文字間隔'
|
||||||
},
|
},
|
||||||
dataset: {
|
dataset: {
|
||||||
scope_edit: '僅編輯時生效',
|
scope_edit: '僅編輯時生效',
|
||||||
|
@ -1554,7 +1554,9 @@ export default {
|
|||||||
map_line_color_source_color: '起始颜色',
|
map_line_color_source_color: '起始颜色',
|
||||||
map_line_color_target_color: '结束颜色',
|
map_line_color_target_color: '结束颜色',
|
||||||
map_line_theta_offset: '弧度',
|
map_line_theta_offset: '弧度',
|
||||||
gauge_axis_label: '刻度标签'
|
gauge_axis_label: '刻度标签',
|
||||||
|
word_size_range: '字号区间',
|
||||||
|
word_spacing: '文字间隔'
|
||||||
},
|
},
|
||||||
dataset: {
|
dataset: {
|
||||||
scope_edit: '仅编辑时生效',
|
scope_edit: '仅编辑时生效',
|
||||||
|
@ -147,7 +147,8 @@ export const DEFAULT_SIZE = {
|
|||||||
mapLineAnimateDuration: 3,
|
mapLineAnimateDuration: 3,
|
||||||
mapLineAnimateInterval: 1,
|
mapLineAnimateInterval: 1,
|
||||||
mapLineAnimateTrailLength: 1,
|
mapLineAnimateTrailLength: 1,
|
||||||
wordSizeRange: [8, 32]
|
wordSizeRange: [8, 32],
|
||||||
|
wordSpacing: 6
|
||||||
}
|
}
|
||||||
export const DEFAULT_SUSPENSION = {
|
export const DEFAULT_SUSPENSION = {
|
||||||
show: true
|
show: true
|
||||||
|
@ -1756,7 +1756,8 @@ export const TYPE_CONFIGS = [
|
|||||||
'alpha'
|
'alpha'
|
||||||
],
|
],
|
||||||
'size-selector-ant-v': [
|
'size-selector-ant-v': [
|
||||||
'wordSizeRange'
|
'wordSizeRange',
|
||||||
|
'wordSpacing'
|
||||||
],
|
],
|
||||||
'tooltip-selector-ant-v': [
|
'tooltip-selector-ant-v': [
|
||||||
'show',
|
'show',
|
||||||
|
@ -13,12 +13,12 @@ export function baseWordCloudOptionAntV(plot, container, chart, action) {
|
|||||||
// data
|
// data
|
||||||
const data = chart.data.data
|
const data = chart.data.data
|
||||||
// size
|
// size
|
||||||
let wordSizeRange = [8, 32]
|
let wordSizeRange
|
||||||
|
let wordSpacing
|
||||||
if (chart.customAttr) {
|
if (chart.customAttr) {
|
||||||
const customAttr = JSON.parse(chart.customAttr)
|
const customAttr = JSON.parse(chart.customAttr)
|
||||||
if (customAttr?.size?.wordSizeRange) {
|
wordSizeRange = customAttr?.size?.wordSizeRange ?? [8, 32]
|
||||||
wordSizeRange = customAttr?.size?.wordSizeRange
|
wordSpacing = customAttr?.size?.wordSpacing ?? 6
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// options
|
// options
|
||||||
const options = {
|
const options = {
|
||||||
@ -31,7 +31,7 @@ export function baseWordCloudOptionAntV(plot, container, chart, action) {
|
|||||||
fontFamily: 'Verdana',
|
fontFamily: 'Verdana',
|
||||||
fontSize: wordSizeRange,
|
fontSize: wordSizeRange,
|
||||||
rotation: [0, 0],
|
rotation: [0, 0],
|
||||||
padding: 6
|
padding: wordSpacing
|
||||||
},
|
},
|
||||||
random: () => 0.5,
|
random: () => 0.5,
|
||||||
appendPadding: getPadding(chart),
|
appendPadding: getPadding(chart),
|
||||||
|
@ -1368,7 +1368,7 @@
|
|||||||
<!-- word-cloud start -->
|
<!-- word-cloud start -->
|
||||||
<el-form-item
|
<el-form-item
|
||||||
v-show="showProperty('wordSizeRange') "
|
v-show="showProperty('wordSizeRange') "
|
||||||
:label="$t('chart.text_fontsize')"
|
:label="$t('chart.word_size_range')"
|
||||||
class="form-item form-item-slider"
|
class="form-item form-item-slider"
|
||||||
>
|
>
|
||||||
<el-slider
|
<el-slider
|
||||||
@ -1379,6 +1379,18 @@
|
|||||||
@change="changeBarSizeCase('wordSizeRange')"
|
@change="changeBarSizeCase('wordSizeRange')"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item
|
||||||
|
v-show="showProperty('wordSpacing') "
|
||||||
|
:label="$t('chart.word_spacing')"
|
||||||
|
class="form-item form-item-slider"
|
||||||
|
>
|
||||||
|
<el-slider
|
||||||
|
v-model="sizeForm.wordSpacing"
|
||||||
|
:min="0"
|
||||||
|
:max="20"
|
||||||
|
@change="changeBarSizeCase('wordSpacing')"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
<!-- word-cloud end -->
|
<!-- word-cloud end -->
|
||||||
</div>
|
</div>
|
||||||
</el-form>
|
</el-form>
|
||||||
@ -1589,9 +1601,10 @@ export default {
|
|||||||
this.sizeForm.mapLineAnimateInterval = this.sizeForm.mapLineAnimateInterval !== undefined ? this.sizeForm.mapLineAnimateInterval : DEFAULT_SIZE.mapLineAnimateInterval
|
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
|
this.sizeForm.mapLineAnimateTrailLength = this.sizeForm.mapLineAnimateTrailLength !== undefined ? this.sizeForm.mapLineAnimateTrailLength : DEFAULT_SIZE.mapLineAnimateTrailLength
|
||||||
if (this.sizeForm.gaugeAxisLine === null || this.sizeForm.gaugeAxisLine === undefined) {
|
if (this.sizeForm.gaugeAxisLine === null || this.sizeForm.gaugeAxisLine === undefined) {
|
||||||
this.sizeForm.gaugeAxisLine = DEFAULT_SIZE.gaugeAxisLin
|
this.sizeForm.gaugeAxisLine = DEFAULT_SIZE.gaugeAxisLine
|
||||||
}
|
}
|
||||||
this.sizeForm.wordSizeRange = this.sizeForm !== undefined ? this.sizeForm.wordSizeRange : DEFAULTSIZE.wordSizeRange
|
this.sizeForm.wordSizeRange = this.sizeForm.wordSizeRange ?? DEFAULT_SIZE.wordSizeRange
|
||||||
|
this.sizeForm.wordSpacing = this.sizeForm.wordSpacing ?? DEFAULT_SIZE.wordSpacing
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user