From 20bbed188fd7833d14801dc202fa3cdbb085ca2b Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期五, 20 十二月 2024 11:51:34 +0800
Subject: [PATCH] 优化excel合并脚本
---
app/models/resource_model.py | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/app/models/resource_model.py b/app/models/resource_model.py
index 61e1bc9..00bd03f 100644
--- a/app/models/resource_model.py
+++ b/app/models/resource_model.py
@@ -25,7 +25,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,6 +56,8 @@
'menuId': self.id,
'menuName': self.name,
'menuType': self.resource_type_id,
+ 'parentId': self.get_pid(),
+ 'parentName': self.get_pName(),
'children': [res.to_tree_select_json() for res in self.children]
}
@@ -86,6 +88,31 @@
router['component'] = 'Layout'
return router
+
+
+ def to_router_dict(self):
+ router = {
+ 'id': self.id,
+ 'name': self.path.capitalize() if self.path else '',
+ 'path': self.path,
+ 'hidden': bool(self.hidden),
+ 'redirect': 'noRedirect',
+ 'component': self.url,
+ 'alwaysShow': True,
+ 'resourceType': self.get_type_json(),
+ 'meta': {
+ 'title': self.name,
+ 'icon': self.icon,
+ 'noCache': False,
+ 'link': ''
+ },
+ 'parentId': self.get_pid(),
+ }
+
+ if not router['component']:
+ router['component'] = 'Layout'
+ return router
+
def to_menu_json(self):
return {
@@ -133,8 +160,8 @@
def to_json(self):
return {
'id': self.id,
- 'createdatetime': self.created_at,
- 'updatedatetime': self.updated_at,
+ # 'createdatetime': self.created_at,
+ # 'updatedatetime': self.updated_at,
'name': self.name,
'description': self.description
}
@@ -151,7 +178,13 @@
perms: Optional[str] = ""
menuType: Optional[str] = ""
description: Optional[str] = ""
+ icon: Optional[str] = ""
parentId: str
status: str
- roles: list
- groups: Optional[list] = []
\ No newline at end of file
+ # roles: list
+ # groups: Optional[list] = []
+
+
+class MenuStatus(BaseModel):
+ menuId: str
+ status: str
\ No newline at end of file
--
Gitblit v1.8.0