zhusenlin/aistudio-wpf-diagram
1
0
Fork 0
mirror of https://gitee.com/akwkevin/aistudio.-wpf.-diagram synced 2026-03-02 15:50:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/akwkevin/aistudio.-wpf.-diagram

Browse Source
This commit is contained in:
fan.yaying
2023-09-11 10:25:45 +08:00
parent a184dce650 9e6000f278
commit da8f77510b
30 changed files with 1723 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Container/BlockItemsContainerInfo.cs
View File

@@ -65,6 +65,7 @@ namespace AIStudio.Wpf.DiagramDesigner
this.ChildFlag = designer.ChildFlag;
this.PhysicalItemWidth = designer.PhysicalItemWidth;
this.PhysicalItemHeight = designer.PhysicalItemHeight;
this.Parameter = new ConstParameter(designer.Parameter);
if (designer.Children != null)
{
foreach (var child in designer.Children)
@@ -178,8 +179,8 @@ namespace AIStudio.Wpf.DiagramDesigner
}
}
private IParameter _parameter;
public IParameter Parameter
private ConstParameter _parameter;
public ConstParameter Parameter
{
get
{
@@ -350,5 +351,15 @@ namespace AIStudio.Wpf.DiagramDesigner
return null;
}
}
public override void Dispose()
{
base.Dispose();
foreach (var child in Children)
{
child.Dispose();
}
}
}
}

6
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs
View File

@@ -814,7 +814,7 @@ namespace AIStudio.Wpf.DiagramDesigner
BuildMenuOptions();
}
public DiagramViewModel(DiagramItem diagramItem, string ext) : this()
public DiagramViewModel(DiagramItem diagramItem, string ext =".json") : this()
{
Init(diagramItem);
@@ -849,6 +849,7 @@ namespace AIStudio.Wpf.DiagramDesigner
public void Init(DiagramItem diagramItem)
{
DiagramType = diagramItem.DiagramType;
Name = diagramItem.Name;
DiagramOption.LayoutOption.ShowGrid = diagramItem.ShowGrid;
DiagramOption.LayoutOption.PhysicalGridCellSize = diagramItem.PhysicalGridCellSize;
DiagramOption.LayoutOption.CellHorizontalAlignment = diagramItem.CellHorizontalAlignment;
@@ -858,7 +859,8 @@ namespace AIStudio.Wpf.DiagramDesigner
DiagramOption.LayoutOption.PageSizeType = diagramItem.PageSizeType;
DiagramOption.LayoutOption.PhysicalGridMarginSize = diagramItem.PhysicalGridMarginSize;
DiagramOption.LayoutOption.GridColor = diagramItem.GridColor;
DiagramOption.LayoutOption.AllowDrop = diagramItem.AllowDrop;
DiagramOption.LayoutOption.PageBackground = diagramItem.PageBackground;
DiagramOption.LayoutOption.AllowDrop = diagramItem.AllowDrop;
Thumbnail = diagramItem.Thumbnail.ToBrush((int)DiagramOption.LayoutOption.PageSize.Width / 4, (int)DiagramOption.LayoutOption.PageSize.Height / 4);
Init(true);

13
AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs
View File

@@ -530,6 +530,19 @@ namespace AIStudio.Wpf.DiagramDesigner
return null;
}
#endregion
public override void Dispose()
{
base.Dispose();
if (ParentContainer == null)
{
foreach (var container in Containers)
{
container.Dispose();
}
}
}
}
#region 扩展

5
AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDiagramViewModel.cs
View File

@@ -14,6 +14,11 @@ namespace AIStudio.Wpf.DiagramDesigner
{
}
public BlockDiagramViewModel(DiagramItem diagramItem, string ext) : base(diagramItem, ext)
{
}
#region
private ICommand _addNextCommand;
public ICommand AddNextCommand