From edfb5be5dc9037152975bd4354e95d5eff78ce2d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 29 十月 2024 18:07:09 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj
index 5be0dc9..dc5ec24 100644
--- a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj
@@ -26,23 +26,33 @@
 
   <ItemGroup>
     <None Remove="bimface\css\Panel.css" />
+    <None Remove="bimface\css\Tailwind.css" />
     <None Remove="bimface\html\Interop3d.html" />
     <None Remove="bimface\js\Background.js" />
     <None Remove="bimface\js\CameraStatus.js" />
+    <None Remove="bimface\js\ComponentsBlink.js" />
     <None Remove="bimface\js\ComponentsColor.js" />
+    <None Remove="bimface\js\ComponentsSelected.js" />
     <None Remove="bimface\js\ComponentsTranslucent.js" />
     <None Remove="bimface\js\ComponentsVisible.js" />
     <None Remove="bimface\js\ContextMenu.js" />
+    <None Remove="bimface\js\DrawableContainer.js" />
     <None Remove="bimface\js\GetComponents.js" />
     <None Remove="bimface\js\Layer.js" />
+    <None Remove="bimface\js\LogicCalcuCustomLabel.js" />
+    <None Remove="bimface\js\LogicMarkLeadLabel.js" />
     <None Remove="bimface\js\Panel.js" />
+    <None Remove="bimface\js\PipeFlow.js" />
     <None Remove="bimface\js\SelectedComponents.js" />
     <None Remove="bimface\js\WalkThrough.js" />
-    <None Remove="bimface\js\ZoomToComponents.js" />
+    <None Remove="bimface\js\Zoom.js" />
   </ItemGroup>
 
   <ItemGroup>
     <Content Include="bimface\css\Panel.css">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\css\Tailwind.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="bimface\html\Interop3d.html">
@@ -57,6 +67,12 @@
     <Content Include="bimface\js\ComponentsColor.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="bimface\js\ComponentsBlink.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\js\ComponentsSelected.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="bimface\js\ComponentsTranslucent.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -66,35 +82,44 @@
     <Content Include="bimface\js\ContextMenu.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="bimface\js\LogicCalcuCustomLabel.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\js\DrawableContainer.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="bimface\js\GetComponents.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="bimface\js\Layer.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="bimface\js\LogicMarkLeadLabel.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="bimface\js\Panel.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="bimface\js\SelectedComponents.js">
+    <Content Include="bimface\js\PipeFlow.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="bimface\js\WalkThrough.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="bimface\js\ZoomToComponents.js">
+    <Content Include="bimface\js\Zoom.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
-    <PackageReference Include="Yw.BLL.Bimface.Core" Version="3.0.2" />
+    <PackageReference Include="Yw.BIMFace.SDK.Core" Version="3.0.5" />
+    <PackageReference Include="Yw.BLL.Bimface.Core" Version="3.0.8" />
     <PackageReference Include="Yw.WebBrower.Core" Version="3.0.2" />
-    <PackageReference Include="Yw.WebView2.WinFrmUI.Core" Version="3.0.0" />
+    <PackageReference Include="Yw.WebView2.WinFrmUI.Core" Version="3.0.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Component\Yw.BIMFace.SDK.Core\Yw.BIMFace.SDK.Core.csproj" />
     <ProjectReference Include="..\Yw.WinFrmUI.Core\Yw.WinFrmUI.Core.csproj" />
   </ItemGroup>
 

--
Gitblit v1.9.3