1

src/YSAI.DAQ/YSAI.Controls/tabcontrol/TabControlControl.xaml

@@ -0,0 +1,14 @@
+<TabControl x:Class="YSAI.Controls.tabcontrol.TabControlControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:YSAI.Controls.tabcontrol">
+
+
+    <TabControl.Resources>
+       
+    </TabControl.Resources>
+
+        
+</TabControl>

src/YSAI.DAQ/YSAI.Controls/tabcontrol/TabControlControl.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace YSAI.Controls.tabcontrol
+{
+    /// <summary>
+    /// TabControlControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class TabControlControl : TabControl
+    {
+        public TabControlControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

src/YSAI.DAQ/YSAI.Log/YSAI.Log.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	<Version>1.0.0.6</Version>
+	<Version>1.0.0.7</Version>
 	<Authors>Shun</Authors>
     <Company>YSAI</Company>
     <Product>SCADA</Product>

src/YSAI.DAQ/YSAI.Manage.Windows/MainWindowController.cs

@@ -99,5 +99,34 @@ namespace YSAI.Manage.Windows
         public ICommand AboutUs { get => new CommandX(() => { UserControl = UserControls["AboutUsTool"]; }); }
 
 
+        /*
+         
+         <TabItem  IsSelected="True">
+                <TabItem.Header>
+                    <StackPanel Orientation="Horizontal">
+                        <Image Source="{DynamicResource Channel}" Style="{StaticResource ButtonImageStyle}"/>
+                        <TextBlock Text="通道" Foreground="{DynamicResource Font.Content.Foreground}" />
+                    </StackPanel>
+                </TabItem.Header>
+                <!--滚动条-->
+                <ScrollViewer Style="{StaticResource ScrollViewerStyle}" MaxHeight="616" VerticalScrollBarVisibility="Auto"  >
+                    <!--动态创建-->
+                    <ContentControl Content="{Binding UserControl}" />
+                </ScrollViewer>
+            </TabItem>
+         
+         */
+
+
+        /// <summary>
+        /// 加载多个页面
+        /// </summary>
+        public TabItem TabControlDataContext
+        {
+            get => GetProperty(() => TabControlDataContext);
+            set => SetProperty(() => TabControlDataContext, value);
+        }
+
+
     }
 }