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/App.xaml | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/WPFProject/App.xaml b/WPFProject/App.xaml
index bfd14e2..484c7c0 100644
--- a/WPFProject/App.xaml
+++ b/WPFProject/App.xaml
@@ -2,9 +2,12 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:WPFProject"
- xmlns:pw="https://opensource.panuon.com/wpf"
- xmlns:pu="https://opensource.panuon.com/wpf-ui"
+ xmlns:pw="https://opensource.panuon.com/wpf"
+ xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
+ xmlns:hc="clr-namespace:HMI.Core;assembly=HMI.Core"
+ ShutdownMode="OnExplicitShutdown"
+ xmlns:sys="clr-namespace:System;assembly=mscorlib"
Startup="Application_Startup">
<Application.Resources>
<ResourceDictionary>
@@ -15,11 +18,23 @@
<ResourceDictionary Source="/HMI.UI;component/Style/Colors.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Style/PanuonResource.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Style/MsgBoxStyle.xaml"/>
+ <ResourceDictionary Source="/HMI.Base;component/MaskControl.xaml"/>
+ <ResourceDictionary Source="/UILib;component/Styles.xaml"/>
+ <ResourceDictionary Source="/SeqEditor;component/UIStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
-
+ <FontFamily x:Key="iconfont">
+ /HMI.UI;component/Resources/Font/#iconfont
+ </FontFamily>
+ <sys:Double x:Key="nanD">NaN</sys:Double>
<Style TargetType="{x:Type pu:FormGroup}" BasedOn="{StaticResource InputFormGroupStyle}"></Style>
<uic:PathImageConverter x:Key="path2Image"/>
<uic:DataGridRowNumberConverter x:Key="rowNumber"/>
+ <uic:VisibilityBoolConverter x:Key="vbConverter"/>
+ <uic:DataGridRowFlagConverter x:Key="rowFlag"/>
+ <uic:ReverseBoolConverter x:Key="reverseBool"/>
+ <hc:LangConverter x:Key="lc"/>
+ <hc:WidthSizeConverter x:Key="fc"/>
+ <hc:HeightSizeConverter x:Key="hfc"/>
</ResourceDictionary>
</Application.Resources>
</Application>
--
Gitblit v1.9.1