From 687b8fd0a9b1a5d1b4f8596912a2a2e095aa7d9c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 01 一月 2023 09:35:19 +0800
Subject: [PATCH] 1
---
DataLoader/MainWindow.xaml.cs | 16 ++++++++++++++++
DataLoader/CS/Main.cs | 2 +-
DataLoader/CS/NtstWeb.cs | 6 +++++-
DataLoader/MainWindow.xaml | 6 +++---
4 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/DataLoader/CS/Main.cs b/DataLoader/CS/Main.cs
index 7332f0f..314a910 100644
--- a/DataLoader/CS/Main.cs
+++ b/DataLoader/CS/Main.cs
@@ -9,7 +9,7 @@
{
public class Main
{
- public static Window Owner = null;
+ public static MainWindow Owner = null;
public static readonly string BaseDir = AppDomain.CurrentDomain.BaseDirectory;
diff --git a/DataLoader/CS/NtstWeb.cs b/DataLoader/CS/NtstWeb.cs
index 59af1c9..61b8ab2 100644
--- a/DataLoader/CS/NtstWeb.cs
+++ b/DataLoader/CS/NtstWeb.cs
@@ -24,7 +24,11 @@
Main.UserId = uid;
Main.Uname = uname;
Main.Token = token;
- owner.Hide();
+
+ owner.Dispatcher.Invoke(new Action(delegate
+ {
+ Main.Owner.SetLoginInfo();
+ }));
}
}
}
diff --git a/DataLoader/MainWindow.xaml b/DataLoader/MainWindow.xaml
index 5f9bbfb..0896b2d 100644
--- a/DataLoader/MainWindow.xaml
+++ b/DataLoader/MainWindow.xaml
@@ -53,11 +53,11 @@
<Label Grid.Row="1" Grid.Column="0" Content="婧愮洰褰曪細" VerticalAlignment="Center" HorizontalAlignment="Right" />
<TextBox x:Name="tbSource" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource tb}" Text="{Binding Path=SourcePath, Mode=TwoWay}"/>
- <Button Grid.Row="1" Grid.Column="4" Content="閫� 鎷�" Style="{StaticResource btn}" Click="Source_MouseLeftButtonDown"/>
+ <Button x:Name="btnSource" Grid.Row="1" Grid.Column="4" Content="閫� 鎷�" Style="{StaticResource btn}" Click="Source_MouseLeftButtonDown"/>
<Label Grid.Row="2" Grid.Column="0" Content="鍏ュ簱鐩綍锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
<TextBox x:Name="tbTarget" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource tb}" Text="{Binding Path=TargetPath, Mode=TwoWay}"/>
- <Button Grid.Row="2" Grid.Column="4" Content="閫� 鎷�" Style="{StaticResource btn}" Click="Target_MouseLeftButtonDown"/>
+ <Button x:Name="btnTarget" Grid.Row="2" Grid.Column="4" Content="閫� 鎷�" Style="{StaticResource btn}" Click="Target_MouseLeftButtonDown"/>
<ScrollViewer Grid.Row="3" Grid.RowSpan="3" Grid.Column="0" Grid.ColumnSpan="4" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" Margin="2">
<ListView x:Name="lvView">
@@ -72,6 +72,6 @@
</ListView.View>
</ListView>
</ScrollViewer>
- <Button Grid.Row="3" Grid.Column="4" Content="瀵� 鍏�" Style="{StaticResource btn}" Click="Import_MouseLeftButtonDown"/>
+ <Button x:Name="btnImport" Grid.Row="3" Grid.Column="4" Content="瀵� 鍏�" Style="{StaticResource btn}" Click="Import_MouseLeftButtonDown"/>
</Grid>
</Window>
diff --git a/DataLoader/MainWindow.xaml.cs b/DataLoader/MainWindow.xaml.cs
index 26c564e..f297ef8 100644
--- a/DataLoader/MainWindow.xaml.cs
+++ b/DataLoader/MainWindow.xaml.cs
@@ -8,6 +8,7 @@
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
+using System.Windows.Forms.VisualStyles;
namespace DataLoader
{
@@ -20,6 +21,8 @@
private string _sourcePath;
private string _targetPath;
+
+ private LoginWin win;
public string SourcePath
{
@@ -62,6 +65,7 @@
{
Main.Owner = this;
+ this.btnImport.IsEnabled = false;
lvView.DataContext = viewDatas;
lvView.SetBinding(ListView.ItemsSourceProperty, new Binding());
}
@@ -70,7 +74,19 @@
// 鐧诲綍
private void Login_MouseLeftButtonDown(object sender, RoutedEventArgs e)
{
+ win = new LoginWin();
+ this.Hide();
+ win.Show();
+ }
+ public void SetLoginInfo()
+ {
+ if (win != null) win.Close();
+ this.Show();
+
+ this.tbUid.Text = Main.UserId.ToString() + "锛�" + Main.Uname;
+ this.tbToken.Text = Main.Token;
+ this.btnImport.IsEnabled = true;
}
// 婧愮洰褰�
--
Gitblit v1.9.3