chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化桌面端无用菜单和地磅数据可手动功能。

Browse Source
This commit is contained in:
geht
2026-05-18 15:55:11 +08:00
parent 5800b6b61c
commit c11f3104cb
18 changed files with 628 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
yy-admin-master/YY.Admin/ViewModels/SysManage/MenuManagementViewModel.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.ObjectModel;
using System.Linq;
using System.Windows;
using HandyControl.Controls;
using Prism.Commands;
using Prism.Mvvm;
@@ -11,21 +12,28 @@ using YY.Admin.Services.Service.Menu;
namespace YY.Admin.ViewModels.SysManage;
/// <summary>
/// 左侧列表一行（树形扁平展示）
/// 左侧列表一行（树形扁平展示，可见行受折叠状态控制）
/// </summary>
public sealed class MenuFlatRow
{
public SysMenu Menu { get; }
public int Depth { get; }
public string IndentTitle { get; }
/// <summary>是否存在子节点（用于显示展开按钮）</summary>
public bool HasChildren { get; }
/// <summary>子节点当前是否展开</summary>
public bool IsExpanded { get; }
public Thickness LeadingMargin => new(Depth * 14, 0, 0, 0);
public string TitleText { get; }
public MenuFlatRow(SysMenu menu, int depth)
public MenuFlatRow(SysMenu menu, int depth, bool hasChildren, bool isExpanded)
{
Menu = menu;
Depth = depth;
var pad = new string('　', depth);
HasChildren = hasChildren;
IsExpanded = isExpanded;
var tag = menu.Type == MenuTypeEnum.Dir ? "[目录] " : menu.Type == MenuTypeEnum.Btn ? "[按钮] " : "[菜单] ";
IndentTitle = pad + tag + menu.Title;
var homeMark = menu.IsDefaultDesktopHome ? "[默认首页] " : "";
TitleText = tag + homeMark + menu.Title;
}
}
@@ -49,13 +57,25 @@ public class MenuEditorModel : BindableBase
private bool _isHide;
private bool _isKeepAlive = true;
private bool _isAffix;
private bool _isDefaultDesktopHome;
private int _orderNo = 100;
private StatusEnum _status = StatusEnum.Enable;
private string? _remark;
public long Id { get => _id; set => SetProperty(ref _id, value); }
public long Pid { get => _pid; set => SetProperty(ref _pid, value); }
public MenuTypeEnum Type { get => _type; set => SetProperty(ref _type, value); }
public MenuTypeEnum Type
{
get => _type;
set
{
if (!SetProperty(ref _type, value))
return;
RaisePropertyChanged(nameof(CanSetDefaultDesktopHome));
if (value != MenuTypeEnum.Menu)
IsDefaultDesktopHome = false;
}
}
public string? Name { get => _name; set => SetProperty(ref _name, value); }
public string? Path { get => _path; set => SetProperty(ref _path, value); }
public string? Component { get => _component; set => SetProperty(ref _component, value); }
@@ -68,12 +88,20 @@ public class MenuEditorModel : BindableBase
public bool IsHide { get => _isHide; set => SetProperty(ref _isHide, value); }
public bool IsKeepAlive { get => _isKeepAlive; set => SetProperty(ref _isKeepAlive, value); }
public bool IsAffix { get => _isAffix; set => SetProperty(ref _isAffix, value); }
public bool IsDefaultDesktopHome
{
get => _isDefaultDesktopHome;
set => SetProperty(ref _isDefaultDesktopHome, value);
}
public int OrderNo { get => _orderNo; set => SetProperty(ref _orderNo, value); }
public StatusEnum Status { get => _status; set => SetProperty(ref _status, value); }
public string? Remark { get => _remark; set => SetProperty(ref _remark, value); }
public bool IsNew => Id == 0;
/// <summary>仅「菜单」类型可设为桌面默认首页</summary>
public bool CanSetDefaultDesktopHome => Type == MenuTypeEnum.Menu;
public void LoadFrom(SysMenu m)
{
Id = m.Id;
@@ -91,6 +119,7 @@ public class MenuEditorModel : BindableBase
IsHide = m.IsHide;
IsKeepAlive = m.IsKeepAlive;
IsAffix = m.IsAffix;
IsDefaultDesktopHome = m.Type == MenuTypeEnum.Menu && m.IsDefaultDesktopHome;
OrderNo = m.OrderNo;
Status = m.Status;
Remark = m.Remark;
@@ -115,6 +144,7 @@ public class MenuEditorModel : BindableBase
IsHide = IsHide,
IsKeepAlive = IsKeepAlive,
IsAffix = IsAffix,
IsDefaultDesktopHome = Type == MenuTypeEnum.Menu && IsDefaultDesktopHome,
OrderNo = OrderNo,
Status = Status,
Remark = Remark
@@ -138,6 +168,7 @@ public class MenuEditorModel : BindableBase
IsHide = false;
IsKeepAlive = true;
IsAffix = false;
IsDefaultDesktopHome = false;
OrderNo = 100;
Status = StatusEnum.Enable;
Remark = null;
@@ -147,6 +178,10 @@ public class MenuEditorModel : BindableBase
public class MenuManagementViewModel : BaseViewModel
{
private readonly ISysMenuService _menuService;
/// <summary>最近一次加载的全量菜单（折叠切换时仅重算列表，不重复读库）</summary>
private List<SysMenu> _allMenusCache = new();
/// <summary>已折叠节点 Id（其子级不在扁平列表中展示）</summary>
private readonly HashSet<long> _collapsedMenuIds = new();
public ObservableCollection<MenuFlatRow> FlatRows { get; } = new();
public ObservableCollection<KeyValuePair<long, string>> ParentOptions { get; } = new();
@@ -208,6 +243,9 @@ public class MenuManagementViewModel : BaseViewModel
public DelegateCommand AddChildCommand { get; }
public DelegateCommand SaveCommand { get; }
public DelegateCommand DeleteCommand { get; }
public DelegateCommand<MenuFlatRow?> ToggleExpandCommand { get; }
public DelegateCommand ExpandAllCommand { get; }
public DelegateCommand CollapseAllCommand { get; }
public MenuManagementViewModel(
ISysMenuService menuService,
@@ -224,6 +262,9 @@ public class MenuManagementViewModel : BaseViewModel
.ObservesProperty(() => Editor);
DeleteCommand = new DelegateCommand(async () => await DeleteAsync(), () => SelectedRow != null && SelectedRow.Menu.Id != 0)
.ObservesProperty(() => SelectedRow);
ToggleExpandCommand = new DelegateCommand<MenuFlatRow?>(OnToggleExpand);
ExpandAllCommand = new DelegateCommand(OnExpandAll);
CollapseAllCommand = new DelegateCommand(OnCollapseAll);
_ = RefreshAsync();
}
@@ -234,8 +275,11 @@ public class MenuManagementViewModel : BaseViewModel
{
IsLoading = true;
var all = await _menuService.GetAllMenusForManageAsync();
PruneCollapsedState(all);
_allMenusCache = all;
RebuildFlat(all);
RebuildParentOptions(all);
ResyncSelectionAfterRebuild();
}
catch (Exception ex)
{
@@ -250,18 +294,90 @@ public class MenuManagementViewModel : BaseViewModel
private void RebuildFlat(List<SysMenu> all)
{
FlatRows.Clear();
bool HasChild(long id) => all.Any(x => x.Pid == id);
void Walk(long pid, int depth)
{
foreach (var m in all.Where(x => x.Pid == pid).OrderBy(x => x.OrderNo).ThenBy(x => x.Id))
{
FlatRows.Add(new MenuFlatRow(m, depth));
Walk(m.Id, depth + 1);
var hasCh = HasChild(m.Id);
var expanded = !_collapsedMenuIds.Contains(m.Id);
FlatRows.Add(new MenuFlatRow(m, depth, hasCh, expanded));
if (hasCh && expanded)
Walk(m.Id, depth + 1);
}
}
Walk(0, 0);
}
/// <summary>删除已不存在的菜单 Id，并去掉已无子级的折叠记录</summary>
private void PruneCollapsedState(List<SysMenu> all)
{
var validIds = new HashSet<long>(all.Select(m => m.Id));
foreach (var id in _collapsedMenuIds.ToList())
{
if (!validIds.Contains(id) || !all.Any(x => x.Pid == id))
_collapsedMenuIds.Remove(id);
}
}
private void OnToggleExpand(MenuFlatRow? row)
{
if (row?.HasChildren != true)
return;
var id = row.Menu.Id;
if (_collapsedMenuIds.Contains(id))
_collapsedMenuIds.Remove(id);
else
_collapsedMenuIds.Add(id);
RebuildFlat(_allMenusCache);
ResyncSelectionAfterRebuild();
}
private void OnExpandAll()
{
_collapsedMenuIds.Clear();
RebuildFlat(_allMenusCache);
ResyncSelectionAfterRebuild();
}
private void OnCollapseAll()
{
_collapsedMenuIds.Clear();
foreach (var m in _allMenusCache.Where(m => _allMenusCache.Any(c => c.Pid == m.Id)))
_collapsedMenuIds.Add(m.Id);
RebuildFlat(_allMenusCache);
ResyncSelectionAfterRebuild();
}
/// <summary>重建列表后，按 Id 恢复选中；若当前项被折叠隐藏则选中其可见祖先</summary>
private void ResyncSelectionAfterRebuild()
{
if (_selectedRow == null)
return;
var id = _selectedRow.Menu.Id;
MenuFlatRow? row = FlatRows.FirstOrDefault(r => r.Menu.Id == id);
var curId = id;
while (row == null && curId != 0)
{
var m = _allMenusCache.FirstOrDefault(x => x.Id == curId);
if (m == null)
break;
curId = m.Pid;
if (curId == 0)
break;
row = FlatRows.FirstOrDefault(r => r.Menu.Id == curId);
}
if (row != null)
SelectedRow = row;
}
private void RebuildParentOptions(List<SysMenu> all)
{
ParentOptions.Clear();