!44 优化权限配置

Merge pull request !44 from 木子-李/role_per_20240628

backend/dvadmin/system/views/role_menu_button_permission.py

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

web/src/views/system/login/component/account.vue

@@ -80,8 +80,8 @@ export default defineComponent({
 		const state = reactive({
 			isShowPassword: false,
 			ruleForm: {
-				username: '',
+				username: 'superadmin',
-				password: '',
+				password: 'admin123456',
 				captcha: '',
 				captchaKey: '',
 				captchaImgBase: '',

web/src/views/system/role/components/PermissionComNew/api.ts

@@ -40,10 +40,11 @@ export function getDataPermissionRangeAll() {
     method: 'get',
   })
 }
-export function getDataPermissionDept() {
+export function getDataPermissionDept(query:object) {
   return request({
     url: '/api/system/role_menu_button_permission/role_to_dept_all/',
-    method: 'get'
+    method: 'get',
+    params:query
   })
 }
 

web/src/views/system/role/components/PermissionComNew/index.vue

@@ -29,7 +29,7 @@
                     :label="btn.value">
                     <div class="btn-item">
                       {{ btn.data_range !== null ? `${btn.name}(${formatDataRange(btn.data_range)})` : btn.name }}
-                      <span v-show="btn.isCheck" @click.stop.prevent="handleSettingClick(menu, btn.id)">
+                      <span v-show="btn.isCheck" @click.stop.prevent="handleSettingClick(menu, btn)">
                         <el-icon>
                           <Setting />
                         </el-icon>
@@ -124,6 +124,7 @@ watch(
   (val) => {
     drawerVisible.value = val;
     getMenuBtnPermission()
+    getDataPermissionRangeLable()
 
   }
 );
@@ -144,9 +145,10 @@ let menuCurrent = ref<Partial<MenuDataType>>({});
 let menuBtnCurrent = ref<number>(-1);
 let dialogVisible = ref(false);
 let dataPermissionRange = ref<DataPermissionRangeType[]>([]);
+let dataPermissionRangeLabel = ref<DataPermissionRangeType[]>([]);
 const formatDataRange = computed(() => {
   return function (datarange: number) {
-    const findItem = dataPermissionRange.value.find((i) => i.value === datarange);
+    const findItem = dataPermissionRangeLabel.value.find((i) => i.value === datarange);
     return findItem?.label || ''
   }
 })
@@ -158,8 +160,13 @@ const getMenuBtnPermission = async () => {
   const resMenu = await getRolePremission({ role: props.roleId })
   menuData.value = resMenu.data
 }
+// 获取按钮的数据权限下拉选项
+const getDataPermissionRangeLable = async () => {
+  const resRange = await getDataPermissionRange({ role: props.roleId })
+  dataPermissionRangeLabel.value = resRange.data;
+}
 
-const fetchData = async (btnId) => {
+const fetchData = async (btnId:number) => {
   try {
     const resRange = await getDataPermissionRange({menu_button:btnId});
     if (resRange?.code === 2000) {
@@ -170,20 +177,22 @@ const fetchData = async (btnId) => {
   }
 };
 
-const handleCollapseChange = (val: number) => {
+// const handleCollapseChange = (val: number) => {
-  collapseCurrent.value = [val];
+//   collapseCurrent.value = [val];
-};
+// };
 
 /**
  * 设置按钮数据权限
  * @param record 当前菜单
  * @param btnType  按钮类型
  */
-const handleSettingClick = (record: MenusType, btnId: number) => {
+const handleSettingClick = (record: MenusType, btn: MenusType['btns'][number]) => {
   menuCurrent.value = record;
-  menuBtnCurrent.value = btnId;
+  menuBtnCurrent.value = btn.id;
   dialogVisible.value = true;
-  fetchData(btnId)
+  dataPermission.value =btn.data_range;  
+  handlePermissionRangeChange(btn.data_range)
+  fetchData( btn.id)
 };
 
 const handleColumnChange = (val: boolean, record: MenusType, btnType: string) => {
@@ -194,9 +203,10 @@ const handleColumnChange = (val: boolean, record: MenusType, btnType: string) =>
 
 const handlePermissionRangeChange = async (val: number) => {
   if (val === 4) {
-    const res = await getDataPermissionDept();
+    const res = await getDataPermissionDept({ role: props.roleId,menu_button:menuBtnCurrent.value });
-    const data = XEUtils.toArrayTree(res.data, { parentKey: 'parent', strict: false });
+    const depts = XEUtils.toArrayTree(res.data.depts, { parentKey: 'parent', strict: false });    
-    deptData.value = data;
+    deptData.value = depts;
+    customDataPermission.value = res.data.dept_checked;
   }
 };