版本更新

src/YSAI.DAQ/YSAI.Beckhoff/BeckhoffOperate.cs

@@ -761,7 +761,7 @@ namespace YSAI.Beckhoff
                     Show = false,
                     Use = false,
                     Default = nameSpace,
-                    DataCate = ParamStructure.dataCate.text
+                    DataCate = null
                 });
                 foreach (var lib in libInstanceParams)
                 {
@@ -784,6 +784,7 @@ namespace YSAI.Beckhoff
                     {
                         PropertyName = lib.Name,
                         Description = Describe,
+
                         Show = displayAttribute?.Show ?? false,
                         Use = displayAttribute?.Use ?? false,
                         MustFillIn = displayAttribute?.MustFillIn ?? false,
@@ -794,8 +795,7 @@ namespace YSAI.Beckhoff
 
                         Default = Default
                     };
-
-                    switch (displayAttribute.DataCate)
+                    switch (displayAttribute?.DataCate)
                     {
                         case Core.data.ParamStructure.dataCate.select:
                             propertie.Options = new List<ParamStructure.subset.propertie.options>();

src/YSAI.DAQ/YSAI.Beckhoff/YSAI.Beckhoff.csproj

@@ -14,7 +14,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Beckhoff.TwinCAT.Ads" Version="6.1.86" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.75" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.77" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Can/YSAI.Can.csproj

@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.75" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.77" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.Core/YSAI.Core.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.0.77</Version>
+    <Version>1.0.0.78</Version>
     <Authors>Shun</Authors>
     <Company>YSAI</Company>
     <Product>SCADA</Product>

src/YSAI.DAQ/YSAI.Core/data/ParamStructure.cs

@@ -30,7 +30,7 @@ namespace YSAI.Core.data
             radio,
 
             /// <summary>
-            /// 数字框
+            /// 整数框
             /// </summary>
             unmber,
 

src/YSAI.DAQ/YSAI.Core/subscribe/SubscribeData.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using YSAI.Core.attribute;
 using YSAI.Core.data;
 using YSAI.Unility;
 
@@ -40,7 +41,9 @@ namespace YSAI.Core.subscription
             /// <summary>
             /// 处理间隔（毫秒）
             /// </summary>
-            [Description("处理间隔（毫秒）")]
+            [Description("处理间隔")]
+            [Unit("ms")]
+            [Display(true, true, true, Core.data.ParamStructure.dataCate.unmber)]
             public int HandleInterval { get; set; } = 1000;
 
             /// <summary>
@@ -49,6 +52,7 @@ namespace YSAI.Core.subscription
             /// 数据库查询，此项无效
             /// </summary>
             [Description("变化抛出")]
+            [Display(true, true, true, Core.data.ParamStructure.dataCate.radio)]
             public bool ChangeOut { get; set; } = true;
 
             /// <summary>
@@ -57,18 +61,22 @@ namespace YSAI.Core.subscription
             /// 数据库查询，此项无效
             /// </summary>
             [Description("未变项与变化项一同抛出")]
+            [Display(true, true, true, Core.data.ParamStructure.dataCate.radio)]
             public bool AllOut { get; set; } = false;
 
             /// <summary>
             /// 任务数量
             /// </summary>
             [Description("任务数量")]
+            [Display(true, true, true, Core.data.ParamStructure.dataCate.unmber)]
             public int TaskNumber { get; set; } = 5;
 
             /// <summary>
             /// 任务处理间隔(毫秒)
             /// </summary>
-            [Description("任务处理间隔(毫秒)")]
+            [Description("任务处理间隔")]
+            [Unit("ms")]
+            [Display(true, true, true, Core.data.ParamStructure.dataCate.unmber)]
             public int TaskHandleInterval { get; set; } = 100;
         }
     }

src/YSAI.DAQ/YSAI.DB/YSAI.DB.csproj

@@ -18,7 +18,7 @@
 		<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 		<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.75" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.77" />
 	</ItemGroup>
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

src/YSAI.DAQ/YSAI.DaqManage/YSAI.DaqManage.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.75" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.77" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Kafka/YSAI.Kafka.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="2.3.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.75" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.77" />
   </ItemGroup>
 	
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Modbus/YSAI.Modbus.csproj

@@ -15,7 +15,7 @@
 	<ItemGroup>
     <PackageReference Include="NModbus" Version="3.0.81" />
     <PackageReference Include="NModbus.Serial" Version="3.0.81" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.75" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.77" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Mqtt/YSAI.Mqtt.csproj

@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="MQTTnet" Version="4.3.1.873" />
     <PackageReference Include="MQTTnet.AspNetCore" Version="4.3.1.873" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.75" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.77" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Netty/YSAI.Netty.csproj

@@ -14,6 +14,6 @@
 	<ItemGroup>
 		<PackageReference Include="DotNetty.Handlers" Version="0.7.5" />
 		<PackageReference Include="DotNetty.Transport" Version="0.7.5" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.75" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.77" />
 	</ItemGroup>
 </Project>

src/YSAI.DAQ/YSAI.Opc/YSAI.Opc.csproj

@@ -13,7 +13,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.372.76" />
-	<PackageReference Include="YSAI.Core" Version="1.0.0.75" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.77" />
   </ItemGroup>
 
 

src/YSAI.DAQ/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="6.6.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.75" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.77" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.RelayManage/YSAI.RelayManage.csproj

@@ -9,7 +9,7 @@
 	<ItemGroup>
 		<PackageReference Include="RabbitMQ.Client" Version="6.6.0" />
 		<PackageReference Include="Confluent.Kafka" Version="2.3.0" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.75" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.77" />
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 

src/YSAI.DAQ/YSAI.S7/YSAI.S7.csproj

@@ -14,7 +14,7 @@
 
 	<ItemGroup>
     <PackageReference Include="S7netplus" Version="0.20.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.75" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.77" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Test/YSAI.Test.csproj

@@ -17,7 +17,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-	<PackageReference Include="YSAI.Core" Version="1.0.0.75" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.77" />
   </ItemGroup>
 
   <ItemGroup>