整合属性研究

lixiaojun

2024-11-04 3effbd15ec04bbc39514c6904fa71d00631c96eb

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj

@@ -8,12 +8,32 @@
  </PropertyGroup>

  <ItemGroup>
    <Compile Remove="03-property\06-curve\SetHydroCurveCtrl - 复制.cs" />
    <Compile Remove="03-property\06-curve\SetHydroCurveCtrl - 复制.Designer.cs" />
    <Compile Remove="04-viewmodel\07-curve\SetHydroCurveCtrl - 复制.cs" />
    <Compile Remove="04-viewmodel\07-curve\SetHydroCurveCtrl - 复制.Designer.cs" />
    <Compile Remove="06-parter\00-core\HydroParterViewModel.cs" />
    <Compile Remove="06-parter\01-reservoir\HydroReservoirViewModel.cs" />
    <Compile Remove="06-parter\02-tank\HydroTankViewModel.cs" />
    <Compile Remove="06-parter\03-waterbox\HydroWaterboxViewModel.cs" />
    <Compile Remove="06-parter\04-junction\HydroJunctionViewModel.cs" />
    <Compile Remove="06-parter\100-blunthead\HydroBluntheadViewModel.cs" />
    <Compile Remove="06-parter\100-elbow\HydroElbowViewModel.cs" />
    <Compile Remove="06-parter\100-threelink\HydroThreelinkViewModel.cs" />
    <Compile Remove="06-parter\100-fourlink\HydroFourlinkViewModel.cs" />
    <Compile Remove="06-parter\100-hydrant\HydroHydrantViewModel.cs" />
    <Compile Remove="06-parter\100-nozzle\HydroNozzleViewModel.cs" />
    <Compile Remove="06-parter\100-meter\HydroMeterViewModel.cs" />
    <Compile Remove="06-parter\100-flowmeter\HydroFlowmeterViewModel.cs" />
    <Compile Remove="06-parter\100-pressmeter\HydroPressmeterViewModel.cs" />
    <Compile Remove="06-parter\100-pipe\HydroPipeViewModel.cs" />
    <Compile Remove="06-parter\100-translation\HydroTranslationViewModel.cs" />
    <Compile Remove="06-parter\100-exchanger\HydroExchangerViewModel.cs" />
    <Compile Remove="06-parter\100-compressor\HydroCompressorViewModel.cs" />
    <Compile Remove="06-parter\100-pump\HydroPumpViewModel.cs" />
    <Compile Remove="06-parter\100-valve\HydroValveViewModel.cs" />
  </ItemGroup>

  <ItemGroup>
    <EmbeddedResource Remove="03-property\06-curve\SetHydroCurveCtrl - 复制.resx" />
    <EmbeddedResource Remove="04-viewmodel\07-curve\SetHydroCurveCtrl - 复制.resx" />
  </ItemGroup>

  <ItemGroup>
@@ -37,220 +57,220 @@
    <Compile Update="02-model\HydroModelMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-property\HydroParterPropertyCtrl.cs">
    <Compile Update="05-property\HydroParterPropertyCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\02-node\02-junction\01-coupling\01-blunthead\HydroBluntheadListCtrl.cs">
    <Compile Update="06-parter\100-blunthead\HydroBluntheadListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\02-node\02-junction\03-other\03-pressmeter\HydroPressmeterListCtrl.cs">
    <Compile Update="06-parter\100-pressmeter\HydroPressmeterListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\02-node\02-junction\03-other\02-flowmeter\HydroFlowmeterListCtrl.cs">
    <Compile Update="06-parter\100-flowmeter\HydroFlowmeterListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\02-node\02-junction\03-other\01-meter\HydroMeterListCtrl.cs">
    <Compile Update="06-parter\100-meter\HydroMeterListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\02-node\02-junction\01-coupling\04-fourlink\HydroFourlinkListCtrl.cs">
    <Compile Update="06-parter\100-fourlink\HydroFourlinkListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\02-node\02-junction\01-coupling\03-threelink\HydroThreelinkListCtrl.cs">
    <Compile Update="06-parter\100-threelink\HydroThreelinkListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\02-node\02-junction\01-coupling\02-elbow\HydroElbowListCtrl.cs">
    <Compile Update="06-parter\100-elbow\HydroElbowListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\02-node\02-junction\02-emitter\01-hydrant\HydroHydrantListCtrl.cs">
    <Compile Update="06-parter\100-hydrant\HydroHydrantListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\02-node\01-source\02-tank\01-waterbox\HydroWaterboxListCtrl.cs">
    <Compile Update="06-parter\03-waterbox\HydroWaterboxListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\02-node\01-source\02-tank\00-core\HydroTankListCtrl.cs">
    <Compile Update="06-parter\02-tank\HydroTankListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\02-node\01-source\01-reservoir\HydroReservoirListCtrl.cs">
    <Compile Update="06-parter\01-reservoir\HydroReservoirListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\03-link\01-pipe\03-compressor\HydroCompressorListCtrl.cs">
    <Compile Update="06-parter\100-compressor\HydroCompressorListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\03-link\01-pipe\02-exchanger\HydroExchangerListCtrl.cs">
    <Compile Update="06-parter\100-exchanger\HydroExchangerListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\03-link\03-valve\HydroValveListCtrl.cs">
    <Compile Update="06-parter\100-valve\HydroValveListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\03-link\02-pump\HydroPumpListCtrl.cs">
    <Compile Update="06-parter\100-pump\HydroPumpListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\03-link\01-pipe\01-translation\HydroTranslationListCtrl.cs">
    <Compile Update="06-parter\100-translation\HydroTranslationListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\03-link\01-pipe\00-core\HydroPipeListCtrl.cs">
    <Compile Update="06-parter\100-pipe\HydroPipeListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="07-l2d\HydroL2dViewPage.cs">
    <Compile Update="14-l2d\HydroL2dViewPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="08-l3d\HydroL3dViewPage.cs">
    <Compile Update="15-l3d\HydroL3dViewPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="10-grading\04-tree\SelectHydroGradingPropTreeCtrl.cs">
    <Compile Update="08-grading\04-tree\SelectHydroGradingPropTreeCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="10-grading\05-set\SetHydroGradingModelTreeDlg.cs">
    <Compile Update="08-grading\05-set\SetHydroGradingModelTreeDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="10-grading\05-set\SetHydroGradingTreeDlg.cs">
    <Compile Update="08-grading\05-set\SetHydroGradingTreeDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="10-grading\06-apply\01-control\ApplyHydroGradingCtrl.cs">
    <Compile Update="08-grading\06-apply\01-control\ApplyHydroGradingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="10-grading\06-apply\02-dlg\ApplyHydroGradingDlg.cs">
    <Compile Update="08-grading\06-apply\02-dlg\ApplyHydroGradingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="11-prefix\99-failed\HydroCalcuFailedCtrl.cs">
    <Compile Update="10-prefix\99-failed\HydroCalcuFailedCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\01-source\01-reservoir\HydroReservoirBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\02-node\01-source\01-reservoir\HydroReservoirBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\01-source\02-tank\00-core\HydroTankBulkSetListDlg.cs">
    <Compile Update="07-bulkset\02-node\01-source\02-tank\00-core\HydroTankBulkSetListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\01-source\02-tank\00-core\HydroTankBulkSetDlg.cs">
    <Compile Update="07-bulkset\02-node\01-source\02-tank\00-core\HydroTankBulkSetDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\01-source\02-tank\00-core\HydroTankBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\02-node\01-source\02-tank\00-core\HydroTankBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\01-source\02-tank\01-waterbox\HydroWaterboxBulkSetListDlg.cs">
    <Compile Update="07-bulkset\02-node\01-source\02-tank\01-waterbox\HydroWaterboxBulkSetListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\01-source\02-tank\01-waterbox\HydroWaterboxBulkSetDlg.cs">
    <Compile Update="07-bulkset\02-node\01-source\02-tank\01-waterbox\HydroWaterboxBulkSetDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\01-source\02-tank\01-waterbox\HydroWaterboxBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\02-node\01-source\02-tank\01-waterbox\HydroWaterboxBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\00-core\HydroJunctionBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\02-node\02-junction\00-core\HydroJunctionBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\00-core\HydroJunctionBulkSetDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\00-core\HydroJunctionBulkSetDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\00-core\HydroJunctionBulkSetListDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\00-core\HydroJunctionBulkSetListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\01-coupling\01-blunthead\HydroBluntheadBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\02-node\02-junction\01-coupling\01-blunthead\HydroBluntheadBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\01-coupling\01-blunthead\HydroBluntheadBulkSetDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\01-coupling\01-blunthead\HydroBluntheadBulkSetDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\01-coupling\01-blunthead\HydroBluntheadBulkSetListDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\01-coupling\01-blunthead\HydroBluntheadBulkSetListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\01-coupling\02-elbow\HydroElbowBulkSetListDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\01-coupling\02-elbow\HydroElbowBulkSetListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\01-coupling\02-elbow\HydroElbowBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\02-node\02-junction\01-coupling\02-elbow\HydroElbowBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\01-coupling\02-elbow\HydroElbowBulkSetDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\01-coupling\02-elbow\HydroElbowBulkSetDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\01-coupling\03-threelink\HydroThreelinkBulkSetListDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\01-coupling\03-threelink\HydroThreelinkBulkSetListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\01-coupling\03-threelink\HydroThreelinkBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\02-node\02-junction\01-coupling\03-threelink\HydroThreelinkBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\01-coupling\03-threelink\HydroThreelinkBulkSetDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\01-coupling\03-threelink\HydroThreelinkBulkSetDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\01-coupling\04-fourlink\HydroFourlinkBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\02-node\02-junction\01-coupling\04-fourlink\HydroFourlinkBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\01-coupling\04-fourlink\HydroFourlinkBulkSetDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\01-coupling\04-fourlink\HydroFourlinkBulkSetDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\01-coupling\04-fourlink\HydroFourlinkBulkSetListDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\01-coupling\04-fourlink\HydroFourlinkBulkSetListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\02-emitter\01-hydrant\HydroHydrantBulkSetDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\02-emitter\01-hydrant\HydroHydrantBulkSetDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\02-emitter\01-hydrant\HydroHydrantBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\02-node\02-junction\02-emitter\01-hydrant\HydroHydrantBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\02-emitter\01-hydrant\HydroHydrantBulkSetListDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\02-emitter\01-hydrant\HydroHydrantBulkSetListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\02-emitter\02-nozzle\HydroNozzleBulkSetListDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\02-emitter\02-nozzle\HydroNozzleBulkSetListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\02-emitter\02-nozzle\HydroNozzleBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\02-node\02-junction\02-emitter\02-nozzle\HydroNozzleBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\02-emitter\02-nozzle\HydroNozzleBulkSetDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\02-emitter\02-nozzle\HydroNozzleBulkSetDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\03-other\01-meter\HydroMeterBulkSetListDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\03-other\01-meter\HydroMeterBulkSetListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\03-other\01-meter\HydroMeterBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\02-node\02-junction\03-other\01-meter\HydroMeterBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\03-other\01-meter\HydroMeterBulkSetDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\03-other\01-meter\HydroMeterBulkSetDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\03-other\02-flowmeter\HydroFlowmeterBulkSetDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\03-other\02-flowmeter\HydroFlowmeterBulkSetDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\03-other\02-flowmeter\HydroFlowmeterBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\02-node\02-junction\03-other\02-flowmeter\HydroFlowmeterBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\03-other\02-flowmeter\HydroFlowmeterBulkSetListDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\03-other\02-flowmeter\HydroFlowmeterBulkSetListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\03-other\03-pressmeter\HydroPressmeterBulkSetListDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\03-other\03-pressmeter\HydroPressmeterBulkSetListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\03-other\03-pressmeter\HydroPressmeterBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\02-node\02-junction\03-other\03-pressmeter\HydroPressmeterBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\02-node\02-junction\03-other\03-pressmeter\HydroPressmeterBulkSetDlg.cs">
    <Compile Update="07-bulkset\02-node\02-junction\03-other\03-pressmeter\HydroPressmeterBulkSetDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\03-link\01-pipe\00-core\HydroPipeBulkSetDlg.cs">
    <Compile Update="07-bulkset\03-link\01-pipe\00-core\HydroPipeBulkSetDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\03-link\01-pipe\00-core\HydroPipeBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\03-link\01-pipe\00-core\HydroPipeBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\03-link\01-pipe\00-core\HydroPipeBulkSetListDlg.cs">
    <Compile Update="07-bulkset\03-link\01-pipe\00-core\HydroPipeBulkSetListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\03-link\02-pump\HydroPumpBulkSetListDlg.cs">
    <Compile Update="07-bulkset\03-link\02-pump\HydroPumpBulkSetListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\03-link\02-pump\HydroPumpBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\03-link\02-pump\HydroPumpBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\03-link\02-pump\HydroPumpBulkSetDlg.cs">
    <Compile Update="07-bulkset\03-link\02-pump\HydroPumpBulkSetDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\03-link\03-valve\HydroValveBulkSetListDlg.cs">
    <Compile Update="07-bulkset\03-link\03-valve\HydroValveBulkSetListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-bulkset\03-link\03-valve\HydroValveBulkSetListCtrl.cs">
    <Compile Update="07-bulkset\03-link\03-valve\HydroValveBulkSetListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-bulkset\03-link\03-valve\HydroValveBulkSetDlg.cs">
    <Compile Update="07-bulkset\03-link\03-valve\HydroValveBulkSetDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="Properties\Resources.Designer.cs">