fix: resolve TIME_FORMAT RegExp (#3066)

Tencent · Aug 28, 2024 · c246cf5 · c246cf5
1 parent 1b6870a
commit c246cf5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 23 deletions.
diff --git a/src/_common b/src/_common
diff --git a/src/time-picker/panel/SinglePanel.tsx b/src/time-picker/panel/SinglePanel.tsx
@@ -18,15 +18,8 @@ import range from 'lodash/range';
 import useConfig from '../../hooks/useConfig';
 import noop from '../../_util/noop';
 import { useTimePickerTextConfig } from '../hooks/useTimePickerTextConfig';
-import {
-  AM,
-  PM,
-  EPickerCols,
-  TIME_FORMAT,
-  MERIDIEM_LIST,
-  TWELVE_HOUR_FORMAT,
-} from '../../_common/js/time-picker/const';
-import { closestLookup } from '../../_common/js/time-picker/utils';
+import { AM, PM, EPickerCols, MERIDIEM_LIST, TWELVE_HOUR_FORMAT } from '../../_common/js/time-picker/const';
+import { closestLookup, getPickerCols } from '../../_common/js/time-picker/utils';
 
 import { TdTimePickerProps, TimeRangePickerPartial } from '../type';
 import useDebounce from '../../hooks/useDebounce';
@@ -94,19 +87,7 @@ const SinglePanel: FC<SinglePanelProps> = (props) => {
   }, [cols]);
 
   useEffect(() => {
-    const match = format.match(TIME_FORMAT);
-    const [, startCol, hourCol, minuteCol, secondCol, milliSecondCol, endCol] = match;
-    const { meridiem, hour, minute, second, milliSecond } = EPickerCols;
-
-    const renderCol = [
-      startCol && meridiem,
-      hourCol && hour,
-      minuteCol && minute,
-      secondCol && second,
-      milliSecondCol && milliSecond,
-      endCol && meridiem,
-    ].filter((v) => !!v);
-
+    const renderCol = getPickerCols(format);
     setCols(renderCol);
   }, [format]);