From 559890c482f5973f06aafdfec9550fee5ba3c7f2 Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 09 十一月 2026 17:02:15 +0800
Subject: [PATCH] feat: CAN 模拟器 TCP 化 + 多设备并发调试 + 后台生命周期管理
---
HMI.UI/Style/PanuonResource.xaml | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/HMI.UI/Style/PanuonResource.xaml b/HMI.UI/Style/PanuonResource.xaml
index 9c5b052..315b3d9 100644
--- a/HMI.UI/Style/PanuonResource.xaml
+++ b/HMI.UI/Style/PanuonResource.xaml
@@ -11,7 +11,7 @@
xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI">
<ResourceDictionary.MergedDictionaries>
- <pu:StyleDictionary Includes="PasswordBox,TextBox,ComboBox,Button,TreeView,Menu,ListBox,ContextMenu,TabControl" />
+ <pu:StyleDictionary Includes="PasswordBox,TextBox,ComboBox,Button,TreeView,ListBox" />
<ResourceDictionary Source="/HMI.UI;component/Style/PanuonDataGrid.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Style/ScrollBarResource.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
@@ -146,6 +146,13 @@
</Style>
<Style x:Key="CommonMenu" TargetType="Menu" BasedOn="{StaticResource {x:Static pu:StyleKeys.MenuStyle}}">
+ <Style.Resources>
+ <ResourceDictionary>
+ <ResourceDictionary.MergedDictionaries>
+ <pu:StyleDictionary Includes="Menu" />
+ </ResourceDictionary.MergedDictionaries>
+ </ResourceDictionary>
+ </Style.Resources>
<Setter Property="Background" Value="{DynamicResource PrimaryColor}"/>
<Setter Property="Foreground" Value="#FFF"/>
<Setter Property="pu:IconHelper.FontFamily" Value="{StaticResource iconfont}"/>
@@ -225,6 +232,7 @@
<Setter Property="pu:WindowXModalDialog.OKButtonContent"
Value="{DynamicResource App.Save}"/>
<Setter Property="pu:WindowXModalDialog.ButtonPanelMargin" Value="0,30,10,10"/>
+ <Setter Property="InteropOwnersMask" Value="False"/>
</Style>
<Style x:Key="DefaultListBox" TargetType="ListBox" BasedOn="{StaticResource {x:Static pu:StyleKeys.ListBoxStyle}}">
@@ -319,4 +327,22 @@
</Setter.Value>
</Setter>
</Style>
+
+ <Style x:Key="DefaultPageItem" TargetType="pu:PaginationItem">
+ <Setter Property="Cursor" Value="Hand" />
+ <Setter Property="MinWidth" Value="30" />
+ <Setter Property="Width" Value="Auto" />
+ <Setter Property="Width" Value="Auto" />
+ </Style>
+
+ <Style x:Key="DefaultPage" TargetType="pu:Pagination">
+ <Setter Property="Height" Value="30"/>
+ <Setter Property="HorizontalAlignment" Value="Right"/>
+ <Setter Property="Foreground" Value="Black" />
+ <Setter Property="ItemsBackground" Value="Transparent"/>
+ <Setter Property="ItemsCornerRadius" Value="12"/>
+ <Setter Property="ItemsSelectedBackground" Value="{DynamicResource SecondPrimaryColor}"/>
+ <Setter Property="ItemContainerStyle" Value="{StaticResource DefaultPageItem}"/>
+ </Style>
+
</ResourceDictionary>
\ No newline at end of file
--
Gitblit v1.9.1