take标识

VIZ.Package.Domain/ApplicationDomainEx.cs

@@ -134,11 +134,16 @@ namespace VIZ.Package.Domain
         public static string VizPreviewRenderer { get; set; }
         public static string VizPreviewRenderer { get; set; }
 
 
         /// <summary>
         /// <summary>
-        /// 当前页
+        /// 当前页或模板
         /// </summary>
         /// </summary>
         public static PageModelBase CurrentPage { get; set; }
         public static PageModelBase CurrentPage { get; set; }
 
 
         /// <summary>
         /// <summary>
+        /// 当前上板的页或模板
+        /// </summary>
+        public static PageModelBase CurrentTake { get; set; }
+
+        /// <summary>
         /// 场景是否正在加载
         /// 场景是否正在加载
         /// </summary>
         /// </summary>
         public static bool IsSceneLoading { get; set; }
         public static bool IsSceneLoading { get; set; }

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

@@ -157,5 +157,19 @@ namespace VIZ.Package.Domain
         }
         }
 
 
         #endregion
         #endregion
+
+        #region IsTake -- 是否上板
+
+        private bool isTake;
+        /// <summary>
+        /// 是否上板
+        /// </summary>
+        public bool IsTake
+        {
+            get { return isTake; }
+            set { isTake = value; this.RaisePropertyChanged(nameof(IsTake)); }
+        }
+
+        #endregion
     }
     }
 }
 }

VIZ.Package.Domain/VIZ.Package.Domain.csproj

@@ -160,6 +160,8 @@
       <Name>VIZ.Package.Storage</Name>
       <Name>VIZ.Package.Storage</Name>
     </ProjectReference>
     </ProjectReference>
   </ItemGroup>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Message\Control\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
 </Project>
\ No newline at end of file

VIZ.Package.Module/Control/ViewModel/ControlViewModel.cs

@@ -118,6 +118,22 @@ namespace VIZ.Package.Module
                     }
                     }
                     this.vizCommandService.SetEnabledUpdate(conn, true);
                     this.vizCommandService.SetEnabledUpdate(conn, true);
                     this.vizCommandService.Start(conn, ApplicationDomainEx.CurrentPage.Layer);
                     this.vizCommandService.Start(conn, ApplicationDomainEx.CurrentPage.Layer);
+
+                    // 设置当前Take的模板
+                    WPFHelper.BeginInvoke(() =>
+                    {
+                        if (ApplicationDomainEx.CurrentTake != null)
+                        {
+                            ApplicationDomainEx.CurrentTake.IsTake = false;
+                        }
+
+                        ApplicationDomainEx.CurrentTake = ApplicationDomainEx.CurrentPage;
+
+                        if (ApplicationDomainEx.CurrentTake != null)
+                        {
+                            ApplicationDomainEx.CurrentTake.IsTake = true;
+                        }
+                    });
                 });
                 });
         }
         }
 
 

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

@@ -36,6 +36,9 @@
             <fcore:Bool2SolidColorBrushConverter x:Key="RowHandleBgConverter"
             <fcore:Bool2SolidColorBrushConverter x:Key="RowHandleBgConverter"
                                                  TrueBrush="#FF0078D7"
                                                  TrueBrush="#FF0078D7"
                                                  FalseBrush="Transparent"></fcore:Bool2SolidColorBrushConverter>
                                                  FalseBrush="Transparent"></fcore:Bool2SolidColorBrushConverter>
+            <fcore:Bool2SolidColorBrushConverter x:Key="RowHandleTakeConverter"
+                                                 TrueBrush="#FF4E4BDE"
+                                                 FalseBrush="Transparent"></fcore:Bool2SolidColorBrushConverter>
 
 
             <!-- 列模板选择器 -->
             <!-- 列模板选择器 -->
             <common:ColumnDefintionGeneratorTemplateSelector x:Key="ColumnDefintionGeneratorTemplateSelector">
             <common:ColumnDefintionGeneratorTemplateSelector x:Key="ColumnDefintionGeneratorTemplateSelector">
@@ -50,6 +53,8 @@
                                             <dxg:GridColumn.CellTemplate>
                                             <dxg:GridColumn.CellTemplate>
                                                 <DataTemplate>
                                                 <DataTemplate>
                                                     <Grid Background="{Binding Path=Row.IsOpen,Converter={StaticResource RowHandleBgConverter}}">
                                                     <Grid Background="{Binding Path=Row.IsOpen,Converter={StaticResource RowHandleBgConverter}}">
+                                                        <Rectangle Fill="{Binding Path=Row.IsTake,Converter={StaticResource RowHandleTakeConverter}}" 
+                                                                   Width="10" HorizontalAlignment="Left"></Rectangle>
                                                         <TextBlock Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding RowData.RowHandle,Converter={StaticResource RowHandleConverter}}"></TextBlock>
                                                         <TextBlock Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding RowData.RowHandle,Converter={StaticResource RowHandleConverter}}"></TextBlock>
                                                     </Grid>
                                                     </Grid>
                                                 </DataTemplate>
                                                 </DataTemplate>

VIZ.Package.Module/Preview/VizPreview/ViewModel/VizPreviewViewModel.cs

@@ -288,7 +288,7 @@ namespace VIZ.Package.Module
         /// </summary>
         /// </summary>
         private void RestartPreview()
         private void RestartPreview()
         {
         {
-            if (DXMessageBox.Show("是否重启Viz预览引擎？", "提示", MessageBoxButton.YesNo) != MessageBoxResult.Yes)
+            if (DXMessageBox.Show("是否重启预览引擎？", "提示", MessageBoxButton.YesNo) != MessageBoxResult.Yes)
                 return;
                 return;
 
 
             // 设置预览引擎未准备完毕
             // 设置预览引擎未准备完毕