From 2f6137112a276aef036d81b6ad16794dbbc7844f Mon Sep 17 00:00:00 2001 From: qianming Date: Tue, 11 Jul 2023 10:17:50 +0800 Subject: [PATCH] =?UTF-8?q?bugfix--=E5=89=AF=E6=A0=87=E9=A2=98=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E5=92=8C=E6=95=B0=E5=80=BC=E8=AE=BE=E5=AE=9A=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E5=86=B2=E7=AA=81-=E6=8A=98=E7=BA=BF=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/configure/lineCharts/widget-line-compare.js | 2 +- .../tools/configure/lineCharts/widget-line-stack.js | 2 +- .../tools/configure/lineCharts/widget-linechart.js | 2 +- .../designer/widget/line/widgetLineCompareChart.vue | 4 ++-- .../designer/widget/line/widgetLineStackChart.vue | 8 ++++---- .../designer/widget/line/widgetLinechart.vue | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) 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 a9f9577b..ed535c48 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 @@ -656,7 +656,7 @@ export const widgetLineCompare = { { type: 'vue-color', label: '字体颜色', - name: 'subTextColor', + name: 'dataColor', required: false, placeholder: '', value: '#fff' 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 6383c314..0a6b0f28 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 @@ -579,7 +579,7 @@ export const widgetLineStack = { { type: 'vue-color', label: '字体颜色', - name: 'subTextColor', + name: 'dataColor', required: false, placeholder: '', value: '#fff' 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 50f91cb9..64e09f4b 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 @@ -489,7 +489,7 @@ export const widgetLinechart = { { type: 'vue-color', label: '字体颜色', - name: 'subTextColor', + name: 'dataColor', required: false, placeholder: '', value: '#fff' diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue index f3aa19b6..4a0653f4 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue @@ -495,7 +495,7 @@ export default { position: "top", distance: 10, show: optionsSetup.isShow, - color: optionsSetup.subTextColor, + color: optionsSetup.dataColor, fontSize: optionsSetup.fontSize, fontWeight: optionsSetup.fontWeight, }; @@ -503,7 +503,7 @@ export default { position: "bottom", distance: 10, show: optionsSetup.isShow, - color: optionsSetup.subTextColor, + color: optionsSetup.dataColor, fontSize: optionsSetup.fontSize, fontWeight: optionsSetup.fontWeight, }; 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 595663eb..ac7421ed 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue @@ -392,13 +392,13 @@ export default { color: arrColor[i], }, areaStyle: this.getOptionArea(), - //标题部分 + //数值设定 label: { show: optionsSetup.isShow, position: "top", distance: 10, fontSize: optionsSetup.fontSize, - color: optionsSetup.subTextColor, + color: optionsSetup.dataColor, fontWeight: optionsSetup.fontWeight, }, }); @@ -480,13 +480,13 @@ export default { color: arrColor[i], }, areaStyle: this.getOptionArea(), - // 标题部分 + // 数值设定 label: { show: optionsSetup.isShow, position: "top", distance: 10, fontSize: optionsSetup.fontSize, - color: optionsSetup.subTextColor, + color: optionsSetup.dataColor, fontWeight: optionsSetup.fontWeight, }, }); 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 24b668f8..8b956578 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue @@ -259,7 +259,7 @@ export default { position: "top", distance: 10, fontSize: optionsSetup.fontSize, - color: optionsSetup.subTextColor, + color: optionsSetup.dataColor, fontWeight: optionsSetup.fontWeight, }; }