diff --git a/backend/dvadmin/system/fixtures/init_menu.json b/backend/dvadmin/system/fixtures/init_menu.json index 4258872..b683f0a 100644 --- a/backend/dvadmin/system/fixtures/init_menu.json +++ b/backend/dvadmin/system/fixtures/init_menu.json @@ -167,19 +167,13 @@ "method": 0 }, { - "name": "查询所有", + "name": "获取所有部门", "value": "dept:SearchAll", "api": "/api/system/dept/all_dept/", "method": 0 }, { - "name": "懒加载查询所有", - "value": "dept:LazySearchAll", - "api": "/api/system/dept/dept_lazy_tree/", - "method": 0 - }, - { - "name": "头信息", + "name": "部门顶部信息", "value": "dept:HeaderInfo", "api": "/api/system/dept/dept_info/", "method": 0 diff --git a/backend/dvadmin/system/views/dept.py b/backend/dvadmin/system/views/dept.py index dfdbc82..de48b0d 100644 --- a/backend/dvadmin/system/views/dept.py +++ b/backend/dvadmin/system/views/dept.py @@ -10,6 +10,7 @@ from rest_framework.decorators import action from rest_framework.permissions import IsAuthenticated from dvadmin.system.models import Dept, RoleMenuButtonPermission, Users +from dvadmin.utils.filters import DataLevelPermissionsFilter from dvadmin.utils.json_response import DetailResponse, SuccessResponse, ErrorResponse from dvadmin.utils.serializers import CustomModelSerializer from dvadmin.utils.viewset import CustomModelViewSet @@ -125,17 +126,6 @@ class DeptViewSet(CustomModelViewSet): return SuccessResponse(data=data) @action(methods=["GET"], detail=False, permission_classes=[IsAuthenticated]) - def dept_lazy_tree(self, request, *args, **kwargs): - parent = self.request.query_params.get('parent') - is_superuser = request.user.is_superuser - if is_superuser: - queryset = Dept.objects.values('id', 'name', 'parent') - else: - queryset = Dept.objects.values('id', 'name', 'parent') - queryset = self.filter_queryset(queryset) - return DetailResponse(data=queryset, msg="获取成功") - - @action(methods=["GET"], detail=False, permission_classes=[IsAuthenticated], extra_filter_class=[]) def all_dept(self, request, *args, **kwargs): queryset = self.filter_queryset(self.get_queryset()) data = queryset.filter(status=True).order_by('sort').values('name', 'id', 'parent') diff --git a/backend/dvadmin/system/views/user.py b/backend/dvadmin/system/views/user.py index 559bdf1..116d71f 100644 --- a/backend/dvadmin/system/views/user.py +++ b/backend/dvadmin/system/views/user.py @@ -119,7 +119,6 @@ class UserUpdateSerializer(CustomModelSerializer): """ 更改激活状态 """ - print(111, value) if value: self.initial_data["login_error_count"] = 0 return value @@ -407,11 +406,11 @@ class UserViewSet(CustomModelViewSet): queryset = self.filter_queryset(self.get_queryset()) else: queryset = self.filter_queryset(self.get_queryset()) - print(queryset.values('id','name','dept__id')) + # print(queryset.values('id','name','dept__id')) page = self.paginate_queryset(queryset) if page is not None: serializer = self.get_serializer(page, many=True, request=request) - print(serializer.data) + # print(serializer.data) return self.get_paginated_response(serializer.data) serializer = self.get_serializer(queryset, many=True, request=request) diff --git a/web/src/views/plugins/dvadmin_form_flow/install.js b/web/src/views/plugins/dvadmin_form_flow/install.js deleted file mode 100644 index 02154d4..0000000 --- a/web/src/views/plugins/dvadmin_form_flow/install.js +++ /dev/null @@ -1,73 +0,0 @@ -import axios from 'axios' - -import VFormDesigner from '@/components/form-designer/index.vue' -import VFormRender from '@/components/form-render/index.vue' - -import Draggable from '@/../lib/vuedraggable/dist/vuedraggable.umd.js' -import {registerIcon} from '@/utils/el-icons' -import 'virtual:svg-icons-register' -import '@/iconfont/iconfont.css' - -import ContainerWidgets from '@/components/form-designer/form-widget/container-widget/index' -import ContainerItems from '@/components/form-render/container-item/index' - -import { addDirective } from '@/utils/directive' -import { installI18n } from '@/utils/i18n' -import { loadExtension } from '@/extension/extension-loader' - - -VFormDesigner.install = function (app) { - addDirective(app) - installI18n(app) - loadExtension(app) - - app.use(ContainerWidgets) - app.use(ContainerItems) - - registerIcon(app) - app.component('draggable', Draggable) - app.component(VFormDesigner.name, VFormDesigner) -} - -VFormRender.install = function (app) { - installI18n(app) - loadExtension(app) - - app.use(ContainerItems) - - registerIcon(app) - app.component(VFormRender.name, VFormRender) -} - -const components = [ - VFormDesigner, - VFormRender -] - -const install = (app) => { - addDirective(app) - installI18n(app) - loadExtension(app) - - app.use(ContainerWidgets) - app.use(ContainerItems) - - registerIcon(app) - app.component('draggable', Draggable) - - components.forEach(component => { - app.component(component.name, component) - }) - - window.axios = axios -} - -if (typeof window !== 'undefined' && window.Vue) { /* scriptʽʱֵaxios */ - //window.axios = axios -} - -export default { - install, - VFormDesigner, - VFormRender -} diff --git a/web/src/views/plugins/dvadmin_form_flow/src/index.ts b/web/src/views/plugins/dvadmin_form_flow/src/index.ts deleted file mode 100644 index c57cc05..0000000 --- a/web/src/views/plugins/dvadmin_form_flow/src/index.ts +++ /dev/null @@ -1,29 +0,0 @@ -// -import DVAFormDesigner from './components/DVAFormDesigner.vue' - -// 浽һ -const components = [ - DVAFormDesigner -] - -// install -const install = function (Vue) { - - if (install.installed) return - install.installed = true - // бעȫ - components.map(component => { - Vue.component(component.name, component) //component.name ˴ʹõvueļе name - }) -} - -if (typeof window !== 'undefined' && window.Vue) { - install(window.Vue) -} - -export default { - // Ķ߱һ install - install, - // б - ...components -} diff --git a/web/src/views/system/user/index.vue b/web/src/views/system/user/index.vue index 4ea5033..71085d1 100644 --- a/web/src/views/system/user/index.vue +++ b/web/src/views/system/user/index.vue @@ -98,7 +98,6 @@ const getData = () => { const result = XEUtils.toArrayTree(responseData, { parentKey: 'parent', children: 'children', - strict: true, }); data.value = result;