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.UI/HMI.UI.csproj | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 112 insertions(+), 4 deletions(-)
diff --git a/HMI.UI/HMI.UI.csproj b/HMI.UI/HMI.UI.csproj
index 72f50a8..0530193 100644
--- a/HMI.UI/HMI.UI.csproj
+++ b/HMI.UI/HMI.UI.csproj
@@ -83,6 +83,10 @@
<Compile Include="Controls\KeyboradWindow.xaml.cs">
<DependentUpon>KeyboradWindow.xaml</DependentUpon>
</Compile>
+ <Compile Include="Controls\LightBall.cs" />
+ <Compile Include="Controls\MultiCombox.xaml.cs">
+ <DependentUpon>MultiCombox.xaml</DependentUpon>
+ </Compile>
<Compile Include="Controls\NumberPanel.xaml.cs">
<DependentUpon>NumberPanel.xaml</DependentUpon>
</Compile>
@@ -90,31 +94,90 @@
<Compile Include="Controls\treegrid\Controls\TreeGrid.cs" />
<Compile Include="Controls\treegrid\Controls\TreeItemContentControl.cs" />
<Compile Include="Controls\treegrid\Controls\TreeItemData.cs" />
+ <Compile Include="Controls\treegrid\Controls\TreeListView.cs" />
+ <Compile Include="Controls\treegrid\TreeItemConverter.cs" />
<Compile Include="Controls\treegrid\TreeNodeExtend.cs" />
+ <Compile Include="Controls\VisualHost.cs" />
+ <Compile Include="Converter\DateStrConverter.cs" />
+ <Compile Include="Converter\RadioEnumConverter.cs" />
+ <Compile Include="Converter\ResultConverter.cs" />
+ <Compile Include="Converter\ReverseBoolConverter.cs" />
+ <Compile Include="Converter\IndentConverter.cs" />
+ <Compile Include="Converter\CollectionHasItem.cs" />
<Compile Include="Converter\VisibilityBoolConverter.cs" />
<Compile Include="Converter\DataGridRowFlagConverter.cs" />
<Compile Include="Converter\DataGridRowNumberConverter.cs" />
<Compile Include="Converter\PathImageConverter.cs" />
<Compile Include="Controls\NumberInput.cs" />
+ <Compile Include="DpUtil\CanvasHelper.cs" />
<Compile Include="DpUtil\DataGridHelper.cs" />
<Compile Include="DpUtil\DataGridTextColumnHelper.cs" />
<Compile Include="DpUtil\FormGroupHelper.cs" />
<Compile Include="DpUtil\GridHelper.cs" />
+ <Compile Include="DpUtil\Resize.cs" />
<Compile Include="DpUtil\StackPanelHelper.cs" />
<Compile Include="DpUtil\TreeViewHelper.cs" />
<Compile Include="DpUtil\UniformGridHelper.cs" />
+ <Compile Include="EditBox.cs" />
+ <Compile Include="Entity\ScannerConfig.cs" />
+ <Compile Include="MaskControl.xaml.cs">
+ <DependentUpon>MaskControl.xaml</DependentUpon>
+ </Compile>
<Compile Include="MaskWindow.xaml.cs">
<DependentUpon>MaskWindow.xaml</DependentUpon>
</Compile>
+ <Compile Include="MDI\BottomBar.xaml.cs">
+ <DependentUpon>BottomBar.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="MDI\InnerWindow.xaml.cs">
+ <DependentUpon>InnerWindow.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="MDI\MinInnerWindow.xaml.cs">
+ <DependentUpon>MinInnerWindow.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="MDI\Workspace.xaml.cs">
+ <DependentUpon>Workspace.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="RequirePasswordByUser.xaml.cs">
+ <DependentUpon>RequirePasswordByUser.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="RequirePasswordWindow.xaml.cs">
+ <DependentUpon>RequirePasswordWindow.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="ScannerSetting.xaml.cs">
+ <DependentUpon>ScannerSetting.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="ScrollLabel.cs" />
<Compile Include="Style\BaseWindow.xaml.cs">
<DependentUpon>BaseWindow.xaml</DependentUpon>
</Compile>
<Compile Include="DpUtil\DpPlugin.cs" />
+ <Compile Include="TableComboBox.cs" />
<Compile Include="Util\IValueValidator.cs" />
<Compile Include="Util\MaskHolder.cs" />
<Compile Include="Util\MsgBoxHelper.cs" />
<Compile Include="Util\MsgBoxHelper2.cs" />
<Compile Include="Util\ToastHelper.cs" />
+ <Page Include="RequirePasswordByUser.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="RequirePasswordWindow.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Style\PanuonListView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Style\ScrollBarResource.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Themes\Generic.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Resource Include="Resources\Font\Font.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -123,7 +186,15 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
+ <Page Include="Controls\MultiCombox.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="Controls\NumberPanel.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Controls\treegrid\Themes\TreeListView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
@@ -135,18 +206,45 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
+ <Page Include="MaskControl.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="MaskWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
+ <Page Include="MDI\BottomBar.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="MDI\InnerWindow.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="MDI\MinInnerWindow.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="MDI\Workspace.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
+ <Page Include="ScannerSetting.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
<Page Include="Style\MsgBoxStyle.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
+ <Page Include="Style\PanuonDataGrid.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Style\PanuonResource.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Page>
<Page Include="Style\BaseWindow.xaml">
<SubType>Designer</SubType>
@@ -155,17 +253,14 @@
<Page Include="Style\Colors.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Page>
<Page Include="Style\FormStyle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Page>
<Page Include="Style\WindowResources.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Page>
</ItemGroup>
<ItemGroup>
@@ -202,6 +297,19 @@
<Project>{3e3bf44a-0b69-45c5-9512-528cb48a7106}</Project>
<Name>HMI.Core</Name>
</ProjectReference>
+ <ProjectReference Include="..\HMI.Util\HMI.Util.csproj">
+ <Project>{afea100a-9223-448d-ab10-3015d93dd98c}</Project>
+ <Name>HMI.Util</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Resource Include="Resources\Icon\dot.svg" />
+ </ItemGroup>
+ <ItemGroup>
+ <Resource Include="Resources\Icon\dot.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <Resource Include="Resources\Icon\dot2.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
--
Gitblit v1.9.1