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 并发验证用例
---
HMI.MenuManage/Modal/MenuModal.xaml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/HMI.MenuManage/Modal/MenuModal.xaml b/HMI.MenuManage/Modal/MenuModal.xaml
index 8eac944..a919f39 100644
--- a/HMI.MenuManage/Modal/MenuModal.xaml
+++ b/HMI.MenuManage/Modal/MenuModal.xaml
@@ -30,7 +30,7 @@
dp:FormGroupHelper.ValidateMethod="ValidateName">
<TextBox x:Name="TbName" Style="{StaticResource EditorTextBoxStyle}" />
</pu:FormGroup>
-
+
<pu:FormGroup x:Name="FgIcon" Style="{StaticResource InputFormGroupStyle}"
Header="{DynamicResource HMI.Menu.Icon}" GroupName="MyFormGroup">
<Grid>
@@ -55,8 +55,9 @@
</pu:FormGroup>
<pu:FormGroup x:Name="FgType"
- Style="{StaticResource InputFormGroupStyle}" Header="{DynamicResource HMI.Menu.Type}" GroupName="MyFormGroup">
+ Style="{StaticResource InputFormGroupStyle}" Header="{DynamicResource HMI.Menu.Type}" GroupName="MyFormGroup">
<ComboBox x:Name="TbType" Style="{StaticResource FormComboxStyle}">
+ <ComboBoxItem>Permission</ComboBoxItem>
<ComboBoxItem>WPF</ComboBoxItem>
<ComboBoxItem>WinForm</ComboBoxItem>
<ComboBoxItem>LV</ComboBoxItem>
@@ -96,6 +97,11 @@
Header="{DynamicResource HMI.Menu.ClassName}" GroupName="MyFormGroup">
<TextBox x:Name="TbClassName" Style="{StaticResource EditorTextBoxStyle}" />
</pu:FormGroup>
+
+ <pu:FormGroup x:Name="FgSort" Style="{StaticResource InputFormGroupStyle}"
+ Header="{DynamicResource HMI.Menu.Sort}" GroupName="MyFormGroup">
+ <pu:NumberInput x:Name="NiSort" Style="{StaticResource FormNumberInput}" />
+ </pu:FormGroup>
</StackPanel>
</Grid>
</pu:WindowX>
--
Gitblit v1.9.1