Merge remote-tracking branch 'origin/develop' into develop

backend/dvadmin/system/views/login.py

@@ -4,6 +4,7 @@ from datetime import datetime, timedelta
 from captcha.views import CaptchaStore, captcha_image
 from django.contrib import auth
 from django.contrib.auth import login
+from django.db.models import Q
 from django.shortcuts import redirect
 from django.utils.translation import gettext_lazy as _
 from drf_yasg import openapi
@@ -83,11 +84,18 @@ class LoginSerializer(TokenObtainPairSerializer):
                 else:
                     self.image_code and self.image_code.delete()
                     raise CustomValidationError("图片验证码错误")
-
-        user = Users.objects.get(username=attrs['username'])
+        try:
+            user = Users.objects.get(
+                Q(username=attrs['username']) | Q(email=attrs['username']) | Q(mobile=attrs['username']))
+        except Users.DoesNotExist:
+            raise CustomValidationError("您登录的账号不存在")
+        except Users.MultipleObjectsReturned:
+            raise CustomValidationError("您登录的账号存在多个,请联系管理员检查登录账号唯一性")
         if not user.is_active:
             raise CustomValidationError("账号已被锁定,联系管理员解锁")
         try:
+            # 必须重置用户名为username,否则使用邮箱手机号登录会提示密码错误
+            attrs['username'] = user.username
             data = super().validate(attrs)
             data["name"] = self.user.name
             data["userId"] = self.user.id
@@ -114,8 +122,8 @@ class LoginSerializer(TokenObtainPairSerializer):
             user.login_error_count += 1
             if user.login_error_count >= 5:
                 user.is_active = False
+                user.save()
                 raise CustomValidationError("账号已被锁定,联系管理员解锁")
-            user.save()
             count = 5 - user.login_error_count
             raise CustomValidationError(f"账号/密码错误;重试{count}次后将被锁定~")
 

backend/dvadmin/system/views/menu_button.py

@@ -16,6 +16,8 @@ from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
 
 
+
+
 class MenuButtonSerializer(CustomModelSerializer):
     """
     菜单按钮-序列化器
@@ -92,17 +94,15 @@ class MenuButtonViewSet(CustomModelViewSet):
         """
         menu_obj = Menu.objects.filter(id=request.data['menu']).first()
         result_list = [
-            {'menu': menu_obj.id, 'name': '新增', 'value': f'{menu_obj.component_name}:Create', 'api': f'/api{menu_obj.web_path}/',
-             'method': 1},
-            {'menu': menu_obj.id, 'name': '删除', 'value': f'{menu_obj.component_name}:Delete', 'api': f'/api{menu_obj.web_path}/{{id}}/',
-             'method': 3},
-            {'menu': menu_obj.id, 'name': '修改', 'value': f'{menu_obj.component_name}:Update', 'api': f'/api{menu_obj.web_path}/{{id}}/',
-             'method': 2},
-            {'menu': menu_obj.id, 'name': '查询', 'value': f'{menu_obj.component_name}:Search', 'api': f'/api{menu_obj.web_path}/',
-             'method': 0},
-            {'menu': menu_obj.id, 'name': '详情', 'value': f'{menu_obj.component_name}:Retrieve', 'api': f'/api{menu_obj.web_path}/{{id}}/',
-             'method': 0}]
+            {'menu': menu_obj.id, 'name': '新增', 'value': f'{menu_obj.component_name}:Create', 'api': f'/api{menu_obj.component_name}/', 'method': 1},
+            {'menu': menu_obj.id, 'name': '删除', 'value': f'{menu_obj.component_name}:Delete', 'api': f'/api{menu_obj.component_name}/{{id}}/', 'method': 3},
+            {'menu': menu_obj.id, 'name': '编辑', 'value': f'{menu_obj.component_name}:Update', 'api': f'/api{menu_obj.component_name}/{{id}}/', 'method': 2},
+            {'menu': menu_obj.id, 'name': '查询', 'value': f'{menu_obj.component_name}:Search', 'api': f'/api{menu_obj.component_name}/', 'method': 0},
+            {'menu': menu_obj.id, 'name': '详情', 'value': f'{menu_obj.component_name}:Retrieve', 'api': f'/api{menu_obj.component_name}/{{id}}/', 'method': 0},
+            {'menu': menu_obj.id, 'name': '复制', 'value': f'{menu_obj.component_name}:Copy', 'api': f'/api{menu_obj.component_name}/', 'method': 1},
+            {'menu': menu_obj.id, 'name': '导入', 'value': f'{menu_obj.component_name}:Import', 'api': f'/api{menu_obj.component_name}/import_data/', 'method': 1},
+            {'menu': menu_obj.id, 'name': '导出', 'value': f'{menu_obj.component_name}:Import', 'api': f'/api{menu_obj.component_name}/export_data/', 'method': 1},]
         serializer = self.get_serializer(data=result_list, many=True)
         serializer.is_valid(raise_exception=True)
         serializer.save()
-        return SuccessResponse(serializer.data, msg="批量创建成功")
+        return SuccessResponse(serializer.data, msg="批量创建成功")

backend/dvadmin/system/views/role_menu_button_permission.py

@@ -321,86 +321,45 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
         is_superuser = request.user.is_superuser
         if is_superuser:
             data = [
-                {
-                    "value": 0,
-                    "label": '仅本人数据权限'
-                },
-                {
-                    "value": 1,
-                    "label": '本部门及以下数据权限'
-                },
-                {
-                    "value": 2,
-                    "label": '本部门数据权限'
-                },
-                {
-                    "value": 3,
-                    "label": '全部数据权限'
-                },
-                {
-                    "value": 4,
-                    "label": '自定义数据权限'
-                }
+                {"value": 0, "label": '仅本人数据权限'},
+                {"value": 1, "label": '本部门及以下数据权限'},
+                {"value": 2, "label": '本部门数据权限'},
+                {"value": 3, "label": '全部数据权限'},
+                {"value": 4, "label": '自定义数据权限'}
             ]
             return DetailResponse(data=data)
         else:
-            data = []
+            params = request.query_params
+            data = [{"value": 0, "label": '仅本人数据权限'}]
             role_list = request.user.role.values_list('id', flat=True)
-            if params := request.query_params:
-                if menu_button_id := params.get('menu_button', None):
-                    role_queryset = RoleMenuButtonPermission.objects.filter(
-                        role__in=role_list, menu_button__id=menu_button_id
-                    ).values_list('data_range', flat=True)
-                    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)
-        return ErrorResponse(msg="参数错误")
+            # 权限页面进入初始化获取所有的数据权限范围
+            role_queryset = RoleMenuButtonPermission.objects.filter(
+                role__in=role_list
+            ).values_list('data_range', flat=True)
+            # 通过按钮小齿轮获取指定按钮的权限
+            if menu_button_id := params.get('menu_button', None):
+                role_queryset = RoleMenuButtonPermission.objects.filter(
+                    role__in=role_list, menu_button__id=menu_button_id
+                ).values_list('data_range', flat=True)
+
+            data_range_list = list(set(role_queryset))
+            for item in data_range_list:
+                if item == 0:
+                    data = data
+                elif item == 1:
+                    data.extend([
+                        {"value": 1, "label": '本部门及以下数据权限'},
+                        {"value": 2, "label": '本部门数据权限'}
+                    ])
+                elif item == 2:
+                    data.extend([{"value": 2, "label": '本部门数据权限'}])
+                elif item == 3:
+                    data.extend([{"value": 3, "label": '全部数据权限'}])
+                elif item == 4:
+                    data.extend([{"value": 4, "label": '自定义数据权限'}])
+                else:
+                    data = []
+            return DetailResponse(data=data)
 
     @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
     def role_to_dept_all(self, request):
@@ -409,23 +368,23 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
         :param request:
         :return:
         """
-        params = request.query_params
         is_superuser = request.user.is_superuser
-        if is_superuser:
-            queryset = Dept.objects.values('id', 'name', 'parent')
-        else:
-            if not params:
-                return ErrorResponse(msg="参数错误")
-            menu_button = params.get('menu_button')
-            if menu_button is None:
-                return ErrorResponse(msg="参数错误")
-            role_list = request.user.role.values_list('id', flat=True)
-            queryset = RoleMenuButtonPermission.objects.filter(role__in=role_list, menu_button=None).values(
-                dept_id=F('dept__id'),
-                name=F('dept__name'),
-                parent=F('dept__parent')
-            )
-        return DetailResponse(data=queryset)
+        params = request.query_params
+        role_id = params.get('role')
+        menu_button_id = params.get('menu_button')
+        dept_checked = RoleMenuButtonPermission.objects.filter(
+            role_id=role_id, menu_button_id=menu_button_id
+        ).values_list('dept', flat=True)
+        dept_list = Dept.objects.values('id', 'name', 'parent')
+        data = {
+            'depts': [],
+            'dept_checked': [i for i in dept_checked if i is not None]
+        }
+
+        for dept in dept_list:
+            dept["disabled"] = False if is_superuser else dept["id"] not in dept_checked
+            data['depts'].append(dept)
+        return DetailResponse(data=data)
 
     @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
     def menu_to_button(self, request):