修改数据库初始化逻辑，完善权限，废弃flaskenv

applications/view/__init__.py

@@ -11,4 +11,4 @@ def init_view(app):
     register_rights_view(app)
     register_passport_views(app)
     register_dept_views(app)
-    register_plugin_views(app)
+    # register_plugin_views(app)

applications/view/passport/__init__.py

@@ -71,11 +71,11 @@ def login_post():
                     continue
                 user_power.append(p.code)
         session['permissions'] = user_power
-        # 角色存入session
-        roles = []
-        for role in current_user.role.all():
-            roles.append(role.id)
-        session['role'] = [roles]
+        # # 角色存入session
+        # roles = []
+        # for role in current_user.role.all():
+        #     roles.append(role.id)
+        # session['role'] = [roles]
 
         return success_api(msg="登录成功")
     login_log(request, uid=user.id, is_access=False)

applications/view/rights/__init__.py

@@ -1,8 +1,6 @@
-from flask import Blueprint, Flask
+from flask import Flask
 
-rights_bp = Blueprint('rights', __name__, url_prefix='/rights')
-
-from . import routes
+from .routes import rights_bp
 
 
 def register_rights_view(app: Flask):

applications/view/rights/routes.py

@@ -1,20 +1,147 @@
 # 渲染配置
-from flask import jsonify
-from flask_login import login_required
+import copy
+from collections import OrderedDict
 
-from . import rights_bp
-from ...common import admin
+from flask import jsonify, current_app, Blueprint
+from flask_login import login_required, current_user
 
+from ...models import Power
+from ...schemas import PowerOutSchema
 
+rights_bp = Blueprint('rights', __name__, url_prefix='/rights')
 @rights_bp.get('/configs')
 @login_required
 def configs():
-    return admin.get_render_config()
+    # 网站配置
+    config = dict(logo={
+        # 网站名称
+        "title": current_app.config.get("SYSTEM_NAME"),
+        # 网站图标
+        "image": "/static/admin/admin/images/logo.png"
+        # 菜单配置
+    }, menu={
+        # 菜单数据来源
+        "data": "/rights/menu",
+        "collaspe": False,
+        # 是否同时只打开一个菜单目录
+        "accordion": True,
+        "method": "GET",
+        # 是否开启多系统菜单模式
+        "control": False,
+        # 顶部菜单宽度 PX
+        "controlWidth": 500,
+        # 默认选中的菜单项
+        "select": "0",
+        # 是否开启异步菜单，false 时 data 属性设置为菜单数据，false 时为 json 文件或后端接口
+        "async": True
+    }, tab={
+        # 是否开启多选项卡
+        "enable": True,
+        # 切换选项卡时，是否刷新页面状态
+        "keepState": True,
+        # 是否开启 Tab 记忆
+        "session": True,
+        # 最大可打开的选项卡数量
+        "max": 30,
+        "index": {
+            # 标识 ID , 建议与菜单项中的 ID 一致
+            "id": "10",
+            # 页面地址
+            "href": "/admin/welcome",
+            # 标题
+            "title": "首页"
+        }
+    }, theme={
+        # 默认主题色，对应 colors 配置中的 ID 标识
+        "defaultColor": "2",
+        # 默认的菜单主题 dark-theme 黑 / light-theme 白
+        "defaultMenu": "dark-theme",
+        # 是否允许用户切换主题，false 时关闭自定义主题面板
+        "allowCustom": True
+    }, colors=[{
+        "id": "1",
+        "color": "#2d8cf0"
+    },
+        {
+            "id": "2",
+            "color": "#5FB878"
+        },
+        {
+            "id": "3",
+            "color": "#1E9FFF"
+        }, {
+            "id": "4",
+            "color": "#FFB800"
+        }, {
+            "id": "5",
+            "color": "darkgray"
+        }
+    ], links=current_app.config.get("SYSTEM_PANEL_LINKS"), other={
+        # 主页动画时长
+        "keepLoad": 1200,
+        # 布局顶部主题
+        "autoHead": False
+    }, header=False)
+    return jsonify(config)
 
 
 # 菜单
 @rights_bp.get('/menu')
 @login_required
 def menu():
-    menu_tree = admin.make_menu_tree()
-    return jsonify(menu_tree)
+
+    if current_user.username != current_app.config.get("SUPERADMIN"):
+        role = current_user.role
+        powers = []
+        for i in role:
+            # 如果角色没有被启用就直接跳过
+            if i.enable == 0:
+                continue
+            # 变量角色用户的权限
+            for p in i.power:
+                # 如果权限关闭了就直接跳过
+                if p.enable == 0:
+                    continue
+                # 一二级菜单
+                if int(p.type) in [0, 1] and p not in powers:
+                    powers.append(p)
+
+        power_schema = PowerOutSchema(many=True)  # 用已继承 ma.ModelSchema 类的自定制类生成序列化类
+        power_dict = power_schema.dump(powers)  # 生成可序列化对象
+        power_dict.sort(key=lambda x: (x['parent_id'], x['id']), reverse=True)
+
+        menu_dict = OrderedDict()
+        for _dict in power_dict:
+            if _dict['id'] in menu_dict:
+                # 当前节点添加子节点
+                _dict['children'] = copy.deepcopy(menu_dict[_dict['id']])
+                _dict['children'].sort(key=lambda item: item['sort'])
+                # 删除子节点
+                del menu_dict[_dict['id']]
+
+            if _dict['parent_id'] not in menu_dict:
+
+                menu_dict[_dict['parent_id']] = [_dict]
+            else:
+                menu_dict[_dict['parent_id']].append(_dict)
+        return jsonify(sorted(menu_dict.get(0), key=lambda item: item['sort']))
+    else:
+        powers = Power.query.all()
+        power_schema = PowerOutSchema(many=True)  # 用已继承 ma.ModelSchema 类的自定制类生成序列化类
+        power_dict = power_schema.dump(powers)  # 生成可序列化对象
+        power_dict.sort(key=lambda x: (x['parent_id'], x['id']), reverse=True)
+
+        menu_dict = OrderedDict()
+        for _dict in power_dict:
+            if _dict['id'] in menu_dict:
+                # 当前节点添加子节点
+                _dict['children'] = copy.deepcopy(menu_dict[_dict['id']])
+                _dict['children'].sort(key=lambda item: item['sort'])
+                # 删除子节点
+                del menu_dict[_dict['id']]
+
+            if _dict['parent_id'] not in menu_dict:
+                menu_dict[_dict['parent_id']] = [_dict]
+            else:
+                menu_dict[_dict['parent_id']].append(_dict)
+        return jsonify(sorted(menu_dict.get(0), key=lambda item: item['sort']))