mind序列化完善中

AIStudio.Wpf.Mind/ViewModels/IMindDiagramViewModel.cs

@@ -34,11 +34,6 @@ namespace AIStudio.Wpf.Mind.ViewModels
             get;
         }
 
-        SimpleCommand DeleteSelfCommand
-        {
-            get;
-        }
-
         SimpleCommand MoveForwardCommand
         {
             get;

AIStudio.Wpf.Mind/ViewModels/MindDiagramViewModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Windows.Documents;
 using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.Mind.ViewModels
@@ -61,15 +62,6 @@ namespace AIStudio.Wpf.Mind.ViewModels
             }
         }
 
-        private SimpleCommand _deleteSelfCommand;
-        public SimpleCommand DeleteSelfCommand
-        {
-            get
-            {
-                return this._deleteSelfCommand ?? (this._deleteSelfCommand = new SimpleCommand(MindLevelEnable, ExecuteDeleteSelfCommand));
-            }
-        }
-
         private SimpleCommand _moveForwardCommand;
         public SimpleCommand MoveForwardCommand
         {
@@ -88,6 +80,15 @@ namespace AIStudio.Wpf.Mind.ViewModels
             }
         }
 
+        private SimpleCommand _deleteCommand;
+        public override SimpleCommand DeleteCommand
+        {
+            get
+            {
+                return this._deleteCommand ?? (this._deleteCommand = new SimpleCommand(MindLevelEnable, ExecuteDeleteCommand));
+            }
+        }
+
         private SimpleCommand _changeMindTypeCommand;
         public SimpleCommand ChangeMindTypeCommand
         {
@@ -162,6 +163,22 @@ namespace AIStudio.Wpf.Mind.ViewModels
         #endregion
 
         public MindDiagramViewModel()
+        {
+
+        }
+
+        public override void Init()
+        {
+            if (Items.Count == 0)
+            {
+                InitRootItem();
+            }
+            GetChildren(RootItem);
+            RootItem?.LayoutUpdated();
+            base.Init();
+        }
+
+        public void InitRootItem()
         {
             MindNode level1node = new MindNode(this) { Root = this, Id = Guid.NewGuid(), Left = 200, Top = 200, Text = "思维导图" };
             level1node.InitLayout(true);
@@ -392,7 +409,7 @@ namespace AIStudio.Wpf.Mind.ViewModels
 
         }
 
-        private void ExecuteDeleteSelfCommand(object parameter)
+        protected override bool Delete(object parameter)
         {
             if (parameter is MindNode node)
             {
@@ -403,6 +420,11 @@ namespace AIStudio.Wpf.Mind.ViewModels
                 node = SelectedItem as MindNode;
             }
 
+            if (node.IsEditing == true)
+            {
+                return false;
+            }
+
             if (node.Parent is MindNode parent)
             {
                 int index = parent.Children.IndexOf(node);
@@ -415,7 +437,11 @@ namespace AIStudio.Wpf.Mind.ViewModels
                       parent.AddChild(node, index);
                       parent.LayoutUpdated();
                   });
+                return true;
             }
+            else
+                return false;
+
 
         }
 
@@ -467,8 +493,7 @@ namespace AIStudio.Wpf.Mind.ViewModels
         #endregion
         protected override void ExecutedInitLayoutCommand(object obj)
         {
-            GetChildren(RootItem);
-            RootItem?.LayoutUpdated();
+
         }
         protected override void ExecutedResetLayoutCommand(object obj)
         {

AIStudio.Wpf.Mind/ViewModels/MindNode.cs

@@ -59,7 +59,7 @@ namespace AIStudio.Wpf.Mind.ViewModels
             AddChildCommand = (Root as IMindDiagramViewModel)?.AddChildCommand;
             AddParentCommand = (Root as IMindDiagramViewModel)?.AddParentCommand;
             AddPeerCommand = (Root as IMindDiagramViewModel)?.AddPeerCommand;
-            DeleteSelfCommand = (Root as IMindDiagramViewModel)?.DeleteSelfCommand;
+            DeleteCommand = (Root as IMindDiagramViewModel)?.DeleteCommand;
             MoveForwardCommand = (Root as IMindDiagramViewModel)?.MoveForwardCommand;
             MoveBackCommand = (Root as IMindDiagramViewModel)?.MoveBackCommand;
             BuildMenuOptions();
@@ -97,7 +97,6 @@ namespace AIStudio.Wpf.Mind.ViewModels
             mindNodeModel.Spacing = Spacing;
             mindNodeModel.Offset = Offset;
             mindNodeModel.IsExpanded = IsExpanded;
-
             return mindNodeModel;
         }
 
@@ -309,7 +308,7 @@ namespace AIStudio.Wpf.Mind.ViewModels
             get; private set;
         }
 
-        public SimpleCommand DeleteSelfCommand
+        public SimpleCommand DeleteCommand
         {
             get; private set;
         }
@@ -356,7 +355,7 @@ namespace AIStudio.Wpf.Mind.ViewModels
             menuOptions.Add(menuItem);
             menuItem = new CinchMenuItem();
             menuItem.Text = "删除";
-            menuItem.Command = DeleteSelfCommand;
+            menuItem.Command = DeleteCommand;
             menuItem.CommandParameter = this;
             menuOptions.Add(menuItem);
         }