From 6ca7066a9d484e602f435ce3a322dea305e41bde Mon Sep 17 00:00:00 2001 From: zoomdong <1344492820@qq.com> Date: Tue, 16 Jun 2020 13:36:05 +0800 Subject: [PATCH 1/5] feat: add icons on month and quarter --- src/panels/MonthPanel/MonthHeader.tsx | 14 +++----------- src/panels/QuarterPanel/QuarterHeader.tsx | 8 ++++++-- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/panels/MonthPanel/MonthHeader.tsx b/src/panels/MonthPanel/MonthHeader.tsx index 15571ddaa..a574f21d4 100644 --- a/src/panels/MonthPanel/MonthHeader.tsx +++ b/src/panels/MonthPanel/MonthHeader.tsx @@ -34,21 +34,13 @@ function MonthHeader(props: MonthHeaderProps) { return (
-
); diff --git a/src/panels/QuarterPanel/QuarterHeader.tsx b/src/panels/QuarterPanel/QuarterHeader.tsx index 5a288ca69..4f1be22df 100644 --- a/src/panels/QuarterPanel/QuarterHeader.tsx +++ b/src/panels/QuarterPanel/QuarterHeader.tsx @@ -31,9 +31,13 @@ function QuarterHeader(props: QuarterHeaderProps) { } const headerPrefixCls = `${prefixCls}-header`; - return ( -
+
From b73c0ab1c73915b69bef12b885948229c3b72e91 Mon Sep 17 00:00:00 2001 From: zoomdong <1344492820@qq.com> Date: Tue, 16 Jun 2020 14:14:48 +0800 Subject: [PATCH 2/5] fix: key --- src/panels/MonthPanel/MonthHeader.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panels/MonthPanel/MonthHeader.tsx b/src/panels/MonthPanel/MonthHeader.tsx index a574f21d4..93688248d 100644 --- a/src/panels/MonthPanel/MonthHeader.tsx +++ b/src/panels/MonthPanel/MonthHeader.tsx @@ -39,7 +39,7 @@ function MonthHeader(props: MonthHeaderProps) { onSuperPrev={onPrevYear} onSuperNext={onNextYear} > -
From d62bc964d736fdc88f89d1ea8de6beb169f37f8b Mon Sep 17 00:00:00 2001 From: zoomdong <1344492820@qq.com> Date: Tue, 16 Jun 2020 14:30:56 +0800 Subject: [PATCH 3/5] fix: key --- src/panels/QuarterPanel/QuarterHeader.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panels/QuarterPanel/QuarterHeader.tsx b/src/panels/QuarterPanel/QuarterHeader.tsx index 4f1be22df..ca24dbeba 100644 --- a/src/panels/QuarterPanel/QuarterHeader.tsx +++ b/src/panels/QuarterPanel/QuarterHeader.tsx @@ -38,7 +38,7 @@ function QuarterHeader(props: QuarterHeaderProps) { onSuperPrev={onPrevYear} onSuperNext={onNextYear} > -
From fa93ef111b9b6dc232697cc07007be1116399bfd Mon Sep 17 00:00:00 2001 From: zoomdong <1344492820@qq.com> Date: Tue, 16 Jun 2020 18:54:34 +0800 Subject: [PATCH 4/5] feat: delete key --- src/panels/MonthPanel/MonthHeader.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panels/MonthPanel/MonthHeader.tsx b/src/panels/MonthPanel/MonthHeader.tsx index 93688248d..58e44b77e 100644 --- a/src/panels/MonthPanel/MonthHeader.tsx +++ b/src/panels/MonthPanel/MonthHeader.tsx @@ -39,7 +39,7 @@ function MonthHeader(props: MonthHeaderProps) { onSuperPrev={onPrevYear} onSuperNext={onNextYear} > - From 213c157569ff83cb547cabaa79ce6045504cd145 Mon Sep 17 00:00:00 2001 From: zoomdong <1344492820@qq.com> Date: Tue, 16 Jun 2020 19:06:50 +0800 Subject: [PATCH 5/5] delete key --- src/panels/QuarterPanel/QuarterHeader.tsx | 2 +- src/panels/YearPanel/YearHeader.tsx | 19 +++---------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/panels/QuarterPanel/QuarterHeader.tsx b/src/panels/QuarterPanel/QuarterHeader.tsx index ca24dbeba..8c94d2e94 100644 --- a/src/panels/QuarterPanel/QuarterHeader.tsx +++ b/src/panels/QuarterPanel/QuarterHeader.tsx @@ -38,7 +38,7 @@ function QuarterHeader(props: QuarterHeaderProps) { onSuperPrev={onPrevYear} onSuperNext={onNextYear} > - diff --git a/src/panels/YearPanel/YearHeader.tsx b/src/panels/YearPanel/YearHeader.tsx index a9442a4a4..3c60aab9a 100644 --- a/src/panels/YearPanel/YearHeader.tsx +++ b/src/panels/YearPanel/YearHeader.tsx @@ -16,14 +16,7 @@ export interface YearHeaderProps { } function YearHeader(props: YearHeaderProps) { - const { - prefixCls, - generateConfig, - viewDate, - onPrevDecade, - onNextDecade, - onDecadeClick, - } = props; + const { prefixCls, generateConfig, viewDate, onPrevDecade, onNextDecade, onDecadeClick } = props; const { hideHeader } = React.useContext(PanelContext); if (hideHeader) { return null; @@ -32,8 +25,7 @@ function YearHeader(props: YearHeaderProps) { const headerPrefixCls = `${prefixCls}-header`; const yearNumber = generateConfig.getYear(viewDate); - const startYear = - Math.floor(yearNumber / YEAR_DECADE_COUNT) * YEAR_DECADE_COUNT; + const startYear = Math.floor(yearNumber / YEAR_DECADE_COUNT) * YEAR_DECADE_COUNT; const endYear = startYear + YEAR_DECADE_COUNT - 1; return ( @@ -43,12 +35,7 @@ function YearHeader(props: YearHeaderProps) { onSuperPrev={onPrevDecade} onSuperNext={onNextDecade} > -