Accept Merge Request #20: (develop -> master)

Merge Request: 新功能 Created By: @dvadmin-开发-李强 Accepted By: @dvadmin-开发-李强 URL: https://dvadmin-private.coding.net/p/code/d/dvadmin3/git/merge/20?initial=true
2024-06-21 08:08:05 +08:00
parent f379ac754d 57d90e8a71
commit e29ae657f6
11 changed files with 485 additions and 397 deletions
--- a/README.zh.md
+++ b/README.zh.md
@@ -47,7 +47,7 @@

 - 密码：admin123456

-👩‍👦‍👦文档地址：[coding](https://dvadmin-private.coding.net/share/km/cec69f3d-30fe-47d5-bd97-e9e851f0b776/K-2)
+👩‍👦‍👦文档地址：[DVAdmin官网](https://www.django-vue-admin.com)



--- a/backend/dvadmin/system/views/menu_button.py
+++ b/backend/dvadmin/system/views/menu_button.py
@@ -81,3 +81,28 @@ class MenuButtonViewSet(CustomModelViewSet):
            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)
+
+    @action(methods=['post'], detail=False, permission_classes=[IsAuthenticated])
+    def batch_create(self, request, *args, **kwargs):
+        """
+        批量创建菜单“增删改查查”权限
+        创建的数据来源于菜单，需要规范创建菜单参数
+        value：菜单的component_name:method
+        api:菜单的web_path增加'/api'前缀，并根据method增加{id}
+        """
+        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}]
+        serializer = self.get_serializer(data=result_list, many=True)
+        serializer.is_valid(raise_exception=True)
+        serializer.save()
+        return SuccessResponse(serializer.data, msg="批量创建成功")
--- a/backend/dvadmin/system/views/role_menu_button_permission.py
+++ b/backend/dvadmin/system/views/role_menu_button_permission.py
@@ -23,13 +23,13 @@ class RoleMenuButtonPermissionSerializer(CustomModelSerializer):
    """
    菜单按钮-序列化器
    """
+
    class Meta:
        model = RoleMenuButtonPermission
        fields = "__all__"
        read_only_fields = ["id"]


-
 class RoleMenuButtonPermissionCreateUpdateSerializer(CustomModelSerializer):
    """
    初始化菜单按钮-序列化器
@@ -67,17 +67,17 @@ class RoleButtonPermissionSerializer(CustomModelSerializer):
            return None
        return obj.data_range

-
    class Meta:
        model = MenuButton
-        fields = ['id','name','value','isCheck','data_range']
+        fields = ['id', 'name', 'value', 'isCheck', 'data_range']
+

 class RoleFieldPermissionSerializer(CustomModelSerializer):
-
    class Meta:
        model = FieldPermission
        fields = "__all__"

+
 class RoleMenuFieldSerializer(CustomModelSerializer):
    is_query = serializers.SerializerMethodField()
    is_create = serializers.SerializerMethodField()
@@ -103,24 +103,38 @@ class RoleMenuFieldSerializer(CustomModelSerializer):
        if queryset:
            return queryset.is_update
        return False
+
    class Meta:
        model = MenuField
-        fields = ['id','field_name','title','is_query','is_create','is_update']
+        fields = ['id', 'field_name', 'title', 'is_query', 'is_create', 'is_update']
+
+
+class RoleMenuSerializer(CustomModelSerializer):
+    menus = serializers.SerializerMethodField()
+
+    def get_menus(self, instance):
+        menu_list = Menu.objects.filter(parent=instance['id']).values('id', 'name')
+        serializer = RoleMenuPermissionSerializer(menu_list, many=True, request=self.request)
+        return serializer.data
+
+    class Meta:
+        model = Menu
+        fields = ['id', 'name', 'menus']


 class RoleMenuPermissionSerializer(CustomModelSerializer):
    """
    菜单和按钮权限
    """
-    name = serializers.SerializerMethodField()
+    # name = serializers.SerializerMethodField()
    isCheck = serializers.SerializerMethodField()
    btns = serializers.SerializerMethodField()
    columns = serializers.SerializerMethodField()

-    def get_name(self, instance):
-        parent_list = Menu.get_all_parent(instance['id'])
-        names = [d["name"] for d in parent_list]
-        return "/".join(names)
+    # def get_name(self, instance):
+    #     parent_list = Menu.get_all_parent(instance['id'])
+    #     names = [d["name"] for d in parent_list]
+    #     return "/".join(names)
    def get_isCheck(self, instance):
        params = self.request.query_params
        return RoleMenuPermission.objects.filter(
@@ -130,19 +144,18 @@ class RoleMenuPermissionSerializer(CustomModelSerializer):

    def get_btns(self, instance):
        btn_list = MenuButton.objects.filter(menu__id=instance['id']).values('id', 'name', 'value')
-        serializer = RoleButtonPermissionSerializer(btn_list,many=True,request=self.request)
+        serializer = RoleButtonPermissionSerializer(btn_list, many=True, request=self.request)
        return serializer.data

    def get_columns(self, instance):
        col_list = MenuField.objects.filter(menu=instance['id'])
-        serializer = RoleMenuFieldSerializer(col_list,many=True,request=self.request)
+        serializer = RoleMenuFieldSerializer(col_list, many=True, request=self.request)
        return serializer.data

-
-
    class Meta:
        model = Menu
-        fields = ['id','name','isCheck','btns','columns']
+        fields = ['id', 'name', 'isCheck', 'btns', 'columns']
+

 class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
    """
@@ -167,54 +180,54 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
        :return: menu,btns,columns
        """
        params = request.query_params
-        role = params.get('role',None)
+        role = params.get('role', None)
        if role is None:
            return ErrorResponse(msg="未获取到角色信息")
        is_superuser = request.user.is_superuser
-        # if is_superuser:
-        #     queryset = Menu.objects.filter(status=1,is_catalog=False).values('name', 'id').all()
-        # else:
-        #     role_id = request.user.role.values_list('id', flat=True)
-        #     menu_list = RoleMenuPermission.objects.filter(role__in=role_id).values_list('id',flat=True)
-        #     queryset = Menu.objects.filter(status=1, is_catalog=False,id__in=menu_list).values('name', 'id').all()
-        # serializer = RoleMenuPermissionSerializer(queryset,many=True,request=request)
-        # data = serializer.data
-        # return DetailResponse(data=data)
-        data = []
        if is_superuser:
-            queryset = Menu.objects.filter(status=1,is_catalog=False).values('name', 'id').all()
+            queryset = Menu.objects.filter(status=1, is_catalog=True).values('name', 'id').all()
        else:
            role_id = request.user.role.values_list('id', flat=True)
-            menu_list = RoleMenuPermission.objects.filter(role__in=role_id).values_list('id',flat=True)
-            queryset = Menu.objects.filter(status=1, is_catalog=False,id__in=menu_list).values('name', 'id')
-        for item in queryset:
-            parent_list = Menu.get_all_parent(item['id'])
-            names = [d["name"] for d in parent_list]
-            completeName = "/".join(names)
-            isCheck = RoleMenuPermission.objects.filter(
-                menu__id=item['id'],
-                role__id=role,
-            ).exists()
-            mbCheck = RoleMenuButtonPermission.objects.filter(
-                menu_button=OuterRef("pk"),
-                role__id=role,
-            )
-            btns = MenuButton.objects.filter(
-                menu__id=item['id'],
-            ).annotate(isCheck=Exists(mbCheck)).values('id', 'name', 'value', 'isCheck',
-                                                       data_range=F('menu_button_permission__data_range'))
-            dicts = {
-                'name': completeName,
-                'id': item['id'],
-                'isCheck': isCheck,
-                'btns': btns,
-
-            }
-            data.append(dicts)
+            menu_list = RoleMenuPermission.objects.filter(role__in=role_id).values_list('id', flat=True)
+            queryset = Menu.objects.filter(status=1, is_catalog=True, id__in=menu_list).values('name', 'id').all()
+        serializer = RoleMenuSerializer(queryset, many=True, request=request)
+        data = serializer.data
        return DetailResponse(data=data)
+        # data = []
+        # if is_superuser:
+        #     queryset = Menu.objects.filter(status=1, is_catalog=False).values('name', 'id').all()
+        # else:
+        #     role_id = request.user.role.values_list('id', flat=True)
+        #     menu_list = RoleMenuPermission.objects.filter(role__in=role_id).values_list('id', flat=True)
+        #     queryset = Menu.objects.filter(status=1, is_catalog=False, id__in=menu_list).values('name', 'id')
+        # for item in queryset:
+        #     parent_list = Menu.get_all_parent(item['id'])
+        #     names = [d["name"] for d in parent_list]
+        #     completeName = "/".join(names)
+        #     isCheck = RoleMenuPermission.objects.filter(
+        #         menu__id=item['id'],
+        #         role__id=role,
+        #     ).exists()
+        #     mbCheck = RoleMenuButtonPermission.objects.filter(
+        #         menu_button=OuterRef("pk"),
+        #         role__id=role,
+        #     )
+        #     btns = MenuButton.objects.filter(
+        #         menu__id=item['id'],
+        #     ).annotate(isCheck=Exists(mbCheck)).values('id', 'name', 'value', 'isCheck',
+        #                                                data_range=F('menu_button_permission__data_range'))
+        #     dicts = {
+        #         'name': completeName,
+        #         'id': item['id'],
+        #         'isCheck': isCheck,
+        #         'btns': btns,
+        #
+        #     }
+        #     data.append(dicts)
+        # return DetailResponse(data=data)

    @action(methods=['PUT'], detail=True, permission_classes=[IsAuthenticated])
-    def set_role_premission(self,request,pk):
+    def set_role_premission(self, request, pk):
        """
        对角色的菜单和按钮及按钮范围授权:
        :param request:
@@ -224,7 +237,8 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
        body = request.data
        RoleMenuPermission.objects.filter(role=pk).delete()
        RoleMenuButtonPermission.objects.filter(role=pk).delete()
-        for menu in body:
+        for item in body:
+            for menu in item["menus"]:
                if menu.get('isCheck'):
                    menu_parent = Menu.get_all_parent(menu.get('id'))
                    role_menu_permission_list = []
@@ -232,21 +246,21 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
                        role_menu_permission_list.append(RoleMenuPermission(role_id=pk, menu_id=d["id"]))
                    RoleMenuPermission.objects.bulk_create(role_menu_permission_list)
                    # RoleMenuPermission.objects.create(role_id=pk, menu_id=menu.get('id'))
-            for btn in menu.get('btns', []):
+                for btn in menu.get('btns'):
                    if btn.get('isCheck'):
-                    data_range = btn.get('data_range',0) or 0
-                    instance = RoleMenuButtonPermission.objects.create(role_id=pk, menu_button_id=btn.get('id'),data_range=data_range)
-                    instance.dept.set(btn.get('dept',[]))
-            for col in menu.get('columns', []):
-                FieldPermission.objects.update_or_create(role_id=pk,field_id=col.get('id'),defaults={
-                    "is_query":col.get('is_query'),
-                    "is_create":col.get('is_create'),
-                    "is_update":col.get('is_update')
+                        data_range = btn.get('data_range', 0) or 0
+                        instance = RoleMenuButtonPermission.objects.create(role_id=pk, menu_button_id=btn.get('id'),
+                                                                           data_range=data_range)
+                        instance.dept.set(btn.get('dept', []))
+                for col in menu.get('columns'):
+                    FieldPermission.objects.update_or_create(role_id=pk, field_id=col.get('id'),
+                                                             defaults={
+                                                                 'is_query': col.get('is_query'),
+                                                                 'is_create': col.get('is_create'),
+                                                                 'is_update': col.get('is_update')
                                                             })
        return DetailResponse(msg="授权成功")

-
-
    @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
    def role_menu_get_button(self, request):
        """
--- a/backend/extra-hooks/hooks-uvicorn.py
+++ b/backend/extra-hooks/hooks-uvicorn.py
@@ -1,6 +0,0 @@
-# extra-hooks/hooks-uvicorn.py
-from PyInstaller.utils.hooks import get_package_paths, collect_submodules
-
-datas = [(get_package_paths('uvicorn')[1], 'uvicorn'), (get_package_paths('whitenoise')[1], 'whitenoise')]
-
-hiddenimports = collect_submodules('whitenoise')
--- a/docker_env/web/DockerfileBuild
+++ b/docker_env/web/DockerfileBuild
@@ -1,4 +1,4 @@
 FROM node:16.19-alpine
 WORKDIR /
 COPY ./web/package.json .
-RUN yarn install --registry=https://registry.npm.taobao.org
+RUN yarn install --registry=https://registry.npmmirror.com
--- a/web/src/utils/columnPermission.ts
+++ b/web/src/utils/columnPermission.ts
@@ -47,6 +47,8 @@ export const handleColumnPermission = async (func: Function, crudOptions: any,ex
 				continue
 			} else if(item.field_name === col) {
 				columns[col].column.show = item['is_query']
+				// 如果列表不可见，则禁止在列设置中选择
+				if(!item['is_query'])columns[col].column.columnSetDisabled = true
 				columns[col].addForm = {
 					show: item['is_create']
 				}
--- a/web/src/views/system/menu/components/MenuButtonCom/api.ts
+++ b/web/src/views/system/menu/components/MenuButtonCom/api.ts
@@ -39,3 +39,12 @@ export function DelObj(id: DelReq) {
 		data: { id },
 	});
 }
+
+export function BatchAdd(obj: AddReq) {
+	return request({
+		url: apiPrefix + 'batch_create/',
+		method: 'post',
+		data: obj,
+	});
+}
+
--- a/web/src/views/system/menu/components/MenuButtonCom/crud.tsx
+++ b/web/src/views/system/menu/components/MenuButtonCom/crud.tsx
@@ -2,6 +2,8 @@ import {AddReq, DelReq, EditReq, dict, CreateCrudOptionsRet, CreateCrudOptionsPr
 import * as api from './api';
 import {auth} from '/@/utils/authFunction'
 import {request} from '/@/utils/service';
+import { successNotification } from '/@/utils/message';
+import { ElMessage } from 'element-plus';
 //此处为crudOptions配置
 export const createCrudOptions = function ({crudExpose, context}: CreateCrudOptionsProps): CreateCrudOptionsRet {
    const pageRequest = async () => {
@@ -40,6 +42,22 @@ export const createCrudOptions = function ({crudExpose, context}: CreateCrudOpti
                    add: {
                        show: auth('btn:Create')
                    },
+                    batchAdd: {
+						show: true,
+						type: 'primary',
+						text: '批量生成',
+						click: async () => {
+							if (context!.selectOptions.value.id == undefined) {
+								ElMessage.error('请选择菜单');
+								return;
+							}
+							const result = await api.BatchAdd({ menu: context!.selectOptions.value.id });
+							if (result.code == 2000) {
+								successNotification(result.msg);
+								crudExpose.doRefresh();
+							}
+						},
+					},
                },
            },
            rowHandle: {
--- a/web/src/views/system/menu/components/MenuFieldCom/index.vue
+++ b/web/src/views/system/menu/components/MenuFieldCom/index.vue
@@ -4,8 +4,15 @@
      <div v-show="props.model">
        <el-tag>已选择:{{ props.model }}</el-tag>
      </div>
+     <!-- 搜索输入框 -->
+    <el-input
+    v-model="searchQuery"
+    placeholder="搜索模型..."
+    style="margin-bottom: 10px;"
+  ></el-input>
      <div class="model-card">
-        <div v-for="(item,index) in allModelData" :value="item.key" :key="index">
+        <!--注释编号:django-vue3-admin-index483211: 对请求回来的allModelData进行computed计算，返加搜索框匹配到的内容-->
+        <div v-for="(item,index) in filteredModelData" :value="item.key" :key="index">
          <el-text :type="modelCheckIndex===index?'primary':''" @click="onModelChecked(item,index)">
            {{ item.app + '--' + item.title + '(' + item.key + ')' }}
          </el-text>
@@ -29,7 +36,7 @@
 </template>

 <script lang="ts" setup>
-import {ref, onMounted, reactive} from 'vue';
+import {ref, onMounted, reactive, computed } from 'vue';
 import {useFs} from '@fast-crud/fast-crud';
 import {createCrudOptions} from './crud';
 import {getModelList} from './api'
@@ -55,6 +62,26 @@ const onModelChecked = (row, index) => {
  props.model = row.key
  props.app = row.app
 }
+
+
+// 注释编号:django-vue3-admin-index083311:代码开始行
+// 功能说明:搭配搜索的处理，返回搜索结果
+const searchQuery = ref('');
+
+const filteredModelData = computed(() => {
+      if (!searchQuery.value) {
+        return allModelData.value;
+      }
+      const query = searchQuery.value.toLowerCase();
+      return allModelData.value.filter(item =>
+        item.app.toLowerCase().includes(query) ||
+        item.title.toLowerCase().includes(query) ||
+        item.key.toLowerCase().includes(query)
+      );
+    });
+// 注释编号:django-vue3-admin-index083311:代码结束行
+
+
 /**
 * 菜单选中时,加载表格数据
 * @param record
--- a/web/src/views/system/role/components/PermissionComNew/index.vue
+++ b/web/src/views/system/role/components/PermissionComNew/index.vue
@@ -1,8 +1,6 @@
 <template>
  <el-drawer v-model="drawerVisible" title="权限配置" direction="rtl" size="60%" :close-on-click-modal="false"
-             :before-close="handleDrawerClose"
-             :destroy-on-close="true"
-  >
+    :before-close="handleDrawerClose" :destroy-on-close="true">
    <template #header>
      <el-row>
        <el-col :span="4">
@@ -19,82 +17,65 @@
      </el-row>
    </template>
    <div class="permission-com">
-      <el-collapse v-model="collapseCurrent" @change="handleCollapseChange" accordion>
-        <el-collapse-item v-for="(item,mIndex) in menuData" :key="mIndex" :name="mIndex" style="background-color: #fafafa;">
-          <template #title>
-            <div>
-              <div class="pc-collapse-title">
-                <el-checkbox v-model="item.isCheck" @click.stop="null">
-                  <span>{{ item.name }}</span>
-                </el-checkbox>
-              </div>
-              <div v-show="!collapseCurrent.includes(mIndex)" @click.stop="null" style="text-align: left;">
-                <el-checkbox v-for="btn in item.btns" :key="btn.value" :label="btn.value" v-model="btn.isCheck">
-                  {{ btn.name }}
-                </el-checkbox>
-              </div>
-            </div>
-          </template>
+      <el-tabs>
+        <el-tab-pane v-for="(item, mIndex) in menuData" :key="mIndex" :label="item.name">
+          <el-tabs tab-position="left">
+            <el-tab-pane v-for="(menu, mIndex) in item.menus" :key="mIndex" :label="menu.name" >
+              <el-checkbox v-model="menu.isCheck">页面显示权限</el-checkbox>
              <div class="pc-collapse-main">
                <div class="pccm-item">
-              <p>允许对这些数据有以下操作</p>
-              <el-checkbox v-for="(btn,bIndex) in item.btns" :key="bIndex" v-model="btn.isCheck" :label="btn.value">
+                  <div class="menu-form-alert"> 配置操作功能点权限 </div>
+                  <el-checkbox v-for="(btn, bIndex) in menu.btns" :key="bIndex" v-model="btn.isCheck"
+                    :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(item, btn.id)">
-                    <el-icon><Setting/></el-icon>
+                      <span v-show="btn.isCheck" @click.stop.prevent="handleSettingClick(menu, btn.id)">
+                        <el-icon>
+                          <Setting />
+                        </el-icon>
                      </span>
                    </div>
                  </el-checkbox>
                </div>

-            <div class="pccm-item" v-if="item.columns&&item.columns.length>0">
-              <p>对这些数据有以下字段权限</p>
-
+                <div class="pccm-item" v-if="menu.columns && menu.columns.length > 0">
+                  <div class="menu-form-alert"> 配置数据列字段权限 </div>
                  <ul class="columns-list">
                    <li class="columns-head">
                      <div class="width-txt">
                        <span>字段</span>
                      </div>
-
-                  <div v-for="(head,hIndex) in column.header" :key="hIndex" class="width-check">
-                    <el-checkbox :label="head.value" @change="handleColumnChange($event, item, head.value)">
+                      <div v-for="(head, hIndex) in column.header" :key="hIndex" class="width-check">
+                        <el-checkbox :label="head.value" @change="handleColumnChange($event, menu, head.value)">
                          <span>{{ head.label }}</span>
                        </el-checkbox>
                      </div>
                    </li>

-                <li v-for="(c_item, c_index) in item.columns" :key="c_index" class="columns-item">
+                    <li v-for="(c_item, c_index) in menu.columns" :key="c_index" class="columns-item">
                      <div class="width-txt">{{ c_item.title }}</div>
-                  <div v-for="(col,cIndex) in column.header" :key="cIndex" class="width-check">
+                      <div v-for="(col, cIndex) in column.header" :key="cIndex" class="width-check">
                        <el-checkbox v-model="c_item[col.value]" class="ci-checkout"></el-checkbox>
                      </div>
                    </li>
                  </ul>
                </div>
              </div>
-        </el-collapse-item>
-      </el-collapse>
+            </el-tab-pane>
+          </el-tabs>
+        </el-tab-pane>
+      </el-tabs>

      <el-dialog v-model="dialogVisible" title="数据权限配置" width="400px" :close-on-click-modal="false"
        :before-close="handleDialogClose">
        <div class="pc-dialog">
          <el-select v-model="dataPermission" @change="handlePermissionRangeChange" class="dialog-select"
            placeholder="请选择">
-            <el-option v-for="item in dataPermissionRange" :key="item.value" :label="item.label" :value="item.value"/>
+            <el-option v-for="item in dataPermissionRange" :key="item.value" :label="item.label" :value="item.value" />
          </el-select>
-          <el-tree-select
-              v-show="dataPermission === 4"
-              node-key="id"
-              v-model="customDataPermission"
-              :props="defaultTreeProps"
-              :data="deptData"
-              multiple
-              check-strictly
-              :render-after-expand="false"
-              show-checkbox
-              class="dialog-tree"
-          />
+          <el-tree-select v-show="dataPermission === 4" node-key="id" v-model="customDataPermission"
+            :props="defaultTreeProps" :data="deptData" multiple check-strictly :render-after-expand="false"
+            show-checkbox class="dialog-tree" />
        </div>
        <template #footer>
          <div>
@@ -108,9 +89,9 @@
 </template>

 <script setup lang="ts">
-import {ref, onMounted, defineProps, watch, computed, reactive} from 'vue';
+import { ref, onMounted, defineProps, watch, computed, reactive } from 'vue';
 import XEUtils from 'xe-utils';
-import {errorNotification} from '/@/utils/message';
+import { errorNotification } from '/@/utils/message';
 import {
  getDataPermissionRange,
  getDataPermissionDept,
@@ -118,8 +99,8 @@ import {
  setRolePremission,
  setBtnDatarange
 } from './api';
-import {MenuDataType, DataPermissionRangeType, CustomDataPermissionDeptType} from './types';
-import {ElMessage} from 'element-plus'
+import { MenuDataType, MenusType, DataPermissionRangeType, CustomDataPermissionDeptType } from './types';
+import { ElMessage } from 'element-plus'

 const props = defineProps({
  roleId: {
@@ -174,7 +155,7 @@ let dataPermission = ref();
 let customDataPermission = ref([]);
 //获取菜单,按钮,权限
 const getMenuBtnPermission = async () => {
-  const resMenu = await getRolePremission({role: props.roleId})
+  const resMenu = await getRolePremission({ role: props.roleId })
  menuData.value = resMenu.data
 }

@@ -198,13 +179,13 @@ const handleCollapseChange = (val: number) => {
 * @param record 当前菜单
 * @param btnType  按钮类型
 */
-const handleSettingClick = (record: MenuDataType, btnId: number) => {
+const handleSettingClick = (record: MenusType, btnId: number) => {
  menuCurrent.value = record;
  menuBtnCurrent.value = btnId;
  dialogVisible.value = true;
 };

-const handleColumnChange = (val: boolean, record: MenuDataType, btnType: string) => {
+const handleColumnChange = (val: boolean, record: MenusType, btnType: string) => {
  for (const iterator of record.columns) {
    iterator[btnType] = val;
  }
@@ -213,7 +194,7 @@ const handleColumnChange = (val: boolean, record: MenuDataType, btnType: string)
 const handlePermissionRangeChange = async (val: number) => {
  if (val === 4) {
    const res = await getDataPermissionDept();
-    const data = XEUtils.toArrayTree(res.data, {parentKey: 'parent', strict: false});
+    const data = XEUtils.toArrayTree(res.data, { parentKey: 'parent', strict: false });
    deptData.value = data;
  }
 };
@@ -228,7 +209,8 @@ const handleDialogConfirm = () => {
  }

  //if (dataPermission.value !== 4) {}
-  for (const iterator of menuData.value) {
+  for (const item of menuData.value) {
+    for (const iterator of item.menus) {
      if (iterator.id === menuCurrent.value.id) {
        for (const btn of iterator.btns) {
          if (btn.id === menuBtnCurrent.value) {
@@ -241,6 +223,7 @@ const handleDialogConfirm = () => {
        }
      }
    }
+  }
  handleDialogClose();
 };
 const handleDialogClose = () => {
@@ -260,7 +243,7 @@ const handleSavePermission = () => {
 }

 const column = reactive({
-  header: [{value: 'is_create', label: '新增可见'}, {value: 'is_update', label: '编辑可见'}, {
+  header: [{ value: 'is_create', label: '新增可见' }, { value: 'is_update', label: '编辑可见' }, {
    value: 'is_query',
    label: '列表可见'
  }]
@@ -295,6 +278,15 @@ onMounted(() => {
    .pccm-item {
      margin-bottom: 10px;

+      .menu-form-alert {
+        color: #fff;
+        line-height: 24px;
+        padding: 8px 16px;
+        margin-bottom: 20px;
+        border-radius: 4px;
+        background-color: var(--el-color-primary);
+      }
+
      .btn-item {
        display: flex;
        align-items: center;
--- a/web/src/views/system/role/components/PermissionComNew/types.ts
+++ b/web/src/views/system/role/components/PermissionComNew/types.ts
@@ -19,11 +19,18 @@ export interface CustomDataPermissionMenuType {
  children: CustomDataPermissionMenuType[]
 }

-export interface MenuDataType {
+export interface MenusType{
  id: string;
  name: string;
  isCheck: boolean;
  radio: string;
-  btns: { id:number,label: string; value: string; isCheck: boolean; data_range: number; dept:object; name:string }[];
+  btns: { id:number,name: string; value: string; isCheck: boolean; data_range: number; dept:object; name:string }[];
  columns: { [key: string]: boolean | string; }[]
 }
+
+export interface MenuDataType {
+  id: string;
+  name: string;
+  menus:MenusType[];
+}
+