fix: 修复空字符串页面崩溃问题 (#1418)

Tencent · Sep 3, 2022 · 23d0e74 · 23d0e74
1 parent a2ee644
commit 23d0e74
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 204 deletions.
diff --git a/src/date-picker/DatePicker.tsx b/src/date-picker/DatePicker.tsx
@@ -7,7 +7,7 @@ import { TdDatePickerProps } from './type';
 import SelectInput from '../select-input';
 import SinglePanel from './panel/SinglePanel';
 import useSingle from './hooks/useSingle';
-import { parseToDayjs, getDefaultFormat, formatTime, formatDate } from './hooks/useFormat';
+import { parseToDayjs, getDefaultFormat, formatTime, formatDate } from '../_common/js/date-picker/format';
 import { subtractMonth, addMonth, extractTimeObj } from '../_common/js/date-picker/utils';
 import { datePickerDefaultProps } from './defaultProps';
 

diff --git a/src/date-picker/DatePickerPanel.tsx b/src/date-picker/DatePickerPanel.tsx
@@ -4,7 +4,7 @@ import { StyledProps } from '../common';
 import { TdDatePickerPanelProps, DateValue, DatePickerYearChangeTrigger, DatePickerMonthChangeTrigger } from './type';
 import SinglePanel from './panel/SinglePanel';
 import useSingleValue from './hooks/useSingleValue';
-import { formatDate, getDefaultFormat } from './hooks/useFormat';
+import { formatDate, getDefaultFormat } from '../_common/js/date-picker/format';
 import { subtractMonth, addMonth, extractTimeObj } from '../_common/js/date-picker/utils';
 
 export interface DatePickerPanelProps extends TdDatePickerPanelProps, StyledProps {}

diff --git a/src/date-picker/DateRangePicker.tsx b/src/date-picker/DateRangePicker.tsx
@@ -8,7 +8,7 @@ import { RangeInputPopup } from '../range-input';
 import RangePanel from './panel/RangePanel';
 import useRange from './hooks/useRange';
 import { initYearMonthTime } from './hooks/useRangeValue';
-import { parseToDayjs, formatTime, formatDate, isValidDate, getDefaultFormat } from './hooks/useFormat';
+import { parseToDayjs, formatTime, formatDate, isValidDate, getDefaultFormat } from '../_common/js/date-picker/format';
 import { subtractMonth, addMonth, extractTimeObj } from '../_common/js/date-picker/utils';
 import { dateRangePickerDefaultProps } from './defaultProps';
 import log from '../_common/js/log';

diff --git a/src/date-picker/DateRangePickerPanel.tsx b/src/date-picker/DateRangePickerPanel.tsx
@@ -9,7 +9,7 @@ import {
 } from './type';
 import RangePanel from './panel/RangePanel';
 import useRangeValue from './hooks/useRangeValue';
-import { formatDate, getDefaultFormat } from './hooks/useFormat';
+import { formatDate, getDefaultFormat } from '../_common/js/date-picker/format';
 import { subtractMonth, addMonth, extractTimeObj } from '../_common/js/date-picker/utils';
 import log from '../_common/js/log';
 
@@ -74,7 +74,7 @@ const DateRangePickerPanel = forwardRef<HTMLDivElement, DateRangePickerPanelProp
 
   // 日期点击
   function onCellClick(date: Date, { e, partial }) {
-    props.onCellClick?.({ date: value.map((v) => dayjs(v).toDate()), e, partial });
+    props.onCellClick?.({ date: value.map((v) => dayjs(v).toDate()), e, partial: activeIndex ? 'end' : 'start' });
 
     setIsSelected(true);
 

diff --git a/src/date-picker/base/Table.tsx b/src/date-picker/base/Table.tsx
@@ -6,7 +6,7 @@ import DatePickerCell from './Cell';
 import { TdDatePickerProps } from '../type';
 import { SinglePanelProps } from '../panel/SinglePanel';
 import { PanelContentProps } from '../panel/PanelContent';
-import { parseToDayjs } from '../hooks/useFormat';
+import { parseToDayjs } from '../../_common/js/date-picker/format';
 
 export interface DatePickerTableProps
   extends Pick<TdDatePickerProps, 'mode' | 'firstDayOfWeek' | 'format'>,

diff --git a/src/date-picker/hooks/useFormat.ts b/src/date-picker/hooks/useFormat.ts
diff --git a/src/date-picker/hooks/useRange.tsx b/src/date-picker/hooks/useRange.tsx
@@ -6,7 +6,7 @@ import useConfig from '../../hooks/useConfig';
 import useGlobalIcon from '../../hooks/useGlobalIcon';
 import { RangeInputRefInterface } from '../../range-input';
 import { TdDateRangePickerProps, DateValue } from '../type';
-import { isValidDate, formatDate, getDefaultFormat } from './useFormat';
+import { isValidDate, formatDate, getDefaultFormat } from '../../_common/js/date-picker/format';
 import useRangeValue from './useRangeValue';
 
 export const PARTIAL_MAP = { first: 'start', second: 'end' };

diff --git a/src/date-picker/hooks/useRangeValue.ts b/src/date-picker/hooks/useRangeValue.ts
@@ -2,7 +2,13 @@ import { useState, useEffect } from 'react';
 import dayjs from 'dayjs';
 import useControlled from '../../hooks/useControlled';
 import { TdDateRangePickerProps, DateRangeValue } from '../type';
-import { isValidDate, formatDate, formatTime, getDefaultFormat, parseToDayjs } from './useFormat';
+import {
+  isValidDate,
+  formatDate,
+  formatTime,
+  getDefaultFormat,
+  parseToDayjs,
+} from '../../_common/js/date-picker/format';
 import { extractTimeFormat } from '../../_common/js/date-picker/utils';
 import log from '../../_common/js/log';
 

diff --git a/src/date-picker/hooks/useSingle.tsx b/src/date-picker/hooks/useSingle.tsx
@@ -5,7 +5,7 @@ import classNames from 'classnames';
 import useConfig from '../../hooks/useConfig';
 import useGlobalIcon from '../../hooks/useGlobalIcon';
 import { TdDatePickerProps } from '../type';
-import { isValidDate, formatDate, formatTime, getDefaultFormat } from './useFormat';
+import { isValidDate, formatDate, formatTime, getDefaultFormat } from '../../_common/js/date-picker/format';
 import useSingleValue from './useSingleValue';
 
 export default function useSingleInput(props: TdDatePickerProps) {

diff --git a/src/date-picker/hooks/useSingleValue.tsx b/src/date-picker/hooks/useSingleValue.tsx
@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react';
 import dayjs from 'dayjs';
-import { formatDate, formatTime, isValidDate, getDefaultFormat } from './useFormat';
+import { formatDate, formatTime, isValidDate, getDefaultFormat } from '../../_common/js/date-picker/format';
 import useControlled from '../../hooks/useControlled';
 import { TdDatePickerProps } from '../type';
 import { extractTimeFormat } from '../../_common/js/date-picker/utils';

diff --git a/src/date-picker/panel/PanelContent.tsx b/src/date-picker/panel/PanelContent.tsx
@@ -5,7 +5,7 @@ import { TimePickerPanel } from '../../time-picker';
 import type { SinglePanelProps } from './SinglePanel';
 import type { RangePanelProps } from './RangePanel';
 import useConfig from '../../hooks/useConfig';
-import { getDefaultFormat } from '../hooks/useFormat';
+import { getDefaultFormat } from '../../_common/js/date-picker/format';
 
 export interface PanelContentProps {
   partial?: 'start' | 'end';

diff --git a/src/date-picker/panel/RangePanel.tsx b/src/date-picker/panel/RangePanel.tsx
@@ -6,7 +6,7 @@ import PanelContent from './PanelContent';
 import ExtraContent from './ExtraContent';
 import { TdDateRangePickerProps, DateValue } from '../type';
 import type { TdTimePickerProps } from '../../time-picker';
-import { getDefaultFormat, parseToDayjs } from '../hooks/useFormat';
+import { getDefaultFormat, parseToDayjs } from '../../_common/js/date-picker/format';
 import useTableData from '../hooks/useTableData';
 import useDisableDate from '../hooks/useDisableDate';
 

diff --git a/src/date-picker/panel/SinglePanel.tsx b/src/date-picker/panel/SinglePanel.tsx
@@ -6,7 +6,7 @@ import PanelContent from './PanelContent';
 import ExtraContent from './ExtraContent';
 import { TdDatePickerProps, DateValue } from '../type';
 import type { TdTimePickerProps } from '../../time-picker';
-import { getDefaultFormat, parseToDayjs } from '../hooks/useFormat';
+import { getDefaultFormat, parseToDayjs } from '../../_common/js/date-picker/format';
 import useTableData from '../hooks/useTableData';
 import useDisableDate from '../hooks/useDisableDate';