bug修复

VIZ.Package.Domain/Model/Conn/ConnGroupModel.cs

@@ -44,7 +44,7 @@ namespace VIZ.Package.Domain
 
 
         #region IsEnabled -- 是否启用
         #region IsEnabled -- 是否启用
 
 
-        private bool isEnabled;
+        private bool isEnabled = true;
         /// <summary>
         /// <summary>
         /// 是否启用
         /// 是否启用
         /// </summary>
         /// </summary>

VIZ.Package.Domain/Model/Conn/ConnModel.cs

@@ -99,7 +99,7 @@ namespace VIZ.Package.Domain
 
 
         #region IsEnabled -- 是否启用
         #region IsEnabled -- 是否启用
 
 
-        private bool isEnabled;
+        private bool isEnabled = true;
         /// <summary>
         /// <summary>
         /// 是否启用
         /// 是否启用
         /// </summary>
         /// </summary>

VIZ.Package.Domain/Model/Page/PageGroupModel.cs

@@ -87,5 +87,19 @@ namespace VIZ.Package.Domain
         }
         }
 
 
         #endregion
         #endregion
+
+        #region IsColumnChooserVisible -- 列选择器是否显示
+
+        private bool isColumnChooserVisible;
+        /// <summary>
+        /// 列选择器是否显示
+        /// </summary>
+        public bool IsColumnChooserVisible
+        {
+            get { return isColumnChooserVisible; }
+            set { isColumnChooserVisible = value; this.RaisePropertyChanged(nameof(IsColumnChooserVisible)); }
+        }
+
+        #endregion
     }
     }
 }
 }

VIZ.Package.Module/Help/About/View/AboutWindow.xaml

@@ -21,7 +21,7 @@
         <!-- 系统版本 -->
         <!-- 系统版本 -->
         <TextBlock Text="系统版本：" VerticalAlignment="Center" HorizontalAlignment="Right" 
         <TextBlock Text="系统版本：" VerticalAlignment="Center" HorizontalAlignment="Right" 
                    Grid.Row="1" Grid.Column="0" Margin="0,0,10,0"></TextBlock>
                    Grid.Row="1" Grid.Column="0" Margin="0,0,10,0"></TextBlock>
-        <TextBlock Text="V1.0.0.0" VerticalAlignment="Center" HorizontalAlignment="Left" 
+        <TextBlock Text="V1.0.0.02172045_beta" VerticalAlignment="Center" HorizontalAlignment="Left" 
                    Grid.Row="1" Grid.Column="1"></TextBlock>
                    Grid.Row="1" Grid.Column="1"></TextBlock>
     </Grid>
     </Grid>
 </dx:ThemedWindow>
 </dx:ThemedWindow>

VIZ.Package.Module/Main/View/MainView.xaml

@@ -46,7 +46,7 @@
                     <Style TargetType="dxdove:CaptionImage">
                     <Style TargetType="dxdove:CaptionImage">
                         <Setter Property="Width" Value="16"/>
                         <Setter Property="Width" Value="16"/>
                         <Setter Property="Height" Value="16"/>
                         <Setter Property="Height" Value="16"/>
-                        <Setter Property="Stretch" Value="Fill"/> 
+                        <Setter Property="Stretch" Value="Fill"/>
                     </Style>
                     </Style>
                 </Setter.Value>
                 </Setter.Value>
             </Setter>
             </Setter>
@@ -78,7 +78,7 @@
     </dxmvvm:Interaction.Behaviors>
     </dxmvvm:Interaction.Behaviors>
 
 
     <dxdo:DockLayoutManager x:Name="dockLayoutManager" FloatingMode="Desktop" EnableWin32Compatibility="True"
     <dxdo:DockLayoutManager x:Name="dockLayoutManager" FloatingMode="Desktop" EnableWin32Compatibility="True"
-                            ViewStyle="Light"
+                            ViewStyle="Default"
                             AutoHideExpandMode="MouseDown">
                             AutoHideExpandMode="MouseDown">
         <dxdo:LayoutGroup ItemsSource="{Binding ItemsSource}"></dxdo:LayoutGroup>
         <dxdo:LayoutGroup ItemsSource="{Binding ItemsSource}"></dxdo:LayoutGroup>
     </dxdo:DockLayoutManager>
     </dxdo:DockLayoutManager>

VIZ.Package.Module/Page/Group/View/PageGroupView.xaml

@@ -65,6 +65,8 @@
                     <MenuItem Header="新建分组" Command="{Binding Path=PlacementTarget.DataContext.AddGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                     <MenuItem Header="新建分组" Command="{Binding Path=PlacementTarget.DataContext.AddGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                     <MenuItem Header="重命名分组" Command="{Binding Path=PlacementTarget.DataContext.RenameGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                     <MenuItem Header="重命名分组" Command="{Binding Path=PlacementTarget.DataContext.RenameGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                     <Separator></Separator>
                     <Separator></Separator>
+                    <MenuItem Header="显示列" Command="{Binding Path=PlacementTarget.DataContext.ColumnChoiceCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
+                    <Separator></Separator>
                     <MenuItem Header="更新页" Command="{Binding Path=PlacementTarget.DataContext.UpdateCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                     <MenuItem Header="更新页" Command="{Binding Path=PlacementTarget.DataContext.UpdateCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                     <MenuItem Header="初始化页" Command="{Binding Path=PlacementTarget.DataContext.TakeInitCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                     <MenuItem Header="初始化页" Command="{Binding Path=PlacementTarget.DataContext.TakeInitCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                     <Separator></Separator>
                     <Separator></Separator>
@@ -155,7 +157,8 @@
                                         <dxg:GridColumn Header="插件" FieldName="PluginName" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False"></dxg:GridColumn>
                                         <dxg:GridColumn Header="插件" FieldName="PluginName" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False"></dxg:GridColumn>
                                     </dxg:GridControl.Columns>
                                     </dxg:GridControl.Columns>
                                     <dxg:GridControl.View>
                                     <dxg:GridControl.View>
-                                        <dxg:TableView IsColumnMenuEnabled="False"
+                                        <dxg:TableView IsColumnMenuEnabled="False" 
+                                                       IsColumnChooserVisible="{Binding Path=IsColumnChooserVisible,Mode=TwoWay}"
                                                        AllowEditing="True" ShowIndicator="False" RowMinHeight="69.5"
                                                        AllowEditing="True" ShowIndicator="False" RowMinHeight="69.5"
                                                        NavigationStyle="Cell" ShowVerticalLines="False"
                                                        NavigationStyle="Cell" ShowVerticalLines="False"
                                                        ShowGroupPanel="False" EditorShowMode="MouseDown"
                                                        ShowGroupPanel="False" EditorShowMode="MouseDown"

VIZ.Package.Module/Page/Group/ViewModel/PageGroupViewModel.cs

@@ -51,6 +51,7 @@ namespace VIZ.Package.Module
             this.TakeClearCommand = new VCommand(this.TakeClear);
             this.TakeClearCommand = new VCommand(this.TakeClear);
             this.TakeInitCommand = new VCommand(this.TakeInit);
             this.TakeInitCommand = new VCommand(this.TakeInit);
             this.TakeInitAllCommand = new VCommand(this.TakeInitAll);
             this.TakeInitAllCommand = new VCommand(this.TakeInitAll);
+            this.ColumnChoiceCommand = new VCommand(this.ColumnChoice);
         }
         }
 
 
         /// <summary>
         /// <summary>
@@ -444,6 +445,26 @@ namespace VIZ.Package.Module
 
 
         #endregion
         #endregion
 
 
+        #region ColumnChoiceCommand -- 列选择命令
+
+        /// <summary>
+        /// 列选择命令
+        /// </summary>
+        public VCommand ColumnChoiceCommand { get; set; }
+
+        /// <summary>
+        /// 列选择
+        /// </summary>
+        private void ColumnChoice()
+        {
+            if (this.SelectedPageGroupModel == null)
+                return;
+
+            this.SelectedPageGroupModel.IsColumnChooserVisible = true;
+        }
+
+        #endregion
+
         // ======================================================================================
         // ======================================================================================
         // Message
         // Message
         // ======================================================================================
         // ======================================================================================
@@ -474,11 +495,17 @@ namespace VIZ.Package.Module
                     this.IsLoading = false;
                     this.IsLoading = false;
                 });
                 });
 
 
-                if (this.SelectedPageGroupModel == null)
-                    return;
-
                 // 获取场景模板缩略图
                 // 获取场景模板缩略图
-                this.pageViewModelHelper.BeginDownLoadIamge(this.SelectedPageGroupModel.Pages.ToList<PageModelBase>());
+                List<PageModelBase> pages = new List<PageModelBase>();
+                foreach (PageGroupModel group in pageGroups)
+                {
+                    if (group.Pages == null || group.Pages.Count == 0)
+                        continue;
+
+                    pages.AddRange(group.Pages);
+                }
+
+                this.pageViewModelHelper.BeginDownLoadIamge(pages);
             });
             });
         }
         }