修改单独匹配界面线程问题

duheng

2024-12-24 ef716332fef142a02843b5a99e8e3e92ab165738

 WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj

@@ -9,33 +9,65 @@

  <ItemGroup>
    <Compile Remove="02-UICore\**" />
    <Compile Remove="03-valve\01-series\**" />
    <Compile Remove="03-valve\02-main\**" />
    <Compile Remove="03-valve\03-factor\**" />
    <Compile Remove="03-valve\01-series-----bak\**" />
    <Compile Remove="03-valve\02-main---bak\**" />
    <Compile Remove="03-valve\04-chart-edit\**" />
    <Compile Remove="03-valve\05-import\**" />
    <Compile Remove="05-elbow\01-series\**" />
    <Compile Remove="05-elbow\02-main\**" />
    <Compile Remove="05-elbow\03-factor\**" />
    <Compile Remove="10-equipment\**" />
    <Compile Remove="20-exchanger\04-curve\**" />
    <Compile Remove="20-exchanger\05-import\**" />
    <Compile Remove="11-compressor\04-chart-edit\**" />
    <Compile Remove="11-compressor\05-import\**" />
    <Compile Remove="14-tank\01-series-bak\**" />
    <Compile Remove="14-tank\02-main-bak\**" />
    <Compile Remove="14-tank\04-chart-edit\**" />
    <Compile Remove="14-tank\05-import\**" />
    <EmbeddedResource Remove="02-UICore\**" />
    <EmbeddedResource Remove="03-valve\01-series\**" />
    <EmbeddedResource Remove="03-valve\02-main\**" />
    <EmbeddedResource Remove="03-valve\03-factor\**" />
    <EmbeddedResource Remove="03-valve\01-series-----bak\**" />
    <EmbeddedResource Remove="03-valve\02-main---bak\**" />
    <EmbeddedResource Remove="03-valve\04-chart-edit\**" />
    <EmbeddedResource Remove="03-valve\05-import\**" />
    <EmbeddedResource Remove="05-elbow\01-series\**" />
    <EmbeddedResource Remove="05-elbow\02-main\**" />
    <EmbeddedResource Remove="05-elbow\03-factor\**" />
    <EmbeddedResource Remove="10-equipment\**" />
    <EmbeddedResource Remove="20-exchanger\04-curve\**" />
    <EmbeddedResource Remove="20-exchanger\05-import\**" />
    <EmbeddedResource Remove="11-compressor\04-chart-edit\**" />
    <EmbeddedResource Remove="11-compressor\05-import\**" />
    <EmbeddedResource Remove="14-tank\01-series-bak\**" />
    <EmbeddedResource Remove="14-tank\02-main-bak\**" />
    <EmbeddedResource Remove="14-tank\04-chart-edit\**" />
    <EmbeddedResource Remove="14-tank\05-import\**" />
    <None Remove="02-UICore\**" />
    <None Remove="03-valve\01-series\**" />
    <None Remove="03-valve\02-main\**" />
    <None Remove="03-valve\03-factor\**" />
    <None Remove="03-valve\01-series-----bak\**" />
    <None Remove="03-valve\02-main---bak\**" />
    <None Remove="03-valve\04-chart-edit\**" />
    <None Remove="03-valve\05-import\**" />
    <None Remove="05-elbow\01-series\**" />
    <None Remove="05-elbow\02-main\**" />
    <None Remove="05-elbow\03-factor\**" />
    <None Remove="10-equipment\**" />
    <None Remove="20-exchanger\04-curve\**" />
    <None Remove="20-exchanger\05-import\**" />
    <None Remove="11-compressor\04-chart-edit\**" />
    <None Remove="11-compressor\05-import\**" />
    <None Remove="14-tank\01-series-bak\**" />
    <None Remove="14-tank\02-main-bak\**" />
    <None Remove="14-tank\04-chart-edit\**" />
    <None Remove="14-tank\05-import\**" />
    <Page Remove="02-UICore\**" />
    <Page Remove="03-valve\01-series\**" />
    <Page Remove="03-valve\02-main\**" />
    <Page Remove="03-valve\03-factor\**" />
    <Page Remove="03-valve\01-series-----bak\**" />
    <Page Remove="03-valve\02-main---bak\**" />
    <Page Remove="03-valve\04-chart-edit\**" />
    <Page Remove="03-valve\05-import\**" />
    <Page Remove="05-elbow\01-series\**" />
    <Page Remove="05-elbow\02-main\**" />
    <Page Remove="05-elbow\03-factor\**" />
    <Page Remove="10-equipment\**" />
    <Page Remove="20-exchanger\04-curve\**" />
    <Page Remove="20-exchanger\05-import\**" />
    <Page Remove="11-compressor\04-chart-edit\**" />
    <Page Remove="11-compressor\05-import\**" />
    <Page Remove="14-tank\01-series-bak\**" />
    <Page Remove="14-tank\02-main-bak\**" />
    <Page Remove="14-tank\04-chart-edit\**" />
    <Page Remove="14-tank\05-import\**" />
  </ItemGroup>

  <ItemGroup>
@@ -43,11 +75,15 @@
    <Compile Remove="01-pump\AddPumpProductMainDlg - 复制.Designer.cs" />
    <Compile Remove="01-pump\PumpProductMainPanel - 复制.cs" />
    <Compile Remove="01-pump\PumpProductMainPanel - 复制.Designer.cs" />
    <Compile Remove="03-valve\AssetsCoolingMgrPage.cs" />
    <Compile Remove="03-valve\AssetsCoolingMgrPage.Designer.cs" />
    <Compile Remove="03-valve\SetValveCoefficientDlg.cs" />
    <Compile Remove="03-valve\SetValveCoefficientDlg.Designer.cs" />
    <Compile Remove="03-valve\ValveManageMainPage.cs" />
    <Compile Remove="03-valve\ValveManageMainPage.Designer.cs" />
    <Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.cs" />
    <Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.Designer.cs" />
    <Compile Remove="12-package\02-main\01-EditPumpPartProp\PropGroupChoiceViewModel.cs" />
    <Compile Remove="14-tank\TankManageMainPage.cs" />
    <Compile Remove="14-tank\TankManageMainPage.Designer.cs" />
    <Compile Remove="20-exchanger\ExchangerManageMainPage.cs" />
    <Compile Remove="20-exchanger\ExchangerManageMainPage.Designer.cs" />
  </ItemGroup>
@@ -55,8 +91,10 @@
  <ItemGroup>
    <EmbeddedResource Remove="01-pump\AddPumpProductMainDlg - 复制.resx" />
    <EmbeddedResource Remove="01-pump\PumpProductMainPanel - 复制.resx" />
    <EmbeddedResource Remove="03-valve\AssetsCoolingMgrPage.resx" />
    <EmbeddedResource Remove="03-valve\SetValveCoefficientDlg.resx" />
    <EmbeddedResource Remove="03-valve\ValveManageMainPage.resx" />
    <EmbeddedResource Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.resx" />
    <EmbeddedResource Remove="14-tank\TankManageMainPage.resx" />
    <EmbeddedResource Remove="20-exchanger\ExchangerManageMainPage.resx" />
  </ItemGroup>

@@ -64,6 +102,7 @@
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
    <PackageReference Include="Yw.BLL.Assets.Core" Version="3.0.1" />
    <PackageReference Include="Yw.BLL.Phart.Core" Version="3.0.5" />
  </ItemGroup>

  <ItemGroup>
@@ -77,32 +116,51 @@
  </ItemGroup>

  <ItemGroup>
    <Compile Update="01-pump\07-PumpChart\01-import\01-excel\ImportPumpPerform2dByExcelDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\07-PumpChart\01-import\02-image\ImportPumpPerform2dByImageDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\07-PumpChart\02-Eidt\EditAssetsPumpPerform2dDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\07-PumpChart\02-Eidt\SetImportanceDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\07-PumpChart\02-Eidt\SetOtherNameDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\07-PumpChart\AssetsPumpCurveQLViewDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="02-adapting\EditAdaptingMainDlg.cs" />
    <Compile Update="02-adapting\AddAdaptingMainDlg.cs" />
    <Compile Update="01-pump\03-AssetsPumpType\EditAssetsPumpTypeDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\EditPumpProductMainDlg.cs" />
    <Compile Update="01-pump\EditPumpProductGroupDlg.cs" />
    <Compile Update="01-pump\AddPumpProductGroupDlg.cs" />
    <Compile Update="01-pump\AddPumpProductMainDlg.cs" />
    <Compile Update="01-pump\EditPumpProductSeriesDlg.cs" />
    <Compile Update="03-valve\04-chart-edit\ValvePerform2dEditChart.cs" />
    <Compile Update="03-valve\04-chart-edit\ValvePerform2dEditCtrl.cs" />
    <Compile Update="03-valve\04-chart-edit\ValvePerform2dEditDlg.cs" />
    <Compile Update="03-valve\05-import\01-excel\ImportValvePerform2dByExcelCtrl.cs" />
    <Compile Update="03-valve\05-import\01-excel\ImportValvePerform2dByExcelDlg.cs" />
    <Compile Update="03-valve\SetValveCoefficientDlg.cs" />
    <Compile Update="03-valve\01-series-----bak\ValveTypeTreeListCtrl.cs" />
    <Compile Update="01-pump\04-PumpMain\EditPumpProductMainDlg.cs" />
    <Compile Update="01-pump\06-PumpGroup\EditPumpProductGroupDlg.cs" />
    <Compile Update="01-pump\06-PumpGroup\AddPumpProductGroupDlg.cs" />
    <Compile Update="01-pump\04-PumpMain\AddPumpProductMainDlg.cs" />
    <Compile Update="01-pump\05-PumpSeries\EditPumpProductSeriesDlg.cs" />
    <Compile Update="02-adapting\AdaptingManageMainPage.cs" />
    <Compile Update="03-valve\04-chart-edit\XhsValveMainPhartMinorLossPanel.cs" />
    <Compile Update="03-valve\04-curve\AssetsValveCurveMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-valve\04-curve\AssetsValveCurveViewDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-valve\04-curve\EditAssetsValveCurveDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-valve\04-curve\ImportAssetsValveCurveByExcelDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-valve\04-curve\ImportAssetsValveCurveByPictureDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-pipe\03-coefficient\SetPipeLineCoefficientDlg.cs" />
    <Compile Update="05-elbow\02-main\AddAssetsElbowMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="05-elbow\02-main\EditAssetsElbowMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="05-elbow\03-coefficient\SetElbowCoefficientDlg.cs" />
    <Compile Update="06-threeLink\01-series\AddAssetsThreelinkSeriesDlg.cs" />
    <Compile Update="06-threeLink\01-series\EditAssetsThreelinkSeriesDlg.cs" />
@@ -115,9 +173,9 @@
    </Compile>
    <Compile Update="06-threeLink\03-coefficient\SetThreelinkCoefficientDlg.cs" />
    <Compile Update="06-threeLink\ThreeLinkManageMainPage.cs" />
    <Compile Update="05-elbow\01-series\AddAssetsElbowSeriesDlg.cs" />
    <Compile Update="05-elbow\01-series\EditAssetsElbowSeriesDlg.cs" />
    <Compile Update="05-elbow\01-series\ElbowTreeListCtrl.cs" />
    <Compile Update="05-elbow\01-series-bak\AddAssetsElbowSeriesDlg.cs" />
    <Compile Update="05-elbow\01-series-bak\EditAssetsElbowSeriesDlg.cs" />
    <Compile Update="05-elbow\01-series-bak\ElbowTreeListCtrl.cs" />
    <Compile Update="05-elbow\ElbowManageMainPage.cs" />
    <Compile Update="04-pipe\01-series\AddPipeLineSeriesDlg.cs" />
    <Compile Update="04-pipe\01-series\EditPipeLineSeriesDlg.cs" />
@@ -139,23 +197,66 @@
    <Compile Update="10-exchanger\06-prop\EditPackagePartPropDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="11-compressor\04-chart-edit\CompressorMainPhartMinorLossPanel.cs" />
    <Compile Update="11-compressor\04-chart-edit\CompressorPerform2dEditChart.cs" />
    <Compile Update="11-compressor\04-chart-edit\CompressorPerform2dEditCtrl.cs" />
    <Compile Update="11-compressor\04-chart-edit\CompressorPerform2dEditDlg.cs" />
    <Compile Update="11-compressor\05-import\01-excel\ImportCompressorPerform2dByExcelCtrl.cs" />
    <Compile Update="11-compressor\05-import\01-excel\ImportTankPerform2dByExcelDlg.cs" />
    <Compile Update="11-compressor\06-prop\EditPackagePartPropDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="11-compressor\06-prop\ExchangerProductListBox.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="14-tank\04-chart-edit\TankPerform2dEditCtrl.cs" />
    <Compile Update="14-tank\04-chart-edit\TankPerform2dEditDlg.cs" />
    <Compile Update="14-tank\04-chart-edit\TankMainPhartMinorLossPanel.cs" />
    <Compile Update="14-tank\05-import\01-excel\ImportTankPerform2dByExcelCtrl.cs" />
    <Compile Update="14-tank\05-import\01-excel\ImportTankPerform2dByExcelDlg.cs" />
    <Compile Update="14-tank\01-series\AddAssetsTankSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="14-tank\01-series\AssetsTankSeriesMgrTreeCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="14-tank\01-series\EditAssetsTankSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="14-tank\01-series\ViewAssetsTankSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="14-tank\02-main\AddAssetsTankMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="14-tank\02-main\AssetsTankMainMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="14-tank\02-main\EditAssetsTankMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="14-tank\02-main\ViewAssetsTankMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="14-tank\03-factor\AddAssetsTankFactorDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="14-tank\03-factor\AssetsTankFactorMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="14-tank\03-factor\EditAssetsTankFactorDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="14-tank\03-factor\ViewAssetsTankFactorDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="14-tank\04-curveVol\AssetsTankCurveVOLMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="14-tank\04-curveVol\AssetsTankCurveVOLViewDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="14-tank\04-curveVol\EditAssetsTankCurveVOLDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="14-tank\04-curveVol\ImportAssetsTankCurveVOLByExcelDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="14-tank\04-curveVol\ImportAssetsTankCurveVOLByPictureDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="14-tank\AssetsTankMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="15-meter\01-series\AddAssetsMeterSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -234,6 +335,45 @@
    <Compile Update="16-flowmeter\AssetsFlowmeterMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="18-pressmeter\01-series\AddAssetsPressmeterSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="18-pressmeter\01-series\AssetsPressmeterSeriesMgrTreeCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="18-pressmeter\01-series\EditAssetsPressmeterSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="18-pressmeter\01-series\ViewAssetsPressmeterSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="18-pressmeter\02-main\AddAssetsPressmeterMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="18-pressmeter\02-main\AssetsPressmeterMainMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="18-pressmeter\02-main\EditAssetsPressmeterMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="18-pressmeter\02-main\ViewAssetsPressmeterMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="18-pressmeter\03-factor\AddAssetsPressmeterFactorDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="18-pressmeter\03-factor\AssetsPressmeterFactorMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="18-pressmeter\03-factor\EditAssetsPressmeterFactorDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="18-pressmeter\03-factor\ViewAssetsPressmeterFactorDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="18-pressmeter\AssetsPressmeterMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="19-translation\01-series\AddAssetsTranslationSeriesDlg.cs" />
    <Compile Update="19-translation\01-series\TranslationTreeListCtrl.cs" />
    <Compile Update="19-translation\01-series\EditAssetsTranslationSeriesDlg.cs" />
@@ -241,13 +381,6 @@
    <Compile Update="19-translation\02-main\EditAssetsTranslationMainDlg.cs" />
    <Compile Update="19-translation\03-coefficient\SetTranslationCoefficientDlg.cs" />
    <Compile Update="19-translation\TranslationManageMainPage.cs" />
    <Compile Update="18-pressmeter\01-series\AddAssetsPressmeterSeriesDlg.cs" />
    <Compile Update="18-pressmeter\01-series\PressmeterTreeListCtrl.cs" />
    <Compile Update="18-pressmeter\01-series\EditAssetsPressmeterSeriesDlg.cs" />
    <Compile Update="18-pressmeter\02-main\AddAssetsPressmeterMainDlg.cs" />
    <Compile Update="18-pressmeter\02-main\EditAssetsPressmeterMainDlg.cs" />
    <Compile Update="18-pressmeter\03-coefficient\SetPressmeterCoefficientDlg.cs" />
    <Compile Update="18-pressmeter\PressmeterManageMainPage.cs" />
    <Compile Update="17-hydrant\01-series\AddAssetsHydrantSeriesDlg.cs" />
    <Compile Update="17-hydrant\01-series\HydrantTreeListCtrl.cs" />
    <Compile Update="17-hydrant\01-series\EditAssetsHydrantSeriesDlg.cs" />
@@ -255,13 +388,6 @@
    <Compile Update="17-hydrant\02-main\EditAssetsHydrantMainDlg.cs" />
    <Compile Update="17-hydrant\03-coefficient\SetHydrantCoefficientDlg.cs" />
    <Compile Update="17-hydrant\HydrantManageMainPage.cs" />
    <Compile Update="14-tank\01-series\AddAssetsTankSeriesDlg.cs" />
    <Compile Update="14-tank\01-series\TankTreeListCtrl.cs" />
    <Compile Update="14-tank\01-series\EditAssetsTankSeriesDlg.cs" />
    <Compile Update="14-tank\02-main\AddAssetsTankMainDlg.cs" />
    <Compile Update="14-tank\02-main\EditAssetsTankMainDlg.cs" />
    <Compile Update="14-tank\03-coefficient\SetTankCoefficientDlg.cs" />
    <Compile Update="14-tank\TankManageMainPage.cs" />
    <Compile Update="13-blunthead\01-series\AddAssetsBluntheadSeriesDlg.cs" />
    <Compile Update="13-blunthead\01-series\EditAssetsBluntheadSeriesDlg.cs" />
    <Compile Update="13-blunthead\01-series\BluntheadTreeListCtrl.cs" />
@@ -344,6 +470,12 @@
    <Compile Update="20-exchanger\03-factor\ViewAssetsCoolingFactorDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="20-exchanger\04-curveql\AssetsExchangerCurveQLViewDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="20-exchanger\04-curveql\ImportAssetsExchangerCurveQLByPictureDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="20-exchanger\AssetsExchangerMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>