Skip to content

fix: 修订dialog 被盖住、height无法撑开、纵向布局footer 样式问题等。 #3032

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

Merged
oasis-cloud merged 1 commit into from
Feb 28, 2025
Merged

fix: 修订dialog 被盖住、height无法撑开、纵向布局footer 样式问题等。 #3032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 5 deletions src/packages/dialog/dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
align-items: center;
width: $dialog-width;
min-width: $dialog-min-width;
/* #ifndef harmony*/
max-height: 67%;
/* #endif */
min-height: $dialog-min-height;
padding: $dialog-padding;
box-sizing: border-box;
Expand Down Expand Up @@ -112,15 +114,10 @@
min-width: 100%;
}

.nut-dialog-footer-ok {
order: 1;
}

.nut-dialog-footer-cancel {
margin: 0;
color: $color-text;
font-size: $font-size-base;
order: 2;
display: flex;
justify-content: center;
margin-top: $dialog-vertical-footer-ok-margin-top;
Expand Down
165 changes: 98 additions & 67 deletions src/packages/dialog/dialog.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,43 +122,68 @@ export const BaseDialog: FunctionComponent<Partial<DialogBasicProps>> & {
const btnClass =
hideCancelButton || hideConfirmButton ? `${classPrefix}-footer-block` : ''

const renderCancelOfVertical = () => {
return (
!hideCancelButton && (
<View
className={`${classPrefix}-footer-cancel ${btnClass}`}
onClick={(e: ITouchEvent) => handleCancel(e)}
>
{cancelText || locale.cancel}
</View>
)
)
}

const renderCancel = () => {
return (
!hideCancelButton && (
<Button
type="default"
size="large"
className={`${classPrefix}-footer-cancel ${btnClass}`}
onClick={(e: React.MouseEvent<HTMLButtonElement>) =>
handleCancel(e)
}
>
{cancelText || locale.cancel}
</Button>
)
)
}

const renderConfirm = () => {
return (
!hideConfirmButton && (
<Button
size="large"
type="primary"
className={classNames(`${classPrefix}-footer-ok ${btnClass}`, {
disabled: disableConfirmButton,
})}
disabled={disableConfirmButton}
onClick={(e: React.MouseEvent<HTMLButtonElement>) => handleOk(e)}
loading={loading}
>
{confirmText || locale.confirm}
</Button>
)
)
}

return (
footer || (
<>
{!hideCancelButton &&
(footerDirection === 'vertical' ? (
<View
className={`${classPrefix}-footer-cancel ${btnClass}`}
onClick={(e: ITouchEvent) => handleCancel(e)}
>
{cancelText || locale.cancel}
</View>
) : (
<Button
type="default"
size="large"
className={`${classPrefix}-footer-cancel ${btnClass}`}
onClick={(e: React.MouseEvent<HTMLButtonElement>) =>
handleCancel(e)
}
>
{cancelText || locale.cancel}
</Button>
))}

{!hideConfirmButton && (
<Button
size="large"
type="primary"
className={classNames(`${classPrefix}-footer-ok ${btnClass}`, {
disabled: disableConfirmButton,
})}
disabled={disableConfirmButton}
onClick={(e: React.MouseEvent<HTMLButtonElement>) => handleOk(e)}
loading={loading}
>
{confirmText || locale.confirm}
</Button>
{footerDirection === 'vertical' ? (
<>
{renderConfirm()}
{renderCancelOfVertical()}
</>
) : (
<>
{renderCancel()}
{renderConfirm()}
</>
)}
</>
)
Expand Down Expand Up @@ -193,46 +218,52 @@ export const BaseDialog: FunctionComponent<Partial<DialogBasicProps>> & {
}
}

const renderContent = () => {
return (
<CSSTransition
in={visible}
timeout={300}
classNames="fadeDialog"
unmountOnExit
appear
>
<Content
className={className}
style={style}
title={title}
header={header}
close={renderCloseIcon()}
footer={renderFooter()}
footerDirection={footerDirection}
visible={visible}
>
{content || children}
</Content>
</CSSTransition>
)
}

return (
<View
style={{ display: visible ? 'block' : 'none' }}
ref={refObject}
catchMove={lockScroll}
>
<>
{overlay && (
<Overlay
zIndex={zIndex}
visible={visible}
style={overlayStyle}
className={overlayClassName}
closeOnOverlayClick={closeOnOverlayClick}
lockScroll={lockScroll}
onClick={onHandleClickOverlay}
/>
)}

<CSSTransition
in={visible}
timeout={300}
classNames="fadeDialog"
unmountOnExit
appear
{overlay ? (
<Overlay
zIndex={zIndex}
visible={visible}
style={overlayStyle}
className={overlayClassName}
closeOnOverlayClick={closeOnOverlayClick}
lockScroll={lockScroll}
onClick={onHandleClickOverlay}
>
<Content
className={className}
style={style}
title={title}
header={header}
close={renderCloseIcon()}
footer={renderFooter()}
footerDirection={footerDirection}
visible={visible}
>
{content || children}
</Content>
</CSSTransition>
</>
{renderContent()}
</Overlay>
) : (
renderContent()
)}
</View>
)
}
Expand Down
1 change: 1 addition & 0 deletions src/packages/dialog/dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ const BaseDialog: ForwardRefRenderFunction<
{!hideCancelButton &&
(footerDirection === 'vertical' ? (
<div
style={{ order: 2 }}
className={`${classPrefix}-footer-cancel ${btnClass}`}
onClick={(e) => handleCancel(e)}
>
Expand Down