Ling
/
EPLAN_PROD_Plugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

105040 Update to 1.0.0.28 

更新版本信息并添加 Release_EPLAN_2024 配置

在 `AssemblyInfo.cs` 中将版本更新至 "1.0.0.28"。
为 `Sinvo.EplanHpD.Plugin.Service.csproj` 和 `Sinvo.EplanHpD.Plugin.Test.csproj` 添加了 `Release_EPLAN_2024` 配置的属性组。
在 `Sinvo.EplanHpD.Plugin.WPFUI.csproj` 中支持 `x64` 和 `x86` 平台的输出路径。
简化了 `CableLectotypeUserControl.xaml.cs` 中的 `using` 语句。
更新了 `CableLectotypeViewModel.cs` 中 `CableTypes` 属性的返回逻辑，并添加了异常处理。
在解决方案文件中添加了 `Release_EPLAN_2024` 配置支持。
更新了 `DesignPluginEntry.cs` 中窗口标题以显示版本号和文档名称。
This commit is contained in:
lihanbo 2025-02-21 09:53:36 +08:00
parent efca568200
commit 9f2b30979a
11 changed files with 165 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Sinvo.EplanHpD.Plugin.Service/Properties/AssemblyInfo.cs
View File

@ -29,6 +29,6 @@ using System.Runtime.InteropServices;
// 生成号 // 生成号
// 修订号 // 修订号
// //
[assembly: AssemblyVersion("1.0.0.25")] [assembly: AssemblyVersion("1.0.0.28")]
[assembly: AssemblyFileVersion("1.0.0.25")] [assembly: AssemblyFileVersion("1.0.0.28")]
[assembly: AssemblyInformationalVersion("1.0.0.25")] [assembly: AssemblyInformationalVersion("1.0.0.28")]

9
Sinvo.EplanHpD.Plugin.Service/Sinvo.EplanHpD.Plugin.Service.csproj
View File

@ -48,6 +48,15 @@
<LangVersion>7.3</LangVersion> <LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_EPLAN_2024|AnyCPU'">
<OutputPath>bin\Release_EPLAN_2024\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />

18
Sinvo.EplanHpD.Plugin.Test/Sinvo.EplanHpD.Plugin.Test.csproj
View File

@ -92,6 +92,24 @@
<LangVersion>7.3</LangVersion> <LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_EPLAN_2024|AnyCPU'">
<OutputPath>bin\Release_EPLAN_2024\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_EPLAN_2024|x86'">
<OutputPath>bin\x86\Release_EPLAN_2024\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.2.2.10\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath> <HintPath>..\packages\MSTest.TestFramework.2.2.10\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>

6
Sinvo.EplanHpD.Plugin.WPFUI/Properties/AssemblyInfo.cs
View File

@ -46,6 +46,6 @@ using System.Windows;
// 生成号 // 生成号
// 修订号 // 修订号
// //
[assembly: AssemblyVersion("1.0.0.25")] [assembly: AssemblyVersion("1.0.0.28")]
[assembly: AssemblyFileVersion("1.0.0.27")] [assembly: AssemblyFileVersion("1.0.0.28")]
[assembly: AssemblyInformationalVersion("1.0.0.27")] [assembly: AssemblyInformationalVersion("1.0.0.28")]

28
Sinvo.EplanHpD.Plugin.WPFUI/Sinvo.EplanHpD.Plugin.WPFUI.csproj
View File

@ -133,6 +133,34 @@
<LangVersion>12.0</LangVersion> <LangVersion>12.0</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_EPLAN_2024|AnyCPU'">
<OutputPath>bin\Release_EPLAN_2024\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>12.0</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_EPLAN_2024|x64'">
<OutputPath>bin\x64\Release_EPLAN_2024\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>12.0</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_EPLAN_2024|x86'">
<OutputPath>bin\x86\Release_EPLAN_2024\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>12.0</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="C1.Win.C1FlexGrid.2"> <Reference Include="C1.Win.C1FlexGrid.2">
<HintPath>..\Sinvo.EplanHpD.Plugin\RefDLL\C1.Win.C1FlexGrid.2.dll</HintPath> <HintPath>..\Sinvo.EplanHpD.Plugin\RefDLL\C1.Win.C1FlexGrid.2.dll</HintPath>

15
Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotypeUserControl.xaml.cs
View File

@ -1,28 +1,15 @@
using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging;
using EPLAN.Harness.Core.Controls;
using EPLAN.Harness.Core.Tasks;
using EPLAN.Harness.Graphics;
using EPLAN.Harness.ProjectCore.Occurrences.Designer;
using EPLAN.Harness.ProjectCore;
using HandyControl.Controls; using HandyControl.Controls;
using Sinvo.EplanHpD.Plugin.Service;
using Sinvo.EplanHpD.Plugin.WPFUI.Common; using Sinvo.EplanHpD.Plugin.WPFUI.Common;
using Sinvo.EplanHpD.Plugin.WPFUI.Models; using Sinvo.EplanHpD.Plugin.WPFUI.Models;
using Sinvo.EplanHpD.Plugin.WPFUI.Utils;
using Sinvo.EplanHpD.Plugin.WPFUI.ViewModel; using Sinvo.EplanHpD.Plugin.WPFUI.ViewModel;
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using System.Diagnostics; using System.Diagnostics;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
using static Sinvo.EplanHpD.Plugin.WPFUI.Utils.LectotypeManager; using static Sinvo.EplanHpD.Plugin.WPFUI.Utils.LectotypeManager;
using System.Linq;
using EPLAN.Harness.ProjectCore.Occurrences;
using Sinvo.EplanHpD.Plugin.WPFUI.Extension;
using Sinvo.EplanHpD.Plugin.Service.Model;
using EPLAN.Harness.Core.Interfaces;
namespace Sinvo.EplanHpD.Plugin.WPFUI.View namespace Sinvo.EplanHpD.Plugin.WPFUI.View
{ {
@ -44,11 +31,9 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.View
_motor = (MotorModel)value; _motor = (MotorModel)value;
ViewModel.Motor = _motor; ViewModel.Motor = _motor;
SetValue(MotorProperty, value); SetValue(MotorProperty, value);
} }
} }
private CableLectotypeViewModel ViewModel = new CableLectotypeViewModel(); private CableLectotypeViewModel ViewModel = new CableLectotypeViewModel();
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;

71
Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/CableLectotypeViewModel.cs
View File

@ -1,20 +1,15 @@
using HandyControl.Controls; using EPLAN.Harness.Core.Controls;
using HandyControl.Controls;
using Sinvo.EplanHpD.Plugin.Service; using Sinvo.EplanHpD.Plugin.Service;
using Sinvo.EplanHpD.Plugin.Service.Model;
using Sinvo.EplanHpD.Plugin.WPFUI.Datas; using Sinvo.EplanHpD.Plugin.WPFUI.Datas;
using Sinvo.EplanHpD.Plugin.WPFUI.Enum; using Sinvo.EplanHpD.Plugin.WPFUI.Enum;
using Sinvo.EplanHpD.Plugin.WPFUI.Extension; using Sinvo.EplanHpD.Plugin.WPFUI.Extension;
using Sinvo.EplanHpD.Plugin.WPFUI.Models; using Sinvo.EplanHpD.Plugin.WPFUI.Models;
using Sinvo.EplanHpD.Plugin.WPFUI.Utils; using Sinvo.EplanHpD.Plugin.WPFUI.Utils;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Linq; using System.Linq;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices.WindowsRuntime;
using System.Security.Cryptography.X509Certificates;
using System.Security.RightsManagement;
using System.Windows.Shapes;
namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel; namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel;
@ -159,8 +154,6 @@ public class CableLectotypeViewModel : INotifyPropertyChanged
secLine.SubLines = GetSubLines(secLine.DrawingNo); secLine.SubLines = GetSubLines(secLine.DrawingNo);
LectotypeList.Add(secLine); LectotypeList.Add(secLine);
} }
} }
else else
{ {
@ -358,11 +351,11 @@ public class CableLectotypeViewModel : INotifyPropertyChanged
var types = motorExcelHelper.GetCableTypes(); var types = motorExcelHelper.GetCableTypes();
if(isCombo) if(isCombo)
{ {
return types.Where(it => it.ItemFlag == "是").ToList(); return [.. types.Where(it => it.ItemFlag == "是")];
} }
else else
{ {
return types.Where(it => it.ItemFlag == "否").ToList(); return [.. types.Where(it => it.ItemFlag == "否")];
} }
} }
set set
@ -424,6 +417,7 @@ public class CableLectotypeViewModel : INotifyPropertyChanged
} }
else else
{ {
IsEnableSecCableType = true;
IsEnableThreeCableType = false; IsEnableThreeCableType = false;
} }
} }
@ -444,35 +438,48 @@ public class CableLectotypeViewModel : INotifyPropertyChanged
} }
public void UpdatePassthroughCableCount() public void UpdatePassthroughCableCount()
{ {
if (_motor != null) try
{ {
var passthroughCables = MotorExcelHelper.Instance.GetPassthroughCableCount(_motor.MotorModelStr).FirstOrDefault(); if (_motor != null)
if(passthroughCables != null)
{ {
_passthroughCableCount = passthroughCables.TotalCableCount; var passthroughCables = MotorExcelHelper.Instance.GetPassthroughCableCount(_motor.MotorModelStr).FirstOrDefault();
if (_passthroughCableCount == 2) if (passthroughCables != null)
{ {
_passthroughCableCount = passthroughCables.TotalCableCount;
if (_passthroughCableCount == 2)
{
IsEnableSecCableType = true;
IsEnableThreeCableType = false;
}
if (_passthroughCableCount == 3)
{
IsEnableSecCableType = true;
IsEnableThreeCableType = true;
}
if (_passthroughCableCount == 1)
{
IsEnableSecCableType = false;
IsEnableThreeCableType = false;
}
}
else
{
//ShowError($"电机型号{_motor.MotorModelStr}没有配置直通线数量");
// 如果没有对应的信息，默认为两个类型
_passthroughCableCount = 2;
IsEnableSecCableType = true; IsEnableSecCableType = true;
IsEnableThreeCableType = false; IsEnableThreeCableType = false;
} }
if (_passthroughCableCount == 3)
{
IsEnableSecCableType = true;
IsEnableThreeCableType = true;
}
if (_passthroughCableCount == 1)
{
IsEnableSecCableType = false;
IsEnableThreeCableType = false;
}
}
else
{
// 如果没有对应的信息，默认为两个类型
IsEnableSecCableType = false;
IsEnableThreeCableType = false;
} }
} }
catch (System.Exception ex)
{
ShowError($"获取电机直通线数量失败{ex}");
//FlexMessageBox.ShowText(FlexMessageBox.Type.ERROR,);
IsEnableSecCableType = true;
IsEnableThreeCableType = false;
}
} }
private string _axison; private string _axison;

33
Sinvo.EplanHpD.Plugin.sln
View File

@ -18,6 +18,9 @@ Global
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64 Debug|x64 = Debug|x64
Debug|x86 = Debug|x86 Debug|x86 = Debug|x86
Release_EPLAN_2024|Any CPU = Release_EPLAN_2024|Any CPU
Release_EPLAN_2024|x64 = Release_EPLAN_2024|x64
Release_EPLAN_2024|x86 = Release_EPLAN_2024|x86
Release_Scanner|Any CPU = Release_Scanner|Any CPU Release_Scanner|Any CPU = Release_Scanner|Any CPU
Release_Scanner|x64 = Release_Scanner|x64 Release_Scanner|x64 = Release_Scanner|x64
Release_Scanner|x86 = Release_Scanner|x86 Release_Scanner|x86 = Release_Scanner|x86
@ -35,6 +38,12 @@ Global
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Debug|x64.Build.0 = Debug|x64 {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Debug|x64.Build.0 = Debug|x64
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Debug|x86.ActiveCfg = Debug|x86 {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Debug|x86.ActiveCfg = Debug|x86
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Debug|x86.Build.0 = Debug|x86 {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Debug|x86.Build.0 = Debug|x86
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_EPLAN_2024|Any CPU.ActiveCfg = Release_EPLAN_2024|Any CPU
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_EPLAN_2024|Any CPU.Build.0 = Release_EPLAN_2024|Any CPU
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_EPLAN_2024|x64.ActiveCfg = Release_EPLAN_2024|x64
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_EPLAN_2024|x64.Build.0 = Release_EPLAN_2024|x64
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_EPLAN_2024|x86.ActiveCfg = Release_EPLAN_2024|x86
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_EPLAN_2024|x86.Build.0 = Release_EPLAN_2024|x86
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x64.ActiveCfg = Release_Scanner|x64 {5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x64.ActiveCfg = Release_Scanner|x64
@ -59,6 +68,12 @@ Global
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Debug|x64.Build.0 = Debug|x64 {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Debug|x64.Build.0 = Debug|x64
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Debug|x86.ActiveCfg = Debug|x86 {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Debug|x86.ActiveCfg = Debug|x86
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Debug|x86.Build.0 = Debug|x86 {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Debug|x86.Build.0 = Debug|x86
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_EPLAN_2024|Any CPU.ActiveCfg = Release_EPLAN_2024|Any CPU
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_EPLAN_2024|Any CPU.Build.0 = Release_EPLAN_2024|Any CPU
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_EPLAN_2024|x64.ActiveCfg = Release_EPLAN_2024|x64
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_EPLAN_2024|x64.Build.0 = Release_EPLAN_2024|x64
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_EPLAN_2024|x86.ActiveCfg = Release_EPLAN_2024|x86
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_EPLAN_2024|x86.Build.0 = Release_EPLAN_2024|x86
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x64.ActiveCfg = Release_Scanner|x64 {2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x64.ActiveCfg = Release_Scanner|x64
@ -83,6 +98,12 @@ Global
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Debug|x64.Build.0 = Debug|Any CPU {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Debug|x64.Build.0 = Debug|Any CPU
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Debug|x86.ActiveCfg = Debug|x86 {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Debug|x86.ActiveCfg = Debug|x86
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Debug|x86.Build.0 = Debug|x86 {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Debug|x86.Build.0 = Debug|x86
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_EPLAN_2024|Any CPU.ActiveCfg = Release_EPLAN_2024|Any CPU
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_EPLAN_2024|Any CPU.Build.0 = Release_EPLAN_2024|Any CPU
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_EPLAN_2024|x64.ActiveCfg = Release_EPLAN_2024|Any CPU
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_EPLAN_2024|x64.Build.0 = Release_EPLAN_2024|Any CPU
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_EPLAN_2024|x86.ActiveCfg = Release_EPLAN_2024|x86
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_EPLAN_2024|x86.Build.0 = Release_EPLAN_2024|x86
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x64.ActiveCfg = Release_Scanner|Any CPU {AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x64.ActiveCfg = Release_Scanner|Any CPU
@ -107,6 +128,12 @@ Global
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Debug|x64.Build.0 = Debug|Any CPU {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Debug|x64.Build.0 = Debug|Any CPU
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Debug|x86.ActiveCfg = Debug|x86 {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Debug|x86.ActiveCfg = Debug|x86
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Debug|x86.Build.0 = Debug|x86 {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Debug|x86.Build.0 = Debug|x86
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_EPLAN_2024|Any CPU.ActiveCfg = Release_EPLAN_2024|Any CPU
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_EPLAN_2024|Any CPU.Build.0 = Release_EPLAN_2024|Any CPU
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_EPLAN_2024|x64.ActiveCfg = Release_EPLAN_2024|Any CPU
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_EPLAN_2024|x64.Build.0 = Release_EPLAN_2024|Any CPU
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_EPLAN_2024|x86.ActiveCfg = Release_EPLAN_2024|x86
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_EPLAN_2024|x86.Build.0 = Release_EPLAN_2024|x86
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x64.ActiveCfg = Release_Scanner|Any CPU {60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x64.ActiveCfg = Release_Scanner|Any CPU
@ -131,6 +158,12 @@ Global
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Debug|x64.Build.0 = Debug|Any CPU {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Debug|x64.Build.0 = Debug|Any CPU
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Debug|x86.ActiveCfg = Debug|Any CPU {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Debug|x86.ActiveCfg = Debug|Any CPU
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Debug|x86.Build.0 = Debug|Any CPU {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Debug|x86.Build.0 = Debug|Any CPU
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_EPLAN_2024|Any CPU.ActiveCfg = Release_EPLAN_2024|Any CPU
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_EPLAN_2024|Any CPU.Build.0 = Release_EPLAN_2024|Any CPU
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_EPLAN_2024|x64.ActiveCfg = Release_EPLAN_2024|Any CPU
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_EPLAN_2024|x64.Build.0 = Release_EPLAN_2024|Any CPU
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_EPLAN_2024|x86.ActiveCfg = Release_EPLAN_2024|Any CPU
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_EPLAN_2024|x86.Build.0 = Release_EPLAN_2024|Any CPU
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x64.ActiveCfg = Release_Scanner|Any CPU {AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x64.ActiveCfg = Release_Scanner|Any CPU

2
Sinvo.EplanHpD.Plugin/DesignPluginEntry.cs
View File

@ -63,6 +63,8 @@ namespace Sinvo.EplanHpD.Plugin
if(window == null) if(window == null)
{ {
window = new LectotypeWindow(doc.ID); window = new LectotypeWindow(doc.ID);
// 获取版本号并显示到窗口标题
window.Title += $" V{Version} - {doc.Name}";
ElementHost.EnableModelessKeyboardInterop(window); ElementHost.EnableModelessKeyboardInterop(window);
var mainApp = BaseApp.ActiveApplication; var mainApp = BaseApp.ActiveApplication;
var helper = new System.Windows.Interop.WindowInteropHelper(window); var helper = new System.Windows.Interop.WindowInteropHelper(window);

6
Sinvo.EplanHpD.Plugin/Properties/AssemblyInfo.cs
View File

@ -28,6 +28,6 @@ using System.Runtime.InteropServices;
// 生成号 // 生成号
// 修订号 // 修订号
// //
[assembly: AssemblyVersion("1.0.0.27")] [assembly: AssemblyVersion("1.0.0.28")]
[assembly: AssemblyFileVersion("1.0.0.27")] [assembly: AssemblyFileVersion("1.0.0.28")]
[assembly: AssemblyInformationalVersion("1.0.0.27-rls")] [assembly: AssemblyInformationalVersion("1.0.0.28")]

27
Sinvo.EplanHpD.Plugin/Sinvo.EplanHpD.Plugin.csproj
View File

@ -121,6 +121,33 @@
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_EPLAN_2024|AnyCPU'">
<OutputPath>bin\Release_EPLAN_2024\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>latest</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_EPLAN_2024|x64'">
<OutputPath>bin\x64\Release_EPLAN_2024\</OutputPath>
<DefineConstants>TRACE;Release_WireAndCable</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_EPLAN_2024|x86'">
<OutputPath>bin\x86\Release_EPLAN_2024\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>latest</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="EPLAN.Harness.API"> <Reference Include="EPLAN.Harness.API">
<HintPath>RefDLL\EPLAN.Harness.API.dll</HintPath> <HintPath>RefDLL\EPLAN.Harness.API.dll</HintPath>