From 351cd801ebf0da665c521448c978da100b4aaf03 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 05 十二月 2024 15:21:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/models/resource_model.py | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/app/models/resource_model.py b/app/models/resource_model.py
index 3aeff5a..e898e3a 100644
--- a/app/models/resource_model.py
+++ b/app/models/resource_model.py
@@ -1,4 +1,7 @@
from datetime import datetime
+from typing import Optional
+
+from pydantic import BaseModel
from sqlalchemy import Column, Integer, String, DateTime, Table, ForeignKey
from sqlalchemy.orm import relationship, backref
@@ -84,6 +87,31 @@
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 {
'id': self.id,
@@ -130,11 +158,26 @@
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
}
def __repr__(self):
- return '<ResourceTypeModel %r>\n' %(self.name)
\ No newline at end of file
+ return '<ResourceTypeModel %r>\n' %(self.name)
+
+class MenuInfo(BaseModel):
+ menuId: Optional[str] = ""
+ menuName: Optional[str] = ""
+ component: Optional[str] = ""
+ path: Optional[str] = ""
+ orderNum: int
+ 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
--
Gitblit v1.8.0