From e26a7859a8900b152e10961d91fa6ad19a8deb9c Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 06 三月 2025 14:41:27 +0800
Subject: [PATCH] 首页通用对话增加

---
 app/models/resource_model.py |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/models/resource_model.py b/app/models/resource_model.py
index 0e71119..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,
@@ -182,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