diff --git a/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj b/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj
index c397978..9e01a53 100644
--- a/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj
+++ b/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj
@@ -8,7 +8,8 @@
A.png
- 1.1.5
+ 1.1.5
+
一个Wpf的Diagram控件基础库
diff --git a/AIStudio.Wpf.DiagramDesigner/Controls/PopupWindow.xaml b/AIStudio.Wpf.DiagramDesigner/Controls/PopupWindow.xaml
index b7ac930..0966dce 100644
--- a/AIStudio.Wpf.DiagramDesigner/Controls/PopupWindow.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/PopupWindow.xaml
@@ -5,7 +5,7 @@
SizeToContent="WidthAndHeight"
WindowStartupLocation="CenterOwner"
x:Name="theView">
-
+
diff --git a/AIStudio.Wpf.DiagramDesigner/Controls/PopupWindow.xaml.cs b/AIStudio.Wpf.DiagramDesigner/Controls/PopupWindow.xaml.cs
index 90e8789..caffde3 100644
--- a/AIStudio.Wpf.DiagramDesigner/Controls/PopupWindow.xaml.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/PopupWindow.xaml.cs
@@ -24,6 +24,12 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
InitializeComponent();
}
+ public void Init(double width, double height)
+ {
+ grid.Width = width;
+ grid.Height = height;
+ }
+
private void Ok_Click(object sender, RoutedEventArgs e)
{
this.DialogResult = true;
diff --git a/AIStudio.Wpf.DiagramDesigner/Services/IUIVisualizerService.cs b/AIStudio.Wpf.DiagramDesigner/Services/IUIVisualizerService.cs
index 2215169..375dc04 100644
--- a/AIStudio.Wpf.DiagramDesigner/Services/IUIVisualizerService.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Services/IUIVisualizerService.cs
@@ -18,5 +18,12 @@ namespace AIStudio.Wpf.DiagramDesigner.Services
/// Object state to associate with the dialog
/// True/False if UI is displayed.
bool? ShowDialog(object dataContextForPopup);
+
+ ///
+ /// This method displays a modal dialog associated with the given key.
+ ///
+ /// Object state to associate with the dialog
+ /// True/False if UI is displayed.
+ bool? ShowDialog(object dataContextForPopup, double width, double height);
}
}
diff --git a/AIStudio.Wpf.DiagramDesigner/Services/WPFUIVisualizerService.cs b/AIStudio.Wpf.DiagramDesigner/Services/WPFUIVisualizerService.cs
index b6af96f..b5c9058 100644
--- a/AIStudio.Wpf.DiagramDesigner/Services/WPFUIVisualizerService.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Services/WPFUIVisualizerService.cs
@@ -22,6 +22,20 @@ namespace AIStudio.Wpf.DiagramDesigner.Services
return false;
}
+
+ public bool? ShowDialog(object dataContextForPopup, double width, double height)
+ {
+ PopupWindow win = new PopupWindow();
+ win.SizeToContent = SizeToContent.Manual;
+ win.Width = width;
+ win.Height = height;
+ win.DataContext = dataContextForPopup;
+ win.Owner = Application.Current.MainWindow;
+ if (win != null)
+ return win.ShowDialog();
+
+ return false;
+ }
#endregion
diff --git a/Extensions/AIStudio.Wpf.Script/Dlls/net5.0-windows/AIStudio.Wpf.Script.Core.dll b/Extensions/AIStudio.Wpf.Script/Dlls/net5.0-windows/AIStudio.Wpf.Script.Core.dll
index a907778..fa8c306 100644
Binary files a/Extensions/AIStudio.Wpf.Script/Dlls/net5.0-windows/AIStudio.Wpf.Script.Core.dll and b/Extensions/AIStudio.Wpf.Script/Dlls/net5.0-windows/AIStudio.Wpf.Script.Core.dll differ
diff --git a/Extensions/AIStudio.Wpf.Script/Dlls/net6.0-windows/AIStudio.Wpf.Script.Core.dll b/Extensions/AIStudio.Wpf.Script/Dlls/net6.0-windows/AIStudio.Wpf.Script.Core.dll
index 869a979..5acfb57 100644
Binary files a/Extensions/AIStudio.Wpf.Script/Dlls/net6.0-windows/AIStudio.Wpf.Script.Core.dll and b/Extensions/AIStudio.Wpf.Script/Dlls/net6.0-windows/AIStudio.Wpf.Script.Core.dll differ
diff --git a/Extensions/AIStudio.Wpf.Script/Dlls/netcoreapp3.1/AIStudio.Wpf.Script.Core.dll b/Extensions/AIStudio.Wpf.Script/Dlls/netcoreapp3.1/AIStudio.Wpf.Script.Core.dll
index 8b60527..7a39d22 100644
Binary files a/Extensions/AIStudio.Wpf.Script/Dlls/netcoreapp3.1/AIStudio.Wpf.Script.Core.dll and b/Extensions/AIStudio.Wpf.Script/Dlls/netcoreapp3.1/AIStudio.Wpf.Script.Core.dll differ