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

feat: 日历支持footer的children定义，增加日历+datepicker的demo #1277

Merged
merged 3 commits into from
Aug 3, 2023
Merged

feat: 日历支持footer的children定义，增加日历+datepicker的demo #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3cdd8d5
feat: 日历组件支持在 footer 部分的children自定义，增加demo 日历+datepicker的交互demo
xiaoyatong Aug 2, 2023
1c260c6
docs: 补充文档
xiaoyatong Aug 2, 2023
d5b7cf9
fix: review
xiaoyatong Aug 3, 2023
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
7 changes: 1 addition & 6 deletions src/packages/calendar/calendar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,6 @@
display: block;
box-sizing: border-box;

// .viewArea {
// display: block;
// }

.calendar-loading-tip {
height: 50px;
line-height: 50px;
Expand Down Expand Up @@ -211,13 +207,12 @@
// 底部导航
&-footer {
display: flex;
height: 62px;
width: 100%;
flex-direction: column;
background-color: $white;

.calendar-confirm-btn {
height: 44px;
width: 100%;
margin: 10px 18px;
border-radius: 22px;
background: $button-primary-background-color;
Expand Down
2 changes: 2 additions & 0 deletions src/packages/calendar/calendar.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export const Calendar = React.forwardRef<
const {
style,
className,
children,
popup,
visible,
type,
Expand Down Expand Up @@ -138,6 +139,7 @@ export const Calendar = React.forwardRef<
ref={calendarRef}
style={style}
className={className}
children={children}
type={type}
autoBackfill={autoBackfill}
popup={popup}
Expand Down
2 changes: 2 additions & 0 deletions src/packages/calendar/calendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export const Calendar = React.forwardRef<
const {
style,
className,
children,
popup,
visible,
type,
Expand Down Expand Up @@ -138,6 +139,7 @@ export const Calendar = React.forwardRef<
ref={calendarRef}
style={style}
className={className}
children={children}
type={type}
autoBackfill={autoBackfill}
popup={popup}
Expand Down
70 changes: 52 additions & 18 deletions src/packages/calendar/demo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,59 @@
.wrapper {
display: flex;
padding: 0 40px;
}
.nut-calendar {
.nut-calendar-btns {
height: 40px;
display: flex;
align-items: center;
justify-content: space-evenly;
padding: 0 20px;
}

.nut-calendar-date {
background-color: #f9f9f9;
font-size: 12px;

&.disabled {
color: $disable-color;
}
}

.wrapper {
display: flex;
padding: 0 40px;
}

.d_div {
margin: 0px 5px;
.d_div {
margin: 0px 5px;

.d_btn {
background: #fa3f19;
color: #fff;
.d_btn {
background: #fa3f19;
color: #fff;
font-size: 12px;
padding: 2px 8px;
border-radius: 4px;
display: inline-block;
height: 20px;
}
}

.info {
display: block;
font-size: 12px;
padding: 2px 8px;
border-radius: 4px;
display: inline-block;
height: 20px;
line-height: 16px;
color: #999;
}
}

.info {
display: block;
font-size: 12px;
line-height: 16px;
color: #999;
.nut-cell__description {
.desc-box {
display: flex;
}

.desc {
padding: 10px;
background-color: #f9f9f9;
}

.desc1 {
padding: 10px;
}
}
Loading