From 038b668a0a4dc1568e753008ff549a870166723c Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 24 十二月 2024 18:51:32 +0800
Subject: [PATCH] 单独匹配修改
---
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj
index 44fcb0b..8d5832e 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj
@@ -9,22 +9,22 @@
<ItemGroup>
<Compile Remove="01-pump-main\**" />
<Compile Remove="01-viewmodel - 澶嶅埗\**" />
- <Compile Remove="01-viewmodel\01-pump\01-feat\**" />
+ <Compile Remove="00-core\00-viewmodel\01-pump\01-feat\**" />
<Compile Remove="02-valve-main\**" />
<Compile Remove="03-variable-speed\**" />
<EmbeddedResource Remove="01-pump-main\**" />
<EmbeddedResource Remove="01-viewmodel - 澶嶅埗\**" />
- <EmbeddedResource Remove="01-viewmodel\01-pump\01-feat\**" />
+ <EmbeddedResource Remove="00-core\00-viewmodel\01-pump\01-feat\**" />
<EmbeddedResource Remove="02-valve-main\**" />
<EmbeddedResource Remove="03-variable-speed\**" />
<None Remove="01-pump-main\**" />
<None Remove="01-viewmodel - 澶嶅埗\**" />
- <None Remove="01-viewmodel\01-pump\01-feat\**" />
+ <None Remove="00-core\00-viewmodel\01-pump\01-feat\**" />
<None Remove="02-valve-main\**" />
<None Remove="03-variable-speed\**" />
<Page Remove="01-pump-main\**" />
<Page Remove="01-viewmodel - 澶嶅埗\**" />
- <Page Remove="01-viewmodel\01-pump\01-feat\**" />
+ <Page Remove="00-core\00-viewmodel\01-pump\01-feat\**" />
<Page Remove="02-valve-main\**" />
<Page Remove="03-variable-speed\**" />
</ItemGroup>
@@ -46,6 +46,8 @@
<Compile Remove="99-common\SelXhsPumpMainPhartDlg.Designer.cs" />
<Compile Remove="99-common\SelXhsValveMainPhartDlg.cs" />
<Compile Remove="99-common\SelXhsValveMainPhartDlg.Designer.cs" />
+ <Compile Remove="PumpCurveExpandDlg.cs" />
+ <Compile Remove="PumpCurveExpandDlg.Designer.cs" />
<Compile Remove="PumpParallelAnalyDlg - 澶嶅埗.cs" />
<Compile Remove="PumpParallelAnalyDlg - 澶嶅埗.Designer.cs" />
<Compile Remove="PumpParallelAnalyDlg.cs" />
@@ -61,6 +63,7 @@
<EmbeddedResource Remove="99-common\PumpWorkComparisonChartDlg.resx" />
<EmbeddedResource Remove="99-common\SelXhsPumpMainPhartDlg.resx" />
<EmbeddedResource Remove="99-common\SelXhsValveMainPhartDlg.resx" />
+ <EmbeddedResource Remove="PumpCurveExpandDlg.resx" />
<EmbeddedResource Remove="PumpParallelAnalyDlg - 澶嶅埗.resx" />
<EmbeddedResource Remove="PumpParallelAnalyDlg.resx" />
</ItemGroup>
@@ -68,7 +71,7 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="NPOI" Version="2.7.1" />
- <PackageReference Include="Yw.BLL.Phart.Core" Version="3.0.2" />
+ <PackageReference Include="Yw.BLL.Phart.Core" Version="3.0.5" />
</ItemGroup>
<ItemGroup>
@@ -80,6 +83,15 @@
<ItemGroup>
<Compile Update="01-pump\02-edit\PumpChartEditCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="01-pump\03-import\01-excel\PumpChartExcelImportCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="01-pump\03-import\02-image\PumpChartImageImportCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="01-pump\03-import\03-point\PumpChartPointImportCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="02-universal\02-edit\UniversalChartEditCtrl.cs">
@@ -112,12 +124,6 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
- </ItemGroup>
-
- <ItemGroup>
- <Folder Include="01-pump\03-import\01-excel\" />
- <Folder Include="01-pump\03-import\02-image\" />
- <Folder Include="01-pump\03-import\03-point\" />
</ItemGroup>
</Project>
--
Gitblit v1.9.3