diff --git a/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj b/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj index a3724a5..dfd930a 100644 --- a/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj +++ b/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj @@ -109,6 +109,7 @@ + all diff --git a/AIStudio.Wpf.DiagramApp/ViewModels/MainWindowViewModel.cs b/AIStudio.Wpf.DiagramApp/ViewModels/MainWindowViewModel.cs index b2821d4..0f1d4f9 100644 --- a/AIStudio.Wpf.DiagramApp/ViewModels/MainWindowViewModel.cs +++ b/AIStudio.Wpf.DiagramApp/ViewModels/MainWindowViewModel.cs @@ -727,7 +727,8 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels private void ColorPickerExecuted() { - + AIStudio.Wpf.ColorPicker.MainWindow window = new AIStudio.Wpf.ColorPicker.MainWindow(); + window.Show(); } #region 方法 diff --git a/AIStudio.Wpf.DiagramApp/ViewModels/PageViewModel.cs b/AIStudio.Wpf.DiagramApp/ViewModels/PageViewModel.cs index e23dc91..8ab2384 100644 --- a/AIStudio.Wpf.DiagramApp/ViewModels/PageViewModel.cs +++ b/AIStudio.Wpf.DiagramApp/ViewModels/PageViewModel.cs @@ -580,7 +580,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels public void AddImageExecuted(object para) { ImageItemViewModel itemBase = new ImageItemViewModel(); - DiagramViewModel?.AddItemCommand.Execute(itemBase); + DiagramViewModel?.AddCommand.Execute(itemBase); if (itemBase.Root != null) { _service.DrawModeViewModel.CursorMode = CursorMode.Move; @@ -631,7 +631,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels public void AddVideoExectued(object para) { VideoItemViewModel itemBase = new VideoItemViewModel(); - DiagramViewModel?.AddItemCommand.Execute(itemBase); + DiagramViewModel?.AddCommand.Execute(itemBase); if (itemBase.Root != null) { _service.DrawModeViewModel.CursorMode = CursorMode.Move; @@ -641,7 +641,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels public void AddOutLineTextExecuted(object para) { OutLineTextDesignerItemViewModel itemBase = new OutLineTextDesignerItemViewModel(); - DiagramViewModel?.AddItemCommand.Execute(itemBase); + DiagramViewModel?.AddCommand.Execute(itemBase); if (itemBase.Root != null) { _service.DrawModeViewModel.CursorMode = CursorMode.Move; @@ -651,7 +651,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels public void AddBarcodeExecuted(object para) { BarcodeDesignerItemViewModel itemBase = new BarcodeDesignerItemViewModel() { Format = (BarcodeFormat)Enum.Parse(typeof(BarcodeFormat), para.ToString()), Text = "AIStudio.Wpf.DiagramApp" }; - DiagramViewModel?.AddItemCommand.Execute(itemBase); + DiagramViewModel?.AddCommand.Execute(itemBase); if (itemBase.Root != null) { _service.DrawModeViewModel.CursorMode = CursorMode.Move; diff --git a/AIStudio.Wpf.DiagramApp/ViewModels/ToolBoxViewModel.cs b/AIStudio.Wpf.DiagramApp/ViewModels/ToolBoxViewModel.cs index e061c62..d8d7bb8 100644 --- a/AIStudio.Wpf.DiagramApp/ViewModels/ToolBoxViewModel.cs +++ b/AIStudio.Wpf.DiagramApp/ViewModels/ToolBoxViewModel.cs @@ -80,7 +80,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels } private ICommand _addItemCommand; - public ICommand AddItemCommand + public ICommand AddCommand { get { @@ -119,7 +119,9 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels List defaultToolBoxItems = new List(); defaultToolBoxItems.Add(new TextToolBoxData("", typeof(DefaultDesignerItemViewModel))); - + var blockitem = new TextToolBoxData("", typeof(BlockDesignerItemViewModel), 64, 32, new Size(130, 65)); + blockitem.ColorViewModel.FillColor.Color = Color.FromRgb(0x00, 0x2F, 0xA7); + defaultToolBoxItems.Add(blockitem); ToolBoxCategory.Add(new ToolBoxCategory() { Header = "Default", ToolBoxItems = new ObservableCollection(defaultToolBoxItems), IsExpanded = true }); ToolBoxCategory.Add(new ToolBoxCategory() { Header = "Svg", ToolBoxItems = new ObservableCollection() }); diff --git a/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml b/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml index ece665e..8e90371 100644 --- a/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml +++ b/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml @@ -2556,6 +2556,16 @@ Width="190" /> + + + + + + + + diff --git a/AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml b/AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml index 0c4b359..74ad368 100644 --- a/AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml +++ b/AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml @@ -363,7 +363,7 @@ -