From e46dfba116c577f1834346e702d625be03eb7dc6 Mon Sep 17 00:00:00 2001 From: dingxs Date: Tue, 9 May 2023 11:47:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D[=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E6=89=80=E9=80=89=E6=97=B6=E9=97=B4=E8=8C=83?= =?UTF-8?q?=E5=9B=B4]Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Informations/Inputs/InputsDate/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/packages/components/Informations/Inputs/InputsDate/index.vue b/src/packages/components/Informations/Inputs/InputsDate/index.vue index 506d03a8..b9e0caa8 100644 --- a/src/packages/components/Informations/Inputs/InputsDate/index.vue +++ b/src/packages/components/Informations/Inputs/InputsDate/index.vue @@ -39,8 +39,8 @@ const onChange = (v: number | number[]) => { props.chartConfig, useChartEditStore, { - [ComponentInteractParamsEnum.DATE_START]: v[0] | dayjs().valueOf(), - [ComponentInteractParamsEnum.DATE_END]: v[1] | dayjs().valueOf(), + [ComponentInteractParamsEnum.DATE_START]: v[0], + [ComponentInteractParamsEnum.DATE_END]: v[1], [ComponentInteractParamsEnum.DATE_RANGE]: `${v[0]}-${v[1]}` }, InteractEventOn.CHANGE From e3a2ba8817ccafff0374d0627c200121712a27c8 Mon Sep 17 00:00:00 2001 From: dingxs Date: Mon, 15 May 2023 10:30:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=E6=8A=98=E7=BA=BF=E5=9B=BE=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=B9=B3=E6=BB=91=E6=9B=B2=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/components/Charts/Lines/LineCommon/config.ts | 1 + src/packages/components/Charts/Lines/LineCommon/config.vue | 6 ++++++ .../components/Charts/Lines/LineGradientSingle/config.ts | 1 + .../components/Charts/Lines/LineGradientSingle/config.vue | 6 ++++++ .../components/Charts/Lines/LineGradients/config.vue | 6 ++++++ .../components/Charts/Lines/LineLinearSingle/config.ts | 1 + .../components/Charts/Lines/LineLinearSingle/config.vue | 6 ++++++ 7 files changed, 27 insertions(+) diff --git a/src/packages/components/Charts/Lines/LineCommon/config.ts b/src/packages/components/Charts/Lines/LineCommon/config.ts index c6c07610..344f4720 100644 --- a/src/packages/components/Charts/Lines/LineCommon/config.ts +++ b/src/packages/components/Charts/Lines/LineCommon/config.ts @@ -7,6 +7,7 @@ import dataJson from './data.json' export const includes = ['legend', 'xAxis', 'yAxis', 'grid'] export const seriesItem = { type: 'line', + smooth: false, label: { show: true, position: 'top', diff --git a/src/packages/components/Charts/Lines/LineCommon/config.vue b/src/packages/components/Charts/Lines/LineCommon/config.vue index 0b15d2a4..4e22e2ab 100644 --- a/src/packages/components/Charts/Lines/LineCommon/config.vue +++ b/src/packages/components/Charts/Lines/LineCommon/config.vue @@ -15,6 +15,12 @@ + + + + 平滑曲线 + + diff --git a/src/packages/components/Charts/Lines/LineGradientSingle/config.ts b/src/packages/components/Charts/Lines/LineGradientSingle/config.ts index 592b704d..1cb213d3 100644 --- a/src/packages/components/Charts/Lines/LineGradientSingle/config.ts +++ b/src/packages/components/Charts/Lines/LineGradientSingle/config.ts @@ -11,6 +11,7 @@ export const includes = ['legend', 'xAxis', 'yAxis', 'grid'] const options = { tooltip: { show: true, + smooth: false, trigger: 'axis', axisPointer: { type: 'line' diff --git a/src/packages/components/Charts/Lines/LineGradientSingle/config.vue b/src/packages/components/Charts/Lines/LineGradientSingle/config.vue index 60250083..f27af1ae 100644 --- a/src/packages/components/Charts/Lines/LineGradientSingle/config.vue +++ b/src/packages/components/Charts/Lines/LineGradientSingle/config.vue @@ -15,6 +15,12 @@ + + + + 平滑曲线 + + diff --git a/src/packages/components/Charts/Lines/LineGradients/config.vue b/src/packages/components/Charts/Lines/LineGradients/config.vue index 3b332664..77f0635d 100644 --- a/src/packages/components/Charts/Lines/LineGradients/config.vue +++ b/src/packages/components/Charts/Lines/LineGradients/config.vue @@ -23,6 +23,12 @@ :options="lineConf.lineStyle.type" > + + + + 平滑曲线 + + diff --git a/src/packages/components/Charts/Lines/LineLinearSingle/config.ts b/src/packages/components/Charts/Lines/LineLinearSingle/config.ts index abcb2a31..fdc16a01 100644 --- a/src/packages/components/Charts/Lines/LineLinearSingle/config.ts +++ b/src/packages/components/Charts/Lines/LineLinearSingle/config.ts @@ -27,6 +27,7 @@ export const option = { series: [ { type: 'line', + smooth: true, symbolSize: 5, //设定实心点的大小 lineStyle: { type: 'solid', diff --git a/src/packages/components/Charts/Lines/LineLinearSingle/config.vue b/src/packages/components/Charts/Lines/LineLinearSingle/config.vue index b1b841a7..1bc7ec02 100644 --- a/src/packages/components/Charts/Lines/LineLinearSingle/config.vue +++ b/src/packages/components/Charts/Lines/LineLinearSingle/config.vue @@ -38,6 +38,12 @@ :options="lineConf.lineStyle.type" > + + + + 平滑曲线 + + From 6e8c4dc793a812aa355b705c917ad2b1d4aea2b5 Mon Sep 17 00:00:00 2001 From: dingxs Date: Mon, 15 May 2023 11:07:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D[=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E6=89=80=E9=80=89=E6=97=B6=E9=97=B4=E8=8C=83?= =?UTF-8?q?=E5=9B=B4]Bug=E5=B9=B6=E4=B8=94=E8=AE=BE=E7=BD=AE=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Informations/Inputs/InputsDate/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/packages/components/Informations/Inputs/InputsDate/index.vue b/src/packages/components/Informations/Inputs/InputsDate/index.vue index b9e0caa8..8d6ee6bf 100644 --- a/src/packages/components/Informations/Inputs/InputsDate/index.vue +++ b/src/packages/components/Informations/Inputs/InputsDate/index.vue @@ -39,9 +39,9 @@ const onChange = (v: number | number[]) => { props.chartConfig, useChartEditStore, { - [ComponentInteractParamsEnum.DATE_START]: v[0], - [ComponentInteractParamsEnum.DATE_END]: v[1], - [ComponentInteractParamsEnum.DATE_RANGE]: `${v[0]}-${v[1]}` + [ComponentInteractParamsEnum.DATE_START]: v[0] || dayjs().valueOf(), + [ComponentInteractParamsEnum.DATE_END]: v[1] || dayjs().valueOf(), + [ComponentInteractParamsEnum.DATE_RANGE]: `${v[0] || dayjs().valueOf() }-${v[1] || dayjs().valueOf()}` }, InteractEventOn.CHANGE ) @@ -50,7 +50,7 @@ const onChange = (v: number | number[]) => { useChartInteract( props.chartConfig, useChartEditStore, - { [ComponentInteractParamsEnum.DATE]: v }, + { [ComponentInteractParamsEnum.DATE]: v || dayjs().valueOf() }, InteractEventOn.CHANGE ) } From 8a01789e9d175af9b6381b3e00712637af8f487f Mon Sep 17 00:00:00 2001 From: dingxs Date: Mon, 15 May 2023 11:29:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E6=98=AF=E5=90=A6=E6=9B=B2=E7=BA=BF?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BAfalse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/components/Charts/Lines/LineLinearSingle/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/components/Charts/Lines/LineLinearSingle/config.ts b/src/packages/components/Charts/Lines/LineLinearSingle/config.ts index fdc16a01..8814e796 100644 --- a/src/packages/components/Charts/Lines/LineLinearSingle/config.ts +++ b/src/packages/components/Charts/Lines/LineLinearSingle/config.ts @@ -27,7 +27,7 @@ export const option = { series: [ { type: 'line', - smooth: true, + smooth: false, symbolSize: 5, //设定实心点的大小 lineStyle: { type: 'solid',