From 67d995bb276d35bed635603ea34f16c9fca5789f Mon Sep 17 00:00:00 2001 From: "fan.yaying" Date: Tue, 22 Aug 2023 10:06:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9E=E7=BA=BF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewModels/BaseViewModel/DiagramViewModel.cs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs index ffd3d5d..69493e1 100644 --- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs +++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs @@ -6,17 +6,12 @@ using System.Linq; using System.Reactive.Linq; using System.Text.RegularExpressions; using System.Windows; -using System.Windows.Controls; -using System.Windows.Documents; using System.Windows.Input; using System.Windows.Media; -using System.Xml.Serialization; using AIStudio.Wpf.DiagramDesigner.Geometrys; using AIStudio.Wpf.DiagramDesigner.Helpers; using AIStudio.Wpf.DiagramDesigner.Models; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using static System.Net.Mime.MediaTypeNames; namespace AIStudio.Wpf.DiagramDesigner { @@ -818,7 +813,7 @@ namespace AIStudio.Wpf.DiagramDesigner BuildMenuOptions(); } - public void Init(DiagramItem diagramItem) + public void Init(DiagramItem diagramItem) { DiagramType = diagramItem.DiagramType; DiagramOption.LayoutOption.ShowGrid = diagramItem.ShowGrid; @@ -1061,7 +1056,7 @@ namespace AIStudio.Wpf.DiagramDesigner public virtual bool Next() { return false; - } + } private void ExecuteSelectAllCommand(object parameter) { @@ -1199,7 +1194,8 @@ namespace AIStudio.Wpf.DiagramDesigner } else if (parameter is IEnumerable items) { - if (items.Select(p => AddVerify(p)).ToList().Any() != true) return; + //如果有条件不满足的不允许添加 + if (items.Select(p => AddVerify(p)).ToList().Any(p => !p)) return; foreach (var item in items) {