)
@@ -781,7 +792,6 @@ export const CalendarItem = React.forwardRef<
>
diff --git a/src/packages/calendaritem/utils.ts b/src/packages/calendaritem/utils.ts
new file mode 100644
index 0000000000..9f0996d391
--- /dev/null
+++ b/src/packages/calendaritem/utils.ts
@@ -0,0 +1,177 @@
+import {
+ getNumTwoBit,
+ getMonthDays,
+ date2Str,
+ getWhatDay,
+ getMonthPreDay,
+} from '@/utils/date'
+
+// 获取当前月数据
+export const getCurrMonthData = (type: string, year: number, month: number) => {
+ if (type === 'prev') {
+ month === 1 && (year -= 1)
+ month = month === 1 ? 12 : --month
+ } else if (type === 'next') {
+ month === 12 && (year += 1)
+ month = month === 12 ? 1 : ++month
+ }
+ return [year, getNumTwoBit(month), getMonthDays(String(year), String(month))]
+}
+
+// 获取日期状态
+export const getDaysStatus = (type: string, year: number, month: number) => {
+ let days = getMonthDays(`${year}`, `${month}`)
+ // 修复：当某个月的1号是周日时，月份下方会空出来一行
+ if (type === 'prev' && days >= 7) {
+ days -= 7
+ }
+ return Array.from(Array(days), (v, k) => {
+ return {
+ day: k + 1,
+ type,
+ year,
+ month,
+ }
+ })
+}
+
+// 获取上一个月的最后一周天数，填充当月空白
+export const getPreMonthDates = (
+ type: string,
+ year: number,
+ month: number,
+ firstDayOfWeek: number
+) => {
+ let preMonth = +month - 1
+ let preYear = year
+ if (preMonth <= 0) {
+ preMonth = 12
+ preYear += 1
+ }
+ let days = getMonthPreDay(+year, +month)
+ days -= firstDayOfWeek
+ // 修复：当某个月的1号是周日时，月份下方会空出来一行
+ if (type === 'prev' && days >= 7) {
+ days -= 7
+ }
+
+ const preDates = getMonthDays(`${preYear}`, `${preMonth}`)
+ const months = Array.from(Array(preDates), (v, k) => {
+ return {
+ day: k + 1,
+ type,
+ preYear,
+ preMonth,
+ }
+ })
+ return months.slice(preDates - days)
+}
+
+export const getWeekDate = (
+ year: string,
+ month: string,
+ date: string,
+ firstDayOfWeek = 0
+): string[] => {
+ const dateNow = new Date(Number(year), parseInt(month) - 1, Number(date))
+ const nowTime = dateNow.getTime()
+ let day = dateNow.getDay()
+ if (firstDayOfWeek === 0) {
+ const oneDayTime = 24 * 60 * 60 * 1000
+ // 显示周日
+ const SundayTime = nowTime - day * oneDayTime // 本周的周日
+ // 显示周六
+ const SaturdayTime = nowTime + (6 - day) * oneDayTime // 本周的周六
+ const sunday = date2Str(new Date(SundayTime))
+ const saturday = date2Str(new Date(SaturdayTime))
+ return [sunday, saturday]
+ }
+ day = day === 0 ? 7 : day
+ const oneDayTime = 24 * 60 * 60 * 1000
+ // 显示周一
+ const MondayTime = nowTime - (day - 1) * oneDayTime // 本周的周一
+ // 显示周日
+ const SundayTime = nowTime + (7 - day) * oneDayTime // 本周的周日
+ const monday = date2Str(new Date(MondayTime))
+ const sunday = date2Str(new Date(SundayTime))
+ return [monday, sunday]
+}
+
+export const formatResultDate = (date: string) => {
+ const [year, month, day] = [...date.split('-')]
+ const formatterDay = getNumTwoBit(Number(day))
+ const formatterDate = `${year}-${month}-${day}`
+ const dayOfWeek = getWhatDay(Number(year), Number(month), Number(day))
+ return [year, month, formatterDay, formatterDate, dayOfWeek]
+}
+
+// 获取某一天所在的周，按国标 8601 处理。第一周至少包含4天。
+export const getWeekOfYearByYMD = (
+ year: number,
+ month: number, // 自然月
+ date: number,
+ firstDayOfWeek = 0
+): number => {
+ // 一天的秒
+ const MILLISECONDS_PER_DAY = 86400000
+
+ const dateNow = new Date(year, month - 1, date)
+ // 一年内第一天
+ const dateFirst = new Date(year, 0, 1)
+ // 一年内第几天
+ const dayOfYear = Math.round(
+ (dateNow.valueOf() - dateFirst.valueOf()) / MILLISECONDS_PER_DAY
+ )
+
+ // ISO 8601 标准：第一个星期至少包含 4 天
+ // 同时，需要兼顾 firstDayOfWeek 一起判断
+ const DAYS_OF_FIRST_WEEK = 3
+ let dayOfWeek = dateNow.getDay()
+ let remainder = 6 - dayOfWeek - DAYS_OF_FIRST_WEEK
+ if (firstDayOfWeek !== 0) {
+ dayOfWeek = dayOfWeek === 0 ? 7 : dayOfWeek // 周日转化为 7
+ remainder = 7 - dayOfWeek - DAYS_OF_FIRST_WEEK
+ }
+
+ // 周号可以出现0，标识当前1月1日不在本年度的第一周，为上一年的最后一周。
+ let weekNo = Math.ceil((dayOfYear + remainder + 1) / 7)
+ // 需要处理第一周为0的的情况，需延续上一年的周数，上一年有可能是53或52。
+ // 需要判断最后一周为53的情况，因为一年至少有52周，但是会有53周的情况，这时需要判断：
+ // 如果最后一周少于4天，则为下一年的第一周。
+ if (weekNo === 0) {
+ // 测试：2010/2011/2012/2017/2023/
+ weekNo = getWeekOfYearByYMD(year - 1, 12, 31, firstDayOfWeek)
+ } else if (weekNo === 53) {
+ // 测试：2024/2021
+ const remainder2 = 7 - dayOfWeek - DAYS_OF_FIRST_WEEK
+ weekNo = remainder2 > 0 ? 1 : weekNo
+ }
+
+ return weekNo
+}
+
+export const getWeekNosOfYear = (
+ year: number,
+ month: number,
+ firstDayOfWeek: number
+) => {
+ const startWeekNo = getWeekOfYearByYMD(year, month, 1, firstDayOfWeek)
+ const endWeekNo = getWeekOfYearByYMD(
+ year,
+ month,
+ getMonthDays(`${year}`, `${month}`),
+ firstDayOfWeek
+ )
+ return Array.from(
+ {
+ length:
+ (endWeekNo === 1 ? 53 : endWeekNo) -
+ (startWeekNo === 53 || startWeekNo === 52 ? 0 : startWeekNo) +
+ 1,
+ },
+ (_, i) => {
+ const lastIndex = (endWeekNo === 1 ? 53 : endWeekNo) - startWeekNo
+ return `${endWeekNo === 1 && i === lastIndex ? 1 : ((startWeekNo === 53 || startWeekNo === 52) && i !== 0 ? 0 : startWeekNo) + i}`
+ }
+ )
+}
diff --git a/src/packages/configprovider/types.ts b/src/packages/configprovider/types.ts
index 7afac92431..f80e2c26f4 100644
--- a/src/packages/configprovider/types.ts
+++ b/src/packages/configprovider/types.ts
@@ -317,6 +317,7 @@ export type NutCSSVariables =
| 'nutuiCalendarDayHeight'
| 'nutuiCalendarDayFontWeight'
| 'nutuiCalendarDayActiveBorderRadius'
+ | 'nutuiCalendarPanelItemWidth'
| 'nutuiOverlayBgColor'
| 'nutuiOverlayZIndex'
| 'nutuiOverlayContentBgColor'
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index e8964178fd..84e5ae1574 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -944,6 +944,10 @@ $calendar-day-active-border-radius: var(
--nutui-calendar-day-active-border-radius,
4px
) !default;
+$calendar-panel-item-width: var(
+ --nutui-calendar-panel-item-width,
+ 24.85%
+) !default;
//overlay（✅）
$overlay-bg-color: var(--nutui-overlay-bg-color, $color-mask) !default;
diff --git a/src/utils/date.ts b/src/utils/date.ts
index c594246240..1993104fe8 100644
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@@ -117,130 +117,3 @@ export const isEqual = (date1: string, date2: string): boolean => {
const endTime = new Date(date2.replace(/-/g, '/')).getTime()
return startTime === endTime
}
-
-export const getMonthWeek = (
- year: number,
- month: number,
- date: number,
- firstDayOfWeek = 0
-): number => {
- const dateNow = new Date(year, month - 1, date)
- let w = dateNow.getDay() // 星期数
- let remainder = 6 - w
- if (firstDayOfWeek !== 0) {
- w = w === 0 ? 7 : w
- remainder = 7 - w
- }
- return Math.ceil((date + remainder) / 7)
-}
-export const getYearWeek = (
- year: number,
- month: number,
- date: number,
- firstDayOfWeek = 0
-): number => {
- const dateNow = new Date(year, month - 1, date)
- const dateFirst = new Date(year, 0, 1)
- const dataNumber = Math.round(
- (dateNow.valueOf() - dateFirst.valueOf()) / 86400000
- )
- return Math.ceil((dataNumber + (dateFirst.getDay() + 1 - 1)) / 7)
-}
-export const getWeekDate = (
- year: string,
- month: string,
- date: string,
- firstDayOfWeek = 0
-): string[] => {
- const dateNow = new Date(Number(year), parseInt(month) - 1, Number(date))
- const nowTime = dateNow.getTime()
- let day = dateNow.getDay()
- if (firstDayOfWeek === 0) {
- const oneDayTime = 24 * 60 * 60 * 1000
- // 显示周日
- const SundayTime = nowTime - day * oneDayTime // 本周的周日
- // 显示周六
- const SaturdayTime = nowTime + (6 - day) * oneDayTime // 本周的周六
- const sunday = date2Str(new Date(SundayTime))
- const saturday = date2Str(new Date(SaturdayTime))
- return [sunday, saturday]
- }
- day = day === 0 ? 7 : day
- const oneDayTime = 24 * 60 * 60 * 1000
- // 显示周一
- const MondayTime = nowTime - (day - 1) * oneDayTime // 本周的周一
- // 显示周日
- const SundayTime = nowTime + (7 - day) * oneDayTime // 本周的周日
- const monday = date2Str(new Date(MondayTime))
- const sunday = date2Str(new Date(SundayTime))
- return [monday, sunday]
-}
-
-export const formatResultDate = (date: string) => {
- const [year, month, day] = [...date.split('-')]
- const formatterDay = getNumTwoBit(Number(day))
- const formatterDate = `${year}-${month}-${day}`
- const dayOfWeek = getWhatDay(Number(year), Number(month), Number(day))
- return [year, month, formatterDay, formatterDate, dayOfWeek]
-}
-
-// 获取当前月数据
-export const getCurrMonthData = (type: string, year: number, month: number) => {
- if (type === 'prev') {
- month === 1 && (year -= 1)
- month = month === 1 ? 12 : --month
- } else if (type === 'next') {
- month === 12 && (year += 1)
- month = month === 12 ? 1 : ++month
- }
- return [year, getNumTwoBit(month), getMonthDays(String(year), String(month))]
-}
-
-// 获取日期状态
-export const getDaysStatus = (type: string, year: number, month: number) => {
- let days = getMonthDays(`${year}`, `${month}`)
- // 修复：当某个月的1号是周日时，月份下方会空出来一行
- if (type === 'prev' && days >= 7) {
- days -= 7
- }
- return Array.from(Array(days), (v, k) => {
- return {
- day: k + 1,
- type,
- year,
- month,
- }
- })
-}
-
-// 获取上一个月的最后一周天数，填充当月空白
-export const getPreMonthDates = (
- type: string,
- year: number,
- month: number,
- firstDayOfWeek: number
-) => {
- let preMonth = +month - 1
- let preYear = year
- if (preMonth <= 0) {
- preMonth = 12
- preYear += 1
- }
- let days = getMonthPreDay(+year, +month)
- days -= firstDayOfWeek
- // 修复：当某个月的1号是周日时，月份下方会空出来一行
- if (type === 'prev' && days >= 7) {
- days -= 7
- }
-
- const preDates = getMonthDays(`${preYear}`, `${preMonth}`)
- const months = Array.from(Array(preDates), (v, k) => {
- return {
- day: k + 1,
- type,
- preYear,
- preMonth,
- }
- })
- return months.slice(preDates - days)
-}