Merge branch 'dev' of https://gitee.com/huge-dream/django-vue3-admin into dev

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": {

web/src/main.ts

@@ -27,7 +27,8 @@ import iconfont from '/@/assets/iconfont/iconfont.json'; //引入json文件
 import '/@/assets/iconfont/iconfont.css'; //引入css
 // 自动注册插件
 import { scanAndInstallPlugins } from '/@/views/plugins/index';
-
+import VXETable from 'vxe-table'
+import 'vxe-table/lib/style.css'
 let forIconfont = analyzingIconForIconfont(iconfont); //解析class
 iconList.addIcon(forIconfont.list); // 添加iconfont dvadmin3的icon
 iconList.addIcon(elementPlus); // 添加element plus的图标
@@ -47,6 +48,8 @@ pinia.use(piniaPersist);
 directive(app);
 other.elSvg(app);
 
+
+app.use(VXETable)
 app.use(permission);
 app.use(pinia).use(router).use(ElementPlus, { i18n: i18n.global.t }).use(i18n).use(VueGridLayout).use(fastCrud).mount('#app');
 

web/src/views/system/role/components/permission.vue

@@ -22,6 +22,7 @@
           :row-config="{keyField: 'menu_id'}"
           :tree-config="{transform: true, rowField: 'menu_id', parentField: 'parent'}"
           :checkbox-config="{labelField: 'menu_id', checkRowKeys: multipleTableData,checkStrictly:true}"
+          @toggle-row-expand="menuNodeClick"
           :data="menuData">
         <vxe-column type="checkbox" title="ID" width="200" tree-node></vxe-column>
         <vxe-column field="name" title="目录/菜单" ></vxe-column>
@@ -106,7 +107,7 @@ import * as api from './api.ts'
 import type {FormRules, FormInstance} from 'element-plus'
 import {ElMessage} from 'element-plus'
 import XEUtils from 'xe-utils'
-import { VXETable, VxeTableInstance } from 'vxe-table'
+import { VXETable, VxeTableInstance,VxeTableEvents } from 'vxe-table'
 
 interface tableRow {
   menu_id: number
@@ -169,16 +170,16 @@ let isBtnPermissionShow = ref(false)
 let buttonOptions = ref<[]>()
 let editedMenuInfo = ref()
 //菜单节点点击事件
-const menuNodeClick = (node: any) => {
+const menuNodeClick: VxeTableEvents.ToggleRowExpand<tableRow> = ({ expanded, row}) => {
-  isBtnPermissionShow.value = !node.is_catalog
+  // isBtnPermissionShow.value = !node.is_catalog
-  if (!node.is_catalog) {
+  if (!row.is_catalog) {
     buttonOptions.value = []
-    editedMenuInfo.value = node
+    editedMenuInfo.value = row
-    api.GetMenuButton({menu: node.menu_id}).then((res: any) => {
+    api.GetMenuButton({menu: row.menu_id}).then((res: any) => {
       const {data} = res
       buttonOptions.value = data
     })
-    api.getObj({menu: node.menu_id, role: editedRoleInfo.value.id}).then((res: any) => {
+    api.getObj({menu: row.menu_id, role: editedRoleInfo.value.id}).then((res: any) => {
       const {data} = res
       buttonPermissionData.value = data
     })