xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 移除MenuBeanDto，直接使用MenuBean模型

Browse Source 
- 删除了 DMS.Application/DTOs/MenuBeanDto.cs 文件
- 在DTOs中将MenuBeanDto类型替换为MenuBean类型
- 更新了IMenuAppService和IMenuManagementService接口中相关方法的参数和返回值类型
- 修改了MenuAppService、MenuManagementService等服务类的实现
- 在DMS.Core/Models/MenuBean.cs中添加了Children属性以支持菜单树结构
- 更新了WPF层相关的菜单处理逻辑
- 修改了映射配置和视图模型中的菜单对象创建方式
- 这一更改简化了数据模型，消除了DTO与模型之间的重复定义，直接在各层之间使用MenuBean实体。
This commit is contained in:
David P.G
2025-10-13 20:20:09 +08:00
parent e78a7981e1
commit 816827e5e9
21 changed files with 95 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DMS.Application/DTOs/CreateDeviceWithDetailsDto.cs
View File

@@ -9,6 +9,6 @@ public class CreateDeviceWithDetailsDto
{
public Device Device { get; set; } public VariableTable VariableTable { get; set; }
public MenuBeanDto DeviceMenu { get; set; } // 如果需要包含菜单信息
public MenuBeanDto VariableTableMenu { get; set; } // 如果需要包含菜单信息
public MenuBean DeviceMenu { get; set; } // 如果需要包含菜单信息
public MenuBean VariableTableMenu { get; set; } // 如果需要包含菜单信息
}

2
DMS.Application/DTOs/CreateMqttWithMenuDto.cs
View File

@@ -15,6 +15,6 @@ namespace DMS.Application.DTOs
/// <summary>
/// 菜单项信息
/// </summary>
public MenuBeanDto MqttServerMenu { get; set; }
public MenuBean MqttServerMenu { get; set; }
}
}

2
DMS.Application/DTOs/CreateVariableTableWithMenuDto.cs
View File

@@ -7,6 +7,6 @@ namespace DMS.Application.DTOs
{
public VariableTable VariableTable { get; set; }
public int DeviceId { get; set; }
public MenuBeanDto Menu { get; set; }
public MenuBean Menu { get; set; }
}
}

64
DMS.Application/DTOs/MenuBeanDto.cs
View File

@@ -1,64 +0,0 @@
using DMS.Core.Enums;
namespace DMS.Application.DTOs;
/// <summary>
/// 菜单数据传输对象（DTO）
/// 用于在应用程序层和表示层之间传输菜单数据，特别是在UI上显示菜单项时使用。
/// </summary>
public class MenuBeanDto
{
/// <summary>
/// 菜单项的唯一标识符
/// </summary>
public int Id { get; set; }
/// <summary>
/// 父级菜单项的ID，用于构建层级菜单结构
/// 如果为0表示为顶级菜单项
/// </summary>
public int ParentId { get; set; }
/// <summary>
/// 菜单项显示的标题文本
/// </summary>
public string Header { get; set; }
/// <summary>
/// 菜单项显示的图标资源路径或标识符
/// </summary>
public string Icon { get; set; }
/// <summary>
/// 菜单的类型,例如菜单关联的是设备，还是变量表，或者是MQTT
/// 用于区分不同类型的菜单项，决定点击菜单项时的行为
/// </summary>
public MenuType MenuType { get; set; }
/// <summary>
/// 菜单关联的数据ID，例如设备Id，变量表Id
/// 根据MenuType的不同，此ID可以指向不同的数据实体
/// </summary>
public int TargetId { get; set; }
/// <summary>
/// 目标视图的键值，用于导航到特定的视图页面
/// </summary>
public string TargetViewKey { get; set; }
/// <summary>
/// 导航参数，传递给目标视图的额外参数信息
/// </summary>
public string NavigationParameter { get; set; }
/// <summary>
/// 菜单项在同级菜单中的显示顺序
/// 数值越小显示越靠前
/// </summary>
public int DisplayOrder { get; set; }
/// <summary>
/// 子菜单项集合，用于构建层级菜单结构
/// </summary>
public List<MenuBeanDto> Children { get; set; } = new List<MenuBeanDto>();
}

12
DMS.Application/Events/MenuChangedEventArgs.cs
View File

@@ -1,5 +1,5 @@
using DMS.Application.DTOs;
using DMS.Core.Enums;
using DMS.Core.Models;
namespace DMS.Application.Events
{
@@ -14,17 +14,17 @@ namespace DMS.Application.Events
public DataChangeType ChangeType { get; }
/// <summary>
/// 菜单DTO
/// 菜单
/// </summary>
public MenuBeanDto Menu { get; }
public MenuBean Menu { get; }
/// <summary>
/// 构造函数
/// </summary>
/// <param name="changeType">变更类型</param>
/// <param name="menu">菜单DTO</param>
/// <param name="parentMenu">父级菜单DTO</param>
public MenuChangedEventArgs(DataChangeType changeType, MenuBeanDto menu)
/// <param name="menu">菜单</param>
/// <param name="parentMenu">父级菜单</param>
public MenuChangedEventArgs(DataChangeType changeType, MenuBean menu)
{
ChangeType = changeType;
Menu = menu;

14
DMS.Application/Interfaces/Database/IMenuAppService.cs
View File

@@ -1,4 +1,4 @@
using DMS.Application.DTOs;
using DMS.Core.Models;
namespace DMS.Application.Interfaces;
@@ -8,24 +8,24 @@ namespace DMS.Application.Interfaces;
public interface IMenuAppService
{
/// <summary>
/// 异步根据ID获取菜单DTO。
/// 异步根据ID获取菜单。
/// </summary>
Task<MenuBeanDto> GetMenuByIdAsync(int id);
Task<MenuBean> GetMenuByIdAsync(int id);
/// <summary>
/// 异步获取所有菜单DTO列表。
/// 异步获取所有菜单列表。
/// </summary>
Task<List<MenuBeanDto>> GetAllMenusAsync();
Task<List<MenuBean>> GetAllMenusAsync();
/// <summary>
/// 异步创建一个新菜单。
/// </summary>
Task<int> CreateMenuAsync(MenuBeanDto menuDto);
Task<int> CreateMenuAsync(MenuBean menu);
/// <summary>
/// 异步更新一个已存在的菜单。
/// </summary>
Task<int> UpdateMenuAsync(MenuBeanDto menuDto);
Task<int> UpdateMenuAsync(MenuBean menu);
/// <summary>
/// 异步删除一个菜单。

4
DMS.Application/Interfaces/IAppDataStorageService.cs
View File

@@ -23,12 +23,12 @@ public interface IAppDataStorageService
/// <summary>
/// 安全字典，用于存储所有菜单数据
/// </summary>
ConcurrentDictionary<int, MenuBeanDto> Menus { get; }
ConcurrentDictionary<int, MenuBean> Menus { get; }
/// <summary>
/// 安全字典，用于存储所有菜单数据
/// </summary>
ConcurrentDictionary<int, MenuBeanDto> MenuTrees { get; }
ConcurrentDictionary<int, MenuBean> MenuTrees { get; }
/// <summary>
/// 安全字典，用于存储所有MQTT服务器数据

18
DMS.Application/Interfaces/Management/IMenuManagementService.cs
View File

@@ -1,28 +1,28 @@
using DMS.Application.DTOs;
using DMS.Core.Models;
namespace DMS.Application.Interfaces.Management;
public interface IMenuManagementService
{
/// <summary>
/// 异步获取所有菜单DTO列表。
/// 异步获取所有菜单列表。
/// </summary>
Task<List<MenuBeanDto>> GetAllMenusAsync();
Task<List<MenuBean>> GetAllMenusAsync();
/// <summary>
/// 异步根据ID获取菜单DTO。
/// 异步根据ID获取菜单。
/// </summary>
Task<MenuBeanDto> GetMenuByIdAsync(int id);
Task<MenuBean> GetMenuByIdAsync(int id);
/// <summary>
/// 异步创建一个新菜单。
/// </summary>
Task<int> CreateMenuAsync(MenuBeanDto menuDto);
Task<int> CreateMenuAsync(MenuBean menu);
/// <summary>
/// 异步更新一个已存在的菜单。
/// </summary>
Task<int> UpdateMenuAsync(MenuBeanDto menuDto);
Task<int> UpdateMenuAsync(MenuBean menu);
/// <summary>
/// 异步删除一个菜单。
@@ -32,14 +32,14 @@ public interface IMenuManagementService
/// <summary>
/// 获取根菜单列表
/// </summary>
List<MenuBeanDto> GetRootMenus();
List<MenuBean> GetRootMenus();
/// <summary>
/// 根据父级ID获取子菜单列表
/// </summary>
/// <param name="parentId">父级菜单ID</param>
/// <returns>子菜单列表</returns>
List<MenuBeanDto> GetChildMenus(int parentId);
List<MenuBean> GetChildMenus(int parentId);
/// <summary>
/// 构建菜单树结构

8
DMS.Application/Profiles/MappingProfile.cs
View File

@@ -1,13 +1,12 @@
using AutoMapper;
using DMS.Core.Models;
using DMS.Application.DTOs;
using DMS.Core.Models;
using DMS.Core.Models.Triggers;
namespace DMS.Application.Profiles;
/// <summary>
/// 配置AutoMapper的映射规则。
/// </summary>
/// 配置AutoMapper的映射规则<EFBFBD><EFBFBD>?/// </summary>
public class MappingProfile : Profile
{
public MappingProfile()
@@ -22,8 +21,7 @@ public class MappingProfile : Profile
.ForMember(dest => dest.VariableName, opt => opt.MapFrom(src => src.Variable.Name))
.ReverseMap();
// MenuBean 映射
CreateMap<MenuBean, MenuBeanDto>().ReverseMap();
// User 映射
CreateMap<User, UserDto>().ReverseMap();

4
DMS.Application/Services/AppDataStorageService.cs
View File

@@ -24,12 +24,12 @@ public class AppDataStorageService : IAppDataStorageService
/// <summary>
/// 安全字典，用于存储所有菜单数据
/// </summary>
public ConcurrentDictionary<int, MenuBeanDto> Menus { get; } = new();
public ConcurrentDictionary<int, MenuBean> Menus { get; } = new();
/// <summary>
/// 安全字典，用于存储所有菜单数据
/// </summary>
public ConcurrentDictionary<int, MenuBeanDto> MenuTrees { get; } = new();
public ConcurrentDictionary<int, MenuBean> MenuTrees { get; } = new();
/// <summary>
/// 安全字典，用于存储所有MQTT服务器数据

6
DMS.Application/Services/DataLoaderService.cs
View File

@@ -1,5 +1,4 @@
using AutoMapper;
using DMS.Application.DTOs;
using DMS.Application.Interfaces;
using DMS.Core.Interfaces;
using System.Collections.Concurrent;
@@ -178,11 +177,10 @@ public class DataLoaderService : IDataLoaderService
_appDataStorageService.Menus.Clear();
_appDataStorageService.MenuTrees.Clear();
var menus = await _repositoryManager.Menus.GetAllAsync();
var menuDtos = _mapper.Map<List<MenuBeanDto>>(menus);
// 将菜单添加到安全字典
foreach (var menuDto in menuDtos)
foreach (var menuBean in menus)
{
_appDataStorageService.Menus.TryAdd(menuDto.Id, menuDto);
_appDataStorageService.Menus.TryAdd(menuBean.Id, menuBean);
}
}

36
DMS.Application/Services/Database/MenuAppService.cs
View File

@@ -1,7 +1,6 @@
using AutoMapper;
using DMS.Core.Interfaces;
using DMS.Core.Models;
using DMS.Application.DTOs;
using DMS.Application.Interfaces.Database;
using DMS.Application.Interfaces;
@@ -28,38 +27,37 @@ public class MenuAppService : IMenuAppService
}
/// <summary>
/// 异步根据ID获取菜单数据传输对象。
/// 异步根据ID获取菜单。
/// </summary>
/// <param name="id">菜单ID。</param>
/// <returns>菜单数据传输对象。</returns>
public async Task<MenuBeanDto> GetMenuByIdAsync(int id)
/// <returns>菜单对象。</returns>
public async Task<MenuBean> GetMenuByIdAsync(int id)
{
var menu = await _repoManager.Menus.GetByIdAsync(id);
return _mapper.Map<MenuBeanDto>(menu);
return _mapper.Map<MenuBean>(menu);
}
/// <summary>
/// 异步获取所有菜单数据传输对象列表。
/// 异步获取所有菜单列表。
/// </summary>
/// <returns>菜单数据传输对象列表。</returns>
public async Task<List<MenuBeanDto>> GetAllMenusAsync()
/// <returns>菜单列表。</returns>
public async Task<List<MenuBean>> GetAllMenusAsync()
{
var menus = await _repoManager.Menus.GetAllAsync();
return _mapper.Map<List<MenuBeanDto>>(menus);
return _mapper.Map<List<MenuBean>>(menus);
}
/// <summary>
/// 异步创建一个新菜单（事务性操作）。
/// </summary>
/// <param name="menuDto">要创建的菜单数据传输对象。</param>
/// <param name="menu">要创建的菜单。</param>
/// <returns>新创建菜单的ID。</returns>
/// <exception cref="ApplicationException">如果创建菜单时发生错误。</exception>
public async Task<int> CreateMenuAsync(MenuBeanDto menuDto)
public async Task<int> CreateMenuAsync(MenuBean menu)
{
try
{
await _repoManager.BeginTranAsync();
var menu = _mapper.Map<MenuBean>(menuDto);
await _repoManager.Menus.AddAsync(menu);
await _repoManager.CommitAsync();
return menu.Id;
@@ -74,21 +72,21 @@ public class MenuAppService : IMenuAppService
/// <summary>
/// 异步更新一个已存在的菜单（事务性操作）。
/// </summary>
/// <param name="menuDto">要更新的菜单数据传输对象。</param>
/// <param name="menu">要更新的菜单。</param>
/// <returns>受影响的行数。</returns>
/// <exception cref="ApplicationException">如果找不到菜单或更新菜单时发生错误。</exception>
public async Task<int> UpdateMenuAsync(MenuBeanDto menuDto)
public async Task<int> UpdateMenuAsync(MenuBean menu)
{
try
{
await _repoManager.BeginTranAsync();
var menu = await _repoManager.Menus.GetByIdAsync(menuDto.Id);
if (menu == null)
var dbmenu = await _repoManager.Menus.GetByIdAsync(menu.Id);
if (dbmenu == null)
{
throw new ApplicationException($"Menu with ID {menuDto.Id} not found.");
throw new ApplicationException($"Menu with ID {menu.Id} not found.");
}
_mapper.Map(menuDto, menu);
int res = await _repoManager.Menus.UpdateAsync(menu);
_mapper.Map(menu, dbmenu);
int res = await _repoManager.Menus.UpdateAsync(dbmenu);
await _repoManager.CommitAsync();
return res;
}

48
DMS.Application/Services/Management/MenuManagementService.cs
View File

@@ -1,8 +1,8 @@
using DMS.Application.DTOs;
using DMS.Application.Events;
using DMS.Application.Interfaces;
using DMS.Application.Interfaces.Management;
using DMS.Core.Enums;
using DMS.Core.Models;
namespace DMS.Application.Services.Management;
@@ -28,17 +28,17 @@ public class MenuManagementService : IMenuManagementService
}
/// <summary>
/// 异步获取所有菜单DTO列表。
/// 异步获取所有菜单列表。
/// </summary>
public async Task<List<MenuBeanDto>> GetAllMenusAsync()
public async Task<List<MenuBean>> GetAllMenusAsync()
{
return await _menuService.GetAllMenusAsync();
}
/// <summary>
/// 异步根据ID获取菜单DTO。
/// 异步根据ID获取菜单。
/// </summary>
public async Task<MenuBeanDto> GetMenuByIdAsync(int id)
public async Task<MenuBean> GetMenuByIdAsync(int id)
{
return await _menuService.GetMenuByIdAsync(id);
}
@@ -46,24 +46,24 @@ public class MenuManagementService : IMenuManagementService
/// <summary>
/// 异步创建一个新菜单。
/// </summary>
public async Task<int> CreateMenuAsync(MenuBeanDto menuDto)
public async Task<int> CreateMenuAsync(MenuBean menu)
{
var result = await _menuService.CreateMenuAsync(menuDto);
var result = await _menuService.CreateMenuAsync(menu);
// 创建成功后，将菜单添加到内存中
if (result > 0)
{
menuDto.Id = result; // 假设返回的ID是新创建的
if (_appDataStorageService.Menus.TryAdd(menuDto.Id, menuDto))
menu.Id = result; // 假设返回的ID是新创建的
if (_appDataStorageService.Menus.TryAdd(menu.Id, menu))
{
MenuBeanDto parentMenu = null;
if (menuDto.ParentId > 0 && _appDataStorageService.Menus.TryGetValue(menuDto.ParentId, out var parent))
MenuBean parentMenu = null;
if (menu.ParentId > 0 && _appDataStorageService.Menus.TryGetValue(menu.ParentId.Value, out var parent))
{
parentMenu = parent;
parent.Children.Add(menuDto);
parent.Children.Add(menu);
}
_eventService.RaiseMenuChanged(this, new MenuChangedEventArgs(DataChangeType.Added, menuDto));
_eventService.RaiseMenuChanged(this, new MenuChangedEventArgs(DataChangeType.Added, menu));
}
}
@@ -73,17 +73,17 @@ public class MenuManagementService : IMenuManagementService
/// <summary>
/// 异步更新一个已存在的菜单。
/// </summary>
public async Task<int> UpdateMenuAsync(MenuBeanDto menuDto)
public async Task<int> UpdateMenuAsync(MenuBean menu)
{
var result = await _menuService.UpdateMenuAsync(menuDto);
var result = await _menuService.UpdateMenuAsync(menu);
// 更新成功后，更新内存中的菜单
if (result > 0 && menuDto != null)
if (result > 0 && menu != null)
{
_appDataStorageService.Menus.AddOrUpdate(menuDto.Id, menuDto, (key, oldValue) => menuDto);
_appDataStorageService.Menus.AddOrUpdate(menu.Id, menu, (key, oldValue) => menu);
_eventService.RaiseMenuChanged(this, new MenuChangedEventArgs(DataChangeType.Updated, menuDto));
_eventService.RaiseMenuChanged(this, new MenuChangedEventArgs(DataChangeType.Updated, menu));
}
return result;
@@ -100,15 +100,15 @@ public class MenuManagementService : IMenuManagementService
// 删除成功后，从内存中移除菜单
if (result && menu != null)
{
if (_appDataStorageService.Menus.TryRemove(id, out var menuDto))
if (_appDataStorageService.Menus.TryRemove(id, out var menuData))
{
// 从父菜单中移除子菜单
if (menuDto.ParentId > 0 && _appDataStorageService.Menus.TryGetValue(menuDto.ParentId, out var parentMenu))
if (menuData.ParentId > 0 && _appDataStorageService.Menus.TryGetValue(menuData.ParentId.Value, out var parentMenu))
{
parentMenu.Children.Remove(menuDto);
parentMenu.Children.Remove(menuData);
}
_eventService.RaiseMenuChanged(this, new MenuChangedEventArgs(DataChangeType.Deleted, menuDto));
_eventService.RaiseMenuChanged(this, new MenuChangedEventArgs(DataChangeType.Deleted, menuData));
}
}
@@ -118,7 +118,7 @@ public class MenuManagementService : IMenuManagementService
/// <summary>
/// 获取根菜单列表
/// </summary>
public List<MenuBeanDto> GetRootMenus()
public List<MenuBean> GetRootMenus()
{
return _appDataStorageService.Menus.Values.Where(m => m.ParentId == 0)
.ToList();
@@ -129,7 +129,7 @@ public class MenuManagementService : IMenuManagementService
/// </summary>
/// <param name="parentId">父级菜单ID</param>
/// <returns>子菜单列表</returns>
public List<MenuBeanDto> GetChildMenus(int parentId)
public List<MenuBean> GetChildMenus(int parentId)
{
return _appDataStorageService.Menus.Values.Where(m => m.ParentId == parentId)
.ToList();

5
DMS.Core/Models/MenuBean.cs
View File

@@ -57,4 +57,9 @@ public class MenuBean
/// 数值越小显示越靠前
/// </summary>
public int DisplayOrder { get; set; }
/// <summary>
/// 子菜单项集合，用于构建层级菜单结构
/// </summary>
public List<MenuBean> Children { get; set; } = new List<MenuBean>();
}

2
DMS.WPF/Interfaces/IVariableTableDataService.cs
View File

@@ -11,7 +11,7 @@ public interface IVariableTableDataService
void LoadAllVariableTables();
Task<int> AddVariableTable(VariableTable variableTable,
MenuBeanDto menuDto = null, bool isAddDb = false);
MenuBean menu = null, bool isAddDb = false);
Task<bool> UpdateVariableTable(VariableTableItem variableTable);
Task<bool> DeleteVariableTable(VariableTableItem variableTable, bool isDeleteDb = false);

4
DMS.WPF/Profiles/MappingProfile.cs
View File

@@ -25,7 +25,7 @@ namespace DMS.WPF.Profiles
.ReverseMap();
CreateMap<MenuBeanDto, MenuItem>()
CreateMap<MenuBean, MenuItem>()
.ReverseMap();
@@ -40,4 +40,4 @@ namespace DMS.WPF.Profiles
CreateMap<NlogDto, NlogItem>().ReverseMap();
}
}
}
}

4
DMS.WPF/Services/MenuDataService.cs
View File

@@ -1,8 +1,8 @@
using AutoMapper;
using DMS.Application.DTOs;
using DMS.Application.Interfaces;
using DMS.Application.Interfaces.Management;
using DMS.Application.Services.Management;
using DMS.Core.Models;
using DMS.WPF.Interfaces;
using DMS.WPF.ItemViewModel;
using System.Collections.ObjectModel;
@@ -79,7 +79,7 @@ public class MenuDataService : IMenuDataService
if (deviceMenu is not null)
{
var menuId= await _menuManagementService.CreateMenuAsync(_mapper.Map<MenuBeanDto>(MenuItem));
var menuId= await _menuManagementService.CreateMenuAsync(_mapper.Map<MenuBean>(MenuItem));
if (menuId>0)
{
MenuItem.Id = menuId;

4
DMS.WPF/Services/MqttDataService.cs
View File

@@ -78,7 +78,7 @@ public class MqttDataService : IMqttDataService
if (mqttRootMenu is not null)
{
var mqttServerMenu = new MenuBeanDto()
var mqttServerMenu = new MenuBean()
{
Header = mqttServerItem.ServerName,
TargetId = mqttServerItem.Id,
@@ -111,7 +111,7 @@ public class MqttDataService : IMqttDataService
menu.Header = mqttServer.ServerName;
// 使用菜单管理服务更新菜单
var menuDto = _mapper.Map<MenuBeanDto>(menu);
var menuDto = _mapper.Map<MenuBean>(menu);
await _menuManagementServiceImpl.UpdateMenuAsync(menuDto);
}
}

6
DMS.WPF/Services/VariableTableDataService.cs
View File

@@ -40,7 +40,7 @@ public class VariableTableDataService : IVariableTableDataService
}
public async Task<int> AddVariableTable(VariableTable variableTable,
MenuBeanDto menuDto = null, bool isAddDb = false)
MenuBean menuDto = null, bool isAddDb = false)
{
if (variableTable == null)
return 0;
@@ -53,7 +53,7 @@ public class VariableTableDataService : IVariableTableDataService
createDto.Menu = menuDto;
var resDto = await _appDataCenterService.VariableTableManagementService.CreateVariableTableAsync(createDto);
_menuDataService.AddMenuItem(_mapper.Map<MenuItem>(resDto.Menu));
await _menuDataService.AddMenuItem(_mapper.Map<MenuItem>(resDto.Menu));
return resDto.VariableTable.Id;
}
@@ -114,7 +114,7 @@ public class VariableTableDataService : IVariableTableDataService
var variableTableMenu
=_dataStorageService.Menus.FirstOrDefault(m => m.MenuType == MenuType.VariableTableMenu && m.TargetId == variableTable.Id);
_menuDataService.DeleteMenuItem(variableTableMenu);
await _menuDataService.DeleteMenuItem(variableTableMenu);
// 删除变量表
_dataStorageService.VariableTables.Remove(variableTable.Id);
variableTable.Device.VariableTables.Remove(variableTable);

2
DMS.WPF/ViewModels/DeviceDetailViewModel.cs
View File

@@ -68,7 +68,7 @@ public partial class DeviceDetailViewModel : ViewModelBase
}
VariableTableItem.DeviceId = CurrentDevice.Id;
var tableMenu = new MenuBeanDto()
var tableMenu = new MenuBean()
{
Header = VariableTableItem.Name,
Icon = SegoeFluentIcons.DataSense.Glyph,

6
DMS.WPF/ViewModels/DevicesViewModel.cs
View File

@@ -104,7 +104,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
}
dto.DeviceMenu = new MenuBeanDto()
dto.DeviceMenu = new MenuBean()
{
Header = device.Name,
Icon = SegoeFluentIcons.Devices2.Glyph,
@@ -119,7 +119,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
Description = "默认变量表",
IsActive = true
};
dto.VariableTableMenu = new MenuBeanDto()
dto.VariableTableMenu = new MenuBean()
{
Header = dto.VariableTable.Name,
Icon = SegoeFluentIcons.DataSense.Glyph,
@@ -266,7 +266,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
}
VariableTableItem.DeviceId = device.Id;
var tableMenu = new MenuBeanDto()
var tableMenu = new MenuBean()
{
Header = VariableTableItem.Name,
Icon = SegoeFluentIcons.DataSense.Glyph,