Преглед на файлове

大屏图表-提示语和数值设定调整

isqianming преди 10 месеца
родител
ревизия
4d629cc30c
променени са 31 файла, в които са добавени 529 реда и са изтрити 47 реда
  1. 27 3
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js
  2. 27 3
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js
  3. 27 3
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js
  4. 25 1
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/funnelCharts/widget-funnel.js
  5. 26 2
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js
  6. 1 1
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js
  7. 26 2
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js
  8. 26 2
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js
  9. 24 0
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-airbubble-map.js
  10. 75 2
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-china-map.js
  11. 75 2
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-global-map.js
  12. 24 0
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-line-map.js
  13. 15 15
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-gauge.js
  14. 24 0
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js
  15. 24 0
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js
  16. 27 3
      report-ui/src/views/bigscreenDesigner/designer/tools/configure/radarCharts/widget-radar.js
  17. 3 0
      report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue
  18. 3 0
      report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue
  19. 3 0
      report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue
  20. 3 0
      report-ui/src/views/bigscreenDesigner/designer/widget/funnel/widgetFunnel.vue
  21. 3 0
      report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue
  22. 3 0
      report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue
  23. 3 0
      report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue
  24. 3 0
      report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue
  25. 9 3
      report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetChinaMap.vue
  26. 9 3
      report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetGlobalMap.vue
  27. 3 0
      report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetLineMap.vue
  28. 2 2
      report-ui/src/views/bigscreenDesigner/designer/widget/percent/widgetGauge.vue
  29. 3 0
      report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue
  30. 3 0
      report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue
  31. 3 0
      report-ui/src/views/bigscreenDesigner/designer/widget/radar/widgetRadar.vue

+ 27 - 3
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
+            },
           ],
         },
         {

+ 27 - 3
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
+            },
           ],
         },
         {

+ 27 - 3
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
+            },
           ],
         },
         {

+ 25 - 1
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
+            },
           ],
         },
         {

+ 26 - 2
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
+            },
           ],
         },
         {

+ 1 - 1
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',

+ 26 - 2
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
+            },
           ],
         },
         {

+ 26 - 2
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
+            },
           ],
         },
         {

+ 24 - 0
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
+            },
           ],
         },
       ],

+ 75 - 2
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
+            },
           ],
         },
         {

+ 75 - 2
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
+            },
           ],
         },
         {

+ 24 - 0
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
+            },
           ],
         },
       ]

+ 15 - 15
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',

+ 24 - 0
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
+            },
           ],
         },
         {

+ 24 - 0
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
+            },
           ],
         },
         {

+ 27 - 3
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
+            },
           ],
         },
         {

+ 3 - 0
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,

+ 3 - 0
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,

+ 3 - 0
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,

+ 3 - 0
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,

+ 3 - 0
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,

+ 3 - 0
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,

+ 3 - 0
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,

+ 3 - 0
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,

+ 9 - 3
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};

+ 9 - 3
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};

+ 3 - 0
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,

+ 2 - 2
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",

+ 3 - 0
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,

+ 3 - 0
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,

+ 3 - 0
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,