Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	web/yarn.lock

backend/dvadmin/system/models.py

@@ -236,7 +236,7 @@ class RoleMenuPermission(CoreModel):
         db_table = table_prefix + "role_menu_permission"
         verbose_name = "角色菜单权限表"
         verbose_name_plural = verbose_name
-        ordering = ("-create_datetime",)
+        # ordering = ("-create_datetime",)
 
 
 class RoleMenuButtonPermission(CoreModel):

backend/dvadmin/system/views/dept.py

@@ -9,7 +9,7 @@ from rest_framework import serializers
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
-from dvadmin.system.models import Dept
+from dvadmin.system.models import Dept, RoleMenuButtonPermission
 from dvadmin.utils.json_response import DetailResponse, SuccessResponse
 from dvadmin.utils.permission import AnonymousUserPermission
 from dvadmin.utils.serializers import CustomModelSerializer
@@ -130,7 +130,8 @@ class DeptViewSet(CustomModelViewSet):
         if is_superuser:
             queryset = Dept.objects.values('id', 'name', 'parent')
         else:
-            data_range = request.user.role.values_list('data_range', flat=True)
+            role_ids = request.user.role.values_list('id',flat=True)
+            data_range = RoleMenuButtonPermission.objects.filter(role__in=role_ids).values_list('data_range', flat=True)
             user_dept_id = request.user.dept.id
             dept_list = [user_dept_id]
             data_range_list = list(set(data_range))

backend/dvadmin/system/views/menu.py

@@ -90,11 +90,16 @@ class MenuViewSet(CustomModelViewSet):
     def web_router(self, request):
         """用于前端获取当前角色的路由"""
         user = request.user
-        queryset = self.queryset.filter(status=1)
+        is_admin = user.role.values_list('admin', flat=True)
-        if not user.is_superuser:
+        if user.is_superuser or True in is_admin:
+            queryset = self.queryset.filter(status=1)
+        else:
             role_list = user.role.values_list('id', flat=True)
-            menu_list = RoleMenuPermission.objects.filter(role__in=role_list).values_list('menu_id')
+            menu_list = RoleMenuPermission.objects.filter(role__in=role_list).values_list('menu_id',flat=True)
+            print("role_list", role_list)
+            print("menu_list",menu_list)
             queryset = Menu.objects.filter(id__in=menu_list)
+        print(queryset)
         serializer = WebRouterSerializer(queryset, many=True, request=request)
         data = serializer.data
         return SuccessResponse(data=data, total=len(data), msg="获取成功")

backend/dvadmin/system/views/role_menu.py

@@ -72,7 +72,14 @@ class RoleMenuPermissionViewSet(CustomModelViewSet):
         menu_list = body.get('menu',None)
         if menu_list is None:
             return ErrorResponse(msg="未获取到菜单参数")
-        data = [{"role":role_id,"menu":item} for item in menu_list]
+        obj_list = RoleMenuPermission.objects.filter(role__id=role_id).values_list('menu__id',flat=True)
+        old_set = set(obj_list)
+        new_set = set(menu_list)
+        #need_update = old_set.intersection(new_set) # 需要更新的
+        need_del = old_set.difference(new_set) # 需要删除的
+        need_add = new_set.difference(old_set) # 需要新增的
+        RoleMenuPermission.objects.filter(role__id=role_id,menu__in=list(need_del)).delete()
+        data = [{"role": role_id, "menu": item} for item in list(need_add)]
         serializer = RoleMenuPermissionSerializer(data=data,many=True,request=request)
         if serializer.is_valid(raise_exception=True):
             serializer.save()

backend/dvadmin/system/views/role_menu_button_permission.py

@@ -6,11 +6,12 @@
 @Created on: 2021/6/3 003 0:30
 @Remark: 菜单按钮管理
 """
-from django.db.models import F
+from django.db.models import F, Subquery, OuterRef, Exists
+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
+from dvadmin.system.models import RoleMenuButtonPermission, Menu, MenuButton, Dept, RoleMenuPermission
 from dvadmin.utils.json_response import DetailResponse, ErrorResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
@@ -20,7 +21,6 @@ class RoleMenuButtonPermissionSerializer(CustomModelSerializer):
     """
     菜单按钮-序列化器
     """
-
     class Meta:
         model = RoleMenuButtonPermission
         fields = "__all__"
@@ -41,6 +41,8 @@ class RoleMenuButtonPermissionCreateUpdateSerializer(CustomModelSerializer):
     """
     初始化菜单按钮-序列化器
     """
+    menu_button__name = serializers.CharField(source='menu_button.name', read_only=True)
+    menu_button__value= serializers.CharField(source='menu_button.value', read_only=True)
 
     class Meta:
         model = RoleMenuButtonPermission
@@ -66,14 +68,23 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
     @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
     def role_get_menu(self, request):
         """根据当前用户的角色返回角色拥有的菜单"""
+        data = []
         is_superuser = request.user.is_superuser
         is_admin = request.user.role.values_list('admin', flat=True)
         if is_superuser or True in is_admin:
-            queryset = Menu.objects.filter(status=1).values('id','name','parent','is_catalog')
+            queryset = Menu.objects.filter(status=1).values('name','parent','is_catalog',menu_id=F('id'))
+            for item in queryset:
+                btn_name = MenuButton.objects.filter(menu=item['menu_id']).values_list(
+                    'name', flat=True)
+                data.append({'menu_id': item['menu_id'], 'name': item['name'], 'parent': item['parent'],
+                             'permission': ','.join(btn_name), 'is_catalog': item['is_catalog']})
         else:
             role_id = request.user.role.values_list('id',flat=True)
-            queryset = RoleMenuButtonPermission.objects.filter(role__in=role_id).values(id=F('menu__id'),name=F('menu__name'),parent=F('menu__parent'),is_catalog=F('menu__is_catalog'))
+            queryset = RoleMenuPermission.objects.filter(role__in=role_id).values('menu_id',name=F('menu__name'),parent=F('menu__parent'),is_catalog=F('menu__is_catalog')).distinct()
-        return DetailResponse(data=queryset)
+            for item in queryset:
+                btn_name = RoleMenuButtonPermission.objects.filter(menu_button__menu=item['menu_id']).values_list('menu_button__name',flat=True)
+                data.append({'menu_id':item['menu_id'], 'name':item['name'], 'parent':item['parent'],'permission':','.join(btn_name),'is_catalog':item['is_catalog']})
+        return DetailResponse(data=data)
 
     @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
     def role_menu_get_button(self,request):
@@ -82,18 +93,16 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
         :param request:
         :return:
         """
-        params = request.query_params
+        if params := request.query_params:
-        if params:
+            if menu_id := params.get('menu', None):
-            menu_id = params.get('menu',None)
-            if menu_id:
                 is_superuser = request.user.is_superuser
                 is_admin = request.user.role.values_list('admin', flat=True)
                 if is_superuser or True in is_admin:
                     queryset = MenuButton.objects.filter(menu=menu_id).values('id', 'name')
                 else:
                     role_list = request.user.role.values_list('id',flat=True)
-                    queryset = RoleMenuButtonPermission.objects.filter(role_in=role_list,menu_button__menu=menu_id).values(
+                    queryset = RoleMenuButtonPermission.objects.filter(role__in=role_list,menu_button__menu=menu_id).values(
-                        id=F('menu_button__id'),
+                        btn_id=F('menu_button__id'),
                         name=F('menu_button__name')
                     )
                 return DetailResponse(data=queryset)
@@ -133,12 +142,10 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
             return DetailResponse(data=data)
         else:
             data = []
-            role_id = request.user.role.id
+            role_list = request.user.role.values_list('id',flat=True)
-            params = request.query_params
+            if params := request.query_params:
-            if params:
+                if menu_button_id := params.get('menu_button', None):
-                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)
-                if menu_button_id:
-                    role_queryset = RoleMenuButtonPermission.objects.filter(role=role_id,menu_button=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:
@@ -202,21 +209,19 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
         is_admin = request.user.role.values_list('admin', flat=True)
         if is_superuser or True in is_admin:
             queryset = Dept.objects.values('id','name','parent')
-            return DetailResponse(data=queryset)
         else:
-            if params:
+            if not params:
-                menu_button = params.get('menu_button')
-                if menu_button is None:
-                    return ErrorResponse(msg="参数错误")
-                role_list = request.user.role.values_list('id', flat=True)
-                queryset = RoleMenuButtonPermission.objects.filter(role_in=role_list,menu_button=None).values(
-                    id=F('dept__id'),
-                    name=F('dept__name'),
-                    parent=F('dept__parent')
-                )
-                return DetailResponse(data=queryset)
-            else:
                 return ErrorResponse(msg="参数错误")
+            menu_button = params.get('menu_button')
+            if menu_button is None:
+                return ErrorResponse(msg="参数错误")
+            role_list = request.user.role.values_list('id', flat=True)
+            queryset = RoleMenuButtonPermission.objects.filter(role__in=role_list,menu_button=None).values(
+                dept_id=F('dept__id'),
+                name=F('dept__name'),
+                parent=F('dept__parent')
+            )
+        return DetailResponse(data=queryset)
 
 
 
@@ -228,17 +233,48 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
         :return:
         """
         params = request.query_params
-        if params:
+        menu_id = params.get('menu', None)
-            menu_id = params.get('menu',None)
+        if menu_id is None:
-            if menu_id is None:
+            return ErrorResponse(msg="未获取到参数")
-                return ErrorResponse(msg="未获取到参数")
+        is_superuser = request.user.is_superuser
-            role_id = params.get('role', None)
+        is_admin = request.user.role.values_list('admin', flat=True)
-            if role_id is None:
+        if is_superuser or True in is_admin:
-                return ErrorResponse(msg="未获取到参数")
+            queryset = RoleMenuButtonPermission.objects.filter(menu_button__menu=menu_id).values(
-            queryset = RoleMenuButtonPermission.objects.filter(role=role_id,menu_button__menu=menu_id).values(
                 'id',
                 'data_range',
-                'menu_button'
+                'menu_button',
+                'menu_button__name',
+                'menu_button__value'
             )
             return DetailResponse(data=queryset)
+        else:
+            if params:
+
+                role_id = params.get('role', None)
+                if role_id is None:
+                    return ErrorResponse(msg="未获取到参数")
+                queryset = RoleMenuButtonPermission.objects.filter(role=role_id,menu_button__menu=menu_id).values(
+                    'id',
+                    'data_range',
+                    'menu_button',
+                    'menu_button__name',
+                    'menu_button__value'
+                )
+                return DetailResponse(data=queryset)
         return ErrorResponse(msg="未获取到参数")
+
+    @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
+    def role_to_menu(self, request):
+        """
+        获取角色对应的按钮权限
+        :param request:
+        :return:
+        """
+        params = request.query_params
+        role_id = params.get('role', None)
+        if role_id is None:
+            return ErrorResponse(msg="未获取到参数")
+        queryset = RoleMenuPermission.objects.filter(role_id=role_id).values_list('menu_id',flat=True).distinct()
+
+        return DetailResponse(data=queryset)
+

backend/dvadmin/system/views/user.py

@@ -1,6 +1,6 @@
 import hashlib
 
-from django.contrib.auth.hashers import make_password
+from django.contrib.auth.hashers import make_password, check_password
 from django_restql.fields import DynamicSerializerMethodField
 from rest_framework import serializers
 from rest_framework.decorators import action, permission_classes
@@ -324,11 +324,10 @@ class UserViewSet(CustomModelViewSet):
             return ErrorResponse(msg="参数不能为空")
         if new_pwd != new_pwd2:
             return ErrorResponse(msg="两次密码不匹配")
-        check_password = request.user.check_password(old_pwd)
+        verify_password = check_password(old_pwd, self.request.user.password)
-        if not check_password:
+        if not verify_password:
-            check_password = request.user.check_password(hashlib.md5(old_pwd.encode(encoding='UTF-8')).hexdigest())
+            verify_password = check_password(hashlib.md5(old_pwd.encode(encoding='UTF-8')).hexdigest(), self.request.user.password)
-        if check_password:
+        if verify_password:
-            new_pwd = hashlib.md5(new_pwd.encode(encoding='UTF-8')).hexdigest()
             request.user.password = make_password(new_pwd)
             request.user.save()
             return DetailResponse(data=None, msg="修改成功")

backend/dvadmin/utils/backends.py

@@ -3,8 +3,11 @@ import logging
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.backends import ModelBackend
+from django.contrib.auth.hashers import check_password
 from django.utils import timezone
 
+from dvadmin.utils.validator import CustomValidationError
+
 logger = logging.getLogger(__name__)
 UserModel = get_user_model()
 
@@ -24,10 +27,13 @@ class CustomBackend(ModelBackend):
         except UserModel.DoesNotExist:
             UserModel().set_password(password)
         else:
-            check_password = user.check_password(password)
+            verify_password = check_password(password, user.password)
-            if not check_password:
+            if not verify_password:
-                check_password = user.check_password(hashlib.md5(password.encode(encoding='UTF-8')).hexdigest())
+                password = hashlib.md5(password.encode(encoding='UTF-8')).hexdigest()
-            if check_password and self.user_can_authenticate(user):
+                verify_password = check_password(password, user.password)
-                user.last_login = timezone.now()
+            if verify_password:
-                user.save()
+                if self.user_can_authenticate(user):
-                return user
+                    user.last_login = timezone.now()
+                    user.save()
+                    return user
+                raise CustomValidationError("当前用户已被禁用，请联系管理员!")

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,74 +86,78 @@ class DataLevelPermissionsFilter(BaseFilterBackend):
         如果不是超级管理员,则进入下一步权限判断
         """
         if request.user.is_superuser == 0:
-            # 0. 获取用户的部门id，没有部门则返回空
+            return self._extracted_from_filter_queryset_33(request, queryset, api, method)
-            user_dept_id = getattr(request.user, "dept_id", None)
-            if not user_dept_id:
-                return queryset.none()
-
-            # 1. 判断过滤的数据是否有创建人所在部门 "dept_belong_id" 字段
-            if not getattr(queryset.model, "dept_belong_id", None):
-                return queryset
-
-            # 2. 如果用户没有关联角色则返回本部门数据
-            if not hasattr(request.user, "role"):
-                return queryset.filter(dept_belong_id=user_dept_id)
-
-            # 3. 根据所有角色 获取所有权限范围
-            # (0, "仅本人数据权限"),
-            # (1, "本部门及以下数据权限"),
-            # (2, "本部门数据权限"),
-            # (3, "全部数据权限"),
-            # (4, "自定数据权限")
-            replace_str = re.compile('\d')
-            re_api = replace_str.sub('{id}', api)
-            role_id_list = request.user.role.values_list('id', flat=True)
-            role_permission_list=RoleMenuButtonPermission.objects.filter(
-                role__in=role_id_list,
-                role__status=1,
-                menu_button__api=re_api,
-                menu_button__method=method).values(
-                'data_range',
-                role_admin=F('role__admin')
-            )
-            dataScope_list = []  # 权限范围列表
-            for ele in role_permission_list:
-                # 判断用户是否为超级管理员角色/如果拥有[全部数据权限]则返回所有数据
-                if 3 == ele.get("data_range") or ele.get("role_admin") == True:
-                    return queryset
-                dataScope_list.append(ele.get("data_range"))
-            dataScope_list = list(set(dataScope_list))
-
-            # 4. 只为仅本人数据权限时只返回过滤本人数据，并且部门为自己本部门(考虑到用户会变部门，只能看当前用户所在的部门数据)
-            if 0 in dataScope_list:
-                return queryset.filter(
-                    creator=request.user, dept_belong_id=user_dept_id
-                )
-
-            # 5. 自定数据权限 获取部门，根据部门过滤
-            dept_list = []
-            for ele in dataScope_list:
-                if ele == 4:
-                    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,
-                        )
-                    )
-            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
 
+    # 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:
+            return queryset.none()
+
+        # 1. 判断过滤的数据是否有创建人所在部门 "dept_belong_id" 字段
+        if not getattr(queryset.model, "dept_belong_id", None):
+            return queryset
+
+        # 2. 如果用户没有关联角色则返回本部门数据
+        if not hasattr(request.user, "role"):
+            return queryset.filter(dept_belong_id=user_dept_id)
+
+        # 3. 根据所有角色 获取所有权限范围
+        # (0, "仅本人数据权限"),
+        # (1, "本部门及以下数据权限"),
+        # (2, "本部门数据权限"),
+        # (3, "全部数据权限"),
+        # (4, "自定数据权限")
+        replace_str = re.compile('\d')
+        re_api = replace_str.sub('{id}', api)
+        role_id_list = request.user.role.values_list('id', flat=True)
+        role_permission_list=RoleMenuButtonPermission.objects.filter(
+            role__in=role_id_list,
+            role__status=1,
+            menu_button__api=re_api,
+            menu_button__method=method).values(
+            'data_range',
+            role_admin=F('role__admin')
+        )
+        dataScope_list = []  # 权限范围列表
+        for ele in role_permission_list:
+                # 判断用户是否为超级管理员角色/如果拥有[全部数据权限]则返回所有数据
+            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))
+
+        # 4. 只为仅本人数据权限时只返回过滤本人数据，并且部门为自己本部门(考虑到用户会变部门，只能看当前用户所在的部门数据)
+        if 0 in dataScope_list:
+            return queryset.filter(
+                creator=request.user, dept_belong_id=user_dept_id
+            )
+
+        # 5. 自定数据权限 获取部门，根据部门过滤
+        dept_list = []
+        for ele in dataScope_list:
+            if 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)))
+
 
 class CustomDjangoFilterBackend(DjangoFilterBackend):
     lookup_prefixes = {
@@ -164,12 +168,14 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
         "~": "icontains",
     }
 
-    def construct_search(self, field_name):
+    def construct_search(self, field_name, lookup_expr=None):
         lookup = self.lookup_prefixes.get(field_name[0])
         if lookup:
             field_name = field_name[1:]
         else:
-            lookup = "icontains"
+            lookup = lookup_expr
+        if field_name.endswith(lookup):
+            return field_name
         return LOOKUP_SEP.join([field_name, lookup])
 
     def find_filter_lookups(self, orm_lookups, search_term_key):
@@ -249,7 +255,10 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
                         # warn if the field doesn't exist.
                         if field is None:
                             undefined.append(field_name)
-
+                        # 更新默认字符串搜索为模糊搜索
+                        if isinstance(field, (models.CharField)) and filterset_fields == '__all__' and lookups == [
+                            'exact']:
+                            lookups = ['icontains']
                         for lookup_expr in lookups:
                             filter_name = cls.get_filter_name(field_name, lookup_expr)
 
@@ -298,7 +307,7 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
             for search_field in filterset.filters:
                 if isinstance(filterset.filters[search_field], CharFilter):
                     orm_lookups.append(
-                        self.construct_search(six.text_type(search_field))
+                        self.construct_search(six.text_type(search_field), filterset.filters[search_field].lookup_expr)
                     )
                 else:
                     orm_lookups.append(search_field)

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:8000'
 
 # 是否启用按钮权限
 VITE_PM_ENABLED = true

web/.gitignore

@@ -1,7 +1,8 @@
 .DS_Store
 node_modules
 /dist
-
+package-lock.json
+yarn.lock
 
 # local env files
 .env.local

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/App.vue

@@ -59,7 +59,12 @@ onBeforeMount(() => {
 	// 设置批量第三方 js
 	setIntroduction.jsCdn();
   //websockt 模块
-  websocket.init(wsReceive)
+  try {
+    websocket.init(wsReceive)
+  }catch (e) {
+    console.log("websocket错误")
+  }
+
 });
 // 页面加载时
 onMounted(() => {

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/plugin/permission/func.permission.ts

@@ -9,7 +9,7 @@ export default {
         return XEUtils.includeArrays(BtnPermission, value)
       }else if(typeof value === 'string'){
         const index = XEUtils.arrayIndexOf(BtnPermission, value)
-        return index>0?true:false
+        return index>-1?true:false
       }
      }
     return true

web/src/utils/service.ts

@@ -22,15 +22,19 @@ function createService() {
 		},
 		paramsSerializer: {
 			serialize(params) {
-				return qs.stringify(params, {
+				interface paramsObj {
-					indices: false,
+					[key: string]: any;
-					encoder: (val: string) => {
+				}
-						if (typeof val === 'boolean') {
+				let result:paramsObj = {};
-							return val ? 1 : 0;
+				for (const [key, value] of Object.entries(params)) {
-						}
+					if (value !== '') {
-						return val;
+						result[key] = value;
-					},
+					}
-				});
+					if(typeof value === 'boolean'){
+						result[key] = value? 'True': 'False';
+					}
+				}
+				return qs.stringify(result);
 			},
 		},
 	});

web/src/views/system/areas/crud.tsx

@@ -205,7 +205,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 							name: 'fs-dict-switch',
 							activeText: '',
 							inactiveText: '',
-							style: '--el-switch-on-color: #409eff; --el-switch-off-color: #dcdfe6',
+							style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
 							onChange: compute((context) => {
 								return () => {
 									api.UpdateObj(context.row).then((res: APIResponseData) => {

web/src/views/system/dept/index.vue

@@ -20,9 +20,9 @@
                         @node-click="handleNodeClick"
                     >
                         <template #default="{ node, data }">
-                            <span v-if="data.status" class="text-center font-black text-xl"><SvgIcon
+                            <span v-if="data.status" class="text-center font-black font-normal"><SvgIcon
                                 :name="node.data.icon"/>&nbsp;{{ node.label }}</span>
-                            <span v-else class="text-center font-black text-xl text-red-700"><SvgIcon
+                            <span v-else class="text-center font-black font-normal text-red-700"><SvgIcon
                                 :name="node.data.icon"/>&nbsp;{{ node.label }}</span>
                         </template>
                     </el-tree>
@@ -302,4 +302,7 @@ onMounted(() => {
 .el-card {
     height: 100%;
 }
+.font-normal {
+    font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+}
 </style>

web/src/views/system/dictionary/crud.tsx

@@ -179,7 +179,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 							name: 'fs-dict-switch',
 							activeText: '',
 							inactiveText: '',
-							style: '--el-switch-on-color: #409eff; --el-switch-off-color: #dcdfe6',
+							style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
 							onChange: compute((context) => {
 								return () => {
 									api.UpdateObj(context.row).then((res: APIResponseData) => {

web/src/views/system/fileList/index.vue

@@ -1,152 +1,26 @@
 <template>
   <fs-page>
-      <el-row style="margin: 10px">
+    <fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
-        <el-col :span="6" :offset="18">
-          <el-input
-              class="w-60"
-              placeholder="请输入名称"
-              v-model="fileParams.name"
-              @keyup.enter="getData"
-              clearable
-              @blur="getData"
-          >
-            <template #append>
-              <el-button :icon="Search" @click="getData">
-              </el-button>
-            </template>
-          </el-input>
-        </el-col>
-      </el-row>
-    <el-row :gutter="10" style="height: 65vh;margin: 10px">
-      <el-col :span="3" v-for="(item,index) in fileList" :key="index">
-        <el-card>
-          <el-image
-              style="width: 150px; height: 150px"
-              :src="formatImgUrl(item.url)"
-              :zoom-rate="1.2"
-              :preview-src-list="[formatImgUrl(item.url)]"
-              :initial-index="4"
-              fit="fill"
-          />
-          <div>
-            <el-text>{{ item.name }}</el-text>
-          </div>
-          <div>
-            <el-popover
-                placement="bottom"
-                :width="500"
-                trigger="click"
-            >
-              <template #reference>
-                <el-button type="text">详细</el-button>
-              </template>
-              <div>
-                <el-descriptions
-                    :column="2"
-                    border
-                >
-                  <el-descriptions-item label="文件名称">{{ item.name }}</el-descriptions-item>
-                  <el-descriptions-item label="创建人">{{ item.creator_name }}</el-descriptions-item>
-                  <el-descriptions-item label="存储引擎">{{ item.engine }}</el-descriptions-item>
-                  <el-descriptions-item label="创建时间">{{ item.create_datetime }}</el-descriptions-item>
-                </el-descriptions>
-              </div>
-            </el-popover>
-            <el-popconfirm title="您确定要删除?" @confirm="onDel(item)">
-              <template #reference>
-                <el-button type="text">删除</el-button>
-              </template>
-            </el-popconfirm>
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
-    <el-divider></el-divider>
-    <el-row style="margin-left: 10px">
-      <el-col :span="12" >
-        <el-pagination
-            v-model:current-page="pageConfig.page"
-            v-model:page-size="pageConfig.limit"
-            background
-            :page-sizes="[5, 10, 20, 50]"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="pageConfig.total"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-        />
-      </el-col>
-    </el-row>
   </fs-page>
 </template>
 
-<script lang="ts" setup name="fileList">
+<script lang="ts" setup>
-import {DelObj, GetList} from "./api";
+import { ref, onMounted } from 'vue';
-import {ref, onMounted,reactive} from "vue";
+import { useExpose, useCrud } from '@fast-crud/fast-crud';
-import {getBaseURL} from "/@/utils/baseUrl";
+import { createCrudOptions } from './crud';
-import {ElMessage} from "element-plus";
+// crud组件的ref
-import { Delete, Edit, Search, Share, Upload } from '@element-plus/icons-vue'
+const crudRef = ref();
-const fileParams = reactive({name:''})
+// crud 配置的ref
-const fileList = ref([])
+const crudBinding = ref();
-const mimeType = ref([])
+// 暴露的方法
-const pageConfig = reactive({
+const { crudExpose } = useExpose({ crudRef, crudBinding });
-  page:1,
+// 你的crud配置
-  limit:10,
+const { crudOptions } = createCrudOptions({ crudExpose });
-  total:0
+// 初始化crud配置
-})
+const { resetCrudOptions } = useCrud({ crudExpose, crudOptions });
-const getData = function () {
-  let params = {
-    page:pageConfig.page,
-    limit:pageConfig.limit,
-    name:fileParams.name
-  }
-  GetList(params).then((res: any) => {
-    const {data,page,limit,total} = res
-    pageConfig.page = page
-    pageConfig.limit=limit
-    pageConfig.total=total
-    fileList.value = data
-  })
-}
-
-
-const onDel = function (item: any) {
-  DelObj(item.id).then((res: any) => {
-    ElMessage.success("删除成功！");
-    getData()
-  })
-}
-const formatImgUrl = function (src: string) {
-  return getBaseURL() + src
-}
-
-const handleSizeChange = function (val: any) {
-  pageConfig.limit = val
-  getData()
-}
-
-const handleCurrentChange = function (val: any) {
-  pageConfig.page = val
-  getData()
-}
 
+// 页面打开后获取列表数据
 onMounted(() => {
-  getData()
+  crudExpose.doRefresh();
-})
+});
 </script>
-<style scoped>
-.demo-tabs > .el-tabs__content {
-  padding: 32px;
-  color: #6b778c;
-  font-size: 32px;
-  font-weight: 600;
-}
-
-.el-tabs--right .el-tabs__content,
-.el-tabs--left .el-tabs__content {
-  height: 100%;
-}
-
-.el-tabs__nav-scroll {
-  border-right: 1px solid #efefef;
-}
-</style>

web/src/views/system/login/api.ts

@@ -2,7 +2,7 @@ import { request } from "/@/utils/service";
 
 export function getCaptcha() {
     return request({
-        url: '/api/captcha',
+        url: '/api/captcha/',
         method: 'get',
     });
 }

web/src/views/system/menu/components/menuButton/api.ts

@@ -24,7 +24,7 @@ export function AddObj(obj: AddReq) {
 	});
 }
 
-export function UpdateObj(obj: EditReq) {
+export function UpdateObj(obj: any) {
 	return request({
 		url: apiPrefix + obj.id + '/',
 		method: 'put',

web/src/views/system/menu/components/menuButton/crud.tsx

@@ -24,7 +24,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 
 	};
 	const editRequest = async ({ form, row }: EditReq) => {
-		return await api.UpdateObj(row);
+		return await api.UpdateObj({ ...form, menu: row.menu });
 	};
 	const delRequest = async ({ row }: DelReq) => {
 		return await api.DelObj(row.id);
@@ -34,6 +34,16 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 	};
 	return {
 		crudOptions: {
+			search: {
+        container: {
+          action: {
+            //按钮栏配置
+            col: {
+              span: 8
+            }
+          }
+        },
+      },
 			rowHandle: {
 				//固定右侧
 				fixed: 'right',

web/src/views/system/menu/index.vue

@@ -19,10 +19,10 @@
                              @node-drop="nodeDrop" lazy icon="ArrowRightBold" :indent="12" draggable
                              @node-click="handleNodeClick">
                         <template #default="{ node, data }">
-							<span v-if="data.status" class="text-center font-black text-xl">
+							<span v-if="data.status" class="text-center font-black font-normal">
 								<SvgIcon :name="node.data.icon"/>&nbsp;{{ node.label }}
 							</span>
-                            <span v-else class="text-center font-black text-xl text-red-700">
+                            <span v-else class="text-center font-black text-red-700 font-normal">
 								<SvgIcon :name="node.data.icon"/>&nbsp;{{ node.label }}
 							</span>
                         </template>
@@ -394,4 +394,7 @@ onActivated(() => {
 .el-card {
     height: 100%;
 }
+.font-normal {
+    font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+}
 </style>

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

@@ -0,0 +1,117 @@
+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:{}
+    });
+}
+

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

@@ -0,0 +1,379 @@
+<template>
+  <el-drawer
+      size="70%"
+      v-model="drawer"
+      direction="rtl"
+      destroy-on-close
+      :before-close="handleClose"
+  >
+    <template #header>
+      <div>
+        <el-tag size="large" type="primary">当前角色:{{ editedRoleInfo.name }}</el-tag>
+      </div>
+    </template>
+    <div style="padding: 1em">
+      <div style="margin-bottom: 10px">
+        <el-button size="mini" 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>

web/src/views/system/role/crud.tsx

@@ -27,6 +27,8 @@ export const createCrudOptions = function ({ crudExpose, rolePermission }: { cru
 	//权限判定
 	const hasPermissions = inject("$hasPermissions")
 
+	// @ts-ignore
+	// @ts-ignore
 	return {
 		crudOptions: {
 			request: {
@@ -175,7 +177,7 @@ export const createCrudOptions = function ({ crudExpose, rolePermission }: { cru
 							name: 'fs-dict-switch',
 							activeText: '',
 							inactiveText: '',
-							style: '--el-switch-on-color: #409eff; --el-switch-off-color: #dcdfe6',
+							style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
 							onChange: compute((context) => {
 								return () => {
 									api.UpdateObj(context.row).then((res: APIResponseData) => {

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

@@ -5,7 +5,8 @@
 				<el-tag size="small">{{ scope.row.url }}</el-tag>
 			</template>
 		</fs-crud>
-		<RolePermission ref="rolePermission"></RolePermission>
+<!--		<RolePermission ref="rolePermission"></RolePermission>-->
+    <permission ref="rolePermission"></permission>
 	</fs-page>
 </template>
 
@@ -14,6 +15,7 @@ import { ref, onMounted } from 'vue';
 import { useExpose, useCrud, dict } from '@fast-crud/fast-crud';
 import { createCrudOptions } from './crud';
 import RolePermission from '/@/views/system/rolePermission/index.vue';
+import permission from './components/permission.vue'
 import * as api from './api';
 import _ from 'lodash-es';
 const rolePermission = ref();

web/src/views/system/rolePermission/index.vue

@@ -198,7 +198,7 @@ let menuData = ref<Tree>()
 const getMenuData = () => {
     api.GetMenu({}).then((res: any) => {
         const {data} = res
-        const list = XEUtils.toArrayTree(data, {parentKey: "parent", strict: true})
+        const list = XEUtils.toArrayTree(data, {parentKey: "parent", key:'menu_id',strict: true})
         menuData.value = list
     })
 }
@@ -212,11 +212,11 @@ const menuNodeClick = (node: any, obj: any) => {
     if (!node.is_catalog) {
         buttonOptions.value = []
         editedMenuInfo.value = node
-        api.GetMenuButton({menu: node.id}).then((res: any) => {
+        api.GetMenuButton({menu: node.menu_id}).then((res: any) => {
             const {data} = res
             buttonOptions.value = data
         })
-        api.getObj({menu: node.id, role: editedRoleInfo.value.id}).then((res: any) => {
+        api.getObj({menu: node.menu_id, role: editedRoleInfo.value.id}).then((res: any) => {
             const {data} = res
             buttonPermissionData.value = data
         })

web/src/views/system/user/crud.tsx

@@ -346,7 +346,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 							name: 'fs-dict-switch',
 							activeText: '',
 							inactiveText: '',
-							style: '--el-switch-on-color: #409eff; --el-switch-off-color: #dcdfe6',
+							style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
 							onChange: compute((context) => {
 								return () => {
 									api.UpdateObj(context.row).then((res: APIResponseData) => {

web/src/views/system/user/index.vue

@@ -23,7 +23,7 @@
 						@node-click="onTreeNodeClick"
 					>
 						<template #default="{ node, data }">
-							<span class="text-center font-black text-xl">{{ node.label }}</span>
+							<span class="text-center font-black font-normal">{{ node.label }}</span>
 						</template>
 					</el-tree>
 				</el-card>
@@ -142,4 +142,7 @@ onMounted(() => {
 .el-card {
 	height: 100%;
 }
+.font-normal {
+    font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+}
 </style>

web/src/views/system/whiteList/crud.tsx

@@ -217,7 +217,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 							name: 'fs-dict-switch',
 							activeText: '',
 							inactiveText: '',
-							style: '--el-switch-on-color: #409eff; --el-switch-off-color: #dcdfe6',
+							style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
 							onChange: compute((context) => {
 								return () => {
 									api.UpdateObj(context.row).then((res: APIResponseData) => {

web/vite.config.ts

@@ -17,7 +17,7 @@ const alias: Record<string, string> = {
 const viteConfig = defineConfig((mode: ConfigEnv) => {
 	const env = loadEnv(mode.mode, process.cwd());
 	return {
-		plugins: [vue(), vueJsx(),vueSetupExtend()],
+		plugins: [vue(), vueJsx(), vueSetupExtend()],
 		root: process.cwd(),
 		resolve: { alias },
 		base: mode.command === 'serve' ? './' : env.VITE_PUBLIC_PATH,
@@ -27,7 +27,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 		server: {
 			host: '0.0.0.0',
 			port: env.VITE_PORT as unknown as number,
-			open: env.VITE_OPEN,
+			open: true,
 			hmr: true,
 			proxy: {
 				'/gitee': {