Commit ddb514c8 by wangonghui

F12清屏操作功能开发

parent 5d63e771
...@@ -128,6 +128,22 @@ namespace VIZ.Package.Domain ...@@ -128,6 +128,22 @@ namespace VIZ.Package.Domain
#endregion #endregion
#region CleanScreen
/// <summary>
/// 是否清屏操作
/// </summary>
private bool cleanScreen;
public bool CleanScreen
{
get { return cleanScreen; }
set { cleanScreen = value; this.RaisePropertyChanged(nameof(CleanScreen)); }
}
#endregion
/// <summary> /// <summary>
/// 更新状态 /// 更新状态
/// </summary> /// </summary>
...@@ -150,5 +166,7 @@ namespace VIZ.Package.Domain ...@@ -150,5 +166,7 @@ namespace VIZ.Package.Domain
// 部分连接 // 部分连接
this.Status = ConnGroupStatus.AnyConnection; this.Status = ConnGroupStatus.AnyConnection;
} }
} }
} }
...@@ -258,10 +258,15 @@ namespace VIZ.Package.Module ...@@ -258,10 +258,15 @@ namespace VIZ.Package.Module
public void ClearSceen() public void ClearSceen()
{ {
var pageModel = ApplicationDomainEx.CurrentPage as PageModel;
ConnGroupModel group = ApplicationDomainEx.ConnGroups.FirstOrDefault(p => p.GroupID == pageModel.ConnGroupID); //var pageModel = ApplicationDomainEx.CurrentPage as PageModel;
//ConnGroupModel group = ApplicationDomainEx.ConnGroups.FirstOrDefault(p => p.GroupID == pageModel.ConnGroupID);
//清除默认勾选的连接引擎
foreach (var group in ApplicationDomainEx.ConnGroups)
{
if (group.CleanScreen)
{
foreach (var item in group.Items) foreach (var item in group.Items)
{ {
if (!item.IsEnabled || !item.IsConnected) if (!item.IsEnabled || !item.IsConnected)
...@@ -273,6 +278,9 @@ namespace VIZ.Package.Module ...@@ -273,6 +278,9 @@ namespace VIZ.Package.Module
} }
} }
}
}
#endregion #endregion
// ============================================================== // ==============================================================
......
...@@ -86,6 +86,13 @@ ...@@ -86,6 +86,13 @@
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn Header="引擎类型" FieldName="EngineType" AllowSorting="False" AllowColumnFiltering="False" <dxg:GridColumn Header="引擎类型" FieldName="EngineType" AllowSorting="False" AllowColumnFiltering="False"
ReadOnly="True"></dxg:GridColumn> ReadOnly="True"></dxg:GridColumn>
<dxg:GridColumn Header="是否清屏" FieldName="CleanScreen" Width="80" AllowSorting="False" AllowColumnFiltering="False">
<dxg:GridColumn.EditSettings>
<dxe:CheckEditSettings></dxe:CheckEditSettings>
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
</dxg:GridControl.Columns> </dxg:GridControl.Columns>
<dxg:GridControl.View> <dxg:GridControl.View>
<dxg:TableView AllowEditing="True" ShowIndicator="False" <dxg:TableView AllowEditing="True" ShowIndicator="False"
......
...@@ -32,6 +32,7 @@ namespace VIZ.Package.Service ...@@ -32,6 +32,7 @@ namespace VIZ.Package.Service
model.IsDefault = entity.IsDefault; model.IsDefault = entity.IsDefault;
model.Name = entity.Name; model.Name = entity.Name;
model.EngineType = entity.EngineType; model.EngineType = entity.EngineType;
model.CleanScreen = entity.CleanScreen;
groups.Add(model); groups.Add(model);
} }
...@@ -74,6 +75,7 @@ namespace VIZ.Package.Service ...@@ -74,6 +75,7 @@ namespace VIZ.Package.Service
groupEntity.IsDefault = group.IsDefault; groupEntity.IsDefault = group.IsDefault;
groupEntity.Name = group.Name; groupEntity.Name = group.Name;
groupEntity.EngineType = group.EngineType; groupEntity.EngineType = group.EngineType;
groupEntity.CleanScreen=group.CleanScreen;
groupList.Add(groupEntity); groupList.Add(groupEntity);
......
...@@ -42,5 +42,10 @@ namespace VIZ.Package.Storage ...@@ -42,5 +42,10 @@ namespace VIZ.Package.Storage
/// 是否是默认分组 /// 是否是默认分组
/// </summary> /// </summary>
public bool IsDefault { get; set; } public bool IsDefault { get; set; }
/// <summary>
/// 是否清屏
/// </summary>
public bool CleanScreen { get; set; }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment