From fe9ed5964427621a11d201c013715736ba9ca89e Mon Sep 17 00:00:00 2001 From: Wu Clan Date: Wed, 2 Apr 2025 22:59:15 +0800 Subject: [PATCH] Update the vben5 tree data structure --- backend/sql/mysql/init_test_data.sql | 2 +- backend/sql/postgresql/init_test_data.sql | 2 +- backend/utils/build_tree.py | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/backend/sql/mysql/init_test_data.sql b/backend/sql/mysql/init_test_data.sql index 178f0878..8905f0e4 100644 --- a/backend/sql/mysql/init_test_data.sql +++ b/backend/sql/mysql/init_test_data.sql @@ -7,7 +7,7 @@ values (1, '创建API', 'POST', '/api/v1/apis', null, '2024-02-02 11:29:47', nu (3, '编辑API', 'PUT', '/api/v1/apis/{pk}', null, '2024-02-02 11:32:22', null); 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) -values (1, '测试', 'test', '', 0, '', 0, null, null, 0, 0, 1, null, null, null, '2023-07-27 19:14:10', null), +values (1, '测试', 'Test', 'test', 0, null, 0, null, null, 0, 0, 1, null, null, null, '2023-07-27 19:14:10', null), (2, '仪表盘', 'Dashboard', 'dashboard', 0, 'material-symbols:dashboard', 0, null, null, 1, 1, 1, null, null, null, '2023-07-27 19:15:45', null), (3, '工作台', 'Workspace', 'workspace', 0, null, 1, '/dashboard/workspace/index.vue', null, 1, 1, 1, null, null, 2, '2023-07-27 19:17:59', null), (4, '数据分析', 'Analytics', 'analytics', 0, null, 1, '/dashboard/analytics/index.vue', null, 1, 1, 1, null, null, 2, '2023-07-27 19:17:59', null), diff --git a/backend/sql/postgresql/init_test_data.sql b/backend/sql/postgresql/init_test_data.sql index f04acf09..a4873d64 100644 --- a/backend/sql/postgresql/init_test_data.sql +++ b/backend/sql/postgresql/init_test_data.sql @@ -7,7 +7,7 @@ values (1, '创建API', 'POST', '/api/v1/apis', null, '2024-02-02 11:29:47', nu (3, '编辑API', 'PUT', '/api/v1/apis/{pk}', null, '2024-02-02 11:32:22', null); 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) -values (1, '测试', 'test', '', 0, '', 0, null, null, 0, 0, 1, null, null, null, '2023-07-27 19:14:10', null), +values (1, '测试', 'Test', 'test', 0, null, 0, null, null, 0, 0, 1, null, null, null, '2023-07-27 19:14:10', null), (2, '仪表盘', 'Dashboard', 'dashboard', 0, 'material-symbols:dashboard', 0, null, null, 1, 1, 1, null, null, null, '2023-07-27 19:15:45', null), (3, '工作台', 'Workspace', 'workspace', 0, null, 1, '/dashboard/workspace/index.vue', null, 1, 1, 1, null, null, 2, '2023-07-27 19:17:59', null), (4, '数据分析', 'Analytics', 'analytics', 0, null, 1, '/dashboard/analytics/index.vue', null, 1, 1, 1, null, null, 2, '2023-07-27 19:17:59', null), diff --git a/backend/utils/build_tree.py b/backend/utils/build_tree.py index 2ff8a759..c939020c 100644 --- a/backend/utils/build_tree.py +++ b/backend/utils/build_tree.py @@ -94,17 +94,18 @@ def get_vben5_tree_data(row: Sequence[RowData]) -> list[dict[str, Any]]: :return: """ # 需要移除的原始字段 - remove_keys = {'status', 'display', 'title', 'link', 'cache'} + remove_keys = {'title', 'icon', 'link', 'cache', 'display', 'status'} vben5_nodes = [ { **{k: v for k, v in node.items() if k not in remove_keys}, - 'disabled': node['status'], - 'show': node['display'], 'meta': { 'title': node['title'], + 'icon': node['icon'], 'link': node['link'], 'keepAlive': node['cache'], + 'hideInMenu': not bool(node['display']), + 'menuVisibleWithForbidden': not bool(node['status']), }, } for node in get_tree_nodes(row)