From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001 From: Shuxia Ning <NingShuxia0927@outlook.com> Date: 星期三, 08 一月 2025 13:57:33 +0800 Subject: [PATCH] 冲突 --- WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj | 157 +++++++++++++++++++++++++++++++++++----------------- 1 files changed, 106 insertions(+), 51 deletions(-) diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj index f310688..d34ff83 100644 --- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj +++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj @@ -8,6 +8,17 @@ </PropertyGroup> <ItemGroup> + <Compile Remove="04-viewmodel\00-core\**" /> + <Compile Remove="12-monitor\00-core\**" /> + <EmbeddedResource Remove="04-viewmodel\00-core\**" /> + <EmbeddedResource Remove="12-monitor\00-core\**" /> + <None Remove="04-viewmodel\00-core\**" /> + <None Remove="12-monitor\00-core\**" /> + <Page Remove="04-viewmodel\00-core\**" /> + <Page Remove="12-monitor\00-core\**" /> + </ItemGroup> + + <ItemGroup> <Compile Remove="04-viewmodel\07-curve\SetHydroCurveCtrl - 澶嶅埗.cs" /> <Compile Remove="04-viewmodel\07-curve\SetHydroCurveCtrl - 澶嶅埗.Designer.cs" /> <Compile Remove="06-visual\00-core\HydroParterListCtrl.cs" /> @@ -23,15 +34,15 @@ <Compile Remove="06-visual\08-fourlink\HydroFourlinkViewModel.cs" /> <Compile Remove="06-visual\09-hydrant\HydroHydrantViewModel.cs" /> <Compile Remove="06-visual\10-nozzle\HydroNozzleViewModel.cs" /> - <Compile Remove="06-visual\11-meter\HydroMeterViewModel.cs" /> - <Compile Remove="06-visual\12-flowmeter\HydroFlowmeterViewModel.cs" /> - <Compile Remove="06-visual\13-pressmeter\HydroPressmeterViewModel.cs" /> - <Compile Remove="06-visual\14-pipe\HydroPipeViewModel.cs" /> - <Compile Remove="06-visual\15-translation\HydroTranslationViewModel.cs" /> - <Compile Remove="06-visual\18-exchanger\HydroExchangerViewModel.cs" /> - <Compile Remove="06-visual\19-compressor\HydroCompressorViewModel.cs" /> - <Compile Remove="06-visual\16-pump\HydroPumpViewModel.cs" /> - <Compile Remove="06-visual\17-valve\HydroValveViewModel.cs" /> + <Compile Remove="06-visual\12-meter\HydroMeterViewModel.cs" /> + <Compile Remove="06-visual\13-flowmeter\HydroFlowmeterViewModel.cs" /> + <Compile Remove="06-visual\14-pressmeter\HydroPressmeterViewModel.cs" /> + <Compile Remove="06-visual\15-pipe\HydroPipeViewModel.cs" /> + <Compile Remove="06-visual\16-translation\HydroTranslationViewModel.cs" /> + <Compile Remove="06-visual\19-exchanger\HydroExchangerViewModel.cs" /> + <Compile Remove="06-visual\20-compressor\HydroCompressorViewModel.cs" /> + <Compile Remove="06-visual\17-pump\HydroPumpViewModel.cs" /> + <Compile Remove="06-visual\18-valve\HydroValveViewModel.cs" /> </ItemGroup> <ItemGroup> @@ -42,8 +53,8 @@ <ItemGroup> <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" /> <PackageReference Include="Yw.BLL.Basic.Core" Version="3.3.0" /> - <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.5.9" /> - <PackageReference Include="Yw.Pump.Core" Version="3.1.3" /> + <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.8.1" /> + <PackageReference Include="Yw.Pump.Core" Version="3.2.1" /> </ItemGroup> <ItemGroup> @@ -53,22 +64,20 @@ <ProjectReference Include="..\Yw.WinFrmUI.Hydro.L3d.Core\Yw.WinFrmUI.Hydro.L3d.Core.csproj" /> <ProjectReference Include="..\Yw.WinFrmUI.Hydro.Q3d.Core\Yw.WinFrmUI.Hydro.Q3d.Core.csproj" /> <ProjectReference Include="..\Yw.WinFrmUI.Hydro.W3d.Core\Yw.WinFrmUI.Hydro.W3d.Core.csproj" /> + <ProjectReference Include="..\Yw.WinFrmUI.Phart.Core\Yw.WinFrmUI.Phart.Core.csproj" /> </ItemGroup> <ItemGroup> + <Compile Update="01-scene\ViewHydroSceneDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="01-scene\EditHydroSceneDlg.cs"> + <SubType>Form</SubType> + </Compile> <Compile Update="01-scene\HydroSceneMgrPage.cs"> <SubType>UserControl</SubType> </Compile> <Compile Update="02-model\HydroModelMgrPage.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-viewmodel\07-curve\01-view\HydroCurveViewDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="04-viewmodel\07-curve\02-set\SetHydroCurveDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="05-property\HydroVisualPropertyViewCtrl.cs"> <SubType>UserControl</SubType> </Compile> <Compile Update="05-property\HydroVisualPropertyCtrl.cs"> @@ -83,13 +92,22 @@ <Compile Update="06-visual\05-blunthead\HydroBluntheadListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-visual\13-pressmeter\HydroPressmeterListCtrl.cs"> + <Compile Update="06-visual\11-cooling\HydroCoolingListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-visual\12-flowmeter\HydroFlowmeterListCtrl.cs"> + <Compile Update="06-visual\11-cooling\SetHydroCoolingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\11-cooling\SetHydroCoolingListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\14-pressmeter\HydroPressmeterListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-visual\11-meter\HydroMeterListCtrl.cs"> + <Compile Update="06-visual\13-flowmeter\HydroFlowmeterListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\12-meter\HydroMeterListCtrl.cs"> <SubType>UserControl</SubType> </Compile> <Compile Update="06-visual\08-fourlink\HydroFourlinkListCtrl.cs"> @@ -113,41 +131,41 @@ <Compile Update="06-visual\01-reservoir\HydroReservoirListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-visual\15-translation\SetHydroTranslationListDlg.cs"> + <Compile Update="06-visual\16-translation\SetHydroTranslationListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\15-translation\SetHydroTranslationDlg.cs"> + <Compile Update="06-visual\16-translation\SetHydroTranslationDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\18-exchanger\SetHydroExchangerDlg.cs"> + <Compile Update="06-visual\19-exchanger\SetHydroExchangerDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\18-exchanger\SetHydroExchangerListDlg.cs"> + <Compile Update="06-visual\19-exchanger\SetHydroExchangerListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\18-exchanger\HydroExchangerListCtrl.cs"> + <Compile Update="06-visual\19-exchanger\HydroExchangerListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-visual\17-valve\HydroValveListCtrl.cs"> + <Compile Update="06-visual\18-valve\HydroValveListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-visual\15-translation\HydroTranslationListCtrl.cs"> + <Compile Update="06-visual\16-translation\HydroTranslationListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-visual\14-pipe\HydroPipeListCtrl.cs"> + <Compile Update="06-visual\15-pipe\HydroPipeListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-visual\19-compressor\HydroCompressorListCtrl.cs"> + <Compile Update="06-visual\20-compressor\HydroCompressorListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-visual\19-compressor\SetHydroCompressorDlg.cs"> + <Compile Update="06-visual\20-compressor\SetHydroCompressorDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\19-compressor\SetHydroCompressorListDlg.cs"> + <Compile Update="06-visual\20-compressor\SetHydroCompressorListDlg.cs"> <SubType>Form</SubType> </Compile> <Compile Update="10-working\02-visual\03-pump\SetHydroPumpWorkingDlg.cs"> - <SubType>Form</SubType> + <SubType>Form</SubType> </Compile> <Compile Update="10-working\02-visual\05-resistanse\SetHydroWorkingResistanceCtrl.cs"> <SubType>UserControl</SubType> @@ -173,16 +191,28 @@ <Compile Update="10-working\05-tree\HydroWorkingTreeCtrl.cs"> <SubType>UserControl</SubType> </Compile> + <Compile Update="10-working\09-edit\EditHydroWorkingDlg.cs"> + <SubType>Form</SubType> + </Compile> <Compile Update="10-working\06-add\AddHydroWorkingDlg.cs"> <SubType>Form</SubType> </Compile> <Compile Update="10-working\08-checked\HydroWorkingCheckedListVertCtrl.cs"> - <SubType>UserControl</SubType> + <SubType>UserControl</SubType> </Compile> <Compile Update="11-search\HydroVisualSearchListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="12-monitor\01-set\SetHydroMonitorListDlg.cs"> + <Compile Update="12-monitor\02-docking\SetHydroMonitorDockingListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="12-monitor\02-docking\SetHydroMonitorDockingListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="12-monitor\03-analyse\SetHydroMonitorAnalyseListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="12-monitor\03-analyse\SetHydroMonitorAnalyseListDlg.cs"> <SubType>Form</SubType> </Compile> <Compile Update="15-visible\SetHydroVisualVisibleDlg.cs"> @@ -207,7 +237,7 @@ <SubType>Form</SubType> </Compile> <Compile Update="18-loss\02-scale\02-input\HydroInputEnergyScaleChartCtrl.cs"> - <SubType>UserControl</SubType> + <SubType>UserControl</SubType> </Compile> <Compile Update="18-loss\03-statistics\HydroMultiWorkingLossStatisticsDlg.cs"> <SubType>Form</SubType> @@ -215,8 +245,29 @@ <Compile Update="18-loss\03-statistics\HydroSingleWorkingLossStatisticsDlg.cs"> <SubType>Form</SubType> </Compile> + <Compile Update="19-pump\02-extend\HydroSinglePumpListExtendGridCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="19-pump\03-query\HydroSinglePumpQueryPointListGridCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="19-pump\04-design\HydroSinglePumpDesignPointListGridCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> <Compile Update="19-pump\04-design\HydroPumpDesignPointListGridCtrl.cs"> - <SubType>UserControl</SubType> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="19-pump\06-working\HydroPumpListViewInWorkingsCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="20-energy\02-total\HydroEnergyTotalHorizViewCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="21-curve\HydroCurveEditDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="21-curve\HydroCurveViewDlg.cs"> + <SubType>Form</SubType> </Compile> <Compile Update="99-view\02-l2d\HydroL2dViewPage.cs"> <SubType>UserControl</SubType> @@ -293,40 +344,40 @@ <Compile Update="06-visual\10-nozzle\SetHydroNozzleDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\11-meter\SetHydroMeterListDlg.cs"> + <Compile Update="06-visual\12-meter\SetHydroMeterListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\11-meter\SetHydroMeterDlg.cs"> + <Compile Update="06-visual\12-meter\SetHydroMeterDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\12-flowmeter\SetHydroFlowmeterDlg.cs"> + <Compile Update="06-visual\13-flowmeter\SetHydroFlowmeterDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\12-flowmeter\SetHydroFlowmeterListDlg.cs"> + <Compile Update="06-visual\13-flowmeter\SetHydroFlowmeterListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\13-pressmeter\SetHydroPressmeterListDlg.cs"> + <Compile Update="06-visual\14-pressmeter\SetHydroPressmeterListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\13-pressmeter\SetHydroPressmeterDlg.cs"> + <Compile Update="06-visual\14-pressmeter\SetHydroPressmeterDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\14-pipe\SetHydroPipeDlg.cs"> + <Compile Update="06-visual\15-pipe\SetHydroPipeDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\14-pipe\SetHydroPipeListDlg.cs"> + <Compile Update="06-visual\15-pipe\SetHydroPipeListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\16-pump\SetHydroPumpListDlg.cs"> + <Compile Update="06-visual\17-pump\SetHydroPumpListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\16-pump\SetHydroPumpDlg.cs"> + <Compile Update="06-visual\17-pump\SetHydroPumpDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\17-valve\SetHydroValveListDlg.cs"> + <Compile Update="06-visual\18-valve\SetHydroValveListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-visual\17-valve\SetHydroValveDlg.cs"> + <Compile Update="06-visual\18-valve\SetHydroValveDlg.cs"> <SubType>Form</SubType> </Compile> <Compile Update="Properties\Resources.Designer.cs"> @@ -343,4 +394,8 @@ </EmbeddedResource> </ItemGroup> + <ItemGroup> + <Folder Include="04-viewmodel\08-validation\" /> + </ItemGroup> + </Project> -- Gitblit v1.9.3