From acb17c279aed8f38fe9860841873141d5e4bde20 Mon Sep 17 00:00:00 2001 From: qianming Date: Thu, 2 Nov 2023 10:51:00 +0800 Subject: [PATCH] =?UTF-8?q?feat--X=E8=BD=B4=E6=95=B0=E5=80=BC=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E5=80=BC=E8=A1=8C=E6=95=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget-bar-double-yaxis-chart.js | 8 ++++++++ .../configure/barCharts/widget-bar-stack.js | 8 ++++++++ .../configure/barCharts/widget-barchart.js | 8 ++++++++ .../barCharts/widget-gradient-barchart.js | 8 ++++++++ .../barlineCharts/widget-bar-line-stack.js | 8 ++++++++ .../barlineCharts/widget-barlinechart.js | 8 ++++++++ .../barlineCharts/widget-more-bar-line.js | 8 ++++++++ .../configure/lineCharts/widget-line-stack.js | 8 ++++++++ .../configure/lineCharts/widget-linechart.js | 8 ++++++++ .../widget/bar/widgetBarDoubleYaxisChart.vue | 10 +++++----- .../widget/bar/widgetBarStackChart.vue | 10 +++++----- .../designer/widget/bar/widgetBarchart.vue | 8 ++++---- .../bar/widgetGradientColorBarchart.vue | 10 +++++----- .../barline/widgetBarLineStackChart.vue | 8 ++++---- .../widget/barline/widgetBarlinechart.vue | 12 +++++------ .../widget/barline/widgetMoreBarLineChart.vue | 13 ++++++------ .../widget/line/widgetLineStackChart.vue | 20 +++++++++---------- .../designer/widget/line/widgetLinechart.vue | 10 +++++----- 18 files changed, 123 insertions(+), 50 deletions(-) diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-double-yaxis-chart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-double-yaxis-chart.js index 482b8bfa..22decbbe 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-double-yaxis-chart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-double-yaxis-chart.js @@ -384,6 +384,14 @@ export const widgetBarDoubleYaxis = { placeholder: '', value: 14, }, + { + type: 'el-input-text', + label: '数值行数', + name: 'textRowsNum', + required: false, + placeholder: '', + value: '', + }, { type: 'el-input-number', label: '数值间隔', diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js index e4467959..b17c0f31 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js @@ -403,6 +403,14 @@ export const widgetBarStack = { placeholder: '', value: 14, }, + { + type: 'el-input-text', + label: '数值行数', + name: 'textRowsNum', + required: false, + placeholder: '', + value: '', + }, { type: 'el-input-number', label: '数值间隔', diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js index 11fbd0d3..dba16319 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js @@ -411,6 +411,14 @@ export const widgetBarchart = { placeholder: '', value: 14, }, + { + type: 'el-input-text', + label: '数值行数', + name: 'textRowsNum', + required: false, + placeholder: '', + value: '', + }, { type: 'el-input-number', label: '数值间隔', diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js index bffbc5be..921c66c6 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js @@ -309,6 +309,14 @@ export const widgetGradientBarchart = { placeholder: '', value: 14, }, + { + type: 'el-input-text', + label: '数值行数', + name: 'textRowsNum', + required: false, + placeholder: '', + value: '', + }, { type: 'el-input-number', label: '数值间隔', 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 119bd461..641ab301 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 @@ -371,6 +371,14 @@ export const widgetBarLineStack = { placeholder: '', value: 14, }, + { + type: 'el-input-text', + label: '数值行数', + name: 'textRowsNum', + required: false, + placeholder: '', + value: '', + }, { type: 'el-input-number', label: '数值间隔', 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 2bfd340a..da035d1a 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 @@ -387,6 +387,14 @@ export const widgetBarlinechart = { placeholder: '', value: 14, }, + { + type: 'el-input-text', + label: '数值行数', + name: 'textRowsNum', + required: false, + placeholder: '', + value: '', + }, { type: 'el-input-number', label: '数值间隔', 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 5078699a..3ae17960 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 @@ -391,6 +391,14 @@ export const widgetMoreBarLine = { placeholder: '', value: 14, }, + { + type: 'el-input-text', + label: '数值行数', + name: 'textRowsNum', + required: false, + placeholder: '', + value: '', + }, { type: 'el-input-number', label: '数值间隔', 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 ee53d268..56c48f83 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 @@ -366,6 +366,14 @@ export const widgetLineStack = { placeholder: '', value: 14, }, + { + type: 'el-input-text', + label: '数值行数', + name: 'textRowsNum', + required: false, + placeholder: '', + value: '', + }, { type: 'el-input-number', label: '数值间隔', 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 b3379cfa..c959ecae 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 @@ -358,6 +358,14 @@ export const widgetLinechart = { placeholder: '', value: 14, }, + { + type: 'el-input-text', + label: '数值行数', + name: 'textRowsNum', + required: false, + placeholder: '', + value: '', + }, { type: 'el-input-number', label: '数值间隔', diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarDoubleYaxisChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarDoubleYaxisChart.vue index 5e27475a..74248d29 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarDoubleYaxisChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarDoubleYaxisChart.vue @@ -442,7 +442,7 @@ export default { legendName.push("bar1"); legendName.push("bar2"); // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 - const wordNum = parseInt((this.optionsStyle.width / axis.length) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / axis.length) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -459,7 +459,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } @@ -501,10 +501,10 @@ export default { } // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 let xAxisDataLength = 1; - if (val.length !== 0){ + if (val.length !== 0) { xAxisDataLength = val.xAxis.length; } - const wordNum = parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -521,7 +521,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue index 21830d9e..61f74a0a 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue @@ -394,7 +394,7 @@ export default { this.options.yAxis.type = "value"; } // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 - const wordNum = parseInt((this.optionsStyle.width / xAxisList.length) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisList.length) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -411,7 +411,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } @@ -501,10 +501,10 @@ export default { } // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 let xAxisDataLength = 1; - if (val.length !== 0){ + if (val.length !== 0) { xAxisDataLength = val.xAxis.length; } - const wordNum = parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -521,7 +521,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue index 144c54b1..eb5c2047 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue @@ -395,7 +395,7 @@ export default { } } // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 - const wordNum = parseInt((this.optionsStyle.width / axis.length) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / axis.length) / optionsSetup.fontSizeX) const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -412,7 +412,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } @@ -519,7 +519,7 @@ export default { if (val.length !== 0){ xAxisDataLength = val.xAxis.length; } - const wordNum = parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX) const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -536,7 +536,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue index 15e891b5..ab6dbb38 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue @@ -445,7 +445,7 @@ export default { series[0].data = data; } // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 - const wordNum = parseInt((this.optionsStyle.width / axis.length) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / axis.length) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -462,7 +462,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } @@ -509,10 +509,10 @@ export default { } // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 let xAxisDataLength = 1; - if (val.length !== 0){ + if (val.length !== 0) { xAxisDataLength = val.xAxis.length; } - const wordNum = parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -529,7 +529,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } 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 2c39c30d..f1f73e05 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue @@ -494,7 +494,7 @@ export default { }); } // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 - const wordNum = parseInt((this.optionsStyle.width / xAxisList.length) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisList.length) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -511,7 +511,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } @@ -628,7 +628,7 @@ export default { if (val.length !== 0){ xAxisDataLength = val.xAxis.length; } - const wordNum = parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -645,7 +645,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } 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 e90b4500..77488a30 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue @@ -1,6 +1,6 @@ @@ -471,7 +471,7 @@ export default { legendName.push("line"); const optionsSetup = this.optionsSetup; // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 - const wordNum = parseInt((this.optionsStyle.width / axis.length) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / axis.length) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -488,7 +488,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } @@ -530,10 +530,10 @@ export default { const optionsSetup = this.optionsSetup; // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 let xAxisDataLength = 1; - if (val.length !== 0){ + if (val.length !== 0) { xAxisDataLength = val.xAxis.length; } - const wordNum = parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -550,7 +550,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } 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 68f5084c..fd6d662a 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue @@ -1,6 +1,6 @@ @@ -8,6 +8,7 @@ import {targetWidgetLinkageLogic} from "@/views/bigscreenDesigner/designer/linkageLogic"; import echarts from "echarts"; + export default { name: "widgetMoreBarLineChart", components: {}, @@ -528,7 +529,7 @@ export default { series[1].data = bar2; series[2].data = line; // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 - const wordNum = parseInt((this.optionsStyle.width / axis.length) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / axis.length) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -545,7 +546,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } @@ -648,10 +649,10 @@ export default { } // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 let xAxisDataLength = 1; - if (val.length !== 0){ + if (val.length !== 0) { xAxisDataLength = val.xAxis.length; } - const wordNum = parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -668,7 +669,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } 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 8fc5a132..c2252836 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue @@ -1,6 +1,6 @@ @@ -317,10 +317,10 @@ export default { optionsData.dataType == "staticData" ? this.staticDataFn(optionsData.staticData, optionsSetup) : this.dynamicDataFn( - optionsData.dynamicData, - optionsData.refreshTime, - optionsSetup - ); + optionsData.dynamicData, + optionsData.refreshTime, + optionsSetup + ); }, //去重 setUnique(arr) { @@ -406,7 +406,7 @@ export default { this.options.yAxis.type = "value"; } // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 - const wordNum = parseInt((this.optionsStyle.width / xAxisList.length) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisList.length) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -423,7 +423,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } @@ -509,10 +509,10 @@ export default { } // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 let xAxisDataLength = 1; - if (val.length !== 0){ + if (val.length !== 0) { xAxisDataLength = val.xAxis.length; } - const wordNum = parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -529,7 +529,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } 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 e9accb03..3a73613b 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue @@ -358,7 +358,7 @@ export default { } } // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 - const wordNum = parseInt((this.optionsStyle.width / axis.length) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / axis.length) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -375,7 +375,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str } @@ -455,10 +455,10 @@ export default { } // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 let xAxisDataLength = 1; - if (val.length !== 0){ + if (val.length !== 0) { xAxisDataLength = val.xAxis.length; } - const wordNum = parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); + const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); const axisLabel = { show: true, interval: optionsSetup.textInterval, @@ -475,7 +475,7 @@ export default { let str = '' for (let i = 0, s; s = strs[i++];) { str += s; - if (!(i % wordNum)) str += '\n'; + if (!(i % rowsNum)) str += '\n'; } return str }