center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #12597 from dataease/pr@dev-v2@chart-map-color

Browse Source 
feat(图表): 地图以及气泡地图支持整体填充地图区域的颜色 #11900
This commit is contained in:
jianneng-fit2cloud 2024-10-09 17:25:54 +08:00 committed by GitHub
commit fbc02de626
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/locales/zh-CN.ts
View File

@ -754,7 +754,7 @@ export default {
color_simple: '简洁',
not_alpha: '不透明度',
area_border_color: '地图边线',
area_base_color: '底图',
area_base_color: '地图区块填充',
size: '大小',
bar_width: '柱宽',
bar_gap: '柱间隔',

2
core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
View File

@ -585,6 +585,8 @@ onMounted(() => {
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="8">
<el-col :span="12" v-if="showProperty('areaBaseColor')">
<el-form-item
:label="t('chart.area_base_color')"

3
core/core-frontend/src/views/chart/components/js/panel/charts/map/bubble-map.ts
View File

@ -32,7 +32,8 @@ export class BubbleMap extends L7PlotChartView<ChoroplethOptions, Choropleth> {
properties: EditorProperty[] = [...MAP_EDITOR_PROPERTY, 'bubble-animate']
propertyInner = {
...MAP_EDITOR_PROPERTY_INNER,
'tooltip-selector': [...MAP_EDITOR_PROPERTY_INNER['tooltip-selector'], 'carousel']
'tooltip-selector': [...MAP_EDITOR_PROPERTY_INNER['tooltip-selector'], 'carousel'],
'basic-style-selector': [...MAP_EDITOR_PROPERTY_INNER['basic-style-selector'], 'areaBaseColor']
}
axis = MAP_AXIS_TYPE
axisConfig: AxisConfig = {

9
core/core-frontend/src/views/chart/components/js/panel/charts/map/map.ts
View File

@ -46,7 +46,14 @@ export class Map extends L7PlotChartView<ChoroplethOptions, Choropleth> {
properties: EditorProperty[] = [...MAP_EDITOR_PROPERTY, 'legend-selector']
propertyInner: EditorPropertyInner = {
...MAP_EDITOR_PROPERTY_INNER,
'basic-style-selector': ['colors', 'alpha', 'areaBorderColor', 'zoom', 'gradient-color'],
'basic-style-selector': [
'colors',
'alpha',
'areaBorderColor',
'areaBaseColor',
'zoom',
'gradient-color'
],
'legend-selector': ['icon', 'fontSize', 'color'],
'tooltip-selector': [...MAP_EDITOR_PROPERTY_INNER['tooltip-selector'], 'carousel']
}