diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index f21576ce84..ac3fbd641f 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -866,6 +866,7 @@ export default { color_technology: 'Technology', color_simple: 'Simple', not_alpha: 'Opacity', + area_border_color: 'Map border', size: 'Size', bar_width: 'Column Width', bar_gap: 'Column septum', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index f626f60b4a..2d24d31945 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -867,6 +867,7 @@ export default { color_technology: '科技', color_simple: '簡潔', not_alpha: '不透明度', + area_border_color: '地圖邊線', size: '大小', bar_width: '柱寬', bar_gap: '柱間隔', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 79740ab28b..da16bf3651 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -869,6 +869,7 @@ export default { color_technology: '科技', color_simple: '简洁', not_alpha: '不透明度', + area_border_color: '地图边线', size: '大小', bar_width: '柱宽', bar_gap: '柱间隔', diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js index 7ad8ffe703..91de281b9b 100644 --- a/frontend/src/views/chart/chart/chart.js +++ b/frontend/src/views/chart/chart/chart.js @@ -23,7 +23,8 @@ export const DEFAULT_COLOR_CASE = { dimensionColor: '#000000', quotaColor: '#4E81BB', tableBorderColor: '#E6E7E4', - seriesColors: [] // 格式:{"name":"s1","color":"","isCustom":false} + seriesColors: [], // 格式:{"name":"s1","color":"","isCustom":false} + areaBorderColor: '#303133' } export const DEFAULT_COLOR_CASE_DARK = { @@ -37,7 +38,8 @@ export const DEFAULT_COLOR_CASE_DARK = { dimensionColor: '#ffffff', quotaColor: '#4E81BB', tableBorderColor: '#CCCCCC', - seriesColors: [] // 格式:{"name":"s1","color":"","isCustom":false} + seriesColors: [], // 格式:{"name":"s1","color":"","isCustom":false} + areaBorderColor: '#EBEEF5' } export const DEFAULT_SIZE = { barDefault: true, @@ -835,7 +837,15 @@ export const BASE_MAP = { type: 'map', map: 'MAP', roam: true, - data: [] + data: [], + itemStyle: { + normal: { + + }, + emphasis: { + + } + } } ] } diff --git a/frontend/src/views/chart/chart/map/map.js b/frontend/src/views/chart/chart/map/map.js index 0547b29a58..95f22ab71d 100644 --- a/frontend/src/views/chart/chart/map/map.js +++ b/frontend/src/views/chart/chart/map/map.js @@ -9,6 +9,9 @@ export function baseMapOption(chart_option, chart, themeStyle, curAreaCode) { customAttr = JSON.parse(chart.customAttr) if (customAttr.color) { chart_option.color = customAttr.color.colors + if (customAttr.color.areaBorderColor) { + chart_option.series[0].itemStyle.normal.borderColor = customAttr.color.areaBorderColor + } } // tooltip if (customAttr.tooltip) { diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js index 912cb1005c..b44f3fa95a 100644 --- a/frontend/src/views/chart/chart/util.js +++ b/frontend/src/views/chart/chart/util.js @@ -2600,7 +2600,8 @@ export const TYPE_CONFIGS = [ 'color-selector': [ 'value', 'custom', - 'alpha' + 'alpha', + 'area-border-color' ], 'label-selector': [ 'show', diff --git a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue index ed1a587b69..493bf0d848 100644 --- a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue +++ b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue @@ -105,6 +105,10 @@ + + + +