diff --git a/doc/docs/guide/chartsConfig.md b/doc/docs/guide/chartsConfig.md index 689f7264..0629944b 100644 --- a/doc/docs/guide/chartsConfig.md +++ b/doc/docs/guide/chartsConfig.md @@ -44,7 +44,8 @@ 定义：定义坐标轴中的X轴的相关设置项。
使用建议： - 可以修改坐标轴的颜色，因为默认是纯白色，所以部分浏览器可能显示不出来；可以设置坐标名（柱状对比图不存在此配置项）；如果数值相对密集的话，可以调整"数值间隔"。 -- V1.2.0版本默认X轴数值自动换行，X轴的label能显示的值的量是估算的，因此给了“数值行数”配置项方便进行调整。当“数值行数”有值时，默认的自动换行规则不会生效。
+- V1.2.0版本默认X轴数值自动换行，X轴的label能显示的值的量是估算的，因此给了“数值行数”配置项方便进行调整。当“数值行数”有值时，默认的自动换行规则不会生效。 +- V1.2.1版本取消默认X轴数值自动换行，改为由配置项控制。
![img4](../picture/chartsConfig/img_4.png) @@ -92,25 +93,30 @@ 文本框和滚动文本这两个组件，修改数据--静态数据，是不会生效的，文本内容配置项中写的内容才是真正的静态数据。
-## 超链接--跳转方式 +### 超链接--跳转方式 使用建议： - 默认的跳转方式是本窗口，实际使用还是请选择新窗口。
-## 图片/图片地址 +### 图片/图片地址 定义：图片对应的url链接
使用建议： - 这里图片的url因为只要是链接能打开就行了，所以适用性范围很广，但一般考虑到网络传输、安全性等问题，建议自行上传图片，然后用系统生成的链接地址；注意目前系统赞不支持svg图片，因此图片可能存在畸变，要注意缩放比例。 - V1.2.0版本支持.svg格式图片上传。
-## 表格--滚动间隔 +### 表格--滚动间隔 -定义：表格数据滚动的间隔，受到"开启滚动"、"动效时间"、"滚动个数"、"数据--动态数据--刷新时间"影响
+定义：表格数据滚动的间隔，受到"开启滚动"、"动效时间"、"滚动个数"、"数据--动态数据--刷新时间"影响。
使用建议： - 表格动态数据默认是5s请求一次数据，因此每隔5s图表就会刷新一次，这时就会重置滚动时间，会出现滚动到某个值时回到开头重新滚动。想让表格把每个值都滚动显示到的话，可以减少滚动间隔时间，去掉动效时间，增大滚动个数，提高动态数据刷新时间。
-## 饼图样式/模式 +### 柱状图--竖展示 +定义：改变柱状图的展示样式
+ +![img9](../picture/chartsConfig/img_9.png) + +### 饼图--饼图样式/模式 定义：定义饼图显示的样式、模式，涉及饼图、南丁格尔玫瑰图。
使用建议： diff --git a/doc/docs/picture/chartsConfig/img_9.png b/doc/docs/picture/chartsConfig/img_9.png new file mode 100644 index 00000000..3a6a6990 Binary files /dev/null and b/doc/docs/picture/chartsConfig/img_9.png differ diff --git a/report-core/pom.xml b/report-core/pom.xml index 4b74d351..98980c77 100644 --- a/report-core/pom.xml +++ b/report-core/pom.xml @@ -14,7 +14,7 @@ com.anji-plus aj-report - 1.2.0.RELEASE + 1.2.1.RELEASE UTF-8 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 22decbbe..cffd2627 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-switch', + label: '数值自动换行', + name: 'textRowsBreakAuto', + required: false, + placeholder: '', + value: false, + }, { type: 'el-input-text', 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 b17c0f31..56c364b2 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-switch', + label: '数值自动换行', + name: 'textRowsBreakAuto', + required: false, + placeholder: '', + value: false, + }, { type: 'el-input-text', 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 dba16319..d72178e3 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-switch', + label: '数值自动换行', + name: 'textRowsBreakAuto', + required: false, + placeholder: '', + value: false, + }, { type: 'el-input-text', 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 921c66c6..c273deba 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-switch', + label: '数值自动换行', + name: 'textRowsBreakAuto', + required: false, + placeholder: '', + value: false, + }, { type: 'el-input-text', 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 641ab301..863c79b4 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-switch', + label: '数值自动换行', + name: 'textRowsBreakAuto', + required: false, + placeholder: '', + value: false, + }, { type: 'el-input-text', label: '数值行数', @@ -815,6 +823,40 @@ export const widgetBarLineStack = { { name: '提示语设置', list: [ + { + type: 'el-switch', + label: '显示', + name: 'isShowTooltip', + required: false, + placeholder: '', + value: true + }, + { + type: 'el-select', + label: '触发类型', + name: 'tooltipTrigger', + required: false, + placeholder: '', + selectOptions: [ + { code: 'item', name: '数据项' }, + { code: 'axis', name: '坐标轴' }, + ], + value: 'axis' + }, + { + type: 'el-select', + label: '指示器类型', + name: 'tooltipAxisPointerType', + required: false, + placeholder: '', + selectOptions: [ + { code: 'none', name: '无' }, + { code: 'line', name: '直线' }, + { code: 'shadow', name: '阴影' }, + { code: 'cross', name: '十字准星' }, + ], + value: 'shadow' + }, { 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 da035d1a..408f9357 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-switch', + label: '数值自动换行', + name: 'textRowsBreakAuto', + required: false, + placeholder: '', + value: false, + }, { type: 'el-input-text', 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 3ae17960..b8b4f691 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-switch', + label: '数值自动换行', + name: 'textRowsBreakAuto', + required: false, + placeholder: '', + value: false, + }, { type: 'el-input-text', 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 56c48f83..ac2ad24e 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-switch', + label: '数值自动换行', + name: 'textRowsBreakAuto', + required: false, + placeholder: '', + value: false, + }, { type: 'el-input-text', 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 c959ecae..7217eeb4 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-switch', + label: '数值自动换行', + name: 'textRowsBreakAuto', + required: false, + placeholder: '', + value: false, + }, { type: 'el-input-text', 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 5cd1cdbf..57d1206d 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarDoubleYaxisChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarDoubleYaxisChart.vue @@ -185,6 +185,17 @@ export default { }, // 轴反转 inverse: optionsSetup.reversalX, + axisLabel: { + show: true, + interval: optionsSetup.textInterval, + // 文字角度 + rotate: optionsSetup.textAngleX, + textStyle: { + // 坐标文字颜色 + color: optionsSetup.colorX, + fontSize: optionsSetup.fontSizeX, + }, + }, axisLine: { show: true, lineStyle: { @@ -464,7 +475,9 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } this.options.legend["data"] = legendName; this.setOptionsLegendName(legendName); }, @@ -523,7 +536,9 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } this.options.legend["data"] = legendName; this.setOptionsLegendName(legendName); }, 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 7407a4cf..b53de705 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue @@ -144,6 +144,17 @@ export default { }, // 轴反转 inverse: optionsSetup.reversalX, + axisLabel: { + show: true, + interval: optionsSetup.textInterval, + // 文字角度 + rotate: optionsSetup.textAngleX, + textStyle: { + // 坐标文字颜色 + color: optionsSetup.colorX, + fontSize: optionsSetup.fontSizeX, + }, + }, axisLine: { show: true, lineStyle: { @@ -382,17 +393,6 @@ export default { legendName.push(yAxisList[i]); } this.options.series = series; - if (optionsSetup.verticalShow) { - this.options.xAxis.data = []; - this.options.yAxis.data = xAxisList; - this.options.xAxis.type = "value"; - this.options.yAxis.type = "category"; - } else { - this.options.xAxis.data = xAxisList; - this.options.yAxis.data = []; - this.options.xAxis.type = "category"; - this.options.yAxis.type = "value"; - } // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisList.length) / optionsSetup.fontSizeX); const axisLabel = { @@ -416,7 +416,20 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + if (optionsSetup.verticalShow) { + this.options.xAxis.data = []; + this.options.yAxis.data = xAxisList; + this.options.xAxis.type = "value"; + this.options.yAxis.type = "category"; + } else { + this.options.xAxis.data = xAxisList; + this.options.yAxis.data = []; + this.options.xAxis.type = "category"; + this.options.yAxis.type = "value"; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } + } this.options.legend["data"] = legendName; this.setOptionsLegendName(legendName); }, @@ -445,18 +458,6 @@ export default { for (let i = 0; i < customColor.length; i++) { arrColor.push(customColor[i].color); } - // x轴 - if (optionsSetup.verticalShow) { - this.options.xAxis.data = []; - this.options.yAxis.data = val.xAxis; - this.options.xAxis.type = "value"; - this.options.yAxis.type = "category"; - } else { - this.options.xAxis.data = val.xAxis; - this.options.yAxis.data = []; - this.options.xAxis.type = "category"; - this.options.yAxis.type = "value"; - } const series = []; const legendName = []; for (const i in val.series) { @@ -523,7 +524,21 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + // x轴 + if (optionsSetup.verticalShow) { + this.options.xAxis.data = []; + this.options.yAxis.data = val.xAxis; + this.options.xAxis.type = "value"; + this.options.yAxis.type = "category"; + } else { + this.options.xAxis.data = val.xAxis; + this.options.yAxis.data = []; + this.options.xAxis.type = "category"; + this.options.yAxis.type = "value"; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } + } this.options.series = series; this.options.legend["data"] = legendName; this.setOptionsLegendName(legendName); 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 bf658374..db09eb3b 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue @@ -151,6 +151,17 @@ export default { }, // 轴反转 inverse: optionsSetup.reversalX, + axisLabel: { + show: true, + interval: optionsSetup.textInterval, + // 文字角度 + rotate: optionsSetup.textAngleX, + textStyle: { + // 坐标文字颜色 + color: optionsSetup.colorX, + fontSize: optionsSetup.fontSizeX, + }, + }, axisLine: { show: true, lineStyle: { @@ -335,18 +346,6 @@ export default { } const legendName = []; legendName.push("bar"); - // x轴 - if (optionsSetup.verticalShow) { - this.options.xAxis.data = []; - this.options.yAxis.data = axis; - this.options.xAxis.type = "value"; - this.options.yAxis.type = "category"; - } else { - this.options.xAxis.data = axis; - this.options.yAxis.data = []; - this.options.xAxis.type = "category"; - this.options.yAxis.type = "value"; - } for (const i in series) { if (series[i].type == "bar") { series[i].type = "bar"; @@ -416,8 +415,22 @@ export default { } return str } + }; + // x轴 + if (optionsSetup.verticalShow) { + this.options.xAxis.data = []; + this.options.yAxis.data = axis; + this.options.xAxis.type = "value"; + this.options.yAxis.type = "category"; + } else { + this.options.xAxis.data = axis; + this.options.yAxis.data = []; + this.options.xAxis.type = "category"; + this.options.yAxis.type = "value"; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } } - this.options.xAxis.axisLabel = axisLabel; this.options.legend["data"] = legendName; this.setOptionsLegendName(legendName); }, @@ -451,18 +464,6 @@ export default { } const series = []; const legendName = []; - // x轴 - if (optionsSetup.verticalShow) { - this.options.xAxis.data = []; - this.options.yAxis.data = val.xAxis; - this.options.xAxis.type = "value"; - this.options.yAxis.type = "category"; - } else { - this.options.xAxis.data = val.xAxis; - this.options.yAxis.data = []; - this.options.xAxis.type = "category"; - this.options.yAxis.type = "value"; - } for (const i in val.series) { legendName.push(val.series[i].name); const obj = {}; @@ -537,8 +538,22 @@ export default { } return str } + }; + // x轴 + if (optionsSetup.verticalShow) { + this.options.xAxis.data = []; + this.options.yAxis.data = val.xAxis; + this.options.xAxis.type = "value"; + this.options.yAxis.type = "category"; + } else { + this.options.xAxis.data = val.xAxis; + this.options.yAxis.data = []; + this.options.xAxis.type = "category"; + this.options.yAxis.type = "value"; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } } - this.options.xAxis.axisLabel = axisLabel; this.options.series = series; this.options.legend["data"] = legendName; this.setOptionsLegendName(legendName); 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 54eb6897..76909000 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue @@ -227,6 +227,17 @@ export default { }, // 轴反转 inverse: optionsSetup.reversalX, + axisLabel: { + show: true, + interval: optionsSetup.textInterval, + // 文字角度 + rotate: optionsSetup.textAngleX, + textStyle: { + // 坐标文字颜色 + color: optionsSetup.colorX, + fontSize: optionsSetup.fontSizeX, + }, + }, axisLine: { show: true, lineStyle: { @@ -429,21 +440,6 @@ export default { axis[i] = val[i].axis; data[i] = val[i].data; } - // x轴 - if (optionsSetup.verticalShow) { - this.options.xAxis.data = []; - this.options.yAxis.data = axis; - this.options.xAxis.type = "value"; - this.options.yAxis.type = "category"; - } else { - this.options.xAxis.data = axis; - this.options.yAxis.data = []; - this.options.xAxis.type = "category"; - this.options.yAxis.type = "value"; - } - if (series[0].type == "bar") { - series[0].data = data; - } // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / axis.length) / optionsSetup.fontSizeX); const axisLabel = { @@ -467,7 +463,24 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + // x轴 + if (optionsSetup.verticalShow) { + this.options.xAxis.data = []; + this.options.yAxis.data = axis; + this.options.xAxis.type = "value"; + this.options.yAxis.type = "category"; + } else { + this.options.xAxis.data = axis; + this.options.yAxis.data = []; + this.options.xAxis.type = "category"; + this.options.yAxis.type = "value"; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } + } + if (series[0].type == "bar") { + series[0].data = data; + } }, // 动态数据 dynamicDataFn(refreshTime) { @@ -491,22 +504,6 @@ export default { }); }, renderingFn(optionsSetup, val) { - // x轴 - if (optionsSetup.verticalShow) { - this.options.xAxis.data = []; - this.options.yAxis.data = val.xAxis; - this.options.xAxis.type = "value"; - this.options.yAxis.type = "category"; - } else { - this.options.xAxis.data = val.xAxis; - this.options.yAxis.data = []; - this.options.xAxis.type = "category"; - this.options.yAxis.type = "value"; - } - const series = this.options.series; - if (series[0].type == "bar") { - series[0].data = val.series[0].data; - } // 根据图表的宽度 x轴的字体大小、长度来估算X轴的label能展示多少个字 const xAxisDataLength = val.length !== 0 ? val.xAxis.length : 1; const rowsNum = optionsSetup.textRowsNum !== "" ? optionsSetup.textRowsNum : parseInt((this.optionsStyle.width / xAxisDataLength) / optionsSetup.fontSizeX); @@ -531,7 +528,25 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + // x轴 + if (optionsSetup.verticalShow) { + this.options.xAxis.data = []; + this.options.yAxis.data = val.xAxis; + this.options.xAxis.type = "value"; + this.options.yAxis.type = "category"; + } else { + this.options.xAxis.data = val.xAxis; + this.options.yAxis.data = []; + this.options.xAxis.type = "category"; + this.options.yAxis.type = "value"; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } + } + const series = this.options.series; + if (series[0].type == "bar") { + series[0].data = val.series[0].data; + } }, }, }; 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 717cc124..05d94db9 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue @@ -179,6 +179,17 @@ export default { }, // 轴反转 inverse: optionsSetup.reversalX, + axisLabel: { + show: true, + interval: optionsSetup.textInterval, + // 文字角度 + rotate: optionsSetup.textAngleX, + textStyle: { + // 坐标文字颜色 + color: optionsSetup.colorX, + fontSize: optionsSetup.fontSizeX, + }, + }, axisLine: { show: true, lineStyle: { @@ -291,8 +302,11 @@ export default { setOptionsTooltip() { const optionsSetup = this.optionsSetup; const tooltip = { - trigger: "item", - show: true, + show: optionsSetup.isShowTooltip, + trigger: optionsSetup.tooltipTrigger, + axisPointer:{ + type: optionsSetup.tooltipAxisPointerType, + }, textStyle: { color: optionsSetup.tipsColor, fontSize: optionsSetup.tipsFontSize, @@ -516,7 +530,9 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } this.options.series = series; this.options.xAxis.data = xAxisList; this.options.yAxis.data = []; @@ -647,7 +663,9 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } this.options.series = series; this.options.legend["data"] = legendName; this.setOptionsLegendName(legendName); 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 2bda77c9..2451067c 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue @@ -186,6 +186,17 @@ export default { }, // 轴反转 inverse: optionsSetup.reversalX, + axisLabel: { + show: true, + interval: optionsSetup.textInterval, + // 文字角度 + rotate: optionsSetup.textAngleX, + textStyle: { + // 坐标文字颜色 + color: optionsSetup.colorX, + fontSize: optionsSetup.fontSizeX, + }, + }, axisLine: { show: true, lineStyle: { @@ -493,7 +504,9 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } this.options.legend["data"] = legendName; this.setOptionsLegendName(legendName); }, @@ -552,7 +565,9 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } this.options.legend["data"] = legendName; this.setOptionsLegendName(legendName); }, 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 997e8e7a..1d927029 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue @@ -246,6 +246,17 @@ export default { }, // 轴反转 inverse: optionsSetup.reversalX, + axisLabel: { + show: true, + interval: optionsSetup.textInterval, + // 文字角度 + rotate: optionsSetup.textAngleX, + textStyle: { + // 坐标文字颜色 + color: optionsSetup.colorX, + fontSize: optionsSetup.fontSizeX, + }, + }, axisLine: { show: true, lineStyle: { @@ -551,7 +562,9 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } this.options.legend["data"] = legendName; this.setOptionsLegendName(legendName); }, @@ -671,7 +684,9 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } this.options.series = series; this.options.legend["data"] = legendName; this.setOptionsLegendName(legendName); 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 3f0871bf..c5fa92af 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue @@ -144,6 +144,17 @@ export default { }, // 轴反转 inverse: optionsSetup.reversalX, + axisLabel: { + show: true, + interval: optionsSetup.textInterval, + // 文字角度 + rotate: optionsSetup.textAngleX, + textStyle: { + // 坐标文字颜色 + color: optionsSetup.colorX, + fontSize: optionsSetup.fontSizeX, + }, + }, axisLine: { show: true, lineStyle: { @@ -428,7 +439,9 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } this.options.legend["data"] = legendName; this.setOptionsLegendName(legendName); }, @@ -531,7 +544,9 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } this.options.series = series; this.options.legend["data"] = legendName; this.setOptionsLegendName(legendName); 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 0ad0b264..1e426890 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue @@ -158,6 +158,17 @@ export default { }, // 轴反转 inverse: optionsSetup.reversalX, + axisLabel: { + show: true, + interval: optionsSetup.textInterval, + // 文字角度 + rotate: optionsSetup.textAngleX, + textStyle: { + // 坐标文字颜色 + color: optionsSetup.colorX, + fontSize: optionsSetup.fontSizeX, + }, + }, axisLine: { show: true, lineStyle: { @@ -380,7 +391,9 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } this.options.legend["data"] = legendName; this.setOptionsLegendName(legendName); }, @@ -477,7 +490,9 @@ export default { return str } } - this.options.xAxis.axisLabel = axisLabel; + if (optionsSetup.textRowsBreakAuto) { + this.options.xAxis.axisLabel = axisLabel; + } this.options.series = series; this.options.legend["data"] = legendName; this.setOptionsLegendName(legendName); diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue index 29a597b5..8a87eb44 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue @@ -151,7 +151,6 @@ export default { }, }, fontSize: optionsSetup.fontSize, - fontWeight: optionsSetup.optionsSetup, }; for (const key in series) { @@ -166,7 +165,6 @@ export default { const optionsSetup = this.optionsSetup; const tooltip = { trigger: "item", - show: true, textStyle: { color: optionsSetup.tipsColor, fontSize: optionsSetup.tipsFontSize, diff --git a/report-ui/src/views/layout/components/Sidebar/index.vue b/report-ui/src/views/layout/components/Sidebar/index.vue index b53f2376..e6ae54f4 100644 --- a/report-ui/src/views/layout/components/Sidebar/index.vue +++ b/report-ui/src/views/layout/components/Sidebar/index.vue @@ -3,7 +3,7 @@
- V1.2.0 + V1.2.1