From b544d5cccd76735e034c8055918a50927b437474 Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期二, 10 十一月 2026 08:29:04 +0800
Subject: [PATCH] fix: 维护模式重复进入失败与按钮灰死 + Broker 并发验证用例
---
WPFProject/Login.xaml | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/WPFProject/Login.xaml b/WPFProject/Login.xaml
index d1b05a0..dfb5752 100644
--- a/WPFProject/Login.xaml
+++ b/WPFProject/Login.xaml
@@ -13,7 +13,10 @@
Height="420"
Width="380"
pu:WindowXCaption.Background="Transparent"
+ WindowStartupLocation="CenterScreen"
Background="{StaticResource VerBar}"
+ Closed="window_Closed"
+ ContentRendered="WindowX_ContentRendered"
pu:WindowXCaption.Buttons="Close">
<Window.Resources>
<ResourceDictionary>
@@ -23,18 +26,8 @@
<ResourceDictionary Source="/HMI.UI;component/Style/Colors.xaml"/>
</ResourceDictionary.MergedDictionaries>
- <Style x:Key="SignInPasswordBoxStyle" TargetType="PasswordBox" BasedOn="{StaticResource {x:Type PasswordBox}}">
- <Setter Property="pu:PasswordBoxHelper.FocusedBorderBrush" Value="#6CBCEA" />
- <Setter Property="pu:PasswordBoxHelper.FocusedShadowColor" Value="#6CBCEA" />
- <Setter Property="pu:PasswordBoxHelper.CornerRadius" Value="2" />
- <Setter Property="pu:PasswordBoxHelper.WatermarkForeground" Value="#4A4A4A" />
- <Setter Property="pu:PasswordBoxHelper.FocusedWatermarkForeground" Value="#AAAAAA" />
- <Setter Property="pu:PasswordBoxHelper.ClearButtonVisibility" Value="VisibleOnHoverAndNonnull" />
- <Setter Property="Height" Value="35" />
- <Setter Property="Padding" Value="10,0" />
- </Style>
-
<Style x:Key="SignInButtonStyle" TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
+ <Setter Property="Background" Value="#6CBCEA"/>
<Setter Property="pu:ButtonHelper.PendingSpinStyle">
<Setter.Value>
<Style TargetType="pu:Spin" BasedOn="{StaticResource {x:Static pu:ButtonHelper.PendingSpinStyleKey}}">
@@ -102,7 +95,8 @@
<Image Height="25"
Stretch="Uniform"
HorizontalAlignment="Left"
- Source="/Resources/JingCeLogo.png"
+ Source="/Icon/LoginLogo.png"
+ x:Name="logoImage"
RenderOptions.BitmapScalingMode="HighQuality" />
<StackPanel Margin="0,50,0,0" Grid.Row="1" x:Name="formPanel" dp:StackPanelHelper.ChildSpace="20" >
<pu:FormGroup x:Name="FrmAccount"
@@ -124,10 +118,13 @@
<pu:Switch Grid.Row="3"
HorizontalAlignment="Right"
Margin="0,25,0,0"
+ x:Name="SwRememberMe"
Cursor="Hand"
+ Unchecked="SwRememberMe_Unchecked"
Foreground="{StaticResource PrimaryColorContract}"
Style="{StaticResource RememberMeSwitchStyle}"
Content="{DynamicResource App.RememberMe}" />
+
<Button Grid.Row="4"
Margin="0,20,0,0"
Height="40"
--
Gitblit v1.9.1