更新框架

Source/Store.Management.Framework/Controls/DialogWindow.xaml.cs

@@ -78,6 +78,12 @@ public partial class DialogWindow : WindowBase, IDialogWindow
 
 	protected override void OnContentChanged(object oldContent, object newContent)
 	{
+		// InitializeComponent 设置初始内容时，窗口样式尚未加载。
+		if (!isConstructorSuccessful)
+		{
+			base.OnContentChanged(oldContent, newContent);
+			return;
+		}
 		this.Style = dialogWindowStyle;
 		if (newContent is UserControl control)
 		{
@@ -124,9 +130,9 @@ public partial class DialogWindow : WindowBase, IDialogWindow
 
 	protected override void OnStyleChanged(Style oldStyle, Style newStyle)
 	{
-		if (newStyle.TargetType == typeof(Window))
+		if (newStyle?.TargetType == typeof(Window))
 		{
-			if (isConstructorSuccessful)
+			if (isConstructorSuccessful && !ReferenceEquals(dialogWindowStyle, newStyle))
 			{
 				dialogWindowStyle.Merge(newStyle);
 			}