!20 Dash-FastAPI-Admin v1.3.0

insistence · gitee-org · commit f955945af629 · 2024-02-27T02:52:53.000Z
Merge pull request !20 from insistence/develop
diff --git a/README.md b/README.md
@@ -1,19 +1,20 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Dash-FastAPI-Admin v1.2.1</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Dash-FastAPI-Admin v1.3.0</h1>
 <h4 align="center">基于Dash+FastAPI前后端分离的纯Python快速开发框架</h4>
 <p align="center">
 	<a href="https://gitee.com/insistence2022/dash-fastapi-admin/stargazers"><img src="https://gitee.com/insistence2022/dash-fastapi-admin/badge/star.svg?theme=dark"></a>
     <a href="https://github.com/insistence/Dash-FastAPI-Admin"><img src="https://img.shields.io/github/stars/insistence/Dash-FastAPI-Admin?style=social"></a>
-	<a href="https://gitee.com/insistence2022/dash-fastapi-admin"><img src="https://img.shields.io/badge/DashFastAPIAdmin-v1.2.1-brightgreen.svg"></a>
+	<a href="https://gitee.com/insistence2022/dash-fastapi-admin"><img src="https://img.shields.io/badge/DashFastAPIAdmin-v1.3.0-brightgreen.svg"></a>
 	<a href="https://gitee.com/insistence2022/dash-fastapi-admin/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
     <img src="https://img.shields.io/badge/python-3.8 | 3.9-blue">
     <img src="https://img.shields.io/badge/MySQL-≥5.7-blue">
 </p>
 
 
 
+
 ## 平台简介
 
 Dash-FastAPI-Admin是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
diff --git a/dash-fastapi-backend/.env.dev b/dash-fastapi-backend/.env.dev
@@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0'
 # 应用端口
 APP_PORT = 9099
 # 应用版本
-APP_VERSION= '1.2.1'
+APP_VERSION= '1.3.0'
 # 应用是否开启热重载
 APP_RELOAD = true
 
diff --git a/dash-fastapi-backend/.env.prod b/dash-fastapi-backend/.env.prod
@@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0'
 # 应用端口
 APP_PORT = 9099
 # 应用版本
-APP_VERSION= '1.2.1'
+APP_VERSION= '1.3.0'
 # 应用是否开启热重载
 APP_RELOAD = false
 
diff --git a/dash-fastapi-frontend/callbacks/layout_c/index_c.py b/dash-fastapi-frontend/callbacks/layout_c/index_c.py
@@ -3,7 +3,7 @@
 from dash.exceptions import PreventUpdate
 import feffery_antd_components as fac
 from jsonpath_ng import parse
-from flask import json
+from flask import json, session
 from collections import OrderedDict
 
 from server import app
@@ -53,10 +53,12 @@ def handle_tab_switch_and_create(currentKey, tabCloseCounts, latestDeletePane, o
         if currentKey == '个人资料':
             menu_title = '个人资料'
             button_perms = []
+            role_perms = []
             menu_modules = 'system.user.profile'
         else:
             menu_title = find_title_by_key(menu_info.get('menu_info'), currentKey)
             button_perms = [item.get('perms') for item in menu_list.get('menu_list') if str(item.get('parent_id')) == currentKey]
+            role_perms = [item.get('role_key') for item in session.get('role_info')]
             # 判断当前选中的菜单栏项是否存在module，如果有，则动态导入module，否则返回404页面
             menu_modules = find_modules_by_key(menu_info.get('menu_info'), currentKey)
 
@@ -106,7 +108,7 @@ def handle_tab_switch_and_create(currentKey, tabCloseCounts, latestDeletePane, o
                     {
                         'label': menu_title,
                         'key': currentKey,
-                        'children': eval('views.' + menu_modules + '.render(button_perms)'),
+                        'children': eval('views.' + menu_modules + '.render(button_perms=button_perms, role_perms=role_perms)'),
                         'contextMenu': context_menu
                     }
                 )
diff --git a/dash-fastapi-frontend/views/monitor/cache/control/__init__.py b/dash-fastapi-frontend/views/monitor/cache/control/__init__.py
@@ -5,7 +5,8 @@
 from api.cache import get_cache_statistical_info_api
 
 
-def render(button_perms):
+def render(*args, **kwargs):
+    button_perms = kwargs.get('button_perms')
     command_stats = []
     db_size = ''
     info = {}
diff --git a/dash-fastapi-frontend/views/monitor/cache/list/__init__.py b/dash-fastapi-frontend/views/monitor/cache/list/__init__.py
@@ -5,7 +5,7 @@
 import callbacks.monitor_c.cache_c.list_c
 
 
-def render(button_perms):
+def render(*args, **kwargs):
     cache_name_data = []
     cache_name_res = get_cache_name_list_api()
     if cache_name_res.get('code') == 200:
diff --git a/dash-fastapi-frontend/views/monitor/druid/__init__.py b/dash-fastapi-frontend/views/monitor/druid/__init__.py
@@ -3,6 +3,6 @@
 import feffery_antd_components as fac
 
 
-def render(button_perms):
+def render(*args, **kwargs):
 
     return html.Div('我是数据监控')
diff --git a/dash-fastapi-frontend/views/monitor/job/__init__.py b/dash-fastapi-frontend/views/monitor/job/__init__.py
@@ -8,7 +8,8 @@
 from api.dict import query_dict_data_list_api
 
 
-def render(button_perms):
+def render(*args, **kwargs):
+    button_perms = kwargs.get('button_perms')
 
     option = []
     option_table = []
diff --git a/dash-fastapi-frontend/views/monitor/logininfor/__init__.py b/dash-fastapi-frontend/views/monitor/logininfor/__init__.py
@@ -5,7 +5,8 @@
 from api.log import get_login_log_list_api
 
 
-def render(button_perms):
+def render(*args, **kwargs):
+    button_perms = kwargs.get('button_perms')
 
     login_log_params = dict(page_num=1, page_size=10)
     table_info = get_login_log_list_api(login_log_params)
diff --git a/dash-fastapi-frontend/views/monitor/online/__init__.py b/dash-fastapi-frontend/views/monitor/online/__init__.py
@@ -5,7 +5,8 @@
 from api.online import get_online_list_api
 
 
-def render(button_perms):
+def render(*args, **kwargs):
+    button_perms = kwargs.get('button_perms')
 
     online_params = dict(page_num=1, page_size=10)
     table_info = get_online_list_api(online_params)
diff --git a/dash-fastapi-frontend/views/monitor/operlog/__init__.py b/dash-fastapi-frontend/views/monitor/operlog/__init__.py
@@ -7,7 +7,8 @@
 from api.dict import query_dict_data_list_api
 
 
-def render(button_perms):
+def render(*args, **kwargs):
+    button_perms = kwargs.get('button_perms')
 
     option = []
     option_table = []
diff --git a/dash-fastapi-frontend/views/monitor/server/__init__.py b/dash-fastapi-frontend/views/monitor/server/__init__.py
@@ -4,7 +4,8 @@
 from api.server import get_server_statistical_info_api
 
 
-def render(button_perms):
+def render(*args, **kwargs):
+    button_perms = kwargs.get('button_perms')
     cpu = {}
     mem = {}
     sys = {}
diff --git a/dash-fastapi-frontend/views/system/config/__init__.py b/dash-fastapi-frontend/views/system/config/__init__.py
@@ -5,7 +5,8 @@
 from api.config import get_config_list_api
 
 
-def render(button_perms):
+def render(*args, **kwargs):
+    button_perms = kwargs.get('button_perms')
 
     config_params = dict(page_num=1, page_size=10)
     table_info = get_config_list_api(config_params)
diff --git a/dash-fastapi-frontend/views/system/dept/__init__.py b/dash-fastapi-frontend/views/system/dept/__init__.py
@@ -6,7 +6,8 @@
 from utils.tree_tool import list_to_tree
 
 
-def render(button_perms):
+def render(*args, **kwargs):
+    button_perms = kwargs.get('button_perms')
     table_data_new = []
     default_expanded_row_keys = []
     table_info = get_dept_list_api({})
diff --git a/dash-fastapi-frontend/views/system/dict/__init__.py b/dash-fastapi-frontend/views/system/dict/__init__.py
@@ -6,7 +6,8 @@
 from api.dict import get_dict_type_list_api
 
 
-def render(button_perms):
+def render(*args, **kwargs):
+    button_perms = kwargs.get('button_perms')
 
     dict_type_params = dict(page_num=1, page_size=10)
     table_info = get_dict_type_list_api(dict_type_params)
diff --git a/dash-fastapi-frontend/views/system/menu/__init__.py b/dash-fastapi-frontend/views/system/menu/__init__.py
@@ -7,7 +7,8 @@
 import callbacks.system_c.menu_c.menu_c
 
 
-def render(button_perms):
+def render(*args, **kwargs):
+    button_perms = kwargs.get('button_perms')
     table_data_new = []
     table_info = get_menu_list_api({})
     if table_info['code'] == 200:
diff --git a/dash-fastapi-frontend/views/system/notice/__init__.py b/dash-fastapi-frontend/views/system/notice/__init__.py
@@ -11,7 +11,8 @@
 from api.dict import query_dict_data_list_api
 
 
-def render(button_perms):
+def render(*args, **kwargs):
+    button_perms = kwargs.get('button_perms')
 
     option = []
     option_table = []
diff --git a/dash-fastapi-frontend/views/system/post/__init__.py b/dash-fastapi-frontend/views/system/post/__init__.py
@@ -5,7 +5,8 @@
 from api.post import get_post_list_api
 
 
-def render(button_perms):
+def render(*args, **kwargs):
+    button_perms = kwargs.get('button_perms')
 
     post_params = dict(page_num=1, page_size=10)
     table_info = get_post_list_api(post_params)
diff --git a/dash-fastapi-frontend/views/system/role/__init__.py b/dash-fastapi-frontend/views/system/role/__init__.py
@@ -6,7 +6,8 @@
 from api.role import get_role_list_api
 
 
-def render(button_perms):
+def render(*args, **kwargs):
+    button_perms = kwargs.get('button_perms')
 
     role_params = dict(page_num=1, page_size=10)
     table_info = get_role_list_api(role_params)
diff --git a/dash-fastapi-frontend/views/system/user/__init__.py b/dash-fastapi-frontend/views/system/user/__init__.py
@@ -10,7 +10,8 @@
 import callbacks.system_c.user_c.user_c
 
 
-def render(button_perms):
+def render(*args, **kwargs):
+    button_perms = kwargs.get('button_perms')
     dept_params = dict(dept_name='')
     user_params = dict(page_num=1, page_size=10)
     tree_info = get_dept_tree_api(dept_params)
diff --git a/dash-fastapi-frontend/views/system/user/profile/__init__.py b/dash-fastapi-frontend/views/system/user/profile/__init__.py
@@ -5,7 +5,7 @@
 from . import user_avatar, user_info, reset_pwd
 
 
-def render(button_perms):
+def render(*args, **kwargs):
 
     return [
         fac.AntdRow(
diff --git a/dash-fastapi-frontend/views/tool/build/__init__.py b/dash-fastapi-frontend/views/tool/build/__init__.py
@@ -3,6 +3,6 @@
 import feffery_antd_components as fac
 
 
-def render(button_perms):
+def render(*args, **kwargs):
 
     return html.Div('我是表单构建')
diff --git a/dash-fastapi-frontend/views/tool/gen/__init__.py b/dash-fastapi-frontend/views/tool/gen/__init__.py
@@ -3,6 +3,6 @@
 import feffery_antd_components as fac
 
 
-def render(button_perms):
+def render(*args, **kwargs):
 
     return html.Div('我是代码生成')
diff --git a/dash-fastapi-frontend/views/tool/swagger/__init__.py b/dash-fastapi-frontend/views/tool/swagger/__init__.py
@@ -3,7 +3,7 @@
 from config.global_config import ApiBaseUrlConfig
 
 
-def render(button_perms):
+def render(*args, **kwargs):
 
     return [
         html.Div(
