Merge branch 'master' of http://49.233.21.66/liulongfei/VIZ.Package

032518d9 · wangonghui · dd3090b5 · 081e5a6a · 032518d9 · 032518d9
Commit 032518d9 authored Feb 15, 2023 by wangonghui
17 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/Images/logo_large.png
+++ b/VIZ.Package.Module.Resource/Images/logo_large.png
--- a/VIZ.Package.Module.Resource/Style/IconButton/IconButton_Default.xaml
+++ b/VIZ.Package.Module.Resource/Style/IconButton/IconButton_Default.xaml
@@ -92,15 +92,19 @@
        <Setter Property="BorderThickness" Value="0"></Setter>
        <Setter Property="Height" Value="20"></Setter>
        <Setter Property="Width" Value="20"></Setter>
+        <Setter Property="IconWidth" Value="20"></Setter>
+        <Setter Property="IconHeight" Value="20"></Setter>
        <Setter Property="Template">
            <Setter.Value>
                <ControlTemplate TargetType="fcommon:IconButton">
                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"
                            Background="{TemplateBinding Background}">
                        <Grid x:Name="content" Opacity="1">
-                            <Image x:Name="img" Width="20" Height="20" Visibility="Visible"
+                            <Image x:Name="img" Visibility="Visible"
+                                   Width="{TemplateBinding IconWidth}" Height="{TemplateBinding IconHeight}"
                                   Source="{TemplateBinding Icon}"></Image>
-                            <Image x:Name="img_hover" Width="20" Height="20" Visibility="Collapsed"
+                            <Image x:Name="img_hover" Visibility="Collapsed"
+                                   Width="{TemplateBinding IconWidth}" Height="{TemplateBinding IconHeight}"
                                   Source="{TemplateBinding IconHover}"></Image>
                        </Grid>
                    </Border>

--- a/VIZ.Package.Module/ControlObject/FieldEdit/View/FieldEditView.xaml
+++ b/VIZ.Package.Module/ControlObject/FieldEdit/View/FieldEditView.xaml
@@ -21,7 +21,7 @@
    <Grid>
        <Grid.RowDefinitions>
            <RowDefinition Height="25"></RowDefinition>
-            <RowDefinition Height="30"></RowDefinition>
+            <RowDefinition Height="35"></RowDefinition>
            <RowDefinition Height="*"></RowDefinition>
        </Grid.RowDefinitions>
        <!-- 描述 -->
@@ -44,13 +44,15 @@
                <fcommon:IconButton Icon="/VIZ.Package.Module.Resource;component/Icons/icon_save_30x30.png"
                                    IconHover="/VIZ.Package.Module.Resource;component/Icons/icon_save_hover_30x30.png"
                                    Style="{StaticResource IconButton_Menu}"
-                                    ToolTip="保存" Margin="5,0,0,0" IconWidth="24" IconHeight="24"
+                                    ToolTip="保存" Margin="5,0,0,0" 
+                                    IconWidth="24" IconHeight="24" Width="24" Height="24"
                                    Command="{Binding SaveCommand}"></fcommon:IconButton>
                <!-- 另存为 -->
                <fcommon:IconButton Icon="/VIZ.Package.Module.Resource;component/Icons/icon_save_as_30x30.png"
                                    IconHover="/VIZ.Package.Module.Resource;component/Icons/icon_save_as_hover_30x30.png"
                                    Style="{StaticResource IconButton_Menu}"
-                                    ToolTip="另存为" Margin="5,0,0,0" IconWidth="24" IconHeight="24"
+                                    ToolTip="另存为" Margin="5,0,0,0" 
+                                    IconWidth="24" IconHeight="24" Width="24" Height="24"
                                    Command="{Binding SaveAsCommand}"></fcommon:IconButton>
            </StackPanel>
        </Border>

--- a/VIZ.Package.Module/Login/View/LoginView.xaml
+++ b/VIZ.Package.Module/Login/View/LoginView.xaml
@@ -10,7 +10,7 @@
             mc:Ignorable="d" 
             d:DataContext="{d:DesignInstance Type=local:LoginViewModel}" 
             d:Background="White"
-             d:DesignHeight="600" d:DesignWidth="500">
+             d:DesignHeight="580" d:DesignWidth="500">
    <dxmvvm:Interaction.Behaviors>
        <dxmvvm:EventToCommand EventName="Loaded" Command="{Binding Path=LoadedCommand}"></dxmvvm:EventToCommand>
@@ -22,19 +22,26 @@
            <RowDefinition Height="*"></RowDefinition>
        </Grid.RowDefinitions>
        <!-- Logo -->
-        <Image Width="170" HorizontalAlignment="Center" VerticalAlignment="Top"
+        <Grid Margin="10,10,10,20">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"></RowDefinition>
+                <RowDefinition Height="50"></RowDefinition>
+            </Grid.RowDefinitions>
+            <Image HorizontalAlignment="Center"
                   Source="/VIZ.Package.Module.Resource;component/Images/logo_large.png"></Image>
+            <TextBlock Text="摩羯座播控系统" Grid.Row="1" VerticalAlignment="Center" 
+                       HorizontalAlignment="Center" FontSize="24"></TextBlock>
+        </Grid>
        <!-- 功能区 -->
        <Grid Grid.Row="1">
            <Grid.RowDefinitions>
-                <RowDefinition Height="40"></RowDefinition>
+                <RowDefinition Height="45"></RowDefinition>
-                <RowDefinition Height="40"></RowDefinition>
+                <RowDefinition Height="45"></RowDefinition>
-                <RowDefinition Height="40"></RowDefinition>
+                <RowDefinition Height="45"></RowDefinition>
-                <RowDefinition Height="40"></RowDefinition>
+                <RowDefinition Height="45"></RowDefinition>
-                <RowDefinition Height="40"></RowDefinition>
+                <RowDefinition Height="45"></RowDefinition>
-                <RowDefinition Height="40"></RowDefinition>
+                <RowDefinition Height="45"></RowDefinition>
-                <RowDefinition Height="*"></RowDefinition>
+                <RowDefinition Height="55"></RowDefinition>
            </Grid.RowDefinitions>
            <Grid.ColumnDefinitions>
                <ColumnDefinition Width="120"></ColumnDefinition>

--- a/VIZ.Package.Module/Main/View/MainTopView.xaml
+++ b/VIZ.Package.Module/Main/View/MainTopView.xaml
@@ -38,11 +38,11 @@
        <dxb:MainMenuControl Caption="MainMenu" VerticalAlignment="Center" Margin="10,0,0,0">
            <dxb:MainMenuControl.Resources>
                <Style TargetType="dxb:BarSubItem">
-                    <Setter Property="Margin" Value="0,0,5,0"></Setter>
+                    <Setter Property="Margin" Value="0,0,3,0"></Setter>
                    <Setter Property="ContentTemplate">
                        <Setter.Value>
                            <DataTemplate>
-                                <TextBlock Text="{Binding .}" FontSize="15"></TextBlock>
+                                <TextBlock Text="{Binding .}" FontSize="14"></TextBlock>
                            </DataTemplate>
                        </Setter.Value>
                    </Setter>

--- a/VIZ.Package.Module/Main/View/MainView.xaml
+++ b/VIZ.Package.Module/Main/View/MainView.xaml
@@ -31,14 +31,7 @@
        <Style TargetType="{x:Type dxdo:LayoutPanel}">
            <Setter Property="FloatOnDoubleClick" Value="False"></Setter>
            <Setter Property="BindableName" Value="{Binding ID}" />
-            <!--<Setter Property="Caption" Value="{Binding Name}" />-->
+            <Setter Property="Caption" Value="{Binding Name}" />
-            <Setter Property="CaptionTemplate">
-                <Setter.Value>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding Path=Name}" FontSize="15"></TextBlock>
-                    </DataTemplate>
-                </Setter.Value>
-            </Setter>
            <Setter Property="MinHeight" Value="60"></Setter>
            <Setter Property="ShowCloseButton" Value="True"></Setter>
            <Setter Property="Closed" Value="{Binding Path=IsClosed,Mode=TwoWay}"></Setter>
@@ -46,13 +39,7 @@
        <Style TargetType="{x:Type dxdo:DocumentPanel}">
            <Setter Property="FloatOnDoubleClick" Value="False"></Setter>
            <Setter Property="BindableName" Value="{Binding ID}" />
-            <Setter Property="CaptionTemplate">
+            <Setter Property="Caption" Value="{Binding Name}" />
-                <Setter.Value>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding Path=Name}" FontSize="15"></TextBlock>
-                    </DataTemplate>
-                </Setter.Value>
-            </Setter>
            <Setter Property="MinHeight" Value="40"></Setter>
            <Setter Property="ShowCloseButton" Value="True"></Setter>
            <Setter Property="Closed" Value="{Binding Path=IsClosed,Mode=TwoWay}"></Setter>

--- 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
    }
 }
--- a/VIZ.Package.Module/Setting/Core/View/SettingWindow.xaml
+++ b/VIZ.Package.Module/Setting/Core/View/SettingWindow.xaml
@@ -18,7 +18,7 @@
        <dxmvvm:EventToCommand EventName="Loaded" Command="{Binding Path=LoadedCommand}"></dxmvvm:EventToCommand>
    </dxmvvm:Interaction.Behaviors>
-    <Grid>
+    <Grid Margin="0,5,0,0">
        <Grid.ColumnDefinitions>
            <ColumnDefinition Width="200"></ColumnDefinition>
            <ColumnDefinition Width="*"></ColumnDefinition>
@@ -28,9 +28,9 @@
            <RowDefinition Height="60"></RowDefinition>
        </Grid.RowDefinitions>
        <!-- 设置项 -->
-        <GroupBox Header="设置" Margin="10" Padding="10">
+        <GroupBox Header="设置" Margin="5" Padding="5">
            <ListBox ItemsSource="{Binding Path=ItemsSource}" Margin="0,0,6,0" Background="Transparent"
-                     SelectedValue="{Binding Path=SelectedValue,Mode=TwoWay}">
+                     SelectedValue="{Binding Path=SelectedValue,Mode=TwoWay}" BorderThickness="0">
                <ListBox.ItemTemplate>
                    <DataTemplate>
                        <Grid Height="30" Margin="5" Background="Transparent">

--- a/VIZ.Package/LoginWindow.xaml
+++ b/VIZ.Package/LoginWindow.xaml
@@ -3,9 +3,9 @@
                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                 xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
                 xmlns:module="clr-namespace:VIZ.Package.Module;assembly=VIZ.Package.Module"
-                 Title="魔羯座" Height="600" Width="500" ControlBoxButtonSet="Close,Minimize"
+                 Title="摩羯座播控系统" Height="600" Width="520" ControlBoxButtonSet="Close,Minimize"
                 WindowStartupLocation="CenterScreen">
-    <module:LoginView Margin="20"></module:LoginView>
+    <module:LoginView></module:LoginView>
 </dx:ThemedWindow>
--- a/VIZ.Package/MainWindow.xaml
+++ b/VIZ.Package/MainWindow.xaml
@@ -4,7 +4,7 @@
                 xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
                 xmlns:dxcn="http://schemas.devexpress.com/winfx/2008/xaml/core/internal"
                 xmlns:module="clr-namespace:VIZ.Package.Module;assembly=VIZ.Package.Module"
-                 Title="魔羯座" Height="1000" Width="1600" ShowTitle="False" Padding="0" ShowIcon="False"
+                 Title="摩羯座播控系统" Height="1000" Width="1600" ShowTitle="False" Padding="0" ShowIcon="False"
                 dxcn:WindowChrome.CaptionHeight="30"
                 WindowStartupLocation="CenterScreen" WindowState="Maximized">
    <dx:ThemedWindow.ToolbarItems>

--- a/VIZ.Package/logo.ico
+++ b/VIZ.Package/logo.ico