准备更新设备组/变量组功能

README.md

@@ -81,7 +81,8 @@
 
 ####  支持作者
  如果对您有帮助，请点击右上角⭐Star关注，感谢支持开源！
- 若希望捐赠项目，请跳转到[文档站点](https://diego2098.gitee.io/thingsgateway/docs/%E6%94%AF%E6%8C%81%E5%BC%80%E6%BA%90%E9%A1%B9%E7%9B%AE)查看捐赠码或使用Gitee捐赠功能
+
+ 若希望捐赠项目，请[点击](https://diego2098.gitee.io/thingsgateway/docs/03%E3%80%81%E6%94%AF%E6%8C%81%E9%A1%B9%E7%9B%AE%E4%B8%8E%E4%B8%93%E4%B8%9A%E7%89%88%E8%AF%B4%E6%98%8E/%E6%94%AF%E6%8C%81%E5%BC%80%E6%BA%90%E9%A1%B9%E7%9B%AE)查看捐赠码或使用Gitee捐赠功能
  
 
 ####  联系作者

src/ThingsGateway.Web.Foundation/Entity/MemoryVariable.cs

@@ -27,7 +27,12 @@ public class MemoryVariable : BaseEntity
     [SugarColumn(ColumnName = "InitialValue", ColumnDescription = "初始值", IsNullable = true)]
     [OrderData(Order = 4)]
     public string InitialValue { get; set; }
-
+    /// <summary>
+    /// 变量组
+    /// </summary>
+    [SugarColumn(ColumnName = "VariableGroup", ColumnDescription = "变量组", IsNullable = true)]
+    [OrderData(Order = 4)]
+    public virtual string VariableGroup { get; set; }
     /// <summary>
     /// 读写权限
     /// </summary>

src/ThingsGateway.Web.Foundation/Entity/UploadDevice.cs

@@ -36,6 +36,13 @@ public class UploadDevice : BaseEntity
     [OrderData(Order = 3)]
     public virtual bool Enable { get; set; }
 
+    /// <summary>
+    /// 设备组
+    /// </summary>
+    [SugarColumn(ColumnName = "DeviceGroup", ColumnDescription = "设备组", IsNullable = true)]
+    [OrderData(Order = 3)]
+    public virtual string DeviceGroup { get; set; }
+
     /// <summary>
     /// 输出日志
     /// </summary>

src/ThingsGateway.Web.Foundation/Services/UploadDevice/Dto/UploadDeviceInput.cs

@@ -75,7 +75,11 @@ namespace ThingsGateway.Application
         /// </summary>
         [ImporterHeader(Name = "使能")]
         public virtual bool Enable { get; set; }
-
+        /// <summary>
+        /// 设备组
+        /// </summary>
+        [ImporterHeader(Name = "设备组")]
+        public virtual string DeviceGroup { get; set; }
         /// <summary>
         /// 输出日志
         /// </summary>
@@ -118,6 +122,11 @@ namespace ThingsGateway.Application
         [ExporterHeader(DisplayName = "使能")]
         public virtual bool Enable { get; set; }
         /// <summary>
+        /// 设备组
+        /// </summary>
+        [ExporterHeader(DisplayName = "设备组")]
+        public virtual string DeviceGroup { get; set; }
+        /// <summary>
         /// 输出日志
         /// </summary>
         [ExporterHeader(DisplayName = "输出日志")]

src/ThingsGateway.Web.Foundation/Services/Variable/Dto/VariableInput.cs

@@ -119,7 +119,11 @@ namespace ThingsGateway.Application
         [ImporterHeader(Name = "描述")]
         public string Description { get; set; }
 
-
+        /// <summary>
+        /// 变量组
+        /// </summary>
+        [ImporterHeader(Name = "变量组")]
+        public string VariableGroup { get; set; }
         /// <summary>
         /// 初始值
         /// </summary>
@@ -351,6 +355,13 @@ namespace ThingsGateway.Application
         /// </summary>
         [ExporterHeader(DisplayName = "描述")]
         public string Description { get; set; }
+
+        /// <summary>
+        /// 变量组
+        /// </summary>
+        [ExporterHeader(DisplayName = "变量组")]
+        public string VariableGroup { get; set; }
+
         /// <summary>
         /// 变量地址，可能带有额外的信息，比如<see cref="DataFormat"/> ，以;分割
         /// </summary>

src/ThingsGateway.Web.Page/Page/CollectDevicePage.razor

@@ -168,6 +168,8 @@
                     <MSubheader Class="mt-4 font-weight-black">    @(context.Description(x => x.Enable))  </MSubheader>
                     <EnableSwitch @bind-Value=@context.Enable />
 
+                    <MSubheader Class="mt-4 font-weight-black">    @(context.Description(x => x.DeviceGroup))  </MSubheader>
+                    <MTextField Dense Outlined HideDetails="@("auto")" @bind-Value=@context.DeviceGroup />
 
                     <MSubheader Class="mt-4 font-weight-black">    @(context.Description(x => x.IsLogOut))  </MSubheader>
                     <EnableSwitch @bind-Value=@context.IsLogOut />

src/ThingsGateway.Web.Page/Page/CollectVariablePage.razor

@@ -150,6 +150,9 @@
                             <MTextField Dense Outlined HideDetails="@("auto")" @bind-Value=@context.Description />
                             </MCol>
 
+                            <MSubheader Class="mt-4 font-weight-black">    @(context.Description(x => x.VariableGroup))  </MSubheader>
+                        <MTextField Dense Outlined HideDetails="@("auto")" @bind-Value=@context.VariableGroup />
+
                             <MCol Md=6 Cols=12 class="px-1">
                             <MSubheader Class="font-weight-black">    @context.Description(x=>x.DeviceId)  </MSubheader>
                             <MSelect Class="mr-3" @bind-Value=@context.DeviceId Outlined