Skip to content

Commit c9e9a45

Browse files
authored
Update the vben5 tree data structure (#564)
1 parent d44a549 commit c9e9a45

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

backend/sql/mysql/init_test_data.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ values (1, '创建API', 'POST', '/api/v1/apis', null, '2024-02-02 11:29:47', nu
77
(3, '编辑API', 'PUT', '/api/v1/apis/{pk}', null, '2024-02-02 11:32:22', null);
88

99
insert into fba.sys_menu (id, title, name, path, sort, icon, type, component, perms, status, display, cache, link, remark, parent_id, created_time, updated_time)
10-
values (1, '测试', 'test', '', 0, '', 0, null, null, 0, 0, 1, null, null, null, '2023-07-27 19:14:10', null),
10+
values (1, '测试', 'Test', 'test', 0, null, 0, null, null, 0, 0, 1, null, null, null, '2023-07-27 19:14:10', null),
1111
(2, '仪表盘', 'Dashboard', 'dashboard', 0, 'material-symbols:dashboard', 0, null, null, 1, 1, 1, null, null, null, '2023-07-27 19:15:45', null),
1212
(3, '工作台', 'Workspace', 'workspace', 0, null, 1, '/dashboard/workspace/index.vue', null, 1, 1, 1, null, null, 2, '2023-07-27 19:17:59', null),
1313
(4, '数据分析', 'Analytics', 'analytics', 0, null, 1, '/dashboard/analytics/index.vue', null, 1, 1, 1, null, null, 2, '2023-07-27 19:17:59', null),

backend/sql/postgresql/init_test_data.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ values (1, '创建API', 'POST', '/api/v1/apis', null, '2024-02-02 11:29:47', nu
77
(3, '编辑API', 'PUT', '/api/v1/apis/{pk}', null, '2024-02-02 11:32:22', null);
88

99
insert into fba.sys_menu (id, title, name, path, sort, icon, type, component, perms, status, display, cache, link, remark, parent_id, created_time, updated_time)
10-
values (1, '测试', 'test', '', 0, '', 0, null, null, 0, 0, 1, null, null, null, '2023-07-27 19:14:10', null),
10+
values (1, '测试', 'Test', 'test', 0, null, 0, null, null, 0, 0, 1, null, null, null, '2023-07-27 19:14:10', null),
1111
(2, '仪表盘', 'Dashboard', 'dashboard', 0, 'material-symbols:dashboard', 0, null, null, 1, 1, 1, null, null, null, '2023-07-27 19:15:45', null),
1212
(3, '工作台', 'Workspace', 'workspace', 0, null, 1, '/dashboard/workspace/index.vue', null, 1, 1, 1, null, null, 2, '2023-07-27 19:17:59', null),
1313
(4, '数据分析', 'Analytics', 'analytics', 0, null, 1, '/dashboard/analytics/index.vue', null, 1, 1, 1, null, null, 2, '2023-07-27 19:17:59', null),

backend/utils/build_tree.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,18 @@ def get_vben5_tree_data(row: Sequence[RowData]) -> list[dict[str, Any]]:
9494
:return:
9595
"""
9696
# 需要移除的原始字段
97-
remove_keys = {'status', 'display', 'title', 'link', 'cache'}
97+
remove_keys = {'title', 'icon', 'link', 'cache', 'display', 'status'}
9898

9999
vben5_nodes = [
100100
{
101101
**{k: v for k, v in node.items() if k not in remove_keys},
102-
'disabled': node['status'],
103-
'show': node['display'],
104102
'meta': {
105103
'title': node['title'],
104+
'icon': node['icon'],
106105
'link': node['link'],
107106
'keepAlive': node['cache'],
107+
'hideInMenu': not bool(node['display']),
108+
'menuVisibleWithForbidden': not bool(node['status']),
108109
},
109110
}
110111
for node in get_tree_nodes(row)

0 commit comments

Comments
 (0)