From 94ad6b1bae9ad4e27054d13d75dece2d6f01a39a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Mon, 20 Nov 2023 17:02:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.更新字段管理
---
 backend/application/settings.py               |   2 +-
 backend/dvadmin/system/models.py              |  21 +-
 backend/dvadmin/system/views/column.py        |  40 +-
 backend/dvadmin/system/views/menu.py          |   3 +-
 backend/dvadmin/system/views/menu_button.py   |   3 +-
 .../views/role_menu_button_permission.py      |  46 ++-
 backend/dvadmin/utils/field_permission.py     |  14 +-
 backend/dvadmin/utils/filters.py              |   5 +-
 backend/dvadmin/utils/models.py               |   3 +-
 backend/dvadmin/utils/pagination.py           |   3 +-
 backend/dvadmin/utils/viewset.py              |  13 +-
 web/.env.development                          |   2 +-
 .../menu/components/MenuButtonCom/crud.tsx    |   2 +-
 .../menu/components/MenuButtonCom/index.vue   |   2 +-
 web/src/views/system/menu/index.vue           |  20 +-
 .../role/components/PermissionCom/api.ts      | 117 ------
 .../role/components/PermissionCom/index.vue   | 350 ------------------
 .../role/components/PermissionComCopy/api.ts  |  21 --
 .../components/PermissionComCopy/index.vue    | 235 ------------
 .../components/PermissionComCopy/types.ts     |  20 -
 .../components/PermissionComNew/index.vue     |   4 +-
 web/src/views/system/role/crud.tsx            |  34 --
 web/src/views/system/role/index.vue           |   1 -
 23 files changed, 116 insertions(+), 845 deletions(-)
 delete mode 100644 web/src/views/system/role/components/PermissionCom/api.ts
 delete mode 100644 web/src/views/system/role/components/PermissionCom/index.vue
 delete mode 100644 web/src/views/system/role/components/PermissionComCopy/api.ts
 delete mode 100644 web/src/views/system/role/components/PermissionComCopy/index.vue
 delete mode 100644 web/src/views/system/role/components/PermissionComCopy/types.ts

diff --git a/backend/application/settings.py b/backend/application/settings.py
index 39ca001..699b77a 100644
--- a/backend/application/settings.py
+++ b/backend/application/settings.py
@@ -46,7 +46,7 @@ ALLOWED_HOSTS = locals().get("ALLOWED_HOSTS", ["*"])
 # Application definition
 CUSTOM_APPS = [
     "dvadmin.system",
-] + CUSTOM_APPS
+]
 
 INSTALLED_APPS = [
     "django.contrib.auth",
diff --git a/backend/dvadmin/system/models.py b/backend/dvadmin/system/models.py
index ed728ea..79eb236 100644
--- a/backend/dvadmin/system/models.py
+++ b/backend/dvadmin/system/models.py
@@ -13,7 +13,6 @@ class Role(CoreModel):
     key = models.CharField(max_length=64, unique=True, verbose_name="权限字符", help_text="权限字符")
     sort = models.IntegerField(default=1, verbose_name="角色顺序", help_text="角色顺序")
     status = models.BooleanField(default=True, verbose_name="角色状态", help_text="角色状态")
-    admin = models.BooleanField(default=False, verbose_name="是否为admin", help_text="是否为admin")
 
     class Meta:
         db_table = table_prefix + "system_role"
@@ -179,21 +178,27 @@ class Menu(CoreModel):
         verbose_name_plural = verbose_name
         ordering = ("sort",)
 
-
-class Columns(CoreModel):
-    role = models.ForeignKey(to='Role', on_delete=models.CASCADE, verbose_name='角色', db_constraint=False)
-    app = models.CharField(max_length=64, verbose_name='应用名')
-    model = models.CharField(max_length=64, verbose_name='表名')
+class MenuField(CoreModel):
+    model = models.CharField(max_length=64, verbose_name='表名',null=True,blank=True)
     menu = models.ForeignKey(to='Menu', on_delete=models.CASCADE, verbose_name='菜单', db_constraint=False)
     field_name = models.CharField(max_length=64, verbose_name='模型表字段名')
     title = models.CharField(max_length=64, verbose_name='字段显示名')
+    class Meta:
+        db_table = table_prefix + "system_menu_field"
+        verbose_name = "菜单字段表"
+        verbose_name_plural = verbose_name
+        ordering = ("id",)
+
+class FieldPermission(CoreModel):
+    role = models.ForeignKey(to='Role', on_delete=models.CASCADE, verbose_name='角色', db_constraint=False)
+    field = models.ForeignKey(to='MenuField', on_delete=models.CASCADE,related_name='menu_field', verbose_name='字段', db_constraint=False)
     is_query = models.BooleanField(default=1, verbose_name='是否可查询')
     is_create = models.BooleanField(default=1, verbose_name='是否可创建')
     is_update = models.BooleanField(default=1, verbose_name='是否可更新')
 
     class Meta:
-        db_table = table_prefix + "system_columns"
-        verbose_name = "列权限表"
+        db_table = table_prefix + "system_field_permission"
+        verbose_name = "字段权限表"
         verbose_name_plural = verbose_name
         ordering = ("id",)
 
diff --git a/backend/dvadmin/system/views/column.py b/backend/dvadmin/system/views/column.py
index a23d27c..993be52 100644
--- a/backend/dvadmin/system/views/column.py
+++ b/backend/dvadmin/system/views/column.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
+from django.apps import apps
 from rest_framework import serializers
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
-from dvadmin.system.models import Columns, Role
+from dvadmin.system.models import  Role, MenuField
 from dvadmin.utils.models import get_custom_app_models
 from dvadmin.utils.viewset import CustomModelViewSet
 from dvadmin.utils.serializers import CustomModelSerializer
@@ -16,7 +17,7 @@ class ColumnSerializer(CustomModelSerializer):
     """
 
     class Meta:
-        model = Columns
+        model = MenuField
         fields = '__all__'
         read_only_fields = ['id']
 
@@ -25,33 +26,34 @@ class ColumnViewSet(CustomModelViewSet):
     """
     列权限视图集
     """
-    queryset = Columns.objects.all()
+    queryset = MenuField.objects.all()
     serializer_class = ColumnSerializer
 
     def list(self, request, *args, **kwargs):
-        role_id = request.query_params.get('role')
         app_name = request.query_params.get('app')
         model_name = request.query_params.get('model')
         menu = request.query_params.get('menu')
-        if not role_id or not model_name or not app_name or not menu:
+        if  not menu:
             return SuccessResponse([])
-        queryset = self.filter_queryset(self.get_queryset().filter(role_id=role_id, model=model_name, app=app_name,menu_id=menu))
-        page = self.paginate_queryset(queryset)
-        if page is not None:
-            serializer = self.get_serializer(page, many=True, request=request)
-            return self.get_paginated_response(serializer.data)
+        queryset = self.filter_queryset(self.get_queryset().filter(menu=menu))
+        # page = self.paginate_queryset(queryset)
+        # if page is not None:
+        #     serializer = self.get_serializer(page, many=True, request=request)
+        #     return self.get_paginated_response(serializer.data)
         serializer = self.get_serializer(queryset, many=True, request=request)
         return SuccessResponse(data=serializer.data, msg="获取成功")
 
     def create(self, request, *args, **kwargs):
         payload = request.data
-        for model in get_custom_app_models(payload.get('app')):
-            if payload.get('model') == model['model']:
+        print(11,get_custom_app_models())
+        for model in apps.get_models():
+            print(model.__name__)
+            if payload.get('model') == model.__name__:
                 break
         else:
             return ErrorResponse(msg='模型表不存在')
 
-        if Columns.objects.filter(app=model['app'], model=model['model'], field_name=payload.get('field_name')).exists():
+        if MenuField.objects.filter(menu=payload.get('menu'),model=model.__name__, field_name=payload.get('field_name')).exists():
             return ErrorResponse(msg='‘%s’ 字段权限已有，不可重复创建' % payload.get('title'))
 
         return super().create(request, *args, **kwargs)
@@ -72,21 +74,21 @@ class ColumnViewSet(CustomModelViewSet):
     @action(methods=['POST'], detail=False, permission_classes=[IsAuthenticated])
     def auto_match_fields(self, request):
         """自动匹配已有的字段"""
-        role_id = request.data.get('role')
+        menu_id = request.data.get('menu')
         app_name = request.data.get('app')
         model_name = request.data.get('model')
-        if not role_id or not model_name or not app_name:
-            return DetailResponse([], msg='无操作')
+        if not menu_id or not model_name or not app_name:
+            return ErrorResponse( msg='参数错误')
         for model in get_custom_app_models(app_name):
             if model['model'] != model_name:
                 continue
             for field in model['fields']:
-                if Columns.objects.filter(
-                        role_id=role_id, app=app_name, model=model_name, field_name=field['name']
+                if MenuField.objects.filter(
+                        menu_id=menu_id, app=app_name, model=model_name, field_name=field['name']
                 ).exists():
                     continue
                 data = {
-                    'role': role_id,
+                    'menu': menu_id,
                     'app': app_name,
                     'model': model_name,
                     'field_name': field['name'],
diff --git a/backend/dvadmin/system/views/menu.py b/backend/dvadmin/system/views/menu.py
index 6899646..7ac3c40 100644
--- a/backend/dvadmin/system/views/menu.py
+++ b/backend/dvadmin/system/views/menu.py
@@ -119,8 +119,7 @@ class MenuViewSet(CustomModelViewSet):
     def web_router(self, request):
         """用于前端获取当前角色的路由"""
         user = request.user
-        is_admin = user.role.values_list('admin', flat=True)
-        if user.is_superuser or True in is_admin:
+        if user.is_superuser:
             queryset = self.queryset.filter(status=1)
         else:
             role_list = user.role.values_list('id', flat=True)
diff --git a/backend/dvadmin/system/views/menu_button.py b/backend/dvadmin/system/views/menu_button.py
index 94a65ef..245b347 100644
--- a/backend/dvadmin/system/views/menu_button.py
+++ b/backend/dvadmin/system/views/menu_button.py
@@ -63,8 +63,7 @@ class MenuButtonViewSet(CustomModelViewSet):
         :return:
         """
         is_superuser = request.user.is_superuser
-        is_admin = request.user.role.values_list('admin', flat=True)
-        if is_superuser or True in is_admin:
+        if is_superuser:
             queryset = MenuButton.objects.values_list('value',flat=True)
         else:
             role_id = request.user.role.values_list('id', flat=True)
diff --git a/backend/dvadmin/system/views/role_menu_button_permission.py b/backend/dvadmin/system/views/role_menu_button_permission.py
index 109b27b..a8865ca 100644
--- a/backend/dvadmin/system/views/role_menu_button_permission.py
+++ b/backend/dvadmin/system/views/role_menu_button_permission.py
@@ -11,7 +11,8 @@ from rest_framework import serializers
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
-from dvadmin.system.models import RoleMenuButtonPermission, Menu, MenuButton, Dept, RoleMenuPermission, Columns
+from dvadmin.system.models import RoleMenuButtonPermission, Menu, MenuButton, Dept, RoleMenuPermission, FieldPermission, \
+    MenuField
 from dvadmin.system.views.menu import MenuSerializer
 from dvadmin.utils.json_response import DetailResponse, ErrorResponse
 from dvadmin.utils.serializers import CustomModelSerializer
@@ -71,12 +72,41 @@ class RoleButtonPermissionSerializer(CustomModelSerializer):
         model = MenuButton
         fields = ['id','name','value','isCheck','data_range']
 
-class RoleColumnsSerializer(CustomModelSerializer):
+class RoleFieldPermissionSerializer(CustomModelSerializer):
 
     class Meta:
-        model = Columns
+        model = FieldPermission
         fields = "__all__"
 
+class RoleMenuFieldSerializer(CustomModelSerializer):
+    is_query = serializers.SerializerMethodField()
+    is_create = serializers.SerializerMethodField()
+    is_update = serializers.SerializerMethodField()
+
+    def get_is_query(self, instance):
+        params = self.request.query_params
+        queryset = instance.menu_field.filter(role=params.get('role')).first()
+        if queryset:
+            return queryset.is_query
+        return False
+
+    def get_is_create(self, instance):
+        params = self.request.query_params
+        queryset = instance.menu_field.filter(role=params.get('role')).first()
+        if queryset:
+            return queryset.is_create
+        return False
+
+    def get_is_update(self, instance):
+        params = self.request.query_params
+        queryset = instance.menu_field.filter(role=params.get('role')).first()
+        if queryset:
+            return queryset.is_update
+        return False
+    class Meta:
+        model = MenuField
+        fields = ['id','field_name','title','is_query','is_create','is_update']
+
 
 class RoleMenuPermissionSerializer(CustomModelSerializer):
     """
@@ -99,9 +129,8 @@ class RoleMenuPermissionSerializer(CustomModelSerializer):
         return  serializer.data
 
     def get_columns(self, instance):
-        params = self.request.query_params
-        col_list = Columns.objects.filter(role__id=params.get('role'),menu__id=instance['id'])
-        serializer = RoleColumnsSerializer(col_list,many=True,request=self.request)
+        col_list = MenuField.objects.filter(menu=instance['id'])
+        serializer = RoleMenuFieldSerializer(col_list,many=True,request=self.request)
         return serializer.data
 
 
@@ -165,10 +194,11 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
                 RoleMenuPermission.objects.create(role_id=pk, menu_id=menu.get('id'))
             for btn in menu.get('btns'):
                 if btn.get('isCheck'):
-                    instance = RoleMenuButtonPermission.objects.create(role_id=pk, menu_button_id=btn.get('id'),data_range=btn.get('data_range'))
+                    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'):
-                Columns.objects.filter(id=col.get('id')).update(is_query=col.get('is_query'),is_create=col.get('is_create'),is_update=col.get('is_update'))
+                FieldPermission.objects.update_or_create(role_id=pk,field_id=col.get('id'),is_query=col.get('is_query'),is_create=col.get('is_create'),is_update=col.get('is_update'))
         return DetailResponse(msg="授权成功")
 
 
diff --git a/backend/dvadmin/utils/field_permission.py b/backend/dvadmin/utils/field_permission.py
index 939381b..1c969a0 100644
--- a/backend/dvadmin/utils/field_permission.py
+++ b/backend/dvadmin/utils/field_permission.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
+from django.db.models import F
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
-from dvadmin.system.models import Columns
+from dvadmin.system.models import FieldPermission, MenuField
 from dvadmin.utils.json_response import DetailResponse
 from dvadmin.utils.models import get_custom_app_models
 
@@ -23,16 +24,17 @@ class FieldPermissionMixin:
                 break
         if finded is False:
             return []
-        roles = request.user.role.values_list('id', flat=True)
+        print(266666,model)
         user = request.user
         if user.is_superuser==1:
-            data = Columns.objects.filter(app=model['app'], model=model['model']).values('field_name', 'is_create', 'is_query', 'is_update')
+            data = MenuField.objects.filter( model=model['model']).values('field_name')
             for item in data:
                 item['is_create'] = True
                 item['is_query'] = True
                 item['is_update'] = True
         else:
-            data= Columns.objects.filter(
-                app=model['app'], model=model['model'],role__in=roles
-            ).values('field_name', 'is_create', 'is_query', 'is_update')
+            roles = request.user.role.values_list('id', flat=True)
+            data= FieldPermission.objects.filter(
+                 field__model=model['model'],role__in=roles
+            ).values( 'is_create', 'is_query', 'is_update',field_name=F('field__field_name'))
         return DetailResponse(data=data)
\ No newline at end of file
diff --git a/backend/dvadmin/utils/filters.py b/backend/dvadmin/utils/filters.py
index dbd921f..06dba2e 100644
--- a/backend/dvadmin/utils/filters.py
+++ b/backend/dvadmin/utils/filters.py
@@ -121,13 +121,12 @@ class DataLevelPermissionsFilter(BaseFilterBackend):
             role__status=1,
             menu_button__api=re_api,
             menu_button__method=method).values(
-            'data_range',
-            role_admin=F('role__admin')
+            'data_range'
         )
         dataScope_list = []  # 权限范围列表
         for ele in role_permission_list:
                 # 判断用户是否为超级管理员角色/如果拥有[全部数据权限]则返回所有数据
-            if ele.get("data_range") == 3 or ele.get("role_admin") == True:
+            if ele.get("data_range") == 3:
                 return queryset
             dataScope_list.append(ele.get("data_range"))
         dataScope_list = list(set(dataScope_list))
diff --git a/backend/dvadmin/utils/models.py b/backend/dvadmin/utils/models.py
index 4ec619d..8ea8007 100644
--- a/backend/dvadmin/utils/models.py
+++ b/backend/dvadmin/utils/models.py
@@ -136,10 +136,11 @@ def get_model_from_app(app_name):
 
 
 def get_custom_app_models(app_name=None):
-    """获取所有项目写的app里的models"""
+    """获取所有项目下的app里的models"""
     if app_name:
         return get_model_from_app(app_name)
     res = []
     for app in settings.CUSTOM_APPS:
+        # print(222,get_model_from_app(app))
         res.append(get_model_from_app(app))
     return res
diff --git a/backend/dvadmin/utils/pagination.py b/backend/dvadmin/utils/pagination.py
index 52bf143..5e80e57 100644
--- a/backend/dvadmin/utils/pagination.py
+++ b/backend/dvadmin/utils/pagination.py
@@ -79,6 +79,5 @@ class CustomPagination(PageNumberPagination):
             ('total', total),
             ('is_next', is_next),
             ('is_previous', is_previous),
-            ('data', data),
-            ('permission', self.request.permission_fields)
+            ('data', data)
         ]))
diff --git a/backend/dvadmin/utils/viewset.py b/backend/dvadmin/utils/viewset.py
index a462003..6b47457 100644
--- a/backend/dvadmin/utils/viewset.py
+++ b/backend/dvadmin/utils/viewset.py
@@ -17,7 +17,7 @@ from dvadmin.utils.import_export_mixin import ExportSerializerMixin, ImportSeria
 from dvadmin.utils.json_response import SuccessResponse, ErrorResponse, DetailResponse
 from dvadmin.utils.permission import CustomPermission
 from dvadmin.utils.models import get_custom_app_models
-from dvadmin.system.models import Columns
+from dvadmin.system.models import FieldPermission, MenuField
 from django_restql.mixins import QueryArgumentsMixin
 
 
@@ -64,7 +64,7 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
         serializer_class = self.get_serializer_class()
         kwargs.setdefault('context', self.get_serializer_context())
         # 全部以可见字段为准
-        can_see = self.get_column_permission(serializer_class)
+        can_see = self.get_menu_field(serializer_class)
         # 排除掉序列化器级的字段
         # sub_set = set(serializer_class._declared_fields.keys()) - set(can_see)
         # for field in sub_set:
@@ -79,8 +79,8 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
         else:
             return serializer_class(*args, **kwargs)
 
-    def get_column_permission(self, serializer_class):
-        """获取列权限"""
+    def get_menu_field(self, serializer_class):
+        """获取字段权限"""
         finded = False
         for app in get_custom_app_models():
             for model in app:
@@ -91,9 +91,8 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
                 break
         if finded is False:
             return []
-        return Columns.objects.filter(
-            app=model['app'], model=model['model']
-        ).values('field_name', 'is_create', 'is_query', 'is_update')
+        return MenuField.objects.filter(model=model['model']
+        ).values('field_name', 'title')
 
     def create(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data, request=request)
diff --git a/web/.env.development b/web/.env.development
index 1c3ca5d..dc36b29 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 本地环境接口地址
-VITE_API_URL = 'http://127.0.0.1:8000'
+VITE_API_URL = 'http://127.0.0.1:8001'
 
 # 是否启用按钮权限
 VITE_PM_ENABLED = true
diff --git a/web/src/views/system/menu/components/MenuButtonCom/crud.tsx b/web/src/views/system/menu/components/MenuButtonCom/crud.tsx
index fe34d05..0270ad5 100644
--- a/web/src/views/system/menu/components/MenuButtonCom/crud.tsx
+++ b/web/src/views/system/menu/components/MenuButtonCom/crud.tsx
@@ -124,7 +124,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 					type: 'text',
 					search: { show: false },
 					column: {
-						width: 120,
+						width: 200,
 						sortable: true,
 					},
 					form: {
diff --git a/web/src/views/system/menu/components/MenuButtonCom/index.vue b/web/src/views/system/menu/components/MenuButtonCom/index.vue
index af2bddd..9dddaf9 100644
--- a/web/src/views/system/menu/components/MenuButtonCom/index.vue
+++ b/web/src/views/system/menu/components/MenuButtonCom/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
+	<fs-crud ref="crudRef"  v-bind="crudBinding"> </fs-crud>
 </template>
 
 <script lang="ts" setup>
diff --git a/web/src/views/system/menu/index.vue b/web/src/views/system/menu/index.vue
index 97e26c3..aea3529 100644
--- a/web/src/views/system/menu/index.vue
+++ b/web/src/views/system/menu/index.vue
@@ -14,9 +14,19 @@
 			</el-col>
 
 			<el-col :span="18">
-				<div class="menu-box menu-right-box">
-					<MenuButtonCom ref="menuButtonRef" />
-				</div>
+        <el-tabs type="border-card">
+          <el-tab-pane label="按钮配置" >
+            <div style="height: 80vh">
+              <MenuButtonCom ref="menuButtonRef" />
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="字段配置">
+            <div style="height: 80vh">
+              <MenuFieldCom ref="menuFieldRef"></MenuFieldCom>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
 			</el-col>
 		</el-row>
 
@@ -39,6 +49,7 @@ import { ElMessageBox } from 'element-plus';
 import MenuTreeCom from './components/MenuTreeCom/index.vue';
 import MenuButtonCom from './components/MenuButtonCom/index.vue';
 import MenuFormCom from './components/MenuFormCom/index.vue';
+import MenuFieldCom from './components/MenuFieldCom/index.vue';
 import { GetList, DelObj } from './api';
 import { successNotification } from '/@/utils/message';
 import { APIResponseData, MenuTreeItemType } from './types';
@@ -49,7 +60,7 @@ let drawerVisible = ref(false);
 let drawerFormData = ref<Partial<MenuTreeItemType>>({});
 let menuTreeRef = ref<InstanceType<typeof MenuTreeCom> | null>(null);
 let menuButtonRef = ref<InstanceType<typeof MenuButtonCom> | null>(null);
-
+let menuFieldRef = ref<InstanceType<typeof MenuFieldCom> | null>(null);
 const getData = () => {
 	GetList({}).then((ret: APIResponseData) => {
 		const responseData = ret.data;
@@ -67,6 +78,7 @@ const getData = () => {
  */
 const handleTreeClick = (record: MenuTreeItemType) => {
 	menuButtonRef.value?.handleRefreshTable(record);
+  menuFieldRef.value?.handleRefreshTable(record)
 };
 
 /**
diff --git a/web/src/views/system/role/components/PermissionCom/api.ts b/web/src/views/system/role/components/PermissionCom/api.ts
deleted file mode 100644
index 8e9abaa..0000000
--- a/web/src/views/system/role/components/PermissionCom/api.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import { request } from "/@/utils/service";
-
-/**
- * 获取角色所拥有的菜单
- * @param params
- */
-export function GetMenu(params:any) {
-    return request({
-        url: '/api/system/role_menu_button_permission/role_get_menu/',
-        method: 'get',
-        params:params
-    });
-}
-
-/***
- * 新增权限
- * @param data
- * @constructor
- */
-export function SaveMenuPermission(data:any) {
-    return request({
-        url: '/api/system/role_menu_permission/save_auth/',
-        method: 'post',
-        data:data
-    });
-}
-
-
-/**
- * 获取菜单下的按钮
- * @param params
- * @constructor
- */
-export function GetMenuButton(params:any) {
-    return request({
-        url: '/api/system/role_menu_button_permission/role_menu_get_button/',
-        method: 'get',
-        params:params
-    });
-}
-
-
-/***
- * 根据角色获取已授权的菜单
- * @param params
- * @constructor
- */
-export function role_to_menu (params:any={}) {
-    return request({
-        url: '/api/system/role_menu_button_permission/role_to_menu/',
-        method: 'get',
-        params: params
-    })
-}
-
-/***
- * 根据角色获取数据权限范围
- * @constructor
- */
-export function GetDataScope (params:any={}) {
-    return request({
-        url: '/api/system/role_menu_button_permission/data_scope/',
-        method: 'get',
-        params: params
-    })
-}
-
-/***
- * 获取权限部门
- * @constructor
- */
-export function GetDataScopeDept (params:any) {
-    return request({
-        url: '/api/system/role_menu_button_permission/role_to_dept_all/',
-        method: 'get',
-        params: params
-    })
-}
-
-/***
- * 新增权限
- * @param data
- * @constructor
- */
-export function CreatePermission(data:any) {
-    return request({
-        url: '/api/system/role_menu_button_permission/',
-        method: 'post',
-        data:data
-    });
-}
-
-/***
- * 根据菜单获取菜单下按钮
- * @param params
- */
-export function getObj(params:any) {
-    return request({
-        url: '/api/system/role_menu_button_permission/menu_to_button/',
-        method: 'get',
-        params:params
-    });
-}
-
-/**
- * 删除按钮权限
- * @param data
- * @constructor
- */
-export function DeletePermission(data:any) {
-    return request({
-        url: `/api/system/role_menu_button_permission/${data.id}/`,
-        method: 'delete',
-        data:{}
-    });
-}
-
diff --git a/web/src/views/system/role/components/PermissionCom/index.vue b/web/src/views/system/role/components/PermissionCom/index.vue
deleted file mode 100644
index e191226..0000000
--- a/web/src/views/system/role/components/PermissionCom/index.vue
+++ /dev/null
@@ -1,350 +0,0 @@
-<template>
-	<el-drawer size="70%" v-model="drawer" direction="rtl" destroy-on-close :before-close="handleClose">
-		<template #header>
-			<div>
-				<el-tag>当前角色:{{ editedRoleInfo.name }}</el-tag>
-			</div>
-		</template>
-		<div style="padding: 1em">
-			<div style="margin-bottom: 10px">
-				<el-button type="primary" @click="onSaveAuth">保存菜单授权</el-button>
-			</div>
-			<vxe-table
-				ref="tableRef"
-				border
-				resizable
-				:row-config="{ keyField: 'menu_id' }"
-				:tree-config="{ transform: true, rowField: 'menu_id', parentField: 'parent' }"
-				:checkbox-config="{ labelField: 'menu_id', checkRowKeys: multipleTableData, checkStrictly: true }"
-				:expand-config="{ accordion: 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>
-				<vxe-column type="expand" title="已授予权限" width="120">
-					<template #content="{ row, rowIndex }">
-						<div style="padding: 10px 0px" v-if="!row.is_catalog">
-							<el-button type="primary" size="small" style="margin-bottom: 0.5em" @click="createBtnPermission">新增 </el-button>
-							<el-table size="small" :data="buttonPermissionData" border style="width: 100%">
-								<el-table-column prop="menu_button" label="权限名称" width="100">
-									<template #default="scope">
-										<div>{{ scope.row.menu_button__name }}</div>
-									</template>
-								</el-table-column>
-								<el-table-column prop="menu_button__value" label="权限值" width="150"> </el-table-column>
-								<el-table-column prop="data_range" label="权限范围" width="140">
-									<template #default="scope">
-										<div>{{ formatDataRange(scope.row.data_range) }}</div>
-									</template>
-								</el-table-column>
-								<el-table-column prop="dept" label="权限涉及部门" />
-								<el-table-column fixed="right" label="操作" width="120">
-									<template #default="scope">
-										<el-button type="danger" size="small" @click="onDeleteBtn(scope)">删除 </el-button>
-									</template>
-								</el-table-column>
-							</el-table>
-						</div>
-					</template>
-				</vxe-column>
-			</vxe-table>
-			<!--      弹窗-->
-			<el-dialog v-model="dialogFormVisible" append-to-body width="400px" title="配置按钮权限">
-				<el-form ref="buttonFormRef" :model="buttonForm" :rules="buttonRules" label-width="120px">
-					<el-form-item label="按钮" prop="menu_button">
-						<el-select v-model="buttonForm.menu_button" placeholder="请选择按钮" @change="onChangeButton">
-							<el-option v-for="(item, index) in buttonOptions" :key="index" :label="item.name" :value="item.id" />
-						</el-select>
-					</el-form-item>
-					<el-form-item label="权限范围" prop="data_range">
-						<el-select v-model="buttonForm.data_range" placeholder="请选择按钮">
-							<el-option v-for="(item, index) in dataScopeOptions" :key="index" :label="item.label" :value="item.value" />
-						</el-select>
-					</el-form-item>
-					<el-form-item label="数据部门" prop="dept" v-show="buttonForm.data_range === 4">
-						<div class="dept-tree">
-							<el-tree
-								:data="deptOptions"
-								show-checkbox
-								default-expand-all
-								:default-checked-keys="deptCheckedKeys"
-								ref="deptTree"
-								node-key="dept_id"
-								:check-strictly="true"
-								:props="{ label: 'name' }"
-							></el-tree>
-						</div>
-					</el-form-item>
-				</el-form>
-				<template #footer>
-					<span class="dialog-footer">
-						<el-button @click="dialogFormVisible = false">取消</el-button>
-						<el-button type="primary" @click="onSaveButtonForm"> 确定 </el-button>
-					</span>
-				</template>
-			</el-dialog>
-		</div>
-	</el-drawer>
-</template>
-
-<script lang="ts" setup>
-import { ref, defineExpose, reactive, toRefs } from 'vue';
-import { ElMessageBox, ElTable } from 'element-plus';
-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, VxeTableEvents } from 'vxe-table';
-
-interface tableRow {
-	menu_id: number;
-	name: string;
-}
-
-//抽屉是否显示
-const drawer = ref(false);
-//当前编辑的角色信息
-const editedRoleInfo = ref({});
-
-//抽屉关闭确认
-const handleClose = (done: () => void) => {
-	ElMessageBox.confirm('您确定要关闭?', {
-		confirmButtonText: '确定',
-		cancelButtonText: '取消',
-		type: 'warning',
-	})
-		.then(() => {
-			done();
-		})
-		.catch(() => {
-			// catch error
-		});
-};
-
-/*****菜单的配置项***/
-const defaultProps = {
-	children: 'children',
-	label: 'name',
-	isLeaf: 'hasChild',
-};
-
-interface Tree {
-	name: string;
-	children?: Tree[];
-	id: number;
-}
-
-let menuData = ref<Tree>();
-//获取菜单
-const getMenuData = () => {
-	api.GetMenu({}).then((res: any) => {
-		const { data } = res;
-		menuData.value = data;
-	});
-};
-
-//获取已授权的菜单
-const tableRef = ref<VxeTableInstance<tableRow>>();
-const multipleTableData = ref();
-const getRoleToMenu = () => {
-	api.role_to_menu({ role: editedRoleInfo.value.id }).then((res: any) => {
-		const { data } = res;
-		multipleTableData.value = data;
-	});
-};
-
-let isBtnPermissionShow = ref(false);
-let buttonOptions = ref<[]>();
-let editedMenuInfo = ref();
-//菜单节点点击事件
-const menuNodeClick: VxeTableEvents.ToggleRowExpand<tableRow> = ({ expanded, row }) => {
-	// isBtnPermissionShow.value = !node.is_catalog
-	if (!row.is_catalog) {
-		buttonOptions.value = [];
-		editedMenuInfo.value = row;
-		api.GetMenuButton({ menu: row.menu_id }).then((res: any) => {
-			const { data } = res;
-			buttonOptions.value = data;
-		});
-		api.getObj({ menu: row.menu_id, role: editedRoleInfo.value.id }).then((res: any) => {
-			const { data } = res;
-			buttonPermissionData.value = data;
-		});
-	}
-};
-const menuTree = ref();
-/*****菜单的配置项***/
-/***按钮授权的弹窗****/
-//是否显示新增表单
-const dialogFormVisible = ref(false);
-//部门树
-const deptTree = ref();
-//自定义部门数据
-const deptOptions = ref();
-//选中的部门数据
-const deptCheckedKeys = [];
-//按钮表单
-const buttonForm = reactive({
-	menu_button: null,
-	role: null,
-	menu: null,
-	data_range: null,
-	dept: [],
-});
-//按钮表格数据
-let buttonPermissionData = ref([]);
-//按钮表单验证
-const buttonRules = reactive<FormRules>({
-	menu_button: [{ required: true, message: '必填项' }],
-	data_range: [{ required: true, message: '必填项' }],
-});
-//新增按钮
-const buttonFormRef = ref<FormInstance>();
-const createBtnPermission = () => {
-	dialogFormVisible.value = true;
-	buttonForm.menu_button = null;
-	buttonForm.menu = null;
-	buttonForm.role = null;
-	buttonForm.data_range = null;
-	buttonForm.dept = [];
-};
-//权限范围数据
-const dataScopeOptions = ref<[]>();
-//按钮值变化事件
-const onChangeButton = (val: any) => {
-	dataScopeOptions.value = [];
-	//获取权限值范围
-	api.GetDataScope({ menu_button: val }).then((res: any) => {
-		dataScopeOptions.value = res.data;
-	});
-	//获取权限部门值
-	api.GetDataScopeDept({ menu_button: val }).then((res: any) => {
-		deptOptions.value = XEUtils.toArrayTree(res.data, { parentKey: 'parent', strict: false });
-	});
-};
-//过滤按钮名称
-const formatMenuBtn = (val: any) => {
-	let obj: any = buttonOptions.value?.find((item: any) => {
-		return item.id === val;
-	});
-	return obj ? obj.name : null;
-};
-//过滤权限范围
-const formatDataRange = (val: any) => {
-	let obj: any = [
-		{
-			value: 0,
-			label: '仅本人数据权限',
-		},
-		{
-			value: 1,
-			label: '本部门及以下数据权限',
-		},
-		{
-			value: 2,
-			label: '本部门数据权限',
-		},
-		{
-			value: 3,
-			label: '全部数据权限',
-		},
-		{
-			value: 4,
-			label: '自定义数据权限',
-		},
-	].find((item: any) => {
-		return item.value === val;
-	});
-	return obj ? obj.label : null;
-};
-//保存按钮表单
-
-const onSaveButtonForm = async () => {
-	const { id: roleId } = editedRoleInfo.value;
-	const { id: menuId } = editedMenuInfo.value;
-	const form: any = Object.assign({}, buttonForm);
-	form.role = roleId;
-	form.menu = menuId;
-	//选中的部门
-	const checkedList = deptTree.value.getCheckedKeys();
-	form.dept = checkedList;
-	if (!buttonFormRef.value) return;
-	await buttonFormRef.value.validate((valid, fields) => {
-		if (valid) {
-			api.CreatePermission(form).then((res: any) => {
-				const { data } = res;
-				buttonPermissionData.value.push(data);
-				dialogFormVisible.value = false;
-				ElMessage({
-					type: 'success',
-					message: res.msg,
-				});
-			});
-		} else {
-			ElMessage({
-				type: 'error',
-				title: '提交错误',
-				message: 'F12控制台看详情',
-			});
-			console.log('提交错误', fields);
-		}
-	});
-};
-//删除按钮权限
-const onDeleteBtn = (scope: any) => {
-	const { row, $index } = scope;
-	ElMessageBox.confirm('您是否要删除数据?', '温馨提示', {
-		confirmButtonText: '确定',
-		cancelButtonText: '取消',
-		type: 'warning',
-	})
-		.then(() => {
-			api.DeletePermission({ id: row.id }).then((res: any) => {
-				buttonPermissionData.value.splice($index, 1);
-				ElMessage({
-					type: 'success',
-					message: res.msg,
-				});
-			});
-		})
-		.catch(() => {
-			ElMessage({
-				type: 'info',
-				message: '取消删除',
-			});
-		});
-};
-/***按钮授权的弹窗****/
-//初始化数据
-const initGet = () => {
-	getMenuData();
-	getRoleToMenu();
-};
-
-/**
- * 保存授权
- */
-const onSaveAuth = () => {
-	const $table = tableRef.value;
-	if ($table) {
-		const selectRecords = $table.getCheckboxRecords();
-		const menuIdList = selectRecords.map((record: any) => record.menu_id);
-		const { id: roleId } = editedRoleInfo.value;
-		const data = {
-			role: roleId,
-			menu: menuIdList,
-		};
-		api.SaveMenuPermission(data).then((res: any) => {
-			ElMessage({
-				message: res.msg,
-				type: 'success',
-			});
-		});
-	}
-};
-
-defineExpose({ drawer, editedRoleInfo, initGet });
-</script>
-
-<style scoped></style>
diff --git a/web/src/views/system/role/components/PermissionComCopy/api.ts b/web/src/views/system/role/components/PermissionComCopy/api.ts
deleted file mode 100644
index 9d4c590..0000000
--- a/web/src/views/system/role/components/PermissionComCopy/api.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { request } from "/@/utils/service";
-
-export function getDataPermissionRange() {
-  return request({
-    url: '/api/system/role_menu_button_permission/data_scope/',
-    method: 'get',
-  })
-}
-export function getDataPermissionDept() {
-  return request({
-    url: '/api/system/role_menu_button_permission/role_to_dept_all/',
-    method: 'get'
-  })
-}
-
-export function getDataPermissionMenu() {
-  return request({
-    url: '/api/system/role_menu_button_permission/get_role_permissions/',
-    method: 'get'
-  })
-}
\ No newline at end of file
diff --git a/web/src/views/system/role/components/PermissionComCopy/index.vue b/web/src/views/system/role/components/PermissionComCopy/index.vue
deleted file mode 100644
index 1d08e99..0000000
--- a/web/src/views/system/role/components/PermissionComCopy/index.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<template>
-	<div class="permission-com">
-		<div class="pc-item">
-			<p class="pc-title">数据授权</p>
-			<div class="pc-cell">
-				<el-radio-group v-model="dataPermission" class="pc-data-permission">
-					<el-radio v-for="item in dataPermissionRange" :key="item.label" :label="item.value" @change="handleChange">{{ item.label }}</el-radio>
-				</el-radio-group>
-				<el-tree-select
-					v-if="dataPermission === 4"
-					node-key="id"
-					v-model="customDataPermission"
-					:props="defaultTreeProps"
-					:data="deptData"
-					multiple
-					check-strictly
-					:render-after-expand="false"
-					show-checkbox
-					class="pc-custom-dept"
-				/>
-			</div>
-		</div>
-
-		<div class="pc-item pc-menu">
-			<p class="pc-title">菜单授权</p>
-			<div>
-				<el-tree
-					:props="defaultTreeProps"
-					:data="menuData"
-					show-checkbox
-					node-key="id"
-					default-expand-all
-					:expand-on-click-node="false"
-					class="dc-menu-tree"
-				>
-					<template #default="{ node, data }">
-						<div class="pc-tree-node" :class="{ 'tree-node-label-border': !data.is_catalog }">
-							<p class="tree-node-label">{{ node.label }}</p>
-							<div v-if="!data.is_catalog">
-								<ul class="menu-permission-list">
-									<li v-for="m in data.menuPermission" :key="m.id" class="menu-permission-item">
-										<el-checkbox v-model="m.id" :label="m.name" />
-									</li>
-								</ul>
-								<ul class="menu-permission-list">
-									<li v-for="m in data.columns" :key="m.id" class="menu-permission-item">
-										<el-checkbox v-model="m.id" :label="m.title" />
-									</li>
-								</ul>
-							</div>
-						</div>
-					</template>
-				</el-tree>
-			</div>
-		</div>
-
-		<div class="pc-btn">
-			<el-button type="primary">确定</el-button>
-			<el-button>取消</el-button>
-		</div>
-	</div>
-</template>
-
-<script lang="ts" setup>
-import { ref, onMounted } from 'vue';
-import XEUtils from 'xe-utils';
-import { getDataPermissionRange, getDataPermissionDept, getDataPermissionMenu } from './api';
-import { DataPermissionRangeType, CustomDataPermissionDeptType, CustomDataPermissionMenuType } from './types';
-
-const defaultTreeProps = {
-	children: 'children',
-	label: 'name',
-	value: 'id',
-};
-
-const data: any[] = [
-	{
-		id: 1,
-		label: 'Level one 1',
-		children: [
-			{
-				id: 4,
-				label: 'Level two 1-1',
-				isPenultimate: true,
-				children: [
-					{
-						id: 9,
-						label: 'Level three 1-1-1',
-					},
-					{
-						id: 10,
-						label: 'Level three 1-1-2',
-					},
-				],
-			},
-		],
-	},
-	{
-		id: 2,
-		label: 'Level one 2',
-		isPenultimate: true,
-		children: [
-			{
-				id: 5,
-				label: 'Level two 2-1',
-			},
-			{
-				id: 6,
-				label: 'Level two 2-2',
-			},
-		],
-	},
-	{
-		id: 3,
-		label: 'Level one 3',
-		isPenultimate: true,
-		children: [
-			{
-				id: 7,
-				label: 'Level two 3-1',
-			},
-			{
-				id: 8,
-				label: 'Level two 3-2',
-			},
-		],
-	},
-];
-
-let dataPermission = ref();
-let dataPermissionRange = ref<DataPermissionRangeType[]>([]);
-let customDataPermission = ref();
-let deptData = ref<CustomDataPermissionDeptType[]>([]);
-let menuData = ref<CustomDataPermissionMenuType[]>([]);
-
-const fetchData = async () => {
-	try {
-		const resRange = await getDataPermissionRange();
-		const resMenu = await getDataPermissionMenu();
-
-		if (resRange?.code === 2000) {
-			dataPermissionRange.value = resRange.data;
-		}
-		if (resMenu?.code === 2000) {
-			console.log(resMenu.data);
-			menuData.value = resMenu.data;
-		}
-	} catch {
-		return;
-	}
-};
-
-const handleChange = async () => {
-	if (dataPermission.value === 4) {
-		const res = await getDataPermissionDept();
-		const data = XEUtils.toArrayTree(res.data, { parentKey: 'parent', strict: false });
-		deptData.value = data;
-	}
-};
-
-const handleTestClick = (node: any, data: any) => {
-	console.log(node, data);
-};
-
-onMounted(() => {
-	fetchData();
-});
-</script>
-
-<style lang="scss" scoped>
-.permission-com {
-	width: 100%;
-	height: 100%;
-	padding: 15px;
-	box-sizing: border-box;
-	.pc-item {
-		width: 100%;
-		margin-bottom: 15px;
-		border-bottom: 1px #dcdfe6 solid;
-	}
-	.pc-title {
-		font-weight: 600;
-	}
-	.pc-cell {
-		display: flex;
-		padding: 10px;
-		overflow-x: auto;
-		.pc-data-permission {
-			min-width: 800px;
-		}
-		.pc-custom-dept {
-			min-width: 200px;
-		}
-	}
-
-	.pc-menu {
-		height: calc(100% - 140px);
-		overflow-y: auto;
-	}
-
-	.pc-tree-node {
-		width: 100%;
-		display: flex;
-		align-items: center;
-
-		.tree-node-label {
-			font-size: 16px;
-			margin-right: 20px;
-		}
-		.menu-permission-list {
-			display: flex;
-			align-items: center;
-			.menu-permission-item {
-				margin-right: 10px;
-			}
-		}
-	}
-
-	.tree-node-label-border {
-		border-bottom: 1px #dcdfe6 solid;
-	}
-
-	.pc-btn {
-		padding-bottom: 15px;
-	}
-}
-</style>
-
-<style lang="scss">
-.dc-menu-tree {
-	.el-tree-node__content {
-		height: auto;
-	}
-}
-</style>
diff --git a/web/src/views/system/role/components/PermissionComCopy/types.ts b/web/src/views/system/role/components/PermissionComCopy/types.ts
deleted file mode 100644
index 6abb63d..0000000
--- a/web/src/views/system/role/components/PermissionComCopy/types.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export interface DataPermissionRangeType {
-  label: string;
-  value: number;
-}
-
-export interface CustomDataPermissionDeptType {
-  id: number;
-  name: string;
-  patent: number;
-  children: CustomDataPermissionDeptType[]
-}
-
-export interface CustomDataPermissionMenuType {
-  id: number;
-  name: string;
-  is_catalog: boolean;
-  menuPermission: { id: number; name: string; value: string }[] | null;
-  columns: { id: number; name: string; title: string }[] | null;
-  children: CustomDataPermissionMenuType[]
-}
\ No newline at end of file
diff --git a/web/src/views/system/role/components/PermissionComNew/index.vue b/web/src/views/system/role/components/PermissionComNew/index.vue
index 0e5d159..db6f332 100644
--- a/web/src/views/system/role/components/PermissionComNew/index.vue
+++ b/web/src/views/system/role/components/PermissionComNew/index.vue
@@ -1,6 +1,8 @@
 <template>
   <el-drawer v-model="drawerVisible" title="权限配置" direction="rtl" size="60%" :close-on-click-modal="false"
-             :before-close="handleDrawerClose">
+             :before-close="handleDrawerClose"
+             :destroy-on-close="true"
+  >
     <template #header>
       <el-row>
         <el-col :span="4">
diff --git a/web/src/views/system/role/crud.tsx b/web/src/views/system/role/crud.tsx
index b978785..8c9f56a 100644
--- a/web/src/views/system/role/crud.tsx
+++ b/web/src/views/system/role/crud.tsx
@@ -183,40 +183,6 @@ export const createCrudOptions = function ({
 						value: 1,
 					},
 				},
-				admin: {
-					title: '是否管理员',
-					search: { show: false },
-					type: 'dict-radio',
-					dict: dict({
-						data: [
-							{
-								label: '是',
-								value: true,
-								color: 'success',
-							},
-							{
-								label: '否',
-								value: false,
-								color: 'danger',
-							},
-						],
-					}),
-					column: {
-						minWidth: 130,
-						sortable: 'custom',
-						show: columnPermission('admin', 'is_query'),
-					},
-					addForm: {
-						show: columnPermission('admin', 'is_create'),
-					},
-					editForm: {
-						show: columnPermission('admin', 'is_update'),
-					},
-					form: {
-						rules: [{ required: true, message: '是否管理员必填' }],
-						value: false,
-					},
-				},
 				status: {
 					title: '状态',
 					search: { show: true },
diff --git a/web/src/views/system/role/index.vue b/web/src/views/system/role/index.vue
index 8e2ef4f..f5d4011 100644
--- a/web/src/views/system/role/index.vue
+++ b/web/src/views/system/role/index.vue
@@ -18,7 +18,6 @@ import { useColumnPermission } from '/@/stores/columnPermission';
 import { GetPermission } from './api';
 import { useExpose, useCrud } from '@fast-crud/fast-crud';
 import { createCrudOptions } from './crud';
-import permission from './components/PermissionCom/index.vue';
 import PermissionComNew from './components/PermissionComNew/index.vue';
 
 let drawerVisible = ref(false);