Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

EX/Exchange.xaml

@@ -7,7 +7,16 @@
         mc:Ignorable="d"
         Title="Exchange" Height="720" Width="1280" MinHeight="720" MinWidth="1280" Background="#FFE0E0E0">
     <Grid>
-        <RichTextBox x:Name="Log" Margin="0,0,0,200" IsReadOnly="True" VerticalScrollBarVisibility="Visible" Background="White">
+        <DataGrid  x:Name="gridLog" Margin="5,5,0,5" HorizontalAlignment="Left" Width="250">
+            <DataGrid.Columns>
+                <!--列信息绑定-->
+                <DataGridTextColumn Binding="{Binding Name}"  Header="文件" Width="200" MaxWidth="200" MinWidth="100"/>
+                <DataGridTextColumn Binding="{Binding Name}"  Header="容量" Width="50" MaxWidth="50" MinWidth="50"/>
+            </DataGrid.Columns>
+        </DataGrid>
+
+
+        <RichTextBox x:Name="Log" Margin="255,5,5,5" IsReadOnly="True" VerticalScrollBarVisibility="Visible" Background="White">
             <FlowDocument>
                 <Paragraph>
                     <Run Text="LOG"/>
@@ -15,10 +24,5 @@
             </FlowDocument>
         </RichTextBox>
 
-        
-        
-        <DatePicker HorizontalAlignment="Left" Height="30" Margin="50,0,0,50" VerticalAlignment="Bottom" Width="250"/>
-
-
     </Grid>
 </Window>

EX/Exchange.xaml.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -19,9 +21,25 @@ namespace formula_manage.EX
     /// </summary>
     public partial class Exchange : Window
     {
+        string Log_time = DateTime.Now.ToString("yyyy-MM-dd");
+        DataTable logdataTable = new DataTable();   //建立log缓存
+
         public Exchange()
         {
             InitializeComponent();
+
+            logdataTable.Columns.Add("Name", typeof(string));
+            logdataTable.Columns.Add("length", typeof(int));
+
+            LOG_file();
+        }
+        private void LOG_file()//建立列表
+        {
+            DirectoryInfo loginfo = new DirectoryInfo(System.Environment.CurrentDirectory + "\\Exchange"); //new文件夹
+            FileInfo[] logFile = loginfo.GetFiles("*.log");//生成文件夹中的文件名合集
+           // logdataTable.ItemsSource = logFile;//加载合集
+          // logFile.fill()
+            //gridLog.DisplayMemberPath = "Name"; // 显示文件名
         }
     }
 }