From dedcf4174c8540ee3a912daad2ff13e014e495b1 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 28 三月 2025 16:28:30 +0800
Subject: [PATCH] 优化UI组件；
---
HMI.UI/HMI.UI.csproj | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/HMI.UI/HMI.UI.csproj b/HMI.UI/HMI.UI.csproj
index 9032440..62ae02c 100644
--- a/HMI.UI/HMI.UI.csproj
+++ b/HMI.UI/HMI.UI.csproj
@@ -59,10 +59,10 @@
</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>
+ <Reference Include="Panuon.WPF.UI, Version=1.3.0.2, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\WPFProject\packages\Panuon.WPF.UI.1.3.0.2\lib\net472\Panuon.WPF.UI.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -80,24 +80,52 @@
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="Controls\KeyboradWindow.xaml.cs">
+ <DependentUpon>KeyboradWindow.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Controls\NumberPanel.xaml.cs">
+ <DependentUpon>NumberPanel.xaml</DependentUpon>
+ </Compile>
+ <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\DataGridHelper.cs" />
+ <Compile Include="DpUtil\DataGridTextColumnHelper.cs" />
<Compile Include="DpUtil\FormGroupHelper.cs" />
+ <Compile Include="DpUtil\GridHelper.cs" />
<Compile Include="DpUtil\StackPanelHelper.cs" />
<Compile Include="DpUtil\TreeViewHelper.cs" />
+ <Compile Include="DpUtil\UniformGridHelper.cs" />
+ <Compile Include="MaskWindow.xaml.cs">
+ <DependentUpon>MaskWindow.xaml</DependentUpon>
+ </Compile>
<Compile Include="Style\BaseWindow.xaml.cs">
<DependentUpon>BaseWindow.xaml</DependentUpon>
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Compile>
<Compile Include="DpUtil\DpPlugin.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" />
<Resource Include="Resources\Font\Font.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
+ <Page Include="Controls\KeyboradWindow.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Controls\NumberPanel.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="MaskWindow.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="Style\MsgBoxStyle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -110,7 +138,6 @@
<Page Include="Style\BaseWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Page>
<Page Include="Style\Colors.xaml">
<Generator>MSBuild:Compile</Generator>
@@ -151,9 +178,8 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
- <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" />
@@ -164,6 +190,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