From a061384ba628a09bf4df91f50321ab22c03129aa Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 18 三月 2025 20:58:36 +0800
Subject: [PATCH] Winform支持遮罩层；
---
HMI.UI/HMI.UI.csproj | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/HMI.UI/HMI.UI.csproj b/HMI.UI/HMI.UI.csproj
index 4f2be69..3255fc9 100644
--- a/HMI.UI/HMI.UI.csproj
+++ b/HMI.UI/HMI.UI.csproj
@@ -59,7 +59,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Panuon.WPF, Version=1.1.2.2, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\WPFProject\packages\Panuon.WPF.1.1.2.2\lib\net472\Panuon.WPF.dll</HintPath>
+ <HintPath>..\WPFProject\packages\Panuon.WPF.1.1.3\lib\net472\Panuon.WPF.dll</HintPath>
</Reference>
<Reference Include="Panuon.WPF.UI, Version=1.2.4.8, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\WPFProject\packages\Panuon.WPF.UI.1.2.4.9\lib\net472\Panuon.WPF.UI.dll</HintPath>
@@ -80,10 +80,12 @@
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="Converter\VisibilityBoolConverter.cs" />
<Compile Include="Converter\DataGridRowFlagConverter.cs" />
<Compile Include="Converter\DataGridRowNumberConverter.cs" />
<Compile Include="Converter\PathImageConverter.cs" />
<Compile Include="DpUtil\DataGridHelper.cs" />
+ <Compile Include="DpUtil\DataGridTextColumnHelper.cs" />
<Compile Include="DpUtil\FormGroupHelper.cs" />
<Compile Include="DpUtil\GridHelper.cs" />
<Compile Include="DpUtil\StackPanelHelper.cs" />
@@ -99,11 +101,11 @@
<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" />
<Resource Include="Resources\Font\Font.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Page Include="MaskWindow.xaml">
<SubType>Designer</SubType>
@@ -161,10 +163,8 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
- <Resource Include="Resources\Font\iconfont.json" />
- <Resource Include="Resources\Font\iconfont.ttf">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Resource>
+ <EmbeddedResource Include="Resources\Font\iconfont.json" />
+ <Resource Include="Resources\Font\iconfont.ttf" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icon\xinzeng_1.png" />
@@ -175,6 +175,5 @@
<Name>HMI.Core</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
--
Gitblit v1.9.1