大屏图表-饼图系列调整

report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js

@@ -274,14 +274,14 @@ export const widgetPieNightingale = {
               placeholder: '',
               value: 0,
             },
-/*            {
+            {
               type: 'el-slider',
               label: '圆角属性',
               name: 'borderRadius',
               required: false,
               placeholder: '',
               value: 10,
-            },*/
+            },
           ]
         },
         {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js

@@ -262,14 +262,14 @@ export const widgetPiechart = {
               placeholder: '',
               value: 0,
             },
-/*            {
+            {
               type: 'el-slider',
               label: '圆角属性',
               name: 'borderRadius',
               required: false,
               placeholder: '',
               value: 10,
-            },*/
+            },
           ]
         },
         {

report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue

@@ -220,9 +220,9 @@ export default {
         minShowLabelAngle: optionsSetup.minShowLabelAngle,
         percentPrecision: optionsSetup.percentPrecision,
         // echarts v5.0.0开始支持
-        /*        itemStyle: {
-                  borderRadius: [optionsSetup.borderRadius + "%", optionsSetup.borderRadius + "%"],
-                },*/
+        itemStyle: {
+          borderRadius: [optionsSetup.borderRadius + "%", optionsSetup.borderRadius + "%"],
+        },
         // 高亮的扇区
         emphasis: {
           label: {
@@ -239,7 +239,7 @@ export default {
           },
           // 色块描边
           itemStyle: {
-            borderColor: optionsSetup.borderColor == '' ? null : optionsSetup.borderColor,
+            borderColor: optionsSetup.borderColor == '' ? "inherit" : optionsSetup.borderColor,
             borderWidth: optionsSetup.borderWidth,
             borderType: optionsSetup.borderType,
             shadowBlur: optionsSetup.shadowBlur,
@@ -253,7 +253,7 @@ export default {
           formatter: `{b}${numberValue}${percentage}`,
           padding: optionsSetup.padding,
           fontSize: optionsSetup.fontSize,
-          color: optionsSetup.fontColor == '' ? null : optionsSetup.fontColor,
+          color: optionsSetup.fontColor == '' ? "inherit" : optionsSetup.fontColor,
           fontWeight: optionsSetup.fontWeight,
           fontStyle: optionsSetup.fontStyle,
           fontFamily: optionsSetup.fontFamily,
@@ -311,9 +311,9 @@ export default {
         minShowLabelAngle: optionsSetup.minShowLabelAngle,
         percentPrecision: optionsSetup.percentPrecision,
         // echarts v5.0.0开始支持
-        /*        itemStyle: {
-                  borderRadius: [optionsSetup.borderRadius + "%", optionsSetup.borderRadius + "%"],
-                },*/
+        itemStyle: {
+          borderRadius: [optionsSetup.borderRadius + "%", optionsSetup.borderRadius + "%"],
+        },
         // 高亮的扇区
         emphasis: {
           label: {
@@ -330,7 +330,7 @@ export default {
           },
           // 色块描边
           itemStyle: {
-            borderColor: optionsSetup.borderColor == '' ? null : optionsSetup.borderColor,
+            borderColor: optionsSetup.borderColor == '' ? "inherit" : optionsSetup.borderColor,
             borderWidth: optionsSetup.borderWidth,
             borderType: optionsSetup.borderType,
             shadowBlur: optionsSetup.shadowBlur,
@@ -344,7 +344,7 @@ export default {
           formatter: `{b}${numberValue}${percentage}`,
           padding: optionsSetup.padding,
           fontSize: optionsSetup.fontSize,
-          color: optionsSetup.fontColor == '' ? null : optionsSetup.fontColor,
+          color: optionsSetup.fontColor == '' ? "inherit" : optionsSetup.fontColor,
           fontWeight: optionsSetup.fontWeight,
           fontStyle: optionsSetup.fontStyle,
           fontFamily: optionsSetup.fontFamily,

report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue

@@ -223,10 +223,9 @@ export default {
         minShowLabelAngle: optionsSetup.minShowLabelAngle,
         percentPrecision: optionsSetup.percentPrecision,
         // echarts v5.0.0开始支持
-        /*        itemStyle: {
-                  borderRadius: [optionsSetup.borderRadius + "%", optionsSetup.borderRadius + "%"],
-                },
-                */
+        itemStyle: {
+          borderRadius: [optionsSetup.borderRadius + "%", optionsSetup.borderRadius + "%"],
+        },
         // 高亮的扇区
         emphasis: {
           label: {
@@ -243,7 +242,7 @@ export default {
           },
           // 色块描边
           itemStyle: {
-            borderColor: optionsSetup.borderColor == '' ? null : optionsSetup.borderColor,
+            borderColor: optionsSetup.borderColor == '' ? "inherit" : optionsSetup.borderColor,
             borderWidth: optionsSetup.borderWidth,
             borderType: optionsSetup.borderType,
             shadowBlur: optionsSetup.shadowBlur,
@@ -257,7 +256,7 @@ export default {
           formatter: `{b}${numberValue}${percentage}`,
           padding: optionsSetup.padding,
           fontSize: optionsSetup.fontSize,
-          color: optionsSetup.fontColor == '' ? null : optionsSetup.fontColor,
+          color: optionsSetup.fontColor == '' ? "inherit" : optionsSetup.fontColor,
           fontWeight: optionsSetup.fontWeight,
           fontStyle: optionsSetup.fontStyle,
           fontFamily: optionsSetup.fontFamily,
@@ -312,10 +311,9 @@ export default {
         minShowLabelAngle: optionsSetup.minShowLabelAngle,
         percentPrecision: optionsSetup.percentPrecision,
         // echarts v5.0.0开始支持
-        /*        itemStyle: {
-                  borderRadius: [optionsSetup.borderRadius + "%", optionsSetup.borderRadius + "%"],
-                },
-                */
+        itemStyle: {
+          borderRadius: [optionsSetup.borderRadius + "%", optionsSetup.borderRadius + "%"],
+        },
         // 高亮的扇区
         emphasis: {
           label: {
@@ -332,7 +330,7 @@ export default {
           },
           // 色块描边
           itemStyle: {
-            borderColor: optionsSetup.borderColor == '' ? null : optionsSetup.borderColor,
+            borderColor: optionsSetup.borderColor == '' ? "inherit" : optionsSetup.borderColor,
             borderWidth: optionsSetup.borderWidth,
             borderType: optionsSetup.borderType,
             shadowBlur: optionsSetup.shadowBlur,
@@ -346,7 +344,7 @@ export default {
           formatter: `{b}${numberValue}${percentage}`,
           padding: optionsSetup.padding,
           fontSize: optionsSetup.fontSize,
-          color: optionsSetup.fontColor == '' ? null : optionsSetup.fontColor,
+          color: optionsSetup.fontColor == '' ? "inherit" : optionsSetup.fontColor,
           fontWeight: optionsSetup.fontWeight,
           fontStyle: optionsSetup.fontStyle,
           fontFamily: optionsSetup.fontFamily,