refactor: calendar

src/packages/calendar/calendar.scss

@@ -190,18 +190,18 @@
       }
     }
 
-    &-choose-disabled {
-      background-color: $calendar-choose-disable-background-color;
-      color: $calendar-disable-color !important;
-
-      .nut-calendar-day-info-curr {
-        display: none;
-      }
-    }
-
     &-choose {
       background-color: $calendar-choose-background-color;
       color: $calendar-choose-color;
+
+      &-disabled {
+        background-color: $calendar-choose-disable-background-color;
+        color: $calendar-disable-color !important;
+
+        .nut-calendar-day-info-curr {
+          display: none;
+        }
+      }
     }
   }
 

src/packages/calendar/calendar.taro.tsx

@@ -1,7 +1,7 @@
 import React, { useRef, ReactNode } from 'react'
 import Popup from '@/packages/popup/index.taro'
 import CalendarItem from '@/packages/calendaritem/index.taro'
-import { Utils } from '@/utils/date'
+import { getDay } from '@/utils/date'
 import { useConfig } from '@/packages/configprovider/configprovider.taro'
 import type { CalendarDay, CalendarType, CalendarRef } from './types'
 import { ComponentDefaults } from '@/utils/typings'
@@ -44,8 +44,8 @@ const defaultProps = {
   visible: false,
   title: '',
   defaultValue: '',
-  startDate: Utils.getDay(0),
-  endDate: Utils.getDay(365),
+  startDate: getDay(0),
+  endDate: getDay(365),
   showToday: true,
   startText: '',
   endText: '',

src/packages/calendar/calendar.tsx

@@ -1,7 +1,7 @@
 import React, { useRef, ReactNode } from 'react'
 import Popup from '@/packages/popup'
 import CalendarItem from '@/packages/calendaritem'
-import { Utils } from '@/utils/date'
+import { getDay } from '@/utils/date'
 import { useConfig } from '@/packages/configprovider'
 import type { CalendarDay, CalendarType, CalendarRef } from './types'
 import { ComponentDefaults } from '@/utils/typings'
@@ -44,8 +44,8 @@ const defaultProps = {
   visible: false,
   title: '',
   defaultValue: '',
-  startDate: Utils.getDay(0),
-  endDate: Utils.getDay(365),
+  startDate: getDay(0),
+  endDate: getDay(365),
   showToday: true,
   startText: '',
   endText: '',

src/packages/calendar/demos/taro/demo1.tsx

@@ -1,6 +1,5 @@
 import React, { useState } from 'react'
 import { Cell, Calendar } from '@nutui/nutui-react-taro'
-import { Star } from '@nutui/icons-react-taro'
 
 const Demo1 = () => {
   const d = new Date()
@@ -35,12 +34,10 @@ const Demo1 = () => {
       />
       <Calendar
         visible={isVisible}
-        showTitle={false}
         defaultValue={date}
         onClose={closeSwitch}
         onConfirm={setChooseValue}
         onDayClick={select}
-        closeIcon={<Star />}
       />
     </>
   )

src/packages/calendar/utils.tsx

@@ -1,4 +1,4 @@
-import { Utils } from '@/utils/date'
+import { isEqual, date2Str, getNumTwoBit } from '@/utils/date'
 import { CalendarDay, CalendarMonthInfo } from './types'
 
 export const splitDate = (date: string) => {
@@ -9,32 +9,30 @@
 export const isMultiple = (day: string, days: string[]) => {
   if (days.length > 0) {
     return days.some((item: string) => {
-      return Utils.isEqual(item, day)
+      return isEqual(item, day)
     })
   }
   return false
 }
 
 export const isCurrDay = (month: CalendarMonthInfo, day: string | number) => {
   const date = `${month.curData[0]}/${month.curData[1]}/${day}`
-  return Utils.isEqual(date, Utils.date2Str(new Date(), '/'))
+  return isEqual(date, date2Str(new Date(), '/'))
 }
 
 export const getCurrDate = (day: CalendarDay, month: CalendarMonthInfo) => {
-  return `${month.curData[0]}/${month.curData[1]}/${Utils.getNumTwoBit(
-    +day.day
-  )}`
+  return `${month.curData[0]}/${month.curData[1]}/${getNumTwoBit(+day.day)}`
 }
 
 export const isStart = (day: string, days: string[]) => {
-  return Utils.isEqual(days[0], day)
+  return isEqual(days[0], day)
 }
 
 export const isEnd = (day: string, days: string[]) => {
-  return Utils.isEqual(days[1], day)
+  return isEqual(days[1], day)
 }
 
 // 开始结束时间是否相等
 export const isStartAndEnd = (days: string[]) => {
-  return days.length >= 2 && Utils.isEqual(days[0], days[1])
+  return days.length >= 2 && isEqual(days[0], days[1])
 }

src/packages/calendarcard/utils.ts

@@ -1,4 +1,4 @@
-import { Utils } from '@/utils/date'
+import { getMonthPreDay, getMonthDays } from '@/utils/date'
 import { CalendarCardDay } from './types'
 
 export const convertDateToDay = (date: Date) => {
@@ -29,13 +29,13 @@ export const getPrevMonthDays = (
     prevMonth = 12
     prevYear -= 1
   }
-  let days = Utils.getMonthPreDay(year, month)
+  let days = getMonthPreDay(year, month)
   days -= firstDayOfWeek
   if (days >= 7) {
     days -= 7
   }
 
-  const preDates = Utils.getMonthDays(`${prevYear}`, `${prevMonth}`)
+  const preDates = getMonthDays(`${prevYear}`, `${prevMonth}`)
   const months = Array.from(Array(preDates), (_, k) => {
     return {
       type: 'prev',
@@ -51,7 +51,7 @@ export const getPrevMonthDays = (
  * 获取当前月的日期数据
  */
 export const getCurrentMonthDays = (year: number, month: number) => {
-  const days = Utils.getMonthDays(`${year}`, `${month}`)
+  const days = getMonthDays(`${year}`, `${month}`)
   return Array.from(Array(days), (_, k) => {
     return {
       type: 'current',