From 52ba4076f5ad55fdf3239a33a2a376eaa0e0dea5 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 09 十二月 2024 17:53:01 +0800
Subject: [PATCH] m
---
app/models/role_model.py | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/app/models/role_model.py b/app/models/role_model.py
index 3121054..520bd86 100644
--- a/app/models/role_model.py
+++ b/app/models/role_model.py
@@ -9,8 +9,8 @@
# 瑙掕壊璧勬簮鍏宠仈琛�
role_resource_table = Table('role_resource', Base.metadata,
- Column('role_id', String(36), ForeignKey('role.id')),
- Column('resource_id', String(36), ForeignKey('resource.id')))
+ Column('role_id', String(36), ForeignKey('role.id', ondelete='CASCADE')),
+ Column('resource_id', String(36), ForeignKey('resource.id', ondelete='CASCADE')))
@@ -66,9 +66,26 @@
return json
+ def to_dict(self):
+ json = {
+ 'roleId': self.id,
+ 'createTime': self.created_at.strftime('%Y-%m-%d %H:%M:%S'),
+ 'updateTime': self.updated_at.strftime('%Y-%m-%d %H:%M:%S'),
+ 'roleName': self.name,
+ 'remark': self.description,
+ 'iconCls': self.iconCls,
+ 'roleSort': self.seq,
+ 'status': self.status,
+ 'roleKey': self.roleKey,
+ 'dataScope': self.dataScope
+ }
+ return json
+
class RoleData(BaseModel):
remark: Optional[str] = ""
roleName: str
+ roleKey: Optional[str] = ""
+ dataScope: Optional[int] = 0
class RoleStatus(BaseModel):
@@ -81,3 +98,6 @@
remark: Optional[str] = ""
roleName: Optional[str] = ""
resources: Optional[list] = []
+ roleKey: Optional[str] = ""
+ dataScope: Optional[int] = 0
+ editType: int
--
Gitblit v1.8.0