Browse Source

bugfix--副标题颜色和数值设定颜色冲突-折线图

qianming 2 years ago
parent
commit
2f6137112a

+ 1 - 1
report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js

@@ -656,7 +656,7 @@ export const widgetLineCompare = {
             {
             {
               type: 'vue-color',
               type: 'vue-color',
               label: '字体颜色',
               label: '字体颜色',
-              name: 'subTextColor',
+              name: 'dataColor',
               required: false,
               required: false,
               placeholder: '',
               placeholder: '',
               value: '#fff'
               value: '#fff'

+ 1 - 1
report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js

@@ -579,7 +579,7 @@ export const widgetLineStack = {
             {
             {
               type: 'vue-color',
               type: 'vue-color',
               label: '字体颜色',
               label: '字体颜色',
-              name: 'subTextColor',
+              name: 'dataColor',
               required: false,
               required: false,
               placeholder: '',
               placeholder: '',
               value: '#fff'
               value: '#fff'

+ 1 - 1
report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js

@@ -489,7 +489,7 @@ export const widgetLinechart = {
             {
             {
               type: 'vue-color',
               type: 'vue-color',
               label: '字体颜色',
               label: '字体颜色',
-              name: 'subTextColor',
+              name: 'dataColor',
               required: false,
               required: false,
               placeholder: '',
               placeholder: '',
               value: '#fff'
               value: '#fff'

+ 2 - 2
report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue

@@ -495,7 +495,7 @@ export default {
           position: "top",
           position: "top",
           distance: 10,
           distance: 10,
           show: optionsSetup.isShow,
           show: optionsSetup.isShow,
-          color: optionsSetup.subTextColor,
+          color: optionsSetup.dataColor,
           fontSize: optionsSetup.fontSize,
           fontSize: optionsSetup.fontSize,
           fontWeight: optionsSetup.fontWeight,
           fontWeight: optionsSetup.fontWeight,
         };
         };
@@ -503,7 +503,7 @@ export default {
           position: "bottom",
           position: "bottom",
           distance: 10,
           distance: 10,
           show: optionsSetup.isShow,
           show: optionsSetup.isShow,
-          color: optionsSetup.subTextColor,
+          color: optionsSetup.dataColor,
           fontSize: optionsSetup.fontSize,
           fontSize: optionsSetup.fontSize,
           fontWeight: optionsSetup.fontWeight,
           fontWeight: optionsSetup.fontWeight,
         };
         };

+ 4 - 4
report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue

@@ -392,13 +392,13 @@ export default {
             color: arrColor[i],
             color: arrColor[i],
           },
           },
           areaStyle: this.getOptionArea(),
           areaStyle: this.getOptionArea(),
-          //标题部分
+          //数值设定
           label: {
           label: {
             show: optionsSetup.isShow,
             show: optionsSetup.isShow,
             position: "top",
             position: "top",
             distance: 10,
             distance: 10,
             fontSize: optionsSetup.fontSize,
             fontSize: optionsSetup.fontSize,
-            color: optionsSetup.subTextColor,
+            color: optionsSetup.dataColor,
             fontWeight: optionsSetup.fontWeight,
             fontWeight: optionsSetup.fontWeight,
           },
           },
         });
         });
@@ -480,13 +480,13 @@ export default {
               color: arrColor[i],
               color: arrColor[i],
             },
             },
             areaStyle: this.getOptionArea(),
             areaStyle: this.getOptionArea(),
-            // 标题部分
+            // 数值设定
             label: {
             label: {
               show: optionsSetup.isShow,
               show: optionsSetup.isShow,
               position: "top",
               position: "top",
               distance: 10,
               distance: 10,
               fontSize: optionsSetup.fontSize,
               fontSize: optionsSetup.fontSize,
-              color: optionsSetup.subTextColor,
+              color: optionsSetup.dataColor,
               fontWeight: optionsSetup.fontWeight,
               fontWeight: optionsSetup.fontWeight,
             },
             },
           });
           });

+ 1 - 1
report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue

@@ -259,7 +259,7 @@ export default {
             position: "top",
             position: "top",
             distance: 10,
             distance: 10,
             fontSize: optionsSetup.fontSize,
             fontSize: optionsSetup.fontSize,
-            color: optionsSetup.subTextColor,
+            color: optionsSetup.dataColor,
             fontWeight: optionsSetup.fontWeight,
             fontWeight: optionsSetup.fontWeight,
           };
           };
         }
         }