功能变化: 菜单管理按钮配置优化

backend/dvadmin/system/views/menu.py

@@ -128,25 +128,12 @@ class WebRouterSerializer(CustomModelSerializer):
     """
     path = serializers.CharField(source="web_path")
     title = serializers.CharField(source="name")
-    menuPermission = serializers.SerializerMethodField(read_only=True)
 
-    def get_menuPermission(self, instance):
-        # 判断是否是超级管理员
-        if self.request.user.is_superuser:
-            return instance.menuPermission.values_list('value', flat=True)
-        else:
-            # 根据当前角色获取权限按钮id集合
-            permissionIds = self.request.user.role.values_list('permission', flat=True)
-            queryset = instance.menuPermission.filter(id__in=permissionIds, menu=instance.id).values_list('value', flat=True)
-            if queryset:
-                return queryset
-            else:
-                return None
 
     class Meta:
         model = Menu
         fields = ('id', 'parent', 'icon', 'sort', 'path', 'name', 'title', 'is_link', 'is_catalog', 'web_path', 'component',
-        'component_name', 'cache', 'visible', 'menuPermission')
+        'component_name', 'cache', 'visible')
         read_only_fields = ["id"]
 
 

backend/dvadmin/system/views/menu_button.py

@@ -6,7 +6,11 @@
 @Created on: 2021/6/3 003 0:30
 @Remark: 菜单按钮管理
 """
-from dvadmin.system.models import MenuButton
+from django.db.models import F
+from rest_framework.decorators import action
+
+from dvadmin.system.models import MenuButton, RoleMenuButtonPermission
+from dvadmin.utils.json_response import DetailResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
 
@@ -57,3 +61,19 @@ class MenuButtonViewSet(CustomModelViewSet):
     create_serializer_class = MenuButtonCreateUpdateSerializer
     update_serializer_class = MenuButtonCreateUpdateSerializer
     extra_filter_class = []
+
+    @action(methods=['get'],detail=False)
+    def menu_button_all_permission(self,request):
+        """
+        获取所有的按钮权限
+        :param request:
+        :return:
+        """
+        is_superuser = request.user.is_superuser
+        is_admin = request.user.role.values_list('admin', flat=True)
+        if is_superuser or True in is_admin:
+            queryset = MenuButton.objects.values_list('menu_button__value',flat=True)
+        else:
+            role_id = request.user.role.values_list('id', flat=True)
+            queryset = RoleMenuButtonPermission.objects.filter(role__in=role_id).values_list('menu_button__value',flat=True).distinct()
+        return DetailResponse(data=queryset)

backend/dvadmin/system/views/role.py

@@ -111,107 +111,3 @@ class RoleViewSet(CustomModelViewSet):
     create_serializer_class = RoleCreateUpdateSerializer
     update_serializer_class = RoleCreateUpdateSerializer
     search_fields = ['name', 'key']
-
-    @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
-    def role_get_menu(self, request):
-        """根据当前用户的角色返回角色拥有的菜单"""
-        is_superuser = request.user.is_superuser
-        is_admin = request.user.role.values_list('admin',flat=True)
-        if is_superuser or True in is_admin:
-            queryset = Menu.objects.filter(status=1).all()
-        else:
-            menu_id_list = request.user.role.values_list('menu',flat=True)
-            queryset = Menu.objects.filter(id__in=menu_id_list)
-        # queryset = self.filter_queryset(queryset)
-        serializer = MenuPermissonSerializer(queryset, many=True,request=request)
-        return DetailResponse(data=serializer.data)
-
-    @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
-    def data_scope(self, request):
-        is_superuser = request.user.is_superuser
-        role_queryset = Role.objects.filter(users__id=request.user.id).values_list('data_range', flat=True)
-        if is_superuser:
-            data = [
-                {
-                    "value": 0,
-                    "label": '仅本人数据权限'
-                },
-                {
-                    "value": 1,
-                    "label": '本部门及以下数据权限'
-                },
-                {
-                    "value": 2,
-                    "label": '本部门数据权限'
-                },
-                {
-                    "value": 3,
-                    "label": '全部数据权限'
-                },
-                {
-                    "value": 4,
-                    "label": '自定义数据权限'
-                }
-            ]
-        else:
-            data = []
-            data_range_list = list(set(role_queryset))
-            for item in data_range_list:
-                if item == 0:
-                    data = [{
-                        "value": 0,
-                        "label": '仅本人数据权限'
-                    }]
-                elif item == 1:
-                    data = [{
-                        "value": 0,
-                        "label": '仅本人数据权限'
-                    }, {
-                        "value": 1,
-                        "label": '本部门及以下数据权限'
-                    },
-                        {
-                            "value": 2,
-                            "label": '本部门数据权限'
-                        }]
-                elif item == 2:
-                    data = [{
-                        "value": 0,
-                        "label": '仅本人数据权限'
-                    },
-                        {
-                            "value": 2,
-                            "label": '本部门数据权限'
-                        }]
-                elif item == 3:
-                    data = [{
-                        "value": 0,
-                        "label": '仅本人数据权限'
-                    },
-                        {
-                            "value": 3,
-                            "label": '全部数据权限'
-                        }, ]
-                elif item == 4:
-                    data = [{
-                        "value": 0,
-                        "label": '仅本人数据权限'
-                    },
-                        {
-                            "value": 4,
-                            "label": '自定义数据权限'
-                        }]
-                else:
-                    data = []
-        return DetailResponse(data=data)
-
-    @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
-    def data_scope_dept(self,request):
-        """根据当前角色获取部门信息"""
-        is_superuser = request.user.is_superuser
-        if is_superuser:
-            queryset = Dept.objects.values('id','name','parent')
-        else:
-            dept_list = request.user.role.values_list('dept',flat=True)
-            queryset = Dept.objects.filter(id__in=dept_list).values('id','name','parent')
-        return DetailResponse(data=queryset)

backend/dvadmin/system/views/role_menu_button_permission.py

@@ -71,8 +71,8 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
         if is_superuser or True in is_admin:
             queryset = Menu.objects.filter(status=1).values('id','name','parent','is_catalog')
         else:
-            role_id = request.user.role.id
-            queryset = RoleMenuButtonPermission.objects.filter(role=role_id).values(id=F('menu__id'),name=F('menu__name'),parent=F('menu__parent'),is_catalog=F('menu__is_catalog'))
+            role_id = request.user.role.values_list('id',flat=True)
+            queryset = RoleMenuButtonPermission.objects.filter(role__in=role_id).values(id=F('menu__id'),name=F('menu__name'),parent=F('menu__parent'),is_catalog=F('menu__is_catalog'))
         return DetailResponse(data=queryset)
 
     @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
@@ -183,6 +183,11 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
 
     @action(methods=['get'],detail=False)
     def menu_to_button(self,request):
+        """
+        根据菜单获取按钮
+        :param request:
+        :return:
+        """
         params = request.query_params
         if params:
             menu_id = params.get('menu',None)