diff --git a/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj b/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj index dfd930a..d7243c8 100644 --- a/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj +++ b/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj @@ -264,6 +264,9 @@ + + PreserveNewest + PreserveNewest diff --git a/AIStudio.Wpf.DiagramDesigner/Images/Gifs/car_chase.gif b/AIStudio.Wpf.DiagramApp/Images/Gifs/car_chase.gif similarity index 100% rename from AIStudio.Wpf.DiagramDesigner/Images/Gifs/car_chase.gif rename to AIStudio.Wpf.DiagramApp/Images/Gifs/car_chase.gif diff --git a/AIStudio.Wpf.DiagramApp/ViewModels/FlowchartViewModel.cs b/AIStudio.Wpf.DiagramApp/ViewModels/FlowchartViewModel.cs index 0fc4631..30be0d2 100644 --- a/AIStudio.Wpf.DiagramApp/ViewModels/FlowchartViewModel.cs +++ b/AIStudio.Wpf.DiagramApp/ViewModels/FlowchartViewModel.cs @@ -42,13 +42,13 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels DesignerItemViewModelBase start = new StartFlowNode() { Left = 100, Top = 0, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString() }; DiagramViewModel.Add(start); - DesignerItemViewModelBase middle1 = new MiddleFlowNode() { Left = 100, Top = 100, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString(), Text = "主管审批", UserIds= new List { "操作员1", "操作员2" }, ActType = "or", SimulateApprove = true }; + DesignerItemViewModelBase middle1 = new MiddleFlowNode() { Left = 100, Top = 100, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString(), Text = "主管审批（两人或）", UserIds= new List { "操作员1", "操作员2" }, ActType = "or", SimulateApprove = true }; DiagramViewModel.Add(middle1); DesignerItemViewModelBase decide = new DecideFlowNode() { Left = 100, Top = 200, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString(), Text = "5" }; DiagramViewModel.Add(decide); - DesignerItemViewModelBase middle2 = new MiddleFlowNode() { Left = 200, Top = 300, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString(), Text = "分管领导", UserIds = new List { "操作员1", "操作员2" }, ActType = "and", SimulateApprove = true }; + DesignerItemViewModelBase middle2 = new MiddleFlowNode() { Left = 200, Top = 300, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString(), Text = "分管领导（两人与）", UserIds = new List { "操作员1", "操作员2" }, ActType = "and", SimulateApprove = true }; DiagramViewModel.Add(middle2); DesignerItemViewModelBase cobegin = new COBeginFlowNode() { Left = 100, Top = 400, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString() }; @@ -101,7 +101,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels TextDesignerItemViewModel despcription = new TextDesignerItemViewModel() { Name = nameof(despcription), - Left = 260, + Left = 360, Top = 60, ItemWidth = 300, ItemHeight = 150, diff --git a/AIStudio.Wpf.DiagramDesigner.Additionals/AIStudio.Wpf.DiagramDesigner.Additionals.csproj b/AIStudio.Wpf.DiagramDesigner.Additionals/AIStudio.Wpf.DiagramDesigner.Additionals.csproj index 8ef1a62..f9ad509 100644 --- a/AIStudio.Wpf.DiagramDesigner.Additionals/AIStudio.Wpf.DiagramDesigner.Additionals.csproj +++ b/AIStudio.Wpf.DiagramDesigner.Additionals/AIStudio.Wpf.DiagramDesigner.Additionals.csproj @@ -13,6 +13,12 @@ 一个Wpf的Diagram控件帮助库 + + + + + + @@ -32,4 +38,10 @@ + + + + + + diff --git a/AIStudio.Wpf.DiagramDesigner.Additionals/Images/Bold.png b/AIStudio.Wpf.DiagramDesigner.Additionals/Images/Bold.png new file mode 100644 index 0000000..baae5a9 Binary files /dev/null and b/AIStudio.Wpf.DiagramDesigner.Additionals/Images/Bold.png differ diff --git a/AIStudio.Wpf.DiagramDesigner.Additionals/Images/Italic.png b/AIStudio.Wpf.DiagramDesigner.Additionals/Images/Italic.png new file mode 100644 index 0000000..dfa065a Binary files /dev/null and b/AIStudio.Wpf.DiagramDesigner.Additionals/Images/Italic.png differ diff --git a/AIStudio.Wpf.DiagramDesigner.Additionals/Images/Underline.png b/AIStudio.Wpf.DiagramDesigner.Additionals/Images/Underline.png new file mode 100644 index 0000000..1599450 Binary files /dev/null and b/AIStudio.Wpf.DiagramDesigner.Additionals/Images/Underline.png differ diff --git a/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj b/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj index df71ff7..07fd8a4 100644 --- a/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj +++ b/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj @@ -47,12 +47,6 @@ - - - PreserveNewest - - - $(DefaultXamlRuntime) diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/BlockConnectorInfo.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/BlockConnectorInfo.cs index 2ca0484..4835080 100644 --- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/BlockConnectorInfo.cs +++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/BlockConnectorInfo.cs @@ -43,5 +43,18 @@ namespace AIStudio.Wpf.DiagramDesigner ColorViewModel.LineColor.Color = Colors.Transparent; ColorViewModel.FillColor.Color = Colors.Transparent; } + + + public override bool CanAttachTo(ConnectorInfoBase port) + { + if (port is BlockConnectorInfo blockConnectorInfo) + { + return port != this && !port.IsReadOnly && DataItem != blockConnectorInfo.DataItem; + } + else + { + return false; + } + } } } diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs index 76bdf0e..d5b379a 100644 --- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs +++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs @@ -1187,7 +1187,7 @@ namespace AIStudio.Wpf.DiagramDesigner } else if (parameter is IEnumerable items) { - if (items.Select(p => AddVerify(p)).Any() != true) return; + if (items.Select(p => AddVerify(p)).ToList().Any() != true) return; foreach (var item in items) { diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/ImageItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/ImageItemViewModel.cs index 7cd59ec..009caee 100644 --- a/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/ImageItemViewModel.cs +++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/ImageItemViewModel.cs @@ -88,7 +88,7 @@ namespace AIStudio.Wpf.DiagramDesigner get { return _suffix; } set { - SetProperty(ref _suffix, filter.Contains(value) ? value : ".txt"); + SetProperty(ref _suffix, value != null && filter.Contains(value) ? value : ".txt"); } } @@ -167,8 +167,10 @@ namespace AIStudio.Wpf.DiagramDesigner return; } - System.Diagnostics.Process.Start(Icon); - + if (!string.IsNullOrEmpty(Icon)) + { + System.Diagnostics.Process.Start(Icon); + } } public void InitWidthAndHeight() diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/DrawingViewModel/Erasable/SharpDrawingDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/DrawingViewModel/Erasable/SharpDrawingDesignerItemViewModel.cs index e697e66..19749d8 100644 --- a/AIStudio.Wpf.DiagramDesigner/ViewModels/DrawingViewModel/Erasable/SharpDrawingDesignerItemViewModel.cs +++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/DrawingViewModel/Erasable/SharpDrawingDesignerItemViewModel.cs @@ -41,11 +41,14 @@ namespace AIStudio.Wpf.DiagramDesigner if (IsFinish) { var path = GetPath(); + var rect = new Rect(Points[0], Points[1]); + var point0 = rect.TopLeft; + var point1 = rect.BottomRight; PathGeometry pathGeometry = PathGeometry.CreateFromGeometry(Geometry.Parse(path)); var transformGroup = new TransformGroup(); - double radiox = Math.Abs(Points[1].X - Points[0].X) / pathGeometry.Bounds.Width; - double radioy = Math.Abs(Points[1].Y - Points[0].Y) / pathGeometry.Bounds.Height; - transformGroup.Children.Add(new TranslateTransform((Points[0].X) / radiox - pathGeometry.Bounds.Left, (Points[0].Y) / radioy - pathGeometry.Bounds.Top)); + double radiox = Math.Abs(point1.X - point0.X) / pathGeometry.Bounds.Width; + double radioy = Math.Abs(point1.Y - point0.Y) / pathGeometry.Bounds.Height; + transformGroup.Children.Add(new TranslateTransform((point0.X) / radiox - pathGeometry.Bounds.Left, (point0.Y) / radioy - pathGeometry.Bounds.Top)); transformGroup.Children.Add(new ScaleTransform(radiox, radioy)); pathGeometry.Transform = transformGroup; Geometry = pathGeometry; @@ -85,11 +88,15 @@ namespace AIStudio.Wpf.DiagramDesigner } var path = GetPath(); + var rect = new Rect(Points[0], Points[1]); + var point0 = rect.TopLeft; + var point1 = rect.BottomRight; + PathGeometry pathGeometry = PathGeometry.CreateFromGeometry(Geometry.Parse(path)); var transformGroup = new TransformGroup(); - double radiox = Math.Abs(point.X - Points[0].X) / pathGeometry.Bounds.Width; - double radioy = Math.Abs(point.Y - Points[0].Y) / pathGeometry.Bounds.Height; - transformGroup.Children.Add(new TranslateTransform((Points[0].X) / radiox - pathGeometry.Bounds.Left, (Points[0].Y) / radioy - pathGeometry.Bounds.Top)); + double radiox = Math.Abs(point1.X - point0.X) / pathGeometry.Bounds.Width; + double radioy = Math.Abs(point1.Y - point0.Y) / pathGeometry.Bounds.Height; + transformGroup.Children.Add(new TranslateTransform((point0.X) / radiox - pathGeometry.Bounds.Left, (point0.Y) / radioy - pathGeometry.Bounds.Top)); transformGroup.Children.Add(new ScaleTransform(radiox, radioy)); pathGeometry.Transform = transformGroup; Geometry = pathGeometry; diff --git a/Extensions/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs b/Extensions/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs index c1fac05..fce45b2 100644 --- a/Extensions/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs +++ b/Extensions/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs @@ -35,7 +35,7 @@ namespace AIStudio.Wpf.Flowchart.ViewModels } } - private string _remark; + private string _remark = "同意"; public string Remark { get