From 74eaafc056abc6b8be0a05f4be97d4aa64e89f9b Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 17 Jan 2021 12:42:11 +0800
Subject: [PATCH] close #624

---
 .../Window/DialogDemoWindow.xaml              |  3 +--
 .../Window/DialogDemoWindow.xaml.cs           | 20 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml
index d18c14d5..3579fc16 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml
@@ -5,14 +5,13 @@
         xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
         xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
         xmlns:data="clr-namespace:HandyControlDemo.Data"
-        hc:Dialog.Token="{x:Static data:MessageToken.DialogDemoWindow}"
         DataContext="{Binding DialogDemo,Source={StaticResource Locator}}"
         Title="{ex:Lang Key={x:Static langs:LangKeys.DialogDemo}}"
         Width="800"
         Height="500">
     <hc:TransitioningContentControl>
         <StackPanel Margin="32" VerticalAlignment="Center">
-            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ShowInCurrentWindow}}" Command="{Binding ShowWithTokenCmd}" CommandParameter="{x:Static data:MessageToken.DialogDemoWindow}"/>
+            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ShowInCurrentWindow}}" Command="{Binding ShowWithTokenCmd}" CommandParameter="{Binding DialogToken,RelativeSource={RelativeSource AncestorType=Window}}"/>
             <Button Margin="0,10,0,0" Content="{ex:Lang Key={x:Static langs:LangKeys.ShowInMainWindow}}" Command="{Binding ShowWithTokenCmd}" CommandParameter="{x:Static data:MessageToken.MainWindow}"/>
         </StackPanel>
     </hc:TransitioningContentControl>
diff --git a/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml.cs
index bbae0df2..bcc0c62e 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml.cs
@@ -1,10 +1,28 @@
-namespace HandyControlDemo.Window
+using System;
+using System.Windows;
+using HandyControl.Controls;
+using HandyControlDemo.Data;
+
+namespace HandyControlDemo.Window
 {
     public partial class DialogDemoWindow
     {
         public DialogDemoWindow()
         {
             InitializeComponent();
+
+            var dialogToken = $"{MessageToken.DialogDemoWindow}+{DateTime.Now:yyyyMMddHHmmssfff}";
+            DialogToken = dialogToken;
+            Dialog.SetToken(this, dialogToken);
+        }
+
+        public static readonly DependencyProperty DialogTokenProperty = DependencyProperty.Register(
+            "DialogToken", typeof(string), typeof(DialogDemoWindow), new PropertyMetadata(default(string)));
+
+        public string DialogToken
+        {
+            get => (string) GetValue(DialogTokenProperty);
+            set => SetValue(DialogTokenProperty, value);
         }
     }
 }