!6 Dash-FastAPI-Admin v1.0.2

Merge pull request !6 from insistence/develop

Author: insistence

README.md

@@ -1,11 +1,11 @@
 <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.0.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Dash-FastAPI-Admin v1.0.2</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://gitee.com/insistence2022/dash-fastapi-admin"><img src="https://img.shields.io/badge/DashFastAPIAdmin-v1.0.0-brightgreen.svg"></a>
+	<a href="https://gitee.com/insistence2022/dash-fastapi-admin"><img src="https://img.shields.io/badge/DashFastAPIAdmin-v1.0.2-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>
 </p>
 
@@ -74,6 +74,7 @@ Dash-FastAPI-Admin是一套全部开源的快速开发平台，毫无保留给
     </tr>
     <tr>
         <td><img src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/%E7%B3%BB%E7%BB%9F%E6%8E%A5%E5%8F%A3.png"></td>
+        <td><img src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/%E4%B8%AA%E4%BA%BA%E8%B5%84%E6%96%99.png"/></td>
     </tr>
 </table>
 
@@ -126,8 +127,11 @@ python3 app.py
 地址：http://127.0.0.1:8088
 ```
 
-## 交流
-如果有对本项目及FastAPI感兴趣的朋友，欢迎加入知识星球一起交流学习。
-<p align="center">
-	<img alt="zsxq" src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/zsxq.jpg">
-</p>
+## 交流与赞助
+如果有对本项目及FastAPI感兴趣的朋友，欢迎加入知识星球一起交流学习，让我们一起变得更强。如果你觉得这个项目帮助到了你，你可以请作者喝杯咖啡表示鼓励☕。
+<table>
+    <tr>
+        <td><img alt="zsxq" src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/zsxq.jpg"></td>
+        <td><img alt="zanzhu" src="https://gitee.com/insistence2022/dash-fastapi-admin/raw/master/demo-pictures/zanzhu.jpg"></td>
+    </tr>
+</table>

dash-fastapi-backend/sql/dash-fastapi.sql

@@ -107,6 +107,7 @@ CREATE TABLE `sys_config`  (
 INSERT INTO `sys_config` VALUES (1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', '#1890ff', 'Y', 'admin', '2023-05-23 16:13:34', 'admin', '2023-05-23 16:13:34', '蓝色 #1890ff');
 INSERT INTO `sys_config` VALUES (2, '账号自助-验证码开关', 'sys.account.captchaEnabled', 'true', 'Y', 'admin', '2023-05-23 16:13:34', 'admin', '2023-05-23 16:13:34', '是否开启验证码功能（true开启，false关闭）');
 INSERT INTO `sys_config` VALUES (3, '用户登录-黑名单列表', 'sys.login.blackIPList', '', 'Y', 'admin', '2023-05-23 16:13:34', '', NULL, '设置登录IP黑名单限制，多个匹配项以;分隔，支持匹配（*通配、网段）');
+INSERT INTO `sys_config` VALUES (4, '账号自助-是否开启忘记密码功能', 'sys.account.forgetUser', 'true', 'Y', 'admin', '2023-05-23 16:13:34', 'admin', '2023-05-23 16:13:34', '是否开启忘记密码功能（true开启，false关闭）');
 
 -- ----------------------------
 -- Table structure for sys_dept

dash-fastapi-frontend/callbacks/system_c/user_c/user_c.py

@@ -271,8 +271,8 @@ def usr_add_confirm(add_confirm, nick_name, dept_id, phone_number, email, user_n
         if all([nick_name, user_name, password]):
             params = dict(nick_name=nick_name, dept_id=dept_id, phonenumber=phone_number,
                           email=email, user_name=user_name, password=password, sex=sex,
-                          status=status, post_id=','.join(map(str, post)), role_id=','.join(map(str, role)),
-                          remark=remark)
+                          status=status, post_id=','.join(map(str, post)) if post else '',
+                          role_id=','.join(map(str, role)) if role else '', remark=remark)
             add_button_result = add_user_api(params)
 
             if add_button_result['code'] == 200:

dash-fastapi-frontend/store/store.py

@@ -19,97 +19,5 @@ def render_store_container():
             dcc.Store(id='menu-list-store-container'),
             # 菜单current_key存储容器
             dcc.Store(id='current-key-container'),
-            # 用户管理模块操作类型存储容器
-            dcc.Store(id='user-operations-store'),
-            # 用户管理模块修改操作行key存储容器
-            dcc.Store(id='user-edit-id-store'),
-            # 用户管理模块删除操作行key存储容器
-            dcc.Store(id='user-delete-ids-store'),
-            # 角色管理模块操作类型存储容器
-            dcc.Store(id='role-operations-store'),
-            dcc.Store(id='role-operations-store-bk'),
-            # 角色管理模块修改操作行key存储容器
-            dcc.Store(id='role-edit-id-store'),
-            # 角色管理模块删除操作行key存储容器
-            dcc.Store(id='role-delete-ids-store'),
-            # 角色管理模块菜单权限存储容器
-            dcc.Store(id='role-menu-store'),
-            dcc.Store(id='current-role-menu-store'),
-            # 菜单管理模块操作类型存储容器
-            dcc.Store(id='menu-operations-store'),
-            dcc.Store(id='menu-operations-store-bk'),
-            # modal菜单类型存储容器
-            dcc.Store(id='menu-modal-menu-type-store'),
-            # 不同菜单类型的触发器
-            dcc.Store(id='menu-modal-M-trigger'),
-            dcc.Store(id='menu-modal-C-trigger'),
-            dcc.Store(id='menu-modal-F-trigger'),
-            # 菜单管理模块修改操作行key存储容器
-            dcc.Store(id='menu-edit-id-store'),
-            # 菜单管理模块删除操作行key存储容器
-            dcc.Store(id='menu-delete-ids-store'),
-            # 部门管理模块操作类型存储容器
-            dcc.Store(id='dept-operations-store'),
-            dcc.Store(id='dept-operations-store-bk'),
-            # 部门管理模块修改操作行key存储容器
-            dcc.Store(id='dept-edit-id-store'),
-            # 部门管理模块删除操作行key存储容器
-            dcc.Store(id='dept-delete-ids-store'),
-            # 岗位管理模块操作类型存储容器
-            dcc.Store(id='post-operations-store'),
-            dcc.Store(id='post-operations-store-bk'),
-            # 岗位管理模块修改操作行key存储容器
-            dcc.Store(id='post-edit-id-store'),
-            # 岗位管理模块删除操作行key存储容器
-            dcc.Store(id='post-delete-ids-store'),
-            # 字典管理模块操作类型存储容器
-            dcc.Store(id='dict_type-operations-store'),
-            dcc.Store(id='dict_type-operations-store-bk'),
-            dcc.Store(id='dict_data-operations-store'),
-            dcc.Store(id='dict_data-operations-store-bk'),
-            # 字典管理模块修改操作行key存储容器
-            dcc.Store(id='dict_type-edit-id-store'),
-            dcc.Store(id='dict_data-edit-id-store'),
-            # 字典管理模块删除操作行key存储容器
-            dcc.Store(id='dict_type-delete-ids-store'),
-            dcc.Store(id='dict_data-delete-ids-store'),
-            # 参数管理模块操作类型存储容器
-            dcc.Store(id='config-operations-store'),
-            dcc.Store(id='config-operations-store-bk'),
-            # 参数管理模块修改操作行key存储容器
-            dcc.Store(id='config-edit-id-store'),
-            # 参数管理模块删除操作行key存储容器
-            dcc.Store(id='config-delete-ids-store'),
-            # 通知公告管理模块操作类型存储容器
-            dcc.Store(id='notice-operations-store'),
-            dcc.Store(id='notice-operations-store-bk'),
-            # 通知公告管理模块修改操作行key存储容器
-            dcc.Store(id='notice-edit-id-store'),
-            # 通知公告管理模块删除操作行key存储容器
-            dcc.Store(id='notice-delete-ids-store'),
-            # 操作日志管理模块操作类型存储容器
-            dcc.Store(id='operation_log-operations-store'),
-            # 操作日志管理模块删除操作行key存储容器
-            dcc.Store(id='operation_log-delete-ids-store'),
-            # 登录日志管理模块操作类型存储容器
-            dcc.Store(id='login_log-operations-store'),
-            # 操作日志管理模块删除操作行key存储容器
-            dcc.Store(id='login_log-delete-ids-store'),
-            # 在线用户模块操作类型存储容器
-            dcc.Store(id='online-operations-store'),
-            dcc.Store(id='online-operations-store-bk'),
-            # 在线用户模块删除操作行key存储容器
-            dcc.Store(id='online-delete-ids-store'),
-            # 定时任务模块操作类型存储容器
-            dcc.Store(id='job-operations-store'),
-            dcc.Store(id='job-operations-store-bk'),
-            # 定时任务模块修改操作行key存储容器
-            dcc.Store(id='job-edit-id-store'),
-            # 定时任务模块删除操作行key存储容器
-            dcc.Store(id='job-delete-ids-store'),
-            # 定时任务日志管理模块操作类型存储容器
-            dcc.Store(id='job_log-operations-store'),
-            # 定时任务日志管理模块删除操作行key存储容器
-            dcc.Store(id='job_log-delete-ids-store'),
         ]
     )

dash-fastapi-frontend/views/login.py

@@ -7,9 +7,13 @@
 
 def render_content():
     captcha_enabled_info = query_config_list_api(config_key='sys.account.captchaEnabled')
+    forget_enabled_info = query_config_list_api(config_key='sys.account.forgetUser')
     captcha_hidden = False
+    forget_show = True
     if captcha_enabled_info.get('code') == 200:
         captcha_hidden = False if captcha_enabled_info.get('data') == 'true' else True
+    if forget_enabled_info.get('code') == 200:
+        forget_show = False if forget_enabled_info.get('data') == 'false' else True
 
     return html.Div(
         [
@@ -139,7 +143,7 @@ def render_content():
                                 ],
                                 align='center',
                                 size=240
-                            ),
+                            ) if forget_show else [],
                             fac.AntdFormItem(
                                 fac.AntdButton(
                                     '登录',
@@ -176,7 +180,7 @@ def render_content():
             fac.AntdFooter(
                 html.Div(
                     fac.AntdText(
-                        '版权所有©2023 Dash-FastAPI',
+                        '版权所有©2023 Dash-FastAPI-Admin',
                         style={
                             'margin': '0'
                         }

dash-fastapi-frontend/views/monitor/job/__init__.py

@@ -72,6 +72,17 @@ def render(button_perms):
         dcc.Store(id='job-export-complete-judge-container'),
         # 绑定的导出组件
         dcc.Download(id='job-export-container'),
+        # 定时任务模块操作类型存储容器
+        dcc.Store(id='job-operations-store'),
+        dcc.Store(id='job-operations-store-bk'),
+        # 定时任务模块修改操作行key存储容器
+        dcc.Store(id='job-edit-id-store'),
+        # 定时任务模块删除操作行key存储容器
+        dcc.Store(id='job-delete-ids-store'),
+        # 定时任务日志管理模块操作类型存储容器
+        dcc.Store(id='job_log-operations-store'),
+        # 定时任务日志管理模块删除操作行key存储容器
+        dcc.Store(id='job_log-delete-ids-store'),
         fac.AntdRow(
             [
                 fac.AntdCol(

dash-fastapi-frontend/views/monitor/logininfor/__init__.py

@@ -31,6 +31,10 @@ def render(button_perms):
         dcc.Store(id='login_log-export-complete-judge-container'),
         # 绑定的导出组件
         dcc.Download(id='login_log-export-container'),
+        # 登录日志管理模块操作类型存储容器
+        dcc.Store(id='login_log-operations-store'),
+        # 登录日志管理模块删除操作行key存储容器
+        dcc.Store(id='login_log-delete-ids-store'),
         fac.AntdRow(
             [
                 fac.AntdCol(

dash-fastapi-frontend/views/monitor/online/__init__.py

@@ -30,6 +30,11 @@ def render(button_perms):
 
     return [
         dcc.Store(id='online-button-perms-container', data=button_perms),
+        # 在线用户模块操作类型存储容器
+        dcc.Store(id='online-operations-store'),
+        dcc.Store(id='online-operations-store-bk'),
+        # 在线用户模块删除操作行key存储容器
+        dcc.Store(id='online-delete-ids-store'),
         fac.AntdRow(
             [
                 fac.AntdCol(

dash-fastapi-frontend/views/monitor/operlog/__init__.py

@@ -57,6 +57,10 @@ def render(button_perms):
         dcc.Store(id='operation_log-export-complete-judge-container'),
         # 绑定的导出组件
         dcc.Download(id='operation_log-export-container'),
+        # 操作日志管理模块操作类型存储容器
+        dcc.Store(id='operation_log-operations-store'),
+        # 操作日志管理模块删除操作行key存储容器
+        dcc.Store(id='operation_log-delete-ids-store'),
         fac.AntdRow(
             [
                 fac.AntdCol(

dash-fastapi-frontend/views/system/config/__init__.py

@@ -43,6 +43,13 @@ def render(button_perms):
         dcc.Store(id='config-export-complete-judge-container'),
         # 绑定的导出组件
         dcc.Download(id='config-export-container'),
+        # 参数管理模块操作类型存储容器
+        dcc.Store(id='config-operations-store'),
+        dcc.Store(id='config-operations-store-bk'),
+        # 参数管理模块修改操作行key存储容器
+        dcc.Store(id='config-edit-id-store'),
+        # 参数管理模块删除操作行key存储容器
+        dcc.Store(id='config-delete-ids-store'),
         fac.AntdRow(
             [
                 fac.AntdCol(