Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(TimePicker): use 12 hours, disable hour not add 12, check meridiem only support en #3326

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

fix(TimePicker): use 12 hours, disable hour not add 12, check meridiem only support en #3326

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8eab666
fix(TimePicker): fixed only support hh:mm format
myronliu347 Aug 26, 2024
0fa8d0a
Merge branch 'Tencent:develop' into develop
myronliu347 Aug 27, 2024
c44f9db
fix(TimePicker): disabled position only is start
myronliu347 Aug 27, 2024
325df20
Merge branch 'Tencent:develop' into develop
myronliu347 Aug 28, 2024
d2a211e
Merge branch 'Tencent:develop' into develop
myronliu347 Sep 5, 2024
d5baa7d
fix(Upload): fixed vue error on uploadPastedFiles is false
myronliu347 Sep 5, 2024
978a159
Merge branch 'Tencent:develop' into develop
myronliu347 Sep 7, 2024
3eda9c3
docs: add readonly in api
myronliu347 Sep 11, 2024
08828c5
Merge branch 'Tencent:develop' into develop
myronliu347 Sep 12, 2024
0d6ccb4
fix(TimePicker): use 12 hours, disable hour not add 12, check meridie…
myronliu347 Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions src/time-picker/panel/single-panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,15 @@ export default defineComponent({
dayjsValue.value.minute(),
dayjsValue.value.second(),
];
params[colIdx] = Number(el);
return !props.disableTime?.(...params, { partial: position.value || 'start' })?.[col]?.includes(Number(el));

let n = Number(el);

if (col === EPickerCols.hour && TWELVE_HOUR_FORMAT.test(props.format) && dayjsValue.value.hour() >= 12) {
n += 12;
}

params[colIdx] = n;
return !props.disableTime?.(...params, { partial: position.value || 'start' })?.[col]?.includes(n);
}
return true;
};
Expand Down Expand Up @@ -133,10 +140,14 @@ export default defineComponent({
dayjsValue.value.second(),
dayjsValue.value.millisecond(),
];
params[colIdx] = Number(t);
return !props
.disableTime?.(...params, { partial: position.value || 'start' })
?.[col]?.includes(Number(t));
let n = Number(t);

if (col === EPickerCols.hour && TWELVE_HOUR_FORMAT.test(props.format) && dayjsValue.value.hour() >= 12) {
n += 12;
}

params[colIdx] = n;
return !props.disableTime?.(...params, { partial: position.value || 'start' })?.[col]?.includes(n);
})
: colList;
}
Expand Down Expand Up @@ -242,11 +253,7 @@ export default defineComponent({
const handleTimeItemClick = (col: EPickerCols, el: string | number, idx: number, e: MouseEvent) => {
if (!timeItemCanUsed(col, el)) return;
if (timeArr.includes(col)) {
if (
col === EPickerCols.hour
&& dayjsValue.value.format('a') === PM
&& cols.value.includes(EPickerCols.meridiem)
) {
if (col === EPickerCols.hour && dayjsValue.value.hour() >= 12 && cols.value.includes(EPickerCols.meridiem)) {
// eslint-disable-next-line no-param-reassign
el = Number(el) + 12;
}
Expand All @@ -272,7 +279,7 @@ export default defineComponent({
// 如果没有设置大于1的steps或设置了大于1的step 正常处理滚动
scrollToTime(
col,
timeArr.includes(col) ? dayjsValue.value[col]?.() : dayjsValue.value.format('a'),
timeArr.includes(col) ? dayjsValue.value[col]?.() : dayjsValue.value.locale('en').format('a'),
idx,
behavior,
);
Expand All @@ -289,7 +296,7 @@ export default defineComponent({
const isCurrent = (col: EPickerCols, colItem: string | number) => {
let colVal: number;
if (col === EPickerCols.meridiem) {
const currentMeridiem = dayjsValue.value.format('a');
const currentMeridiem = dayjsValue.value.locale('en').format('a');
return currentMeridiem === colItem;
}
colVal = dayjsValue.value[col]?.();
Expand Down
Loading