场景模板选择页面逻辑调整

57b9c9f5 · liulongfei · ad6b3a81 · 57b9c9f5 · 57b9c9f5 · 57b9c9f5
Commit 57b9c9f5 authored Feb 15, 2023 by liulongfei
7 changed files
--- a/VIZ.Package.Domain/Model/Resource/GH/GHResourceFileModel.cs
+++ b/VIZ.Package.Domain/Model/Resource/GH/GHResourceFileModel.cs
@@ -117,20 +117,6 @@ namespace VIZ.Package.Domain
        #endregion
-        #region IsChecked -- 是否被选中
-        private bool isChecked;
-        /// <summary>
-        /// 是否被选中
-        /// </summary>
-        public bool IsChecked
-        {
-            get { return isChecked; }
-            set { isChecked = value; this.RaisePropertyChanged(nameof(IsChecked)); }
-        }
-        #endregion
        // ---------------------------------------------------------------------
        // 方法

--- a/VIZ.Package.Module.Resource/Icons/checked_36x36.png
+++ b/VIZ.Package.Module.Resource/Icons/checked_36x36.png
--- a/VIZ.Package.Module/Resource/GHResource/Controller/GHResourceFileController.cs
+++ b/VIZ.Package.Module/Resource/GHResource/Controller/GHResourceFileController.cs
@@ -57,16 +57,9 @@ namespace VIZ.Package.Module
            if (folder == null)
            {
                this.ViewModel.FileModels = null;
-                this.ViewModel.SelectedFileModel = null;
                return;
            }
-            // 清除选择
-            foreach (GHResourceFileModel file in folder.Files)
-            {
-                file.IsChecked = false;
-            }
            // 已经获取过文件
            if (folder.IsRefreshedFiles)
            {

--- a/VIZ.Package.Module/Resource/GHResource/View/GHResourcePanel.xaml
+++ b/VIZ.Package.Module/Resource/GHResource/View/GHResourcePanel.xaml
@@ -51,7 +51,7 @@
                            <TextBlock Grid.Row="1" TextAlignment="Center" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" HorizontalAlignment="Center"
                                   Text="{Binding Path=Row.Name}" ToolTip="{Binding Path=Row.Name}" Margin="0,5,0,0"/>
                            <CheckBox Style="{StaticResource ResourceKey=CheckBox_Resource}" Grid.RowSpan="2"
-                                      IsChecked="{Binding Path=Row.IsChecked,Mode=TwoWay}"></CheckBox>
+                                      IsChecked="{Binding Path=IsSelected,Mode=OneWay}" IsHitTestVisible="False"></CheckBox>
                        </Grid>
                    </DataTemplate>
                </resource:ResourceFileSelectionModeConverter.MultipleDataTemplate>
@@ -94,6 +94,7 @@
                         SelectionMode="Row"
                         CustomRowFilterCommand="{Binding Path=FileRowFilterCommand}"
                         ItemsSource="{Binding Path=FileModels}" 
+                         SelectedItems="{Binding Path=SelectedFileModels,Mode=OneWayToSource}"
                         SelectedItem="{Binding Path=SelectedFileModel,Mode=TwoWay}">
            <dxmvvm:Interaction.Behaviors>
                <dxmvvm:EventToCommand EventName="MouseDoubleClick" Command="{Binding Path=FileDoubleClickCommand}"></dxmvvm:EventToCommand>

--- a/VIZ.Package.Module/Resource/GHResource/View/GHSceneView.xaml
+++ b/VIZ.Package.Module/Resource/GHResource/View/GHSceneView.xaml
@@ -7,6 +7,10 @@
             mc:Ignorable="d" 
             d:DesignHeight="450" d:DesignWidth="800">
    <Grid Background="Transparent">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"></RowDefinition>
+            <RowDefinition Height="50"></RowDefinition>
+        </Grid.RowDefinitions>
        <!-- GH资源面板 -->
        <local:GHResourcePanel  FileSelectionMode="Multiple">
            <local:GHResourcePanel.FolderContextMenu>
@@ -17,11 +21,14 @@
            <local:GHResourcePanel.FileContextMenu>
                <ContextMenu>
                    <MenuItem Header="刷新" Command="{Binding Path=PlacementTarget.DataContext.RefreshFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
-                    <MenuItem Header="取消选择" Command="{Binding Path=PlacementTarget.DataContext.CancelFileSelectedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                    <Separator/>
                    <MenuItem Header="添加场景模板" Command="{Binding Path=PlacementTarget.DataContext.AddSceneTemplateCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                </ContextMenu>
            </local:GHResourcePanel.FileContextMenu>
        </local:GHResourcePanel>
+        <!-- 按钮组 -->
+        <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,10,0">
+            <Button Content="添加模板" Width="100" Height="30" Command="{Binding Path=AddSceneTemplateCommand}"></Button>
+        </StackPanel>
    </Grid>
 </UserControl>
--- a/VIZ.Package.Module/Resource/GHResource/ViewModel/GHResourcePanelModel.cs
+++ b/VIZ.Package.Module/Resource/GHResource/ViewModel/GHResourcePanelModel.cs
 using DevExpress.Mvvm.Xpf;
 using log4net;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -143,6 +144,20 @@ namespace VIZ.Package.Module
        #endregion
+        #region SelectedFileModels -- 选中的文件模型集合
+        private IList selectedFileModels;
+        /// <summary>
+        /// 选中的文件模型集合
+        /// </summary>
+        public IList SelectedFileModels
+        {
+            get { return selectedFileModels; }
+            set { selectedFileModels = value; this.RaisePropertyChanged(nameof(SelectedFileModels)); }
+        }
+        #endregion
        #region IsFolderLoading -- 是否正在加载文件夹
        private bool isFolderLoading;

--- a/VIZ.Package.Module/Resource/GHResource/ViewModel/GHSceneViewModel.cs
+++ b/VIZ.Package.Module/Resource/GHResource/ViewModel/GHSceneViewModel.cs
-using System;
+using DevExpress.Xpf.Core;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -27,7 +28,6 @@ namespace VIZ.Package.Module
        private void InitCommand()
        {
            this.AddSceneTemplateCommand = new VCommand(this.AddSceneTemplate);
-            this.CancelFileSelectedCommand = new VCommand(this.CancelFileSelected);
        }
        // ===========================================================================
@@ -46,45 +46,23 @@ namespace VIZ.Package.Module
        /// </summary>
        private void AddSceneTemplate()
        {
-            if (this.SelectedFolderModel == null)
+            if (this.SelectedFolderModel == null || this.SelectedFileModels.Count == 0)
+            {
+                DXMessageBox.Show("请选择场景模板");
                return;
+            }
            IPageTemplateService service = ApplicationDomainEx.ServiceManager.GetService<IPageTemplateService>(ViewServiceKeys.PAGE_TEMPLATE_SERVICE);
            if (service == null)
                return;
-            foreach (GHResourceFileModel file in this.SelectedFolderModel.Files)
+            foreach (GHResourceFileModel file in this.SelectedFileModels)
            {
-                if (!file.IsChecked)
-                    continue;
                service.AddSceneTemplate(file);
            }
        }
        #endregion
-        #region CancelFileSelectedCommand -- 取消文件选择命令
-        /// <summary>
-        /// 取消文件选择命令
-        /// </summary>
-        public VCommand CancelFileSelectedCommand { get; set; }
-        /// <summary>
-        /// 取消文件选择
-        /// </summary>
-        private void CancelFileSelected()
-        {
-            if (this.SelectedFolderModel == null)
-                return;
-            foreach (GHResourceFileModel file in this.SelectedFolderModel.Files)
-            {
-                file.IsChecked = false;
-            }
-        }
-        #endregion
    }
 }