样式修改，bug修复

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

@@ -76,14 +76,13 @@ namespace VIZ.Package.Domain
 
         #region SelectedPages -- 当前选中的页集合
 
-        private IList selectedPages;
+        private ObservableCollection<PageModel> selectedPages = new ObservableCollection<PageModel>();
         /// <summary>
         /// 当前选中的页集合
         /// </summary>
-        public IList SelectedPages
+        public ObservableCollection<PageModel> SelectedPages
         {
             get { return selectedPages; }
-            set { selectedPages = value; this.RaisePropertyChanged(nameof(SelectedPages)); }
         }
 
         #endregion

VIZ.Package.Module.Resource/DevExpreess/Theme/VizThemeThemePalette.cs

@@ -15,15 +15,8 @@ namespace VIZ.Package.Module.Resource
     {
         public VizThemeThemePalette() : base("VizTheme")
         {
-            SetColor("HoverBackground", (Color)ColorConverter.ConvertFromString("#FF343434"));
-            SetColor("Backstage.Button.Background", (Color)ColorConverter.ConvertFromString("#FF4E4BDE"));
-            SetColor("Backstage.Delimiter", (Color)ColorConverter.ConvertFromString("#FF4E4BDE"));
-            SetColor("Backstage.HoverBackground", (Color)ColorConverter.ConvertFromString("#FF4E4BDE"));
-            SetColor("Backstage.Window.Background", (Color)ColorConverter.ConvertFromString("#FF4E4BDE"));
-            SetColor("Focused", (Color)ColorConverter.ConvertFromString("#FF4E4BDE"));
-            SetColor("SelectionBackground", (Color)ColorConverter.ConvertFromString("#FF4E4BDE"));
-            SetColor("SelectionBorder", (Color)ColorConverter.ConvertFromString("#FF4E4BDE"));
-            SetColor("Window.HeaderButton.SelectionBackground", (Color)ColorConverter.ConvertFromString("#FF4E4BDE"));
+            SetColor("FocusedBorder", (Color)ColorConverter.ConvertFromString("#22FFFFFF"));
+            SetColor("AltBorder", (Color)ColorConverter.ConvertFromString("#22FFFFFF"));
         }
     }
 }

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

@@ -78,7 +78,7 @@
     </dxmvvm:Interaction.Behaviors>
 
     <dxdo:DockLayoutManager x:Name="dockLayoutManager" FloatingMode="Desktop" EnableWin32Compatibility="True"
-                            ViewStyle="Default"
+                            ViewStyle="Light"
                             AutoHideExpandMode="MouseDown">
         <dxdo:LayoutGroup ItemsSource="{Binding ItemsSource}"></dxdo:LayoutGroup>
     </dxdo:DockLayoutManager>

VIZ.Package.Module/Page/Core/Helper/PageViewModelHelper.cs

@@ -144,7 +144,7 @@ namespace VIZ.Package.Module
                             if (!item.IsEnabled || !item.IsConnected)
                                 continue;
 
-                            this.vizCommandService.TakeClear(ApplicationDomainEx.PreviewConn);
+                            this.vizCommandService.TakeClear(item);
                         }
                         catch (Exception ex)
                         {

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

@@ -94,7 +94,7 @@
                         <Setter.Value>
                             <DataTemplate>
                                 <dxg:GridControl ItemsSource="{Binding Path=Pages}" ShowBorder="False" IsFilterEnabled="False" SelectionMode="Row"
-                                                 SelectedItems="{Binding Path=SelectedPages,Mode=OneWayToSource}">
+                                                 SelectedItems="{Binding Path=SelectedPages}">
                                     <dxg:GridControl.Columns>
                                         <dxg:GridColumn Header="编号" AllowSorting="False" AllowColumnFiltering="False" AllowResizing="True"
                                                         FieldName="PageNum">
@@ -139,12 +139,12 @@
                                                                           DisplayMember="Name" ValueMember="GroupID" IsTextEditable="False"></dxe:ComboBoxEditSettings>
                                             </dxg:GridColumn.EditSettings>
                                         </dxg:GridColumn>
-                                        <dxg:GridColumn Header="加载" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" AllowEditing="False">
+                                        <dxg:GridColumn Header="初始化加载" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" AllowEditing="False">
                                             <dxg:GridColumn.CellTemplate>
                                                 <DataTemplate>
                                                     <Grid Background="Transparent" ToolTip="{Binding Path=Row.SceneInfo.TakeInitedMessage}">
                                                         <dxe:ProgressBarEdit Minimum="0" Maximum="1" ContentDisplayMode="Value" 
-                                                                             DisplayFormatString="{}{0:P}" Height="30" ShowBorder="False" Background="Transparent"
+                                                                             DisplayFormatString="{}{0:P}" Height="20" ShowBorder="False" Background="Transparent"
                                                                              EditValue="{Binding Path=Row.SceneInfo.TakeInitedProgress}"></dxe:ProgressBarEdit>
                                                     </Grid>
                                                 </DataTemplate>

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

@@ -287,11 +287,7 @@ namespace VIZ.Package.Module
             if (DXMessageBox.Show($"是否删除项", "提示", MessageBoxButton.YesNo) != MessageBoxResult.Yes)
                 return;
 
-            List<PageModel> pages = new List<PageModel>();
-            foreach (PageModel page in this.SelectedPageGroupModel.SelectedPages)
-            {
-                pages.Add(page);
-            }
+            List<PageModel> pages = this.SelectedPageGroupModel.Pages.ToList();
 
             foreach (PageModel page in pages)
             {
@@ -323,7 +319,7 @@ namespace VIZ.Package.Module
             if (this.SelectedPageGroupModel.SelectedPages == null || this.SelectedPageGroupModel.SelectedPages.Count == 0)
                 return;
 
-            PageModel page = this.SelectedPageGroupModel.SelectedPages[0] as PageModel;
+            PageModel page = this.SelectedPageGroupModel.SelectedPages.First();
             this.OpenPage(page);
         }
 
@@ -347,11 +343,7 @@ namespace VIZ.Package.Module
             if (this.SelectedPageGroupModel.SelectedPages == null || this.SelectedPageGroupModel.SelectedPages.Count == 0)
                 return;
 
-            List<PageModelBase> pages = new List<PageModelBase>();
-            foreach (PageModelBase page in this.SelectedPageGroupModel.SelectedPages)
-            {
-                pages.Add(page);
-            }
+            List<PageModelBase> pages = this.SelectedPageGroupModel.SelectedPages.ToList<PageModelBase>();
 
             // 开始下载图片
             this.pageViewModelHelper.BeginDownLoadIamge(pages);
@@ -382,8 +374,18 @@ namespace VIZ.Package.Module
         /// </summary>
         private void TakeClear()
         {
-            List<ConnGroupModel> groups = ApplicationDomainEx.ConnGroups.ToList();
+            // 清理状态
+            lock (ApplicationDomainEx.SceneInfoList)
+            {
+                foreach (SceneInfoModel sceneInfo in ApplicationDomainEx.SceneInfoList)
+                {
+                    sceneInfo.TakeInitedProgress = 0d;
+                    sceneInfo.TakeInitedMessage = null;
+                }
+            }
 
+            // 开始清理
+            List<ConnGroupModel> groups = ApplicationDomainEx.ConnGroups.ToList();
             this.pageViewModelHelper.BeginTakeClear(groups);
         }
 
@@ -407,11 +409,7 @@ namespace VIZ.Package.Module
             if (this.SelectedPageGroupModel.SelectedPages == null || this.SelectedPageGroupModel.SelectedPages.Count == 0)
                 return;
 
-            List<PageModel> pages = new List<PageModel>();
-            foreach (PageModel page in this.SelectedPageGroupModel.SelectedPages)
-            {
-                pages.Add(page);
-            }
+            List<PageModel> pages = this.SelectedPageGroupModel.SelectedPages.ToList();
 
             // 开始初始化
             this.pageViewModelHelper.BeginTakeInit(pages);

VIZ.Package.Module/Page/Templage/View/PageTemplateView.xaml

@@ -28,7 +28,7 @@
 
     <Grid IsEnabled="{Binding Path=IsEnabled}" Margin="0,10,0,10">
         <dxg:GridControl ItemsSource="{Binding Path=SceneTemplateModels}" ShowBorder="False" SelectionMode="Row"
-                         SelectedItems="{Binding Path=SelectedSceneTemplateModels,Mode=OneWayToSource}">
+                         SelectedItems="{Binding Path=SelectedSceneTemplateModels}">
             <dxg:GridControl.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="打开" Command="{Binding Path=PlacementTarget.DataContext.OpenScenePageCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>

VIZ.Package.Module/Page/Templage/ViewModel/PageTemplateViewModel.cs

@@ -146,14 +146,13 @@ namespace VIZ.Package.Module
 
         #region SelectedSceneTemplateModels -- 当前选中的场景模板集合
 
-        private IList selectedSceneTemplateModels;
+        private ObservableCollection<PageTemplateModel> selectedSceneTemplateModels = new ObservableCollection<PageTemplateModel>();
         /// <summary>
         /// 当前选中的场景模板集合
         /// </summary>
-        public IList SelectedSceneTemplateModels
+        public ObservableCollection<PageTemplateModel> SelectedSceneTemplateModels
         {
             get { return selectedSceneTemplateModels; }
-            set { selectedSceneTemplateModels = value; this.RaisePropertyChanged(nameof(SelectedSceneTemplateModels)); }
         }
 
         #endregion
@@ -204,7 +203,7 @@ namespace VIZ.Package.Module
             if (this.SelectedSceneTemplateModels == null || this.SelectedSceneTemplateModels.Count == 0)
                 return;
 
-            PageTemplateModel template = this.SelectedSceneTemplateModels[0] as PageTemplateModel;
+            PageTemplateModel template = this.SelectedSceneTemplateModels.First();
             this.OpenScenePage(template);
         }
 
@@ -238,11 +237,7 @@ namespace VIZ.Package.Module
             if (this.SelectedSceneTemplateModels == null || this.SelectedSceneTemplateModels.Count == 0)
                 return;
 
-            List<PageModelBase> templates = new List<PageModelBase>();
-            foreach (PageTemplateModel template in this.SelectedSceneTemplateModels)
-            {
-                templates.Add(template);
-            }
+            List<PageModelBase> templates = this.SelectedSceneTemplateModels.ToList<PageModelBase>();
 
             // 开始下载图片
             this.pageViewModelHelper.BeginDownLoadIamge(templates);
@@ -279,11 +274,7 @@ namespace VIZ.Package.Module
             if (DXMessageBox.Show($"是否删除模板?", "提示", System.Windows.MessageBoxButton.YesNo) != System.Windows.MessageBoxResult.Yes)
                 return;
 
-            List<PageTemplateModel> templates = new List<PageTemplateModel>();
-            foreach (PageTemplateModel template in this.SelectedSceneTemplateModels)
-            {
-                templates.Add(template);
-            }
+            List<PageTemplateModel> templates = this.SelectedSceneTemplateModels.ToList();
             foreach (PageTemplateModel template in templates)
             {
                 this.SceneTemplateModels.Remove(template);

VIZ.Package.Module/Resource/GHResource/View/GHResourcePanel.xaml

@@ -94,7 +94,7 @@
                          SelectionMode="Row"
                          CustomRowFilterCommand="{Binding Path=FileRowFilterCommand}"
                          ItemsSource="{Binding Path=FileModels}" 
-                         SelectedItems="{Binding Path=SelectedFileModels,Mode=OneWayToSource}"
+                         SelectedItems="{Binding Path=SelectedFileModels}"
                          SelectedItem="{Binding Path=SelectedFileModel,Mode=TwoWay}">
             <dxmvvm:Interaction.Behaviors>
                 <dxmvvm:EventToCommand EventName="MouseDoubleClick" Command="{Binding Path=FileDoubleClickCommand}"></dxmvvm:EventToCommand>

VIZ.Package.Module/Resource/GHResource/ViewModel/GHResourcePanelModel.cs

@@ -146,14 +146,13 @@ namespace VIZ.Package.Module
 
         #region SelectedFileModels -- 选中的文件模型集合
 
-        private IList selectedFileModels;
+        private ObservableCollection<GHResourceFileModel> selectedFileModels = new ObservableCollection<GHResourceFileModel>();
         /// <summary>
         /// 选中的文件模型集合
         /// </summary>
-        public IList SelectedFileModels
+        public ObservableCollection<GHResourceFileModel> SelectedFileModels
         {
             get { return selectedFileModels; }
-            set { selectedFileModels = value; this.RaisePropertyChanged(nameof(SelectedFileModels)); }
         }
 
         #endregion

VIZ.Package.Module/Resource/GHResource/ViewModel/GHSceneViewModel.cs

@@ -57,12 +57,7 @@ namespace VIZ.Package.Module
             if (service == null)
                 return;
 
-            List<GHResourceFileModel> list = new List<GHResourceFileModel>();
-            foreach (GHResourceFileModel file in this.SelectedFileModels)
-            {
-                list.Add(file);
-            }
-            service.AddSceneTemplate(list);
+            service.AddSceneTemplate(this.SelectedFileModels.ToList());
         }
 
         #endregion

VIZ.Package/App.xaml.cs

@@ -25,11 +25,10 @@ namespace VIZ.Package
         public App()
         {
             // 设置DevExpress主题
-            //VizThemeThemePalette palette = new VizThemeThemePalette();
-            //Theme theme = Theme.CreateTheme(palette, Theme.Win11Dark);
-            //Theme.RegisterTheme(theme);
-            //ApplicationThemeHelper.ApplicationThemeName = theme.Name;
-            ApplicationThemeHelper.ApplicationThemeName = Theme.Win10DarkName;
+            VizThemeThemePalette palette = new VizThemeThemePalette();
+            Theme theme = Theme.CreateTheme(palette, Theme.Win10Dark);
+            Theme.RegisterTheme(theme);
+            ApplicationThemeHelper.ApplicationThemeName = theme.Name;
 
             // 初始化LiteDB
             AppSetup.AppendSetup(new AppSetup_InitLiteDB());