diff --git a/Control/UserControls/PannelCard/LeftCardControl.xaml b/Control/UserControls/PannelCard/LeftCardControl.xaml index 142fe88..91d6530 100644 --- a/Control/UserControls/PannelCard/LeftCardControl.xaml +++ b/Control/UserControls/PannelCard/LeftCardControl.xaml @@ -44,13 +44,24 @@ - - + + + + + + + + + + + + + + + @@ -111,17 +122,18 @@ - diff --git a/ViewModel/MenuInfo.cs b/ViewModel/MenuInfo.cs index 2db5812..691e577 100644 --- a/ViewModel/MenuInfo.cs +++ b/ViewModel/MenuInfo.cs @@ -17,11 +17,23 @@ namespace GeekDesk.ViewModel private string menuId; private Visibility menuEdit = Visibility.Collapsed; private Visibility notMenuEdit = Visibility.Visible; + private bool isEdit = false; private string menuGeometry; //菜单几何图标 private string geometryColor; //几何图标颜色 private ObservableCollection iconList = new ObservableCollection(); - + public bool IsEdit + { + get + { + return isEdit; + } + set + { + isEdit = value; + OnPropertyChanged("IsEdit"); + } + } public string MenuGeometry { get @@ -93,9 +105,11 @@ namespace GeekDesk.ViewModel menuEdit = value; if (menuEdit == Visibility.Visible) { + IsEdit = true; NotMenuEdit = Visibility.Collapsed; } else { + IsEdit = false; NotMenuEdit = Visibility.Visible; } OnPropertyChanged("MenuEdit");