Skip to content

Commit

Permalink
fix(Dialog): fix dialog props duplicate (#3423)
Browse files Browse the repository at this point in the history
* fix(Dialog): fix dialog props duplicate

* fix(Dialog): fix dialog props duplicate
  • Loading branch information
uyarn committed Dec 16, 2024
1 parent fc18fcc commit cfc2db3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/dialog/dialog.tsx
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

0 comments on commit cfc2db3

Please sign in to comment.