From 5d496fc89a5ea19aaa1a7cb91947d656bd25bafb Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期三, 08 一月 2025 17:54:00 +0800
Subject: [PATCH] 合并excel历史记录查看功能
---
app/models/resource_model.py | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/app/models/resource_model.py b/app/models/resource_model.py
index 00bd03f..c1c6960 100644
--- a/app/models/resource_model.py
+++ b/app/models/resource_model.py
@@ -5,6 +5,7 @@
from sqlalchemy import Column, Integer, String, DateTime, Table, ForeignKey
from sqlalchemy.orm import relationship, backref
+from app.config.const import RESOURCE_STATUS_DELETE
from app.models.base_model import Base
class ResourceModel(Base):
@@ -57,8 +58,9 @@
'menuName': self.name,
'menuType': self.resource_type_id,
'parentId': self.get_pid(),
+ 'status': self.status,
'parentName': self.get_pName(),
- 'children': [res.to_tree_select_json() for res in self.children]
+ 'children': [res.to_tree_select_json() for res in self.children if res if res.status != RESOURCE_STATUS_DELETE]
}
def to_router_json(self):
@@ -94,12 +96,15 @@
router = {
'id': self.id,
'name': self.path.capitalize() if self.path else '',
+ # 'name': self.name,
'path': self.path,
'hidden': bool(self.hidden),
'redirect': 'noRedirect',
'component': self.url,
'alwaysShow': True,
+ 'perms': self.perms,
'resourceType': self.get_type_json(),
+ 'seq': self.seq,
'meta': {
'title': self.name,
'icon': self.icon,
--
Gitblit v1.8.0