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

fix(Dialog): fix dialog props duplicate #3423

Merged
merged 2 commits into from
Dec 16, 2024
Merged

fix(Dialog): fix dialog props duplicate #3423

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dc7dca
fix(Dialog): fix dialog props duplicate
uyarn Dec 16, 2024
a8277bd
fix(Dialog): fix dialog props duplicate
uyarn Dec 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
6 changes: 3 additions & 3 deletions src/dialog/dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ export default mixins(ActionMixin, getConfigReceiverMixins<Vue, DialogConfig>('d
}
return topStyle;
},
dialogStyle(): Styles {
return !this.isFullScreen ? { width: getCSSValue(this.width) } : {}; // width全屏模式不生效;
computedDialogStyle(): Styles {
return !this.isFullScreen ? { width: getCSSValue(this.width), ...this.dialogStyle } : { ...this.dialogStyle }; // width全屏模式不生效;
},
},

Expand Down Expand Up @@ -477,7 +477,7 @@ export default mixins(ActionMixin, getConfigReceiverMixins<Vue, DialogConfig>('d
// 非模态形态下draggable为true才允许拖拽
<div class={this.wrapClass}>
<div class={this.positionClass} style={this.positionStyle} onClick={this.overlayAction} ref="dialogPosition">
<div key="dialog" ref="dialog" class={this.dialogClass} style={this.dialogStyle}>
<div key="dialog" ref="dialog" class={this.dialogClass} style={this.computedDialogStyle}>
<div class={headerClassName} onmousedown={this.onStopDown}>
<div class={`${this.componentName}__header-content`}>
{this.getIcon()}
Expand Down
Loading