From 159ffb4af29f84ef108bb2677c5c075c7aac7d67 Mon Sep 17 00:00:00 2001 From: MTrun <1262327911@qq.com> Date: Wed, 9 Mar 2022 19:22:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8A=98=E7=BA=BF?= =?UTF-8?q?=E5=9B=BE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Charts/Bars/BarCommon/config.ts | 2 +- .../Charts/Bars/BarCrossrange/config.ts | 2 +- .../Charts/Lines/LineCommon/config.ts | 9 +- .../Charts/Lines/LineGradientSingle/config.ts | 92 ++++++++++--------- .../Charts/Lines/LineGradients/config.ts | 9 +- .../Charts/Pies/PieCommon/config.ts | 2 +- 6 files changed, 67 insertions(+), 49 deletions(-) diff --git a/src/packages/components/Charts/Bars/BarCommon/config.ts b/src/packages/components/Charts/Bars/BarCommon/config.ts index e4c6ae73..d767a2c5 100644 --- a/src/packages/components/Charts/Bars/BarCommon/config.ts +++ b/src/packages/components/Charts/Bars/BarCommon/config.ts @@ -54,7 +54,7 @@ export const option = { export default class Config extends publicConfig implements CreateComponentType { public key = BarCommonConfig.key - public chartConfig = omit(cloneDeep(BarCommonConfig), ['node']) + public chartConfig = omit(cloneDeep(BarCommonConfig), ['node', 'conNode']) // 图表配置项 public option = echartOptionProfixHandle(option, includes) } diff --git a/src/packages/components/Charts/Bars/BarCrossrange/config.ts b/src/packages/components/Charts/Bars/BarCrossrange/config.ts index c2b6ec6a..5ab863b6 100644 --- a/src/packages/components/Charts/Bars/BarCrossrange/config.ts +++ b/src/packages/components/Charts/Bars/BarCrossrange/config.ts @@ -54,7 +54,7 @@ export const option = { export default class Config extends publicConfig implements CreateComponentType { public key: string = BarCrossrangefig.key - public chartConfig = omit(cloneDeep(BarCrossrangefig), ['node']) + public chartConfig = omit(cloneDeep(BarCrossrangefig), ['node', 'conNode']) // 图表配置项 public option = echartOptionProfixHandle(option, includes) } diff --git a/src/packages/components/Charts/Lines/LineCommon/config.ts b/src/packages/components/Charts/Lines/LineCommon/config.ts index e2c0c5bc..dc173278 100644 --- a/src/packages/components/Charts/Lines/LineCommon/config.ts +++ b/src/packages/components/Charts/Lines/LineCommon/config.ts @@ -6,6 +6,13 @@ import omit from 'lodash/omit' export const includes = ['legend', 'xAxis', 'yAxis'] const option = { + tooltip: { + show: true, + trigger: 'axis', + axisPointer: { + type: 'line' + } + }, legend: { show: true }, @@ -60,7 +67,7 @@ const option = { export default class Config extends publicConfig implements CreateComponentType { public key: string = LineCommonConfig.key - public chartConfig = omit(LineCommonConfig, ['node']) + public chartConfig = omit(LineCommonConfig, ['node', 'conNode']) // 图表配置项 public option = echartOptionProfixHandle(option, includes) } diff --git a/src/packages/components/Charts/Lines/LineGradientSingle/config.ts b/src/packages/components/Charts/Lines/LineGradientSingle/config.ts index d2fc0877..ee0bc23d 100644 --- a/src/packages/components/Charts/Lines/LineGradientSingle/config.ts +++ b/src/packages/components/Charts/Lines/LineGradientSingle/config.ts @@ -6,54 +6,58 @@ import omit from 'lodash/omit' export const includes = ['legend', 'xAxis', 'yAxis'] -const options = echartOptionProfixHandle( - { - legend: { - show: true - }, - xAxis: { - show: true, - type: 'category', - data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] - }, - yAxis: { - show: true, - type: 'value' - }, - series: [ - { - name: 'data1', - type: 'line', - smooth: false, - lineStyle: { - normal: { - width: 3 - } - }, - areaStyle: { - opacity: 0.8, - color: new graphic.LinearGradient(0, 0, 0, 1, [ - { - offset: 0, - color: 'rgba(25,163,223,.5)' - }, - { - offset: 1, - color: 'rgba(25,163,223, 0)' - } - ]) - }, - data: [120, 200, 150, 80, 70, 110, 130] - } - ] +const options = { + legend: { + show: true }, - includes -) + tooltip: { + show: true, + trigger: 'axis', + axisPointer: { + type: 'line' + } + }, + xAxis: { + show: true, + type: 'category', + data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] + }, + yAxis: { + show: true, + type: 'value' + }, + series: [ + { + name: 'data1', + type: 'line', + smooth: false, + lineStyle: { + normal: { + width: 3 + } + }, + areaStyle: { + opacity: 0.8, + color: new graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: 'rgba(25,163,223,.5)' + }, + { + offset: 1, + color: 'rgba(25,163,223, 0)' + } + ]) + }, + data: [120, 200, 150, 80, 70, 110, 130] + } + ] +} export default class Config extends publicConfig implements CreateComponentType { public key: string = LineGradientSingleConfig.key - public chartConfig = omit(LineGradientSingleConfig, ['node']) + public chartConfig = omit(LineGradientSingleConfig, ['node', 'conNode']) // 图表配置项 - public option = options + public option = echartOptionProfixHandle(options, includes) } diff --git a/src/packages/components/Charts/Lines/LineGradients/config.ts b/src/packages/components/Charts/Lines/LineGradients/config.ts index b37569be..9f8a41a0 100644 --- a/src/packages/components/Charts/Lines/LineGradients/config.ts +++ b/src/packages/components/Charts/Lines/LineGradients/config.ts @@ -10,6 +10,13 @@ const option = { legend: { show: true }, + tooltip: { + show: true, + trigger: 'axis', + axisPointer: { + type: 'line' + } + }, xAxis: { show: true, type: 'category', @@ -78,7 +85,7 @@ const option = { export default class Config extends publicConfig implements CreateComponentType { public key: string = LineGradientsConfig.key - public chartConfig = omit(LineGradientsConfig, ['node']) + public chartConfig = omit(LineGradientsConfig, ['node', 'conNode']) // 图表配置项 public option = echartOptionProfixHandle(option, includes) } diff --git a/src/packages/components/Charts/Pies/PieCommon/config.ts b/src/packages/components/Charts/Pies/PieCommon/config.ts index 796fb437..b9c288fd 100644 --- a/src/packages/components/Charts/Pies/PieCommon/config.ts +++ b/src/packages/components/Charts/Pies/PieCommon/config.ts @@ -54,7 +54,7 @@ const option = { export default class Config extends publicConfig implements CreateComponentType { public key: string = PieCommonConfig.key - public chartConfig = omit(PieCommonConfig, ['node']) + public chartConfig = omit(PieCommonConfig, ['node', 'conNode']) // 图表配置项 public option = echartOptionProfixHandle(option, includes)