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: fix calendar confirmBtn when value is null #1621

Merged
merged 2 commits into from
Oct 16, 2024
Merged

feat: fix calendar confirmBtn when value is null #1621

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
966b60a
feat: fix calendar confirmBtn when value is null
GaoJiuJiu Oct 15, 2024
91deb07
chore: simplify
anlyyao Oct 16, 2024
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
8 changes: 6 additions & 2 deletions src/calendar/calendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,20 @@ export default defineComponent({
return () => {
const title = renderTNodeJSX('title');
const confirmBtn = renderTNodeJSX('confirmBtn');
let newConfirmBtn = confirmBtn;
if (typeof confirmBtn === 'undefined') {
anlyyao marked this conversation as resolved.
Show resolved Hide resolved
newConfirmBtn = null;
}
return (
<div>
{!props.usePopup ? (
<calendarTemplate ref={calendarTemplateRef} title={title} confirmBtn={confirmBtn}></calendarTemplate>
<calendarTemplate ref={calendarTemplateRef} title={title} confirmBtn={newConfirmBtn}></calendarTemplate>
) : (
<t-popup visible={props.visible} placement="bottom" onVisibleChange={onPopupVisibleChange}>
<calendarTemplate
ref={calendarTemplateRef}
title={title}
confirmBtn={confirmBtn}
confirmBtn={newConfirmBtn}
onVisibleChange={onVisibleChange}
></calendarTemplate>
</t-popup>
Expand Down
Loading