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

VIZ.Package.Module.Resource/VIZ.Package.Module.Resource.csproj

@@ -182,5 +182,8 @@
   <ItemGroup>
     <Resource Include="Icons\checked_36x36.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Icons\image_20x20.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/ImageListCellEdit.xaml

@@ -17,10 +17,12 @@
                         d:DesignHeight="30" d:DesignWidth="200">
     <Grid>
         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="30"></ColumnDefinition>
             <ColumnDefinition Width="*"></ColumnDefinition>
             <ColumnDefinition Width="30"></ColumnDefinition>
         </Grid.ColumnDefinitions>
-        <dxe:TextEdit x:Name="PART_Text" IsReadOnly="True" EditValueChanged="EditValueChanged"></dxe:TextEdit>
-        <Button x:Name="PART_Show" Content=".." Grid.Column="1" Click="EditClick"></Button>
+        <Image Width="16" Height="16" Source="/VIZ.Package.Module.Resource;component/Icons/image_20x20.png"></Image>
+        <dxe:TextEdit x:Name="PART_Text" Grid.Column="1" IsReadOnly="True" EditValueChanged="EditValueChanged"></dxe:TextEdit>
+        <Button x:Name="PART_Show" Content=".." Grid.Column="2" Click="EditClick"></Button>
     </Grid>
 </local:ListCellEditBase>

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

@@ -9,6 +9,7 @@
              xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
              xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
              xmlns:fcore="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
+             xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
              xmlns:storage="clr-namespace:VIZ.Package.Storage;assembly=VIZ.Package.Storage"
              xmlns:resource="clr-namespace:VIZ.Package.Module.Resource;assembly=VIZ.Package.Module.Resource"
              xmlns:local="clr-namespace:VIZ.Package.Module"
@@ -70,10 +71,12 @@
                                                 </DataTemplate>
                                             </dxg:GridColumn.CellTemplate>
                                         </dxg:GridColumn>
-                                        <dxg:GridColumn Header="缩略图" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="120" AllowResizing="False">
+                                        <dxg:GridColumn Header="缩略图" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="120" MinWidth="40" MaxWidth="300" AllowResizing="True">
                                             <dxg:GridColumn.CellTemplate>
                                                 <DataTemplate>
-                                                    <Image Width="120" Source="{Binding Path=Row.ThumbnailBitmap,Converter={StaticResource Bitmap2ImageSourceConverter}}"></Image>
+                                                    <fcommon:ResizeImageControl ImageSource="{Binding Path=Row.ThumbnailBitmap,Converter={StaticResource Bitmap2ImageSourceConverter}}"
+                                                                                IconSource="/VIZ.Package.Module.Resource;component/Icons/image_20x20.png"
+                                                                                ShowImageMinWidth="50" ShowImageMinHeight="50"></fcommon:ResizeImageControl>
                                                 </DataTemplate>
                                             </dxg:GridColumn.CellTemplate>
                                         </dxg:GridColumn>

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

@@ -9,6 +9,7 @@
              xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
              xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
              xmlns:fcore="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
+             xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
              xmlns:storage="clr-namespace:VIZ.Package.Storage;assembly=VIZ.Package.Storage"
              xmlns:resource="clr-namespace:VIZ.Package.Module.Resource;assembly=VIZ.Package.Module.Resource"
              xmlns:local="clr-namespace:VIZ.Package.Module"
@@ -47,10 +48,12 @@
                                 </DataTemplate>
                             </dxg:GridColumn.CellTemplate>
                         </dxg:GridColumn>
-                        <dxg:GridColumn Header="缩略图" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="120" AllowResizing="False">
+                        <dxg:GridColumn Header="缩略图" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="120" MinWidth="40" MaxWidth="300" AllowResizing="True">
                             <dxg:GridColumn.CellTemplate>
                                 <DataTemplate>
-                                    <Image Source="{Binding Path=Row.ThumbnailBitmap,Converter={StaticResource Bitmap2ImageSourceConverter}}"></Image>
+                                    <fcommon:ResizeImageControl ImageSource="{Binding Path=Row.ThumbnailBitmap,Converter={StaticResource Bitmap2ImageSourceConverter}}"
+                                                                IconSource="/VIZ.Package.Module.Resource;component/Icons/image_20x20.png"
+                                                                ShowImageMinWidth="50" ShowImageMinHeight="50"></fcommon:ResizeImageControl>
                                 </DataTemplate>
                             </dxg:GridColumn.CellTemplate>
                         </dxg:GridColumn>

VIZ.Package.Module/Preview/VizPreview/View/VizPreviewView.xaml

@@ -52,23 +52,14 @@
             </StackPanel>
 
             <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center">
-                <CheckBox Content="TA" Style="{StaticResource CheckBox_Preview_TA}" Margin="5,0,0,0">
-                    <dxmvvm:Interaction.Behaviors>
-                        <dxmvvm:EventToCommand EventName="Checked" Command="{Binding Path=ShowTSCommand}"></dxmvvm:EventToCommand>
-                        <dxmvvm:EventToCommand EventName="Unchecked" Command="{Binding Path=HideTSCommand}"></dxmvvm:EventToCommand>
-                    </dxmvvm:Interaction.Behaviors>
+                <CheckBox Content="TA" Style="{StaticResource CheckBox_Preview_TA}" Margin="5,0,0,0"
+                          IsChecked="{Binding Path=IsShowTS,Mode=TwoWay}">
                 </CheckBox>
-                <CheckBox Content="SA" Style="{StaticResource CheckBox_Preview_SA}" Margin="5,0,0,0">
-                    <dxmvvm:Interaction.Behaviors>
-                        <dxmvvm:EventToCommand EventName="Checked" Command="{Binding Path=ShowSACommand}"></dxmvvm:EventToCommand>
-                        <dxmvvm:EventToCommand EventName="Unchecked" Command="{Binding Path=HideSACommand}"></dxmvvm:EventToCommand>
-                    </dxmvvm:Interaction.Behaviors>
+                <CheckBox Content="SA" Style="{StaticResource CheckBox_Preview_SA}" Margin="5,0,0,0"
+                          IsChecked="{Binding Path=IsShowSA,Mode=TwoWay}">
                 </CheckBox>
-                <CheckBox Content="BB" Style="{StaticResource CheckBox_Preview_BB}" Margin="5,0,0,0">
-                    <dxmvvm:Interaction.Behaviors>
-                        <dxmvvm:EventToCommand EventName="Checked" Command="{Binding Path=ShowBBCommand}"></dxmvvm:EventToCommand>
-                        <dxmvvm:EventToCommand EventName="Unchecked" Command="{Binding Path=HideBBCommand}"></dxmvvm:EventToCommand>
-                    </dxmvvm:Interaction.Behaviors>
+                <CheckBox Content="BB" Style="{StaticResource CheckBox_Preview_BB}" Margin="5,0,0,0"
+                          IsChecked="{Binding Path=IsShowBB,Mode=TwoWay}">
                 </CheckBox>
 
                 <RadioButton Content="RGB" Style="{StaticResource RadioButton_Preview_RGB}"

VIZ.Package.Service/Viz/VizCommandControlObjectService.cs

@@ -356,6 +356,29 @@ namespace VIZ.Package.Service
         }
 
         /// <summary>
+        /// 设置控制字段聚焦
+        /// </summary>
+        /// <param name="conn">连接</param>
+        /// <param name="obj">控制对象</param>
+        /// <param name="field">控制字段</param>
+        public void ShowFocus(ConnModel conn, ControlObjectModel obj, ControlFieldNodeModel field)
+        {
+            if (conn == null)
+                throw new ArgumentNullException(nameof(conn));
+
+            VizConfigEntity config = ApplicationDomainEx.VizConfig;
+
+            if (config.EngineFullType == EngineFullType.VIZ_Eng3)
+            {
+                conn.EndpointManager.Send($"RENDERER*TREE*{obj.TreeNodePath}*FUNCTION*ControlObject*in SET FOCUS {field.FieldIdentifier}");
+            }
+            else if (config.EngineFullType == EngineFullType.VIZ_Eng4)
+            {
+                conn.EndpointManager.Send($"{ApplicationDomainEx.VizPreviewRenderer}*TREE*{obj.TreeNodePath}*FUNCTION*ControlObject*in SET FOCUS {field.FieldIdentifier}");
+            }
+        }
+
+        /// <summary>
         /// 获取控制字段类型
         /// </summary>
         /// <param name="type">字段类型</param>