From 4d629cc30c362a615d92ae1ce4597e6df3d7cd57 Mon Sep 17 00:00:00 2001 From: isqianming Date: Thu, 10 Oct 2024 23:03:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=9B=BE=E8=A1=A8-=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E5=92=8C=E6=95=B0=E5=80=BC=E8=AE=BE=E5=AE=9A?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../barlineCharts/widget-bar-line-stack.js | 30 +++++++- .../barlineCharts/widget-barlinechart.js | 30 +++++++- .../barlineCharts/widget-more-bar-line.js | 30 +++++++- .../configure/funnelCharts/widget-funnel.js | 26 ++++++- .../tools/configure/heatmap/widget-heatmap.js | 28 ++++++- .../lineCharts/widget-line-compare.js | 2 +- .../configure/lineCharts/widget-line-stack.js | 28 ++++++- .../configure/lineCharts/widget-linechart.js | 28 ++++++- .../mapCharts/widget-airbubble-map.js | 24 ++++++ .../configure/mapCharts/widget-china-map.js | 77 ++++++++++++++++++- .../configure/mapCharts/widget-global-map.js | 77 ++++++++++++++++++- .../configure/mapCharts/widget-line-map.js | 24 ++++++ .../configure/percentCharts/widget-gauge.js | 30 ++++---- .../pieCharts/widget-pie-nightingale.js | 24 ++++++ .../configure/pieCharts/widget-piechart.js | 24 ++++++ .../configure/radarCharts/widget-radar.js | 30 +++++++- .../barline/widgetBarLineStackChart.vue | 3 + .../widget/barline/widgetBarlinechart.vue | 3 + .../widget/barline/widgetMoreBarLineChart.vue | 3 + .../designer/widget/funnel/widgetFunnel.vue | 3 + .../designer/widget/heatmap/widgetHeatmap.vue | 3 + .../widget/line/widgetLineStackChart.vue | 3 + .../designer/widget/line/widgetLinechart.vue | 3 + .../widget/map/widgetAirBubbleMap.vue | 3 + .../designer/widget/map/widgetChinaMap.vue | 12 ++- .../designer/widget/map/widgetGlobalMap.vue | 12 ++- .../designer/widget/map/widgetLineMap.vue | 3 + .../designer/widget/percent/widgetGauge.vue | 4 +- .../widget/pie/widgetPieNightingaleRose.vue | 3 + .../designer/widget/pie/widgetPiechart.vue | 3 + .../designer/widget/radar/widgetRadar.vue | 3 + 31 files changed, 529 insertions(+), 47 deletions(-) diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js index 9a97b4f5..9845ea8a 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js @@ -1357,7 +1357,7 @@ export const widgetBarLineStack = { name: 'fontDistanceBar', required: false, placeholder: '', - value: 0 + value: 10 }, { type: 'vue-color', @@ -1365,7 +1365,7 @@ export const widgetBarLineStack = { name: 'fontColorBar', required: false, placeholder: '', - value: '' + value: '#fff' }, { type: 'el-input-number', @@ -1469,7 +1469,7 @@ export const widgetBarLineStack = { name: 'fontColorLine', required: false, placeholder: '', - value: '' + value: '#fff' }, { type: 'el-input-number', @@ -1559,6 +1559,14 @@ export const widgetBarLineStack = { ], value: 'shadow' }, + { + type: 'vue-color', + label: '背景颜色', + name: 'tooltipBackgroundColor', + required: false, + placeholder: '', + value: '#333' + }, { type: 'el-input-number', label: '字体字号', @@ -1616,6 +1624,22 @@ export const widgetBarLineStack = { ], value: 'sans-serif' }, + { + type: 'vue-color', + label: '边框颜色', + name: 'tooltipBorderColor', + required: false, + placeholder: '', + value: '#333' + }, + { + type: 'el-input-number', + label: '边框宽度', + name: 'tooltipBorderWidth', + required: false, + placeholder: '', + value: 0 + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js index e9fa4a5e..e88a0ce6 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js @@ -1341,7 +1341,7 @@ export const widgetBarlinechart = { name: 'fontDistanceBar', required: false, placeholder: '', - value: 0 + value: 10 }, { type: 'vue-color', @@ -1349,7 +1349,7 @@ export const widgetBarlinechart = { name: 'fontColorBar', required: false, placeholder: '', - value: '' + value: '#fff' }, { type: 'el-input-number', @@ -1453,7 +1453,7 @@ export const widgetBarlinechart = { name: 'fontColorLine', required: false, placeholder: '', - value: '' + value: '#fff' }, { type: 'el-input-number', @@ -1543,6 +1543,14 @@ export const widgetBarlinechart = { ], value: 'shadow' }, + { + type: 'vue-color', + label: '背景颜色', + name: 'tooltipBackgroundColor', + required: false, + placeholder: '', + value: '#333' + }, { type: 'el-input-number', label: '字体字号', @@ -1600,6 +1608,22 @@ export const widgetBarlinechart = { ], value: 'sans-serif' }, + { + type: 'vue-color', + label: '边框颜色', + name: 'tooltipBorderColor', + required: false, + placeholder: '', + value: '#333' + }, + { + type: 'el-input-number', + label: '边框宽度', + name: 'tooltipBorderWidth', + required: false, + placeholder: '', + value: 0 + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js index fd487e36..8b8fd301 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js @@ -1361,7 +1361,7 @@ export const widgetMoreBarLine = { name: 'fontDistanceBar', required: false, placeholder: '', - value: 0 + value: 10 }, { type: 'vue-color', @@ -1369,7 +1369,7 @@ export const widgetMoreBarLine = { name: 'fontColorBar', required: false, placeholder: '', - value: '' + value: '#fff' }, { type: 'el-input-number', @@ -1473,7 +1473,7 @@ export const widgetMoreBarLine = { name: 'fontColorLine', required: false, placeholder: '', - value: '' + value: '#fff' }, { type: 'el-input-number', @@ -1563,6 +1563,14 @@ export const widgetMoreBarLine = { ], value: 'shadow' }, + { + type: 'vue-color', + label: '背景颜色', + name: 'tooltipBackgroundColor', + required: false, + placeholder: '', + value: '#333' + }, { type: 'el-input-number', label: '字体字号', @@ -1620,6 +1628,22 @@ export const widgetMoreBarLine = { ], value: 'sans-serif' }, + { + type: 'vue-color', + label: '边框颜色', + name: 'tooltipBorderColor', + required: false, + placeholder: '', + value: '#333' + }, + { + type: 'el-input-number', + label: '边框宽度', + name: 'tooltipBorderWidth', + required: false, + placeholder: '', + value: 0 + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/funnelCharts/widget-funnel.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/funnelCharts/widget-funnel.js index 2fd711cc..6ffc14ad 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/funnelCharts/widget-funnel.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/funnelCharts/widget-funnel.js @@ -394,7 +394,7 @@ export const widgetFunnel = { name: 'fontColor', required: false, placeholder: '', - value: '' + value: '#fff' }, { type: 'el-input-number', @@ -458,6 +458,14 @@ export const widgetFunnel = { placeholder: '', value: true }, + { + type: 'vue-color', + label: '背景颜色', + name: 'tooltipBackgroundColor', + required: false, + placeholder: '', + value: '#333' + }, { type: 'el-input-number', label: '字体字号', @@ -515,6 +523,22 @@ export const widgetFunnel = { ], value: 'sans-serif' }, + { + type: 'vue-color', + label: '边框颜色', + name: 'tooltipBorderColor', + required: false, + placeholder: '', + value: '#333' + }, + { + type: 'el-input-number', + label: '边框宽度', + name: 'tooltipBorderWidth', + required: false, + placeholder: '', + value: 0 + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js index b310c2e8..87cfb980 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js @@ -928,7 +928,7 @@ export const widgetHeatmap = { name: 'fontDistance', required: false, placeholder: '', - value: 0 + value: 10 }, { type: 'vue-color', @@ -936,7 +936,7 @@ export const widgetHeatmap = { name: 'fontColor', required: false, placeholder: '', - value: '' + value: '#fff' }, { type: 'el-input-number', @@ -1000,6 +1000,14 @@ export const widgetHeatmap = { placeholder: '', value: true }, + { + type: 'vue-color', + label: '背景颜色', + name: 'tooltipBackgroundColor', + required: false, + placeholder: '', + value: '#333' + }, { type: 'el-input-number', label: '字体字号', @@ -1057,6 +1065,22 @@ export const widgetHeatmap = { ], value: 'sans-serif' }, + { + type: 'vue-color', + label: '边框颜色', + name: 'tooltipBorderColor', + required: false, + placeholder: '', + value: '#333' + }, + { + type: 'el-input-number', + label: '边框宽度', + name: 'tooltipBorderWidth', + required: false, + placeholder: '', + value: 0 + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js index 1feb10d2..13ff1e8d 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js @@ -1107,7 +1107,7 @@ export const widgetLineCompare = { name: 'fontColor', required: false, placeholder: '', - value: '' + value: '#fff' }, { type: 'el-input-number', diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js index 75096ddf..da223042 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js @@ -987,7 +987,7 @@ export const widgetLineStack = { name: 'fontDistance', required: false, placeholder: '', - value: 0 + value: 10 }, { type: 'vue-color', @@ -995,7 +995,7 @@ export const widgetLineStack = { name: 'fontColor', required: false, placeholder: '', - value: '' + value: '#fff' }, { type: 'el-input-number', @@ -1085,6 +1085,14 @@ export const widgetLineStack = { ], value: 'shadow' }, + { + type: 'vue-color', + label: '背景颜色', + name: 'tooltipBackgroundColor', + required: false, + placeholder: '', + value: '#333' + }, { type: 'el-input-number', label: '字体字号', @@ -1142,6 +1150,22 @@ export const widgetLineStack = { ], value: 'sans-serif' }, + { + type: 'vue-color', + label: '边框颜色', + name: 'tooltipBorderColor', + required: false, + placeholder: '', + value: '#333' + }, + { + type: 'el-input-number', + label: '边框宽度', + name: 'tooltipBorderWidth', + required: false, + placeholder: '', + value: 0 + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js index f1de9409..ce14007c 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js @@ -979,7 +979,7 @@ export const widgetLinechart = { name: 'fontDistance', required: false, placeholder: '', - value: 0 + value: 10 }, { type: 'vue-color', @@ -987,7 +987,7 @@ export const widgetLinechart = { name: 'fontColor', required: false, placeholder: '', - value: '' + value: '#fff' }, { type: 'el-input-number', @@ -1077,6 +1077,14 @@ export const widgetLinechart = { ], value: 'shadow' }, + { + type: 'vue-color', + label: '背景颜色', + name: 'tooltipBackgroundColor', + required: false, + placeholder: '', + value: '#333' + }, { type: 'el-input-number', label: '字体字号', @@ -1134,6 +1142,22 @@ export const widgetLinechart = { ], value: 'sans-serif' }, + { + type: 'vue-color', + label: '边框颜色', + name: 'tooltipBorderColor', + required: false, + placeholder: '', + value: '#333' + }, + { + type: 'el-input-number', + label: '边框宽度', + name: 'tooltipBorderWidth', + required: false, + placeholder: '', + value: 0 + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-airbubble-map.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-airbubble-map.js index a3ffa037..54d7d8e8 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-airbubble-map.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-airbubble-map.js @@ -585,6 +585,14 @@ export const widgetAirbubbleMap = { placeholder: '', value: true }, + { + type: 'vue-color', + label: '背景颜色', + name: 'tooltipBackgroundColor', + required: false, + placeholder: '', + value: '#333' + }, { type: 'el-input-number', label: '字体字号', @@ -642,6 +650,22 @@ export const widgetAirbubbleMap = { ], value: 'sans-serif' }, + { + type: 'vue-color', + label: '边框颜色', + name: 'tooltipBorderColor', + required: false, + placeholder: '', + value: '#333' + }, + { + type: 'el-input-number', + label: '边框宽度', + name: 'tooltipBorderWidth', + required: false, + placeholder: '', + value: 0 + }, ], }, ], diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-china-map.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-china-map.js index d51b7165..44d43bd4 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-china-map.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-china-map.js @@ -312,10 +312,26 @@ export const widgetChinaMap = { { name: '提示语设置', list: [ + { + type: 'el-switch', + label: '显示', + name: 'isShowTooltip', + required: false, + placeholder: '', + value: true + }, + { + type: 'vue-color', + label: '背景颜色', + name: 'tooltipBackgroundColor', + required: false, + placeholder: '', + value: '#333' + }, { type: 'el-input-number', label: '字体字号', - name: 'tipsFontSize', + name: 'tooltipFontSize', required: false, placeholder: '', value: 16 @@ -323,11 +339,68 @@ export const widgetChinaMap = { { type: 'vue-color', label: '字体颜色', - name: 'tipsColor', + name: 'tooltipColor', required: false, placeholder: '', value: '#00FEFF' }, + { + type: 'el-select', + label: '字体粗细', + name: 'tooltipFontWeight', + required: false, + placeholder: '', + selectOptions: [ + {code: 'normal', name: '正常'}, + {code: 'bold', name: '粗体'}, + {code: 'bolder', name: '特粗体'}, + {code: 'lighter', name: '细体'} + ], + value: 'normal' + }, + { + type: 'el-select', + label: '字体风格', + name: 'tooltipFontStyle', + required: false, + placeholder: '', + selectOptions: [ + {code: 'normal', name: '正常'}, + {code: 'italic', name: 'italic斜体'}, + {code: 'oblique', name: 'oblique斜体'}, + ], + value: 'normal' + }, + { + type: 'el-select', + label: '字体系列', + name: 'tooltipFontFamily', + required: false, + placeholder: '', + selectOptions: [ + {code: 'sans-serif', name: 'sans-serif'}, + {code: 'serif', name: 'serif'}, + {code: 'Arial', name: 'Arial'}, + {code: 'Courier New', name: 'Courier New'}, + ], + value: 'sans-serif' + }, + { + type: 'vue-color', + label: '边框颜色', + name: 'tooltipBorderColor', + required: false, + placeholder: '', + value: '#333' + }, + { + type: 'el-input-number', + label: '边框宽度', + name: 'tooltipBorderWidth', + required: false, + placeholder: '', + value: 0 + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-global-map.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-global-map.js index 32677ce7..3dfd508e 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-global-map.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-global-map.js @@ -313,10 +313,26 @@ export const widgetGlobalMap = { { name: '提示语设置', list: [ + { + type: 'el-switch', + label: '显示', + name: 'isShowTooltip', + required: false, + placeholder: '', + value: true + }, + { + type: 'vue-color', + label: '背景颜色', + name: 'tooltipBackgroundColor', + required: false, + placeholder: '', + value: '#333' + }, { type: 'el-input-number', label: '字体字号', - name: 'tipsFontSize', + name: 'tooltipFontSize', required: false, placeholder: '', value: 16 @@ -324,11 +340,68 @@ export const widgetGlobalMap = { { type: 'vue-color', label: '字体颜色', - name: 'tipsColor', + name: 'tooltipColor', required: false, placeholder: '', value: '#00FEFF' }, + { + type: 'el-select', + label: '字体粗细', + name: 'tooltipFontWeight', + required: false, + placeholder: '', + selectOptions: [ + {code: 'normal', name: '正常'}, + {code: 'bold', name: '粗体'}, + {code: 'bolder', name: '特粗体'}, + {code: 'lighter', name: '细体'} + ], + value: 'normal' + }, + { + type: 'el-select', + label: '字体风格', + name: 'tooltipFontStyle', + required: false, + placeholder: '', + selectOptions: [ + {code: 'normal', name: '正常'}, + {code: 'italic', name: 'italic斜体'}, + {code: 'oblique', name: 'oblique斜体'}, + ], + value: 'normal' + }, + { + type: 'el-select', + label: '字体系列', + name: 'tooltipFontFamily', + required: false, + placeholder: '', + selectOptions: [ + {code: 'sans-serif', name: 'sans-serif'}, + {code: 'serif', name: 'serif'}, + {code: 'Arial', name: 'Arial'}, + {code: 'Courier New', name: 'Courier New'}, + ], + value: 'sans-serif' + }, + { + type: 'vue-color', + label: '边框颜色', + name: 'tooltipBorderColor', + required: false, + placeholder: '', + value: '#333' + }, + { + type: 'el-input-number', + label: '边框宽度', + name: 'tooltipBorderWidth', + required: false, + placeholder: '', + value: 0 + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-line-map.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-line-map.js index 5461f9fd..c659e1e9 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-line-map.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-line-map.js @@ -750,6 +750,14 @@ export const widgetLineMap = { placeholder: '', value: true }, + { + type: 'vue-color', + label: '背景颜色', + name: 'tooltipBackgroundColor', + required: false, + placeholder: '', + value: '#333' + }, { type: 'el-input-number', label: '字体字号', @@ -807,6 +815,22 @@ export const widgetLineMap = { ], value: 'sans-serif' }, + { + type: 'vue-color', + label: '边框颜色', + name: 'tooltipBorderColor', + required: false, + placeholder: '', + value: '#333' + }, + { + type: 'el-input-number', + label: '边框宽度', + name: 'tooltipBorderWidth', + required: false, + placeholder: '', + value: 0 + }, ], }, ] diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-gauge.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-gauge.js index acca85d1..d7acc827 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-gauge.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-gauge.js @@ -270,6 +270,14 @@ export const widgetGauge = { placeholder: '', value: true, }, + { + type: 'el-input-number', + label: '圆环刻度距离', + name: 'tickDistance', + require: false, + placeholder: '', + value: 5, + }, { type: 'el-input-number', label: '刻度数', @@ -278,14 +286,6 @@ export const widgetGauge = { placeholder: '', value: 5, }, - /* { - type: 'el-input-number', - label: '距离', - name: 'tickDistance', - require: false, - placeholder: '', - value: 0, - },*/ { type: 'el-input-number', label: '长度', @@ -323,14 +323,14 @@ export const widgetGauge = { placeholder: '', value: true, }, -/* { + { type: 'el-input-number', - label: '距离', + label: '指标刻度距离', name: 'splitDistance', require: false, placeholder: '', - value: 0, - },*/ + value: 10, + }, { type: 'el-input-number', label: '长度', @@ -345,7 +345,7 @@ export const widgetGauge = { name: 'splitWidth', require: false, placeholder: '', - value: 4, + value: 5, }, { type: 'el-select', @@ -452,7 +452,7 @@ export const widgetGauge = { name: 'labelDistance', require: false, placeholder: '', - value: 5, + value: 10, }, { type: 'vue-color', @@ -468,7 +468,7 @@ export const widgetGauge = { name: 'labelFontSize', require: false, placeholder: '', - value: 10, + value: 12, }, { type: 'el-select', diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js index 75dbb4cb..9b6662a5 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js @@ -717,6 +717,14 @@ export const widgetPieNightingale = { placeholder: '', value: true, }, + { + type: 'vue-color', + label: '背景颜色', + name: 'tooltipBackgroundColor', + required: false, + placeholder: '', + value: '#333' + }, { type: 'el-input-number', label: '字体字号', @@ -774,6 +782,22 @@ export const widgetPieNightingale = { ], value: 'sans-serif' }, + { + type: 'vue-color', + label: '边框颜色', + name: 'tooltipBorderColor', + required: false, + placeholder: '', + value: '#333' + }, + { + type: 'el-input-number', + label: '边框宽度', + name: 'tooltipBorderWidth', + required: false, + placeholder: '', + value: 0 + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js index b7d57ac0..314cf3e8 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js @@ -705,6 +705,14 @@ export const widgetPiechart = { placeholder: '', value: true, }, + { + type: 'vue-color', + label: '背景颜色', + name: 'tooltipBackgroundColor', + required: false, + placeholder: '', + value: '#333' + }, { type: 'el-input-number', label: '字体字号', @@ -762,6 +770,22 @@ export const widgetPiechart = { ], value: 'sans-serif' }, + { + type: 'vue-color', + label: '边框颜色', + name: 'tooltipBorderColor', + required: false, + placeholder: '', + value: '#333' + }, + { + type: 'el-input-number', + label: '边框宽度', + name: 'tooltipBorderWidth', + required: false, + placeholder: '', + value: 0 + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/radarCharts/widget-radar.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/radarCharts/widget-radar.js index 048dca40..4e94954d 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/radarCharts/widget-radar.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/radarCharts/widget-radar.js @@ -433,7 +433,7 @@ export const widgetRadar = { { code: 'insideRight', name: '里右' }, { code: 'insideBottom', name: '里底' }, ], - value: 'insideTop' + value: 'top' }, { type: 'el-input-number', @@ -441,7 +441,7 @@ export const widgetRadar = { name: 'fontDistance', required: false, placeholder: '', - value: 0 + value: 10 }, { type: 'el-input-number', @@ -457,7 +457,7 @@ export const widgetRadar = { name: 'fontColor', required: false, placeholder: '', - value: '' + value: '#fff' }, { type: 'el-select', @@ -550,6 +550,14 @@ export const widgetRadar = { placeholder: '', value: true, }, + { + type: 'vue-color', + label: '背景颜色', + name: 'tooltipBackgroundColor', + required: false, + placeholder: '', + value: '#333' + }, { type: 'el-input-number', label: '字体字号', @@ -607,6 +615,22 @@ export const widgetRadar = { ], value: 'Microsoft YaHei' }, + { + type: 'vue-color', + label: '边框颜色', + name: 'tooltipBorderColor', + required: false, + placeholder: '', + value: '#333' + }, + { + type: 'el-input-number', + label: '边框宽度', + name: 'tooltipBorderWidth', + required: false, + placeholder: '', + value: 0 + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue index 885db25d..d5b2871e 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue @@ -361,6 +361,9 @@ export default { axisPointer: { type: optionsSetup.tooltipAxisPointerType, }, + backgroundColor: optionsSetup.tooltipBackgroundColor, + borderColor: optionsSetup.tooltipBorderColor, + borderWidth: optionsSetup.tooltipBorderWidth, textStyle: { color: optionsSetup.tooltipColor, fontSize: optionsSetup.tooltipFontSize, diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue index 12d26fcc..2c954d1b 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue @@ -441,6 +441,9 @@ export default { axisPointer: { type: optionsSetup.tooltipAxisPointerType, }, + backgroundColor: optionsSetup.tooltipBackgroundColor, + borderColor: optionsSetup.tooltipBorderColor, + borderWidth: optionsSetup.tooltipBorderWidth, textStyle: { color: optionsSetup.tooltipColor, fontSize: optionsSetup.tooltipFontSize, diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue index c7fe8ac0..c7746960 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue @@ -429,6 +429,9 @@ export default { axisPointer: { type: optionsSetup.tooltipAxisPointerType, }, + backgroundColor: optionsSetup.tooltipBackgroundColor, + borderColor: optionsSetup.tooltipBorderColor, + borderWidth: optionsSetup.tooltipBorderWidth, textStyle: { color: optionsSetup.tooltipColor, fontSize: optionsSetup.tooltipFontSize, diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/funnel/widgetFunnel.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/funnel/widgetFunnel.vue index 9a12d936..ce527531 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/funnel/widgetFunnel.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/funnel/widgetFunnel.vue @@ -187,6 +187,9 @@ export default { const tooltip = { trigger: "item", show: optionsSetup.isShowTooltip, + backgroundColor: optionsSetup.tooltipBackgroundColor, + borderColor: optionsSetup.tooltipBorderColor, + borderWidth: optionsSetup.tooltipBorderWidth, textStyle: { color: optionsSetup.tooltipColor, fontSize: optionsSetup.tooltipFontSize, diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue index 81585b87..5c9a490d 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue @@ -341,6 +341,9 @@ export default { trigger: "item", position: "top", show: optionsSetup.isShowTooltip, + backgroundColor: optionsSetup.tooltipBackgroundColor, + borderColor: optionsSetup.tooltipBorderColor, + borderWidth: optionsSetup.tooltipBorderWidth, textStyle: { color: optionsSetup.tooltipColor, fontSize: optionsSetup.tooltipFontSize, diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue index 87686ed0..c19110d1 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue @@ -283,6 +283,9 @@ export default { axisPointer: { type: optionsSetup.tooltipAxisPointerType, }, + backgroundColor: optionsSetup.tooltipBackgroundColor, + borderColor: optionsSetup.tooltipBorderColor, + borderWidth: optionsSetup.tooltipBorderWidth, textStyle: { color: optionsSetup.tooltipColor, fontSize: optionsSetup.tooltipFontSize, diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue index e9c873b0..964afb6e 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue @@ -282,6 +282,9 @@ export default { axisPointer: { type: optionsSetup.tooltipAxisPointerType, }, + backgroundColor: optionsSetup.tooltipBackgroundColor, + borderColor: optionsSetup.tooltipBorderColor, + borderWidth: optionsSetup.tooltipBorderWidth, textStyle: { color: optionsSetup.tooltipColor, fontSize: optionsSetup.tooltipFontSize, diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue index 88d6448e..1ad67bfb 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue @@ -536,6 +536,9 @@ export default { const tooltip = { trigger: "item", show: optionsSetup.isShowTooltip, + backgroundColor: optionsSetup.tooltipBackgroundColor, + borderColor: optionsSetup.tooltipBorderColor, + borderWidth: optionsSetup.tooltipBorderWidth, textStyle: { color: optionsSetup.tooltipColor, fontSize: optionsSetup.tooltipFontSize, diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetChinaMap.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetChinaMap.vue index 27ef56f5..d87d6dca 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetChinaMap.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetChinaMap.vue @@ -232,11 +232,17 @@ export default { const optionsSetup = this.optionsSetup; const tooltip = { trigger: "item", - show: true, + show: optionsSetup.isShowTooltip, + backgroundColor: optionsSetup.tooltipBackgroundColor, + borderColor: optionsSetup.tooltipBorderColor, + borderWidth: optionsSetup.tooltipBorderWidth, enterable: true, textStyle: { - color: optionsSetup.tipsColor, - fontSize: optionsSetup.tipsFontSize, + color: optionsSetup.tooltipColor, + fontSize: optionsSetup.tooltipFontSize, + fontWeight: optionsSetup.tooltipFontWeight, + fontStyle: optionsSetup.tooltipFontStyle, + fontFamily: optionsSetup.tooltipFontFamily, }, }; this.options.tooltip = {...this.options.tooltip,...tooltip}; diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetGlobalMap.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetGlobalMap.vue index 9ffa163e..f9ab0478 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetGlobalMap.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetGlobalMap.vue @@ -191,11 +191,17 @@ export default { const optionsSetup = this.optionsSetup; const tooltip = { trigger: "item", - show: true, + show: optionsSetup.isShowTooltip, + backgroundColor: optionsSetup.tooltipBackgroundColor, + borderColor: optionsSetup.tooltipBorderColor, + borderWidth: optionsSetup.tooltipBorderWidth, enterable: true, textStyle: { - color: optionsSetup.tipsColor, - fontSize: optionsSetup.tipsFontSize, + color: optionsSetup.tooltipColor, + fontSize: optionsSetup.tooltipFontSize, + fontWeight: optionsSetup.tooltipFontWeight, + fontStyle: optionsSetup.tooltipFontStyle, + fontFamily: optionsSetup.tooltipFontFamily, }, }; this.options.tooltip = {...this.options.tooltip,...tooltip}; diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetLineMap.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetLineMap.vue index 271a8192..ebd3e0f5 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetLineMap.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetLineMap.vue @@ -490,6 +490,9 @@ export default { const tooltip = { trigger: "item", show: optionsSetup.isShowTooltip, + backgroundColor: optionsSetup.tooltipBackgroundColor, + borderColor: optionsSetup.tooltipBorderColor, + borderWidth: optionsSetup.tooltipBorderWidth, textStyle: { color: optionsSetup.tooltipColor, fontSize: optionsSetup.tooltipFontSize, diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/percent/widgetGauge.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/percent/widgetGauge.vue index 815fb538..f2390097 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/percent/widgetGauge.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/percent/widgetGauge.vue @@ -272,7 +272,7 @@ export default { const axisTick = { show: optionsSetup.tickShow, splitNumber: optionsSetup.tickSplitNumber, - //distance: optionsSetup.tickDistance, echartsV5.0.0开始支持 + distance: optionsSetup.tickDistance, length: optionsSetup.tickLength, lineStyle: { color: "auto", @@ -283,7 +283,7 @@ export default { // 分隔线-指标线 const splitLine = { show: optionsSetup.splitShow, - // distance: optionsSetup.splitDistance,echartsV5.0.0开始支持 + distance: optionsSetup.splitDistance, length: optionsSetup.splitLength, lineStyle: { color: "auto", diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue index 49042085..e6a0b834 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue @@ -128,6 +128,9 @@ export default { const tooltip = { trigger: "item", show: optionsSetup.isShowTooltip, + backgroundColor: optionsSetup.tooltipBackgroundColor, + borderColor: optionsSetup.tooltipBorderColor, + borderWidth: optionsSetup.tooltipBorderWidth, textStyle: { color: optionsSetup.tooltipColor, fontSize: optionsSetup.tooltipFontSize, diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue index 474bbc68..108680c9 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue @@ -134,6 +134,9 @@ export default { const tooltip = { trigger: "item", show: optionsSetup.isShowTooltip, + backgroundColor: optionsSetup.tooltipBackgroundColor, + borderColor: optionsSetup.tooltipBorderColor, + borderWidth: optionsSetup.tooltipBorderWidth, textStyle: { color: optionsSetup.tooltipColor, fontSize: optionsSetup.tooltipFontSize, diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/radar/widgetRadar.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/radar/widgetRadar.vue index d11a72b2..c29c9b48 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/radar/widgetRadar.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/radar/widgetRadar.vue @@ -180,6 +180,9 @@ export default { const tooltip = { trigger: "item", show: optionsSetup.isShowTooltip, + backgroundColor: optionsSetup.tooltipBackgroundColor, + borderColor: optionsSetup.tooltipBorderColor, + borderWidth: optionsSetup.tooltipBorderWidth, textStyle: { color: optionsSetup.tooltipColor, fontSize: optionsSetup.tooltipFontSize,