refactor: ♻️ 授权页面重构

重构授权页面

backend/dvadmin/utils/filters.py

@@ -75,7 +75,7 @@ class DataLevelPermissionsFilter(BaseFilterBackend):
             if item.get("permission__api")
         ]
         for item in api_white_list:
-            new_api = api + ":" + str(method)
+            new_api = f"{api}:{method}"
             matchObj = re.match(item, new_api, re.M | re.I)
             if matchObj is None:
                 continue
@@ -86,6 +86,12 @@ class DataLevelPermissionsFilter(BaseFilterBackend):
         如果不是超级管理员,则进入下一步权限判断
         """
         if request.user.is_superuser == 0:
+            return self._extracted_from_filter_queryset_33(request, queryset, api, method)
+        else:
+            return queryset
+
+    # TODO Rename this here and in `filter_queryset`
+    def _extracted_from_filter_queryset_33(self, request, queryset, api, method):
         # 0. 获取用户的部门id，没有部门则返回空
         user_dept_id = getattr(request.user, "dept_id", None)
         if not user_dept_id:
@@ -119,7 +125,7 @@ class DataLevelPermissionsFilter(BaseFilterBackend):
         dataScope_list = []  # 权限范围列表
         for ele in role_permission_list:
                 # 判断用户是否为超级管理员角色/如果拥有[全部数据权限]则返回所有数据
-                if 3 == ele.get("data_range") or ele.get("role_admin") == True:
+            if ele.get("data_range") == 3 or ele.get("role_admin") == True:
                 return queryset
             dataScope_list.append(ele.get("data_range"))
         dataScope_list = list(set(dataScope_list))
@@ -133,26 +139,24 @@ class DataLevelPermissionsFilter(BaseFilterBackend):
         # 5. 自定数据权限 获取部门，根据部门过滤
         dept_list = []
         for ele in dataScope_list:
-                if ele == 4:
+            if ele == 1:
-                    dept_list.extend(
-                        request.user.role.filter(status=1).values_list(
-                            "dept__id", flat=True
-                        )
-                    )
-                elif ele == 2:
-                    dept_list.append(user_dept_id)
-                elif ele == 1:
                 dept_list.append(user_dept_id)
                 dept_list.extend(
                     get_dept(
                         user_dept_id,
                     )
                 )
+            elif ele == 2:
+                dept_list.append(user_dept_id)
+            elif ele == 4:
+                dept_list.extend(
+                    request.user.role.filter(status=1).values_list(
+                        "dept__id", flat=True
+                    )
+                )
         if queryset.model._meta.model_name == 'dept':
             return queryset.filter(id__in=list(set(dept_list)))
         return queryset.filter(dept_belong_id__in=list(set(dept_list)))
-        else:
-            return queryset
 
 
 class CustomDjangoFilterBackend(DjangoFilterBackend):

web/package.json

@@ -49,7 +49,7 @@
 		"vue-grid-layout": "^3.0.0-beta1",
 		"vue-i18n": "^9.2.2",
 		"vue-router": "^4.1.6",
-		"vxe-table": "^4.3.10",
+		"vxe-table": "^4.4.1",
 		"xe-utils": "^3.5.7"
 	},
 	"devDependencies": {