diff --git a/src/config.json b/src/config.json
index 83adf08400..03457edc3f 100644
--- a/src/config.json
+++ b/src/config.json
@@ -499,7 +499,7 @@
"dd": false
},
{
- "version": "2.0.0",
+ "version": "3.0.0",
"name": "Calendar",
"type": "component",
"cName": "日历",
@@ -508,7 +508,7 @@
"show": true,
"taro": true,
"author": "szg2008",
- "dd": false
+ "dd": true
},
{
"version": "2.0.0",
diff --git a/src/packages/calendar/calendar.scss b/src/packages/calendar/calendar.scss
index 169fe4bf6d..7a394555d6 100644
--- a/src/packages/calendar/calendar.scss
+++ b/src/packages/calendar/calendar.scss
@@ -36,6 +36,10 @@
display: flex;
flex-direction: column;
text-align: center;
+
+ &-buttons {
+ height: $calendar-header-height;
+ }
}
&-title {
@@ -51,10 +55,6 @@
font-size: $calendar-sub-title-font-size;
}
- &-header-buttons {
- height: $calendar-header-height;
- }
-
&-weeks {
display: flex;
align-items: center;
@@ -103,12 +103,12 @@
display: flex;
flex-direction: column;
text-align: center;
- }
- &-month-title {
- height: 23px;
- line-height: 23px;
- margin: 8px 0;
+ &-title {
+ height: 23px;
+ line-height: 23px;
+ margin: 8px 0;
+ }
}
&-days {
@@ -132,6 +132,7 @@
color: $color-primary;
}
+ &-info,
&-info-curr {
position: absolute;
bottom: 5px;
@@ -140,14 +141,6 @@
line-height: 14px;
}
- &-info {
- position: absolute;
- bottom: 5px;
- width: 100%;
- font-size: 12px;
- line-height: 14px;
- }
-
&-info-top {
position: absolute;
width: 100%;
@@ -190,18 +183,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;
+ }
+ }
}
}
@@ -213,13 +206,14 @@
background-color: $white;
.calendar-confirm-btn {
- height: 44px;
- margin: 10px 18px;
- border-radius: 22px;
+ height: 40px;
+ line-height: 40px;
+ margin: 6px 16px;
+ text-align: center;
+ border-radius: $radius-base;
background: $button-primary-background-color;
color: $color-primary-text;
- text-align: center;
- line-height: 44px;
+ font-weight: $font-weight-bold;
}
}
}
diff --git a/src/packages/calendar/demos/taro/demo1.tsx b/src/packages/calendar/demos/taro/demo1.tsx
index 4c94182c12..47604d8a00 100644
--- a/src/packages/calendar/demos/taro/demo1.tsx
+++ b/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 = () => {
/>
}
/>
>
)
diff --git a/src/packages/calendaritem/calendaritem.taro.tsx b/src/packages/calendaritem/calendaritem.taro.tsx
index e757e5df76..deffb4f4da 100644
--- a/src/packages/calendaritem/calendaritem.taro.tsx
+++ b/src/packages/calendaritem/calendaritem.taro.tsx
@@ -880,7 +880,7 @@ export const CalendarItem = React.forwardRef<
return (
{children}
-
+
{renderBottomButton ? (
renderBottomButton()
) : (