Skip to content

Commit

Permalink
fix(DatePicker): fix boundary week format bug (#3336)
Browse files Browse the repository at this point in the history
* docs: fix datepicker week firstdayofweek usage demo

* fix(DatePicker): fix week calculate bug
  • Loading branch information
uyarn committed Sep 24, 2024
1 parent 4c8c54c commit 5733d8e
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/_common
Submodule _common updated 60 files
+27 −27 .github/workflows/pull-request.yml
+2 −2 .vscode/settings.json
+47 −0 docs/mobile/api/checkbox.en-US.md
+26 −14 docs/mobile/api/checkbox.md
+12 −0 docs/mobile/api/drawer.md
+23 −0 docs/mobile/api/empty.en-US.md
+23 −0 docs/mobile/api/empty.md
+17 −0 docs/mobile/api/indexes.en-US.md
+6 −0 docs/mobile/api/indexes.md
+19 −0 docs/mobile/api/popover.en-US.md
+19 −0 docs/mobile/api/popover.md
+15 −0 docs/mobile/api/pull-down-refresh.en-US.md
+3 −11 docs/mobile/api/pull-down-refresh.md
+35 −0 docs/mobile/api/radio.en-US.md
+23 −5 docs/mobile/api/radio.md
+35 −0 docs/mobile/api/stepper.en-US.md
+16 −10 docs/mobile/api/stepper.md
+33 −0 docs/mobile/api/swipe-cell.en-US.md
+9 −29 docs/mobile/api/swipe-cell.md
+28 −0 docs/mobile/api/switch.en-US.md
+7 −3 docs/mobile/api/switch.md
+39 −0 docs/mobile/api/tabs.en-US.md
+15 −17 docs/mobile/api/tabs.md
+25 −0 docs/mobile/api/tree-select.en-US.md
+25 −0 docs/mobile/api/tree-select.md
+37 −0 docs/mobile/api_v2/config-provider.en-US.md
+92 −0 docs/mobile/api_v2/config-provider.md
+12 −0 docs/mobile/api_v2/drawer.en-US.md
+12 −0 docs/mobile/api_v2/drawer.md
+1 −1 docs/mobile/api_v2/indexes.en-US.md
+4 −0 docs/mobile/api_v2/picker.en-US.md
+4 −0 docs/mobile/api_v2/picker.md
+1 −1 docs/web/api/popup.md
+1 −0 js/avatar/utils.ts
+4 −4 js/color-picker/color.ts
+2 −2 js/date-picker/format.ts
+3 −3 js/date-picker/utils.ts
+72 −16 js/input-number/large-number.ts
+6 −1 js/input-number/number.ts
+3 −2 style/mobile/_variables.less
+32 −10 style/mobile/components/_index.less
+16 −12 style/mobile/components/avatar/v2/_index.less
+9 −0 style/mobile/components/avatar/v2/_mixin.less
+11 −8 style/mobile/components/avatar/v2/_var.less
+1 −71 style/mobile/components/button/v2/_index.less
+1 −16 style/mobile/components/button/v2/_var.less
+1 −1 style/mobile/components/picker/v2/_index.less
+24 −14 style/mobile/components/radio/v2/_index.less
+5 −0 style/mobile/components/radio/v2/_mixin.less
+1 −1 style/mobile/components/result/v2/_var.less
+1 −1 style/mobile/components/swipe-cell/v2/_index.less
+1 −1 style/mobile/components/toast/v2/_index.less
+1 −1 style/mobile/package.json
+37 −0 style/mobile/theme/_font.less
+2 −0 style/mobile/theme/_index.less
+6 −0 style/web/components/dialog/_index.less
+1 −1 style/web/components/switch/_index.less
+20 −0 test/unit/date-picker/utils.test.js
+41 −0 test/unit/input-number/formatDecimal.test.js
+23 −6 test/unit/input-number/largeNumberToFixed.test.js
19 changes: 17 additions & 2 deletions src/date-picker/_example-composition/week.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
<template>
<t-space direction="vertical">
<t-date-picker mode="week" clearable allow-input />
<t-date-range-picker mode="week" clearable allow-input />
<t-date-picker mode="week" clearable allow-input :first-day-of-week="weekStart" />

<t-date-range-picker mode="week" clearable allow-input :first-day-of-week="weekStart" />
</t-space>
</template>
<script setup>
// 如果配合 firstDayOfWeek API 使用,请使用 dayjs 同步修改 weekStart,否则部分日期选择会用异常
import { ref } from 'vue';
import dayjs from 'dayjs';
import updateLocale from 'dayjs/plugin/updateLocale';
dayjs.extend(updateLocale);
dayjs.updateLocale('zh-cn', {
weekStart: 2,
});
const weekStart = ref(2);
</script>
24 changes: 22 additions & 2 deletions src/date-picker/_example/week.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
<template>
<t-space direction="vertical">
<t-date-picker mode="week" clearable allow-input />
<t-date-range-picker mode="week" clearable allow-input />
<t-date-picker mode="week" clearable allow-input :first-day-of-week="weekStart" />

<t-date-range-picker mode="week" clearable allow-input :first-day-of-week="weekStart" />
</t-space>
</template>
<script>
// 如果配合 firstDayOfWeek API 使用,请使用 dayjs 同步修改 weekStart,否则部分日期选择会用异常
import dayjs from 'dayjs';
import updateLocale from 'dayjs/plugin/updateLocale';
dayjs.extend(updateLocale);
dayjs.updateLocale('zh-cn', {
weekStart: 2,
});
export default {
data() {
return {
weekStart: 2,
};
},
};
</script>

0 comments on commit 5733d8e

Please sign in to comment.