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..ddd2afd5 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 @@ -815,6 +815,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/widget/barline/widgetBarLineStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue index 717cc124..2be6ae11 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue @@ -291,8 +291,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, 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,