From a1e8b5465845393c013cb2d3ae12cbecc5c4efd8 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 26 二月 2025 13:51:20 +0800
Subject: [PATCH] 用户增加修改组信息
---
app/models/resource_model.py | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/app/models/resource_model.py b/app/models/resource_model.py
index e898e3a..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):
@@ -25,7 +26,7 @@
resource_id = Column(String(36), ForeignKey('resource.id'))
parent = relationship('ResourceModel', remote_side=[id], backref='resources', uselist=False)
children = relationship('ResourceModel')
- status = Column(String(10))
+ status = Column(String(10), default="1")
hidden = Column(Integer, default=0)
def get_id(self):
return str(self.ID)
@@ -56,7 +57,10 @@
'menuId': self.id,
'menuName': self.name,
'menuType': self.resource_type_id,
- 'children': [res.to_tree_select_json() for res in self.children]
+ 'parentId': self.get_pid(),
+ 'status': self.status,
+ 'parentName': self.get_pName(),
+ 'children': [res.to_tree_select_json() for res in self.children if res if res.status != RESOURCE_STATUS_DELETE]
}
def to_router_json(self):
@@ -92,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,
@@ -180,4 +187,9 @@
parentId: str
status: str
# roles: list
- # groups: Optional[list] = []
\ No newline at end of file
+ # groups: Optional[list] = []
+
+
+class MenuStatus(BaseModel):
+ menuId: str
+ status: str
\ No newline at end of file
--
Gitblit v1.8.0