From d05df2d778886d9714d01db41581f7c480bf6ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Fri, 9 Dec 2022 23:55:47 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=94=99=E8=AF=AF=E6=97=B6=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84verbase=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/utils/exception.py | 12 +++++++----- backend/dvadmin/utils/serializers.py | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/backend/dvadmin/utils/exception.py b/backend/dvadmin/utils/exception.py index b9d2d51..2cf9150 100644 --- a/backend/dvadmin/utils/exception.py +++ b/backend/dvadmin/utils/exception.py @@ -10,6 +10,7 @@ import logging import traceback from django.db.models import ProtectedError +from django.http import Http404 from rest_framework.exceptions import APIException as DRFAPIException, AuthenticationFailed from rest_framework.views import set_rollback @@ -33,9 +34,15 @@ def CustomExceptionHandler(ex, context): if isinstance(ex, AuthenticationFailed): code = 401 msg = ex.detail + elif isinstance(ex,Http404): + code = 400 + msg = "接口地址不正确" elif isinstance(ex, DRFAPIException): set_rollback() msg = ex.detail + for k, v in msg.items(): + for i in v: + msg = "%s:%s" % (k, i) elif isinstance(ex, ProtectedError): set_rollback() msg = "删除失败:该条数据与其他数据有相关绑定" @@ -45,9 +52,4 @@ def CustomExceptionHandler(ex, context): elif isinstance(ex, Exception): logger.error(traceback.format_exc()) msg = str(ex) - - # errorMsg = msg - # for key in errorMsg: - # msg = errorMsg[key][0] - return ErrorResponse(msg=msg, code=code) diff --git a/backend/dvadmin/utils/serializers.py b/backend/dvadmin/utils/serializers.py index 90a685e..c2b047d 100644 --- a/backend/dvadmin/utils/serializers.py +++ b/backend/dvadmin/utils/serializers.py @@ -104,6 +104,24 @@ class CustomModelSerializer(DynamicFieldsMixin, ModelSerializer): return getattr(self.request.user, "id", None) return None + @property + def errors(self): + # get errors + errors = super().errors + verbose_errors = {} + + # fields = { field.name: field.verbose_name } for each field in model + fields = {field.name: field.verbose_name for field in + self.Meta.model._meta.get_fields() if hasattr(field, 'verbose_name')} + + # iterate over errors and replace error key with verbose name if exists + for field_name, error in errors.items(): + if field_name in fields: + verbose_errors[str(fields[field_name])] = error + else: + verbose_errors[field_name] = error + return verbose_errors + # @cached_property # def fields(self): # fields = BindingDict(self) From f6e8fb3d095dd44199f55da1d9395ad4a8fec0a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Wed, 28 Dec 2022 15:59:38 +0800 Subject: [PATCH 02/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.权限优化;2.导入更新 --- backend/dvadmin/system/views/menu.py | 4 +- web/src/components/importExcel/index.vue | 96 +++++++++++++------ web/src/views/system/dept/crud.js | 9 +- web/src/views/system/dept/index.vue | 1 + web/src/views/system/rolePermission/api.js | 14 +++ web/src/views/system/rolePermission/index.vue | 7 ++ web/src/views/system/user/index.vue | 12 +++ 7 files changed, 108 insertions(+), 35 deletions(-) diff --git a/backend/dvadmin/system/views/menu.py b/backend/dvadmin/system/views/menu.py index 3f2309c..3078d34 100644 --- a/backend/dvadmin/system/views/menu.py +++ b/backend/dvadmin/system/views/menu.py @@ -180,9 +180,7 @@ class MenuViewSet(CustomModelViewSet): return SuccessResponse(data=data, total=len(data), msg="获取成功") def list(self,request): - """ - 懒加载 - """ + """懒加载""" params = request.query_params parent = params.get('parent', None) if params: diff --git a/web/src/components/importExcel/index.vue b/web/src/components/importExcel/index.vue index 118e77b..2b3de92 100644 --- a/web/src/components/importExcel/index.vue +++ b/web/src/components/importExcel/index.vue @@ -3,36 +3,47 @@ 导入 - - - -
- 将文件拖到此处，或 - 点击上传 + + + +
+ 将文件拖到此处，或 + 点击上传 +
+
+ + + + + +
如果导入时需要更新数据,则请选择一个字段作为更新依据
+
+
提示：仅允许导入“xls”或“xlsx”格式文件！
+ +
+ 下载模板
-
- - +
+ 确 定 + 取 消
-
提示：仅允许导入“xls”或“xlsx”格式文件！
- -
下载模板
-
- 确 定 - 取 消 -
- +
@@ -68,6 +79,18 @@ export default { default () { return undefined } + }, + updateFieldApi: { + type: String, + default () { + return undefined + } + }, + fieldOptions: { + type: Array, + default () { + return [] + } } }, methods: { @@ -99,7 +122,8 @@ export default { method: 'post', data: { url: response.data.url, - updateSupport: that.upload.updateSupport + updateSupport: that.upload.updateSupport, + updateField: that.upload.updateField } }).then(response => { // this.$alert("导入成功！", "导入结果", { dangerouslyUseHTMLString: true }); @@ -114,7 +138,21 @@ export default { // 提交上传文件 submitFileForm () { this.$refs.upload.submit() + }, + getUpdateField () { + const that = this + if (that.updateFieldApi) { + return request({ + url: that.updateFieldApi, + method: 'get' + }).then(res => { + that.fieldOptions = res.data + }) + } } + }, + mounted () { + this.getUpdateField() } } diff --git a/web/src/views/system/dept/crud.js b/web/src/views/system/dept/crud.js index b3ff85c..b9dd086 100644 --- a/web/src/views/system/dept/crud.js +++ b/web/src/views/system/dept/crud.js @@ -1,10 +1,10 @@ import * as api from './api' export const crudOptions = (vm) => { return { - // pagination: false, pageOptions: { compact: true }, + pagination: false, options: { tableType: 'vxe-table', stripe: false, @@ -14,10 +14,13 @@ export const crudOptions = (vm) => { highlightCurrentRow: false, defaultExpandAll: true, treeConfig: { + transform: true, + rowField: 'id', + parentField: 'parent', + hasChild: 'hasChild', lazy: true, - hasChild: 'has_children', loadMethod: ({ row }) => { - return api.GetList({ parent: row.id, lazy: true }).then(ret => { + return api.GetList({ parent: row.id }).then(ret => { return ret.data.data }) }, diff --git a/web/src/views/system/dept/index.vue b/web/src/views/system/dept/index.vue index b479d48..6990e64 100644 --- a/web/src/views/system/dept/index.vue +++ b/web/src/views/system/dept/index.vue @@ -18,6 +18,7 @@ > 导入 diff --git a/web/src/views/system/rolePermission/api.js b/web/src/views/system/rolePermission/api.js index 2b6eb6b..57c0391 100644 --- a/web/src/views/system/rolePermission/api.js +++ b/web/src/views/system/rolePermission/api.js @@ -55,3 +55,17 @@ export function GetMenuData (obj) { return res.data.data }) } + +/** + * 获取数据权限 + * @param obj + * @returns {*} + * @constructor + */ +export function GetDataScope () { + return request({ + url: '/api/system/role/data_scope/', + method: 'get', + params: {} + }) +} diff --git a/web/src/views/system/rolePermission/index.vue b/web/src/views/system/rolePermission/index.vue index e47e53d..25555b4 100644 --- a/web/src/views/system/rolePermission/index.vue +++ b/web/src/views/system/rolePermission/index.vue @@ -202,6 +202,7 @@ export default { this.menuCheckedKeys = this.roleObj.menu // 加载已勾选的菜单 this.menuCheckStrictly = true // 父子不相互关联 this.deptCheckedKeys = this.roleObj.dept + this.GetDataScope() }, addRequest (row) { return api.createObj(row) @@ -238,6 +239,12 @@ export default { }) }) }, + //获取权限范围 + GetDataScope(){ + api.GetDataScope().then(res=>{ + this.dataScopeOptions = res.data + }) + }, // 所有勾选菜单节点数据 getMenuAllCheckedKeys () { // 目前被选中的菜单节点 diff --git a/web/src/views/system/user/index.vue b/web/src/views/system/user/index.vue index 21293a0..be8e519 100644 --- a/web/src/views/system/user/index.vue +++ b/web/src/views/system/user/index.vue @@ -198,6 +198,18 @@ export default { that.$message.error('表单校验失败，请检查') } }) + }, + //部门懒加载 + loadChildrenMethod({ row} ){ + return new Promise(resolve => { + setTimeout(() => { + const childs = [ + { id: row.id + 100000, parent: row.id, name: row.name + 'Test45', type: 'mp4', size: null, date: '2021-10-03', hasChild: true }, + { id: row.id + 150000, parent: row.id, name: row.name + 'Test56', type: 'mp3', size: null, date: '2021-07-09', hasChild: false } + ] + resolve(childs) + }, 500) + }) } } } From 43e21c9c64fc75d011ceb7a495f5024c4a406678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Thu, 29 Dec 2022 13:07:47 +0800 Subject: [PATCH 03/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=EF=BC=8C=E5=90=8C=E6=AD=A5=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/dept.py | 47 +++++++--------- backend/dvadmin/system/views/role.py | 59 ++++++++++++++++++-- backend/dvadmin/utils/exception.py | 7 ++- backend/dvadmin/utils/import_export_mixin.py | 19 +++++-- 4 files changed, 92 insertions(+), 40 deletions(-) diff --git a/backend/dvadmin/system/views/dept.py b/backend/dvadmin/system/views/dept.py index 8239c85..743fa79 100644 --- a/backend/dvadmin/system/views/dept.py +++ b/backend/dvadmin/system/views/dept.py @@ -22,6 +22,13 @@ class DeptSerializer(CustomModelSerializer): parent_name = serializers.CharField(read_only=True, source='parent.name') status_label = serializers.SerializerMethodField() has_children = serializers.SerializerMethodField() + hasChild = serializers.SerializerMethodField() + + def get_hasChild(self, instance): + hasChild = Dept.objects.filter(parent=instance.id) + if hasChild: + return True + return False def get_status_label(self, obj: Dept): if obj.status: @@ -133,31 +140,19 @@ class DeptViewSet(CustomModelViewSet): def list(self, request, *args, **kwargs): # 如果懒加载，则只返回父级 - queryset = self.filter_queryset(self.get_queryset()) - lazy = self.request.query_params.get('lazy') - parent = self.request.query_params.get('parent') - if lazy: - # 如果懒加载模式，返回全部 - if not parent: - role_list = request.user.role.filter(status=1).values("admin", "data_range") - is_admin = False - for ele in role_list: - if 3 == ele.get("data_range") or ele.get("admin") == True: - is_admin = True - break - if self.request.user.is_superuser or is_admin: - queryset = queryset.filter(parent__isnull=True) - else: - queryset = queryset.filter(id=self.request.user.dept_id) - serializer = self.get_serializer(queryset, many=True, request=request) - return SuccessResponse(data=serializer.data, msg="获取成功") - - 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="获取成功") + params = request.query_params + parent = params.get('parent', None) + if params: + if parent: + queryset = self.queryset.filter(status=True, parent=parent) + else: + queryset = self.queryset.filter(status=True) + else: + queryset = self.queryset.filter(status=True, parent__isnull=True) + queryset = self.filter_queryset(queryset) + serializer = DeptSerializer(queryset, many=True, request=request) + data = serializer.data + return SuccessResponse(data=data) def dept_lazy_tree(self, request, *args, **kwargs): parent = self.request.query_params.get('parent') @@ -170,9 +165,9 @@ class DeptViewSet(CustomModelViewSet): data = queryset.filter(status=True).order_by('sort').values('name', 'id', 'parent') return DetailResponse(data=data, msg="获取成功") + @action(methods=["GET"], detail=False, permission_classes=[AnonymousUserPermission]) def all_dept(self, request, *args, **kwargs): - self.extra_filter_backends = [] queryset = self.filter_queryset(self.get_queryset()) data = queryset.filter(status=True).order_by('sort').values('name', 'id', 'parent') return DetailResponse(data=data, msg="获取成功") diff --git a/backend/dvadmin/system/views/role.py b/backend/dvadmin/system/views/role.py index 66aac90..e1acf87 100644 --- a/backend/dvadmin/system/views/role.py +++ b/backend/dvadmin/system/views/role.py @@ -8,12 +8,13 @@ """ from rest_framework import serializers from rest_framework.decorators import action +from rest_framework.permissions import IsAuthenticated from dvadmin.system.models import Role, Menu from dvadmin.system.views.dept import DeptSerializer from dvadmin.system.views.menu import MenuSerializer from dvadmin.system.views.menu_button import MenuButtonSerializer -from dvadmin.utils.json_response import SuccessResponse +from dvadmin.utils.json_response import SuccessResponse, DetailResponse from dvadmin.utils.serializers import CustomModelSerializer from dvadmin.utils.validator import CustomUniqueValidator from dvadmin.utils.viewset import CustomModelViewSet @@ -96,12 +97,58 @@ class RoleViewSet(CustomModelViewSet): serializer_class = RoleSerializer create_serializer_class = RoleCreateUpdateSerializer update_serializer_class = RoleCreateUpdateSerializer + search_fields = ['name','key'] - @action(methods=['GET'], detail=True, permission_classes=[]) - def roleId_get_menu(self, request, *args, **kwargs): + @action(methods=['GET'], detail=True, permission_classes=[IsAuthenticated]) + def roleId_get_menu(self, request,pk): """通过角色id获取该角色用于的菜单""" - # instance = self.get_object() - # queryset = instance.menu.all() - queryset = Menu.objects.filter(status=1).all() + instance = Role.objects.filter(id=pk).first() + queryset = instance.menu.all() + # queryset = Menu.objects.filter(status=1).all() + queryset = self.filter_queryset(queryset) serializer = MenuPermissonSerializer(queryset, many=True) return SuccessResponse(data=serializer.data) + + @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated]) + def data_scope(self,request): + is_superuser = request.user.is_superuser + is_admin = Role.objects.filter(users__id=request.user.id,admin=True) + if is_superuser or is_admin: + data = [ + { + "value": 0, + "label": '仅本人数据权限' + }, + { + "value": 1, + "label": '本部门及以下数据权限' + }, + { + "value": 2, + "label": '本部门数据权限' + }, + { + "value": 3, + "label": '全部数据权限' + }, + { + "value": 4, + "label": '自定义数据权限' + } + ] + else: + data = [ + { + "value": 0, + "label": '仅本人数据权限' + }, + { + "value": 1, + "label": '本部门及以下数据权限' + }, + { + "value": 2, + "label": '本部门数据权限' + } + ] + return DetailResponse(data=data) diff --git a/backend/dvadmin/utils/exception.py b/backend/dvadmin/utils/exception.py index 2cf9150..a6996df 100644 --- a/backend/dvadmin/utils/exception.py +++ b/backend/dvadmin/utils/exception.py @@ -40,9 +40,10 @@ def CustomExceptionHandler(ex, context): elif isinstance(ex, DRFAPIException): set_rollback() msg = ex.detail - for k, v in msg.items(): - for i in v: - msg = "%s:%s" % (k, i) + if isinstance(msg,dict): + for k, v in msg.items(): + for i in v: + msg = "%s:%s" % (k, i) elif isinstance(ex, ProtectedError): set_rollback() msg = "删除失败:该条数据与其他数据有相关绑定" diff --git a/backend/dvadmin/utils/import_export_mixin.py b/backend/dvadmin/utils/import_export_mixin.py index 39913fb..45e08db 100644 --- a/backend/dvadmin/utils/import_export_mixin.py +++ b/backend/dvadmin/utils/import_export_mixin.py @@ -57,6 +57,11 @@ class ImportSerializerMixin: length += 2.1 if ord(char) > 256 else 1 return round(length, 1) if length <= self.export_column_width else self.export_column_width + @action(methods=['get'],detail=False) + def update_field(self,request:Request): + data = [{"label":value,"value":key} for key,value in self.import_field_dict.items()] + return DetailResponse(data=data) + @action(methods=['get','post'],detail=False) @transaction.atomic # Django 事务,防止出错 def import_data(self, request: Request, *args, **kwargs): @@ -148,12 +153,15 @@ class ImportSerializerMixin: unique_list = [ ele.name for ele in queryset.model._meta.get_fields() if hasattr(ele, "unique") and ele.unique == True ] + updateField = request.data.get("updateField") for ele in data: - # 获取 unique 字段 - if queryset.model._meta.unique_together: # 判断是否存在联合主键 - filter_dic = {i: ele.get(i) for i in list(queryset.model._meta.unique_together[0])} - else: - filter_dic = {i: ele.get(i) for i in list(set(unique_list)) if ele.get(i) is not None} + # # 获取 unique 字段 + # if queryset.model._meta.unique_together: # 判断是否存在联合主键 + # filter_dic = {i: ele.get(i) for i in list(queryset.model._meta.unique_together[0])} + # else: + # filter_dic = {i: ele.get(i) for i in list(set(unique_list)) if ele.get(i) is not None} + filter_dic = {updateField:ele.get(updateField)} + print(162,filter_dic) instance = filter_dic and queryset.filter(**filter_dic).first() if instance and not updateSupport: continue @@ -207,6 +215,7 @@ class ExportSerializerMixin: length += 2.1 if ord(char) > 256 else 1 return round(length, 1) if length <= self.export_column_width else self.export_column_width + @action(methods=['get'],detail=False) def export_data(self, request: Request, *args, **kwargs): """ 导出功能 From 8158d2b981d917be6cd5a89b20cd82e7a53e6ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Thu, 29 Dec 2022 14:44:39 +0800 Subject: [PATCH 04/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=88=E6=9D=83=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/menu_button.py | 2 +- backend/dvadmin/system/views/role.py | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/backend/dvadmin/system/views/menu_button.py b/backend/dvadmin/system/views/menu_button.py index 4c4d2eb..f32bcb4 100644 --- a/backend/dvadmin/system/views/menu_button.py +++ b/backend/dvadmin/system/views/menu_button.py @@ -18,7 +18,7 @@ class MenuButtonSerializer(CustomModelSerializer): class Meta: model = MenuButton - fields = "__all__" + fields = ['id','name','value','api','method'] read_only_fields = ["id"] diff --git a/backend/dvadmin/system/views/role.py b/backend/dvadmin/system/views/role.py index e1acf87..be9a1a2 100644 --- a/backend/dvadmin/system/views/role.py +++ b/backend/dvadmin/system/views/role.py @@ -81,7 +81,7 @@ class MenuPermissonSerializer(CustomModelSerializer): class Meta: model = Menu - fields = '__all__' + fields = ['id','parent','name','menuPermission'] class RoleViewSet(CustomModelViewSet): @@ -102,12 +102,18 @@ class RoleViewSet(CustomModelViewSet): @action(methods=['GET'], detail=True, permission_classes=[IsAuthenticated]) def roleId_get_menu(self, request,pk): """通过角色id获取该角色用于的菜单""" - instance = Role.objects.filter(id=pk).first() - queryset = instance.menu.all() - # queryset = Menu.objects.filter(status=1).all() + is_superuser = request.user.is_superuser + is_admin = Role.objects.filter(id=pk, admin=True).first() + if is_superuser or is_admin: + queryset = Menu.objects.filter(status=1).all() + else: + instance = Role.objects.filter(id=pk).first() + queryset = instance.menu.all() + print(111, queryset) queryset = self.filter_queryset(queryset) serializer = MenuPermissonSerializer(queryset, many=True) - return SuccessResponse(data=serializer.data) + print(114, serializer.data) + return DetailResponse(data=serializer.data) @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated]) def data_scope(self,request): From f2e474bf12ee2f3e3e44e442c37ac6071bd2042f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Thu, 29 Dec 2022 15:21:31 +0800 Subject: [PATCH 05/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=201?= =?UTF-8?q?.=E6=9D=83=E9=99=90=E4=BC=98=E5=8C=96;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/role.py | 2 -- web/src/views/system/rolePermission/api.js | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/dvadmin/system/views/role.py b/backend/dvadmin/system/views/role.py index be9a1a2..81b1d42 100644 --- a/backend/dvadmin/system/views/role.py +++ b/backend/dvadmin/system/views/role.py @@ -109,10 +109,8 @@ class RoleViewSet(CustomModelViewSet): else: instance = Role.objects.filter(id=pk).first() queryset = instance.menu.all() - print(111, queryset) queryset = self.filter_queryset(queryset) serializer = MenuPermissonSerializer(queryset, many=True) - print(114, serializer.data) return DetailResponse(data=serializer.data) @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated]) diff --git a/web/src/views/system/rolePermission/api.js b/web/src/views/system/rolePermission/api.js index 57c0391..d0b4631 100644 --- a/web/src/views/system/rolePermission/api.js +++ b/web/src/views/system/rolePermission/api.js @@ -52,7 +52,7 @@ export function GetMenuData (obj) { params: {} }).then(res => { // 将列表数据转换为树形数据 - return res.data.data + return res.data }) } From 0a3516369ed5ef3fe55731530eacb074c6cdb5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Fri, 30 Dec 2022 14:33:06 +0800 Subject: [PATCH 06/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/role.py | 95 +++++++++++++++++++--------- 1 file changed, 65 insertions(+), 30 deletions(-) diff --git a/backend/dvadmin/system/views/role.py b/backend/dvadmin/system/views/role.py index 81b1d42..3bf3c6e 100644 --- a/backend/dvadmin/system/views/role.py +++ b/backend/dvadmin/system/views/role.py @@ -81,7 +81,7 @@ class MenuPermissonSerializer(CustomModelSerializer): class Meta: model = Menu - fields = ['id','parent','name','menuPermission'] + fields = ['id', 'parent', 'name', 'menuPermission'] class RoleViewSet(CustomModelViewSet): @@ -97,14 +97,14 @@ class RoleViewSet(CustomModelViewSet): serializer_class = RoleSerializer create_serializer_class = RoleCreateUpdateSerializer update_serializer_class = RoleCreateUpdateSerializer - search_fields = ['name','key'] + search_fields = ['name', 'key'] @action(methods=['GET'], detail=True, permission_classes=[IsAuthenticated]) - def roleId_get_menu(self, request,pk): + def roleId_get_menu(self, request, pk): """通过角色id获取该角色用于的菜单""" is_superuser = request.user.is_superuser is_admin = Role.objects.filter(id=pk, admin=True).first() - if is_superuser or is_admin: + if is_superuser or is_admin : queryset = Menu.objects.filter(status=1).all() else: instance = Role.objects.filter(id=pk).first() @@ -114,33 +114,10 @@ class RoleViewSet(CustomModelViewSet): return DetailResponse(data=serializer.data) @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated]) - def data_scope(self,request): + def data_scope(self, request): is_superuser = request.user.is_superuser - is_admin = Role.objects.filter(users__id=request.user.id,admin=True) - if is_superuser or is_admin: - data = [ - { - "value": 0, - "label": '仅本人数据权限' - }, - { - "value": 1, - "label": '本部门及以下数据权限' - }, - { - "value": 2, - "label": '本部门数据权限' - }, - { - "value": 3, - "label": '全部数据权限' - }, - { - "value": 4, - "label": '自定义数据权限' - } - ] - else: + role_queryset = Role.objects.filter(users__id=request.user.id).values_list('data_range', flat=True) + if is_superuser: data = [ { "value": 0, @@ -153,6 +130,64 @@ class RoleViewSet(CustomModelViewSet): { "value": 2, "label": '本部门数据权限' + }, + { + "value": 3, + "label": '全部数据权限' + }, + { + "value": 4, + "label": '自定义数据权限' } ] + else: + data = [] + data_range_list = list(set(role_queryset)) + for item in data_range_list: + if item == 0: + data = [{ + "value": 0, + "label": '仅本人数据权限' + }] + elif item == 1: + data = [{ + "value": 0, + "label": '仅本人数据权限' + }, { + "value": 1, + "label": '本部门及以下数据权限' + }, + { + "value": 2, + "label": '本部门数据权限' + }] + elif item == 2: + data = [{ + "value": 0, + "label": '仅本人数据权限' + }, + { + "value": 2, + "label": '本部门数据权限' + }] + elif item == 3: + data = [{ + "value": 0, + "label": '仅本人数据权限' + }, + { + "value": 3, + "label": '全部数据权限' + }, ] + elif item == 4: + data = [{ + "value": 0, + "label": '仅本人数据权限' + }, + { + "value": 4, + "label": '自定义数据权限' + }] + else: + data = [] return DetailResponse(data=data) From 977e75dd5062a0b85c8ef0d995017ba6f585269c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Fri, 30 Dec 2022 15:08:51 +0800 Subject: [PATCH 07/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95=E6=8E=88=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/role.py | 30 ++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/backend/dvadmin/system/views/role.py b/backend/dvadmin/system/views/role.py index 3bf3c6e..da4f951 100644 --- a/backend/dvadmin/system/views/role.py +++ b/backend/dvadmin/system/views/role.py @@ -10,7 +10,7 @@ from rest_framework import serializers from rest_framework.decorators import action from rest_framework.permissions import IsAuthenticated -from dvadmin.system.models import Role, Menu +from dvadmin.system.models import Role, Menu, MenuButton from dvadmin.system.views.dept import DeptSerializer from dvadmin.system.views.menu import MenuSerializer from dvadmin.system.views.menu_button import MenuButtonSerializer @@ -77,7 +77,17 @@ class MenuPermissonSerializer(CustomModelSerializer): """ 菜单的按钮权限 """ - menuPermission = MenuButtonSerializer(many=True, read_only=True) + menuPermission = serializers.SerializerMethodField() + + def get_menuPermission(self, instance): + is_superuser = self.request.user.is_superuser + if is_superuser: + queryset = MenuButton.objects.filter(menu__id=instance.id) + else: + menu_permission_id_list = self.request.user.role.values_list('permission',flat=True) + queryset = MenuButton.objects.filter(id__in=menu_permission_id_list,menu__id=instance.id) + serializer = MenuButtonSerializer(queryset,many=True, read_only=True) + return serializer.data class Meta: model = Menu @@ -99,18 +109,18 @@ class RoleViewSet(CustomModelViewSet): update_serializer_class = RoleCreateUpdateSerializer search_fields = ['name', 'key'] - @action(methods=['GET'], detail=True, permission_classes=[IsAuthenticated]) - def roleId_get_menu(self, request, pk): - """通过角色id获取该角色用于的菜单""" + @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated]) + def role_get_menu(self, request): + """根据当前用户的角色返回角色拥有的菜单""" is_superuser = request.user.is_superuser - is_admin = Role.objects.filter(id=pk, admin=True).first() - if is_superuser or is_admin : + is_admin = request.user.role.values_list('admin',flat=True) + if is_superuser or True in is_admin: queryset = Menu.objects.filter(status=1).all() else: - instance = Role.objects.filter(id=pk).first() - queryset = instance.menu.all() + menu_id_list = request.user.role.values_list('menu',flat=True) + queryset = Menu.objects.filter(id__in=menu_id_list) queryset = self.filter_queryset(queryset) - serializer = MenuPermissonSerializer(queryset, many=True) + serializer = MenuPermissonSerializer(queryset, many=True,request=request) return DetailResponse(data=serializer.data) @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated]) From 9f523f6eba66ac1fcb70bbe07cfab57927e19689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Fri, 30 Dec 2022 16:57:53 +0800 Subject: [PATCH 08/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/dept.py | 19 ++++++++++++------- backend/dvadmin/system/views/role.py | 18 ++++++++++++++++-- .../components/header-user/userinfo.vue | 1 - web/src/views/system/role/crud.js | 8 ++++---- web/src/views/system/role/index.vue | 5 +++++ web/src/views/system/rolePermission/api.js | 15 ++++++++++++++- web/src/views/system/rolePermission/index.vue | 2 +- 7 files changed, 52 insertions(+), 16 deletions(-) diff --git a/backend/dvadmin/system/views/dept.py b/backend/dvadmin/system/views/dept.py index 743fa79..52dc1df 100644 --- a/backend/dvadmin/system/views/dept.py +++ b/backend/dvadmin/system/views/dept.py @@ -156,14 +156,19 @@ class DeptViewSet(CustomModelViewSet): def dept_lazy_tree(self, request, *args, **kwargs): parent = self.request.query_params.get('parent') - queryset = self.filter_queryset(self.get_queryset()) - if not parent: - if self.request.user.is_superuser: - queryset = queryset.filter(parent__isnull=True) + is_superuser = request.user.is_superuser + if is_superuser: + if parent: + queryset = Dept.objects.filter(parent=parent).values('id', 'name', 'parent') else: - queryset = queryset.filter(id=self.request.user.dept_id) - data = queryset.filter(status=True).order_by('sort').values('name', 'id', 'parent') - return DetailResponse(data=data, msg="获取成功") + queryset = Dept.objects.filter(parent__isnull=True).values('id', 'name', 'parent') + else: + dept_list = request.user.role.values_list('dept', flat=True) + if parent: + queryset = Dept.objects.filter(id__in=dept_list,parent=parent).values('id', 'name', 'parent') + else: + queryset = Dept.objects.filter(id__in=dept_list,parent__isnull=True).values('id', 'name', 'parent') + return DetailResponse(data=queryset, msg="获取成功") @action(methods=["GET"], detail=False, permission_classes=[AnonymousUserPermission]) diff --git a/backend/dvadmin/system/views/role.py b/backend/dvadmin/system/views/role.py index da4f951..727e355 100644 --- a/backend/dvadmin/system/views/role.py +++ b/backend/dvadmin/system/views/role.py @@ -10,7 +10,7 @@ from rest_framework import serializers from rest_framework.decorators import action from rest_framework.permissions import IsAuthenticated -from dvadmin.system.models import Role, Menu, MenuButton +from dvadmin.system.models import Role, Menu, MenuButton, Dept from dvadmin.system.views.dept import DeptSerializer from dvadmin.system.views.menu import MenuSerializer from dvadmin.system.views.menu_button import MenuButtonSerializer @@ -62,6 +62,9 @@ class RoleCreateUpdateSerializer(CustomModelSerializer): return super().validate(attrs) def save(self, **kwargs): + is_superuser = self.request.user.is_superuser + if not is_superuser: + self.validated_data.pop('admin') data = super().save(**kwargs) data.dept.set(self.initial_data.get('dept', [])) data.menu.set(self.initial_data.get('menu', [])) @@ -119,7 +122,7 @@ class RoleViewSet(CustomModelViewSet): else: menu_id_list = request.user.role.values_list('menu',flat=True) queryset = Menu.objects.filter(id__in=menu_id_list) - queryset = self.filter_queryset(queryset) + # queryset = self.filter_queryset(queryset) serializer = MenuPermissonSerializer(queryset, many=True,request=request) return DetailResponse(data=serializer.data) @@ -201,3 +204,14 @@ class RoleViewSet(CustomModelViewSet): else: data = [] return DetailResponse(data=data) + + @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated]) + def data_scope_dept(self,request): + """根据当前角色获取部门信息""" + is_superuser = request.user.is_superuser + if is_superuser: + queryset = Dept.objects.values('id','name','parent') + else: + dept_list = request.user.role.values_list('dept',flat=True) + queryset = Dept.objects.filter(id__in=dept_list).values('id','name','parent') + return DetailResponse(data=queryset) \ No newline at end of file diff --git a/web/src/layout/header-aside/components/header-user/userinfo.vue b/web/src/layout/header-aside/components/header-user/userinfo.vue index b46522e..d02c51d 100644 --- a/web/src/layout/header-aside/components/header-user/userinfo.vue +++ b/web/src/layout/header-aside/components/header-user/userinfo.vue @@ -279,7 +279,6 @@ export default { * @param file */ handleAvatarSuccess (res, file) { - console.log(11, res) this.userInfo.avatar = res } } diff --git a/web/src/views/system/role/crud.js b/web/src/views/system/role/crud.js index 6e2169c..3468f44 100644 --- a/web/src/views/system/role/crud.js +++ b/web/src/views/system/role/crud.js @@ -156,7 +156,6 @@ export const crudOptions = (vm) => { title: '是否管理员', key: 'admin', sortable: true, - type: 'radio', dict: { data: vm.dictionary('button_whether_bool') @@ -164,11 +163,12 @@ export const crudOptions = (vm) => { form: { value: false, component: { - placeholder: '请选择是否管理员' - } + placeholder: '请选择是否管理员', + show(context){ + return vm.info.is_superuser?true:false} + }, } }, - { title: '状态', key: 'status', diff --git a/web/src/views/system/role/index.vue b/web/src/views/system/role/index.vue index 8ed34d7..72517e8 100644 --- a/web/src/views/system/role/index.vue +++ b/web/src/views/system/role/index.vue @@ -64,12 +64,17 @@ import * as api from './api' import { crudOptions } from './crud' import { d2CrudPlus } from 'd2-crud-plus' import rolePermission from '../rolePermission' +import { mapState } from 'vuex' + export default { name: 'role', mixins: [d2CrudPlus.crud], components: { rolePermission }, + computed: { + ...mapState('d2admin/user', ['info']) + }, data () { return { rolePermissionShow: false, diff --git a/web/src/views/system/rolePermission/api.js b/web/src/views/system/rolePermission/api.js index d0b4631..8e9d842 100644 --- a/web/src/views/system/rolePermission/api.js +++ b/web/src/views/system/rolePermission/api.js @@ -47,7 +47,7 @@ export function DelObj (id) { // 通过角色id,获取菜单数据 export function GetMenuData (obj) { return request({ - url: '/api/system/role/' + obj.id + '/roleId_get_menu/', + url: '/api/system/role/role_get_menu/', method: 'get', params: {} }).then(res => { @@ -69,3 +69,16 @@ export function GetDataScope () { params: {} }) } + +/** + * 获取角色部门 + * @returns {*} + * @constructor + */ +export function GetDataScopeDept () { + return request({ + url: '/api/system/role/data_scope_dept/', + method: 'get', + params: {} + }) +} diff --git a/web/src/views/system/rolePermission/index.vue b/web/src/views/system/rolePermission/index.vue index 25555b4..fa81c32 100644 --- a/web/src/views/system/rolePermission/index.vue +++ b/web/src/views/system/rolePermission/index.vue @@ -215,7 +215,7 @@ export default { }, // 获取部门数据 getDeptData () { - deptApi.GetListAll().then(ret => { + api.GetDataScopeDept().then(ret => { this.deptOptions = XEUtils.toArrayTree(ret.data, { parentKey: 'parent', strict: false }) }) }, From cd1b39e9d34849c358716319fd76d95e0ff6a1d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Fri, 30 Dec 2022 22:07:43 +0800 Subject: [PATCH 09/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/utils/import_export_mixin.py | 96 ++++++++++++++------ web/src/api/service.js | 4 +- web/src/views/system/role/crud.js | 7 +- 3 files changed, 72 insertions(+), 35 deletions(-) diff --git a/backend/dvadmin/utils/import_export_mixin.py b/backend/dvadmin/utils/import_export_mixin.py index 45e08db..371a128 100644 --- a/backend/dvadmin/utils/import_export_mixin.py +++ b/backend/dvadmin/utils/import_export_mixin.py @@ -139,38 +139,74 @@ class ImportSerializerMixin: ws.add_table(tab) wb.save(response) return response + else: + # 从excel中组织对应的数据结构，然后使用序列化器保存 + queryset = self.filter_queryset(self.get_queryset()) + # 获取多对多字段 + m2m_fields = [ + ele.name + for ele in queryset.model._meta.get_fields() + if hasattr(ele, "many_to_many") and ele.many_to_many == True + ] + import_field_dict = {'id':'更新主键(勿改)',**self.import_field_dict} + data = import_to_data(request.data.get("url"), import_field_dict, m2m_fields) + for ele in data: + filter_dic = {'id':ele.get('id')} + instance = filter_dic and queryset.filter(**filter_dic).first() + print(instance) + serializer = self.import_serializer_class(instance, data=ele, request=request) + serializer.is_valid(raise_exception=True) + serializer.save() + return DetailResponse(msg=f"导入成功！") - updateSupport = request.data.get("updateSupport") - # 从excel中组织对应的数据结构，然后使用序列化器保存 + @action(methods=['get'],detail=False) + def update_template(self,request): queryset = self.filter_queryset(self.get_queryset()) - # 获取多对多字段 - m2m_fields = [ - ele.name - for ele in queryset.model._meta.get_fields() - if hasattr(ele, "many_to_many") and ele.many_to_many == True - ] - data = import_to_data(request.data.get("url"), self.import_field_dict, m2m_fields) - unique_list = [ - ele.name for ele in queryset.model._meta.get_fields() if hasattr(ele, "unique") and ele.unique == True - ] - updateField = request.data.get("updateField") - for ele in data: - # # 获取 unique 字段 - # if queryset.model._meta.unique_together: # 判断是否存在联合主键 - # filter_dic = {i: ele.get(i) for i in list(queryset.model._meta.unique_together[0])} - # else: - # filter_dic = {i: ele.get(i) for i in list(set(unique_list)) if ele.get(i) is not None} - filter_dic = {updateField:ele.get(updateField)} - print(162,filter_dic) - instance = filter_dic and queryset.filter(**filter_dic).first() - if instance and not updateSupport: - continue - if not filter_dic: - instance = None - serializer = self.import_serializer_class(instance, data=ele, request=request) - serializer.is_valid(raise_exception=True) - serializer.save() - return DetailResponse(msg=f"导入成功！") + assert self.import_field_dict, "'%s' 请配置对应的导入模板字段。" % self.__class__.__name__ + assert self.import_serializer_class, "'%s' 请配置对应的导入序列化器。" % self.__class__.__name__ + data = self.import_serializer_class(queryset, many=True, request=request).data + # 导出excel 表 + response = HttpResponse(content_type="application/msexcel") + response["Access-Control-Expose-Headers"] = f"Content-Disposition" + response["content-disposition"] = f'attachment;filename={quote(str(f"导出{get_verbose_name(queryset)}.xlsx"))}' + wb = Workbook() + ws = wb.active + header_data = ["序号","更新主键(勿改)", *self.import_field_dict.values()] + hidden_header = ["#","id", *self.import_field_dict.keys()] + df_len_max = [self.get_string_len(ele) for ele in header_data] + row = get_column_letter(len(hidden_header) + 1) + column = 1 + ws.append(header_data) + for index, results in enumerate(data): + results_list = [] + for h_index, h_item in enumerate(hidden_header): + for key, val in results.items(): + if key == h_item: + if val is None or val == "": + results_list.append("") + else: + results_list.append(val) + # 计算最大列宽度 + result_column_width = self.get_string_len(val) + if h_index != 0 and result_column_width > df_len_max[h_index]: + df_len_max[h_index] = result_column_width + ws.append([index+1,*results_list]) + column += 1 + # 　更新列宽 + for index, width in enumerate(df_len_max): + ws.column_dimensions[get_column_letter(index + 1)].width = width + tab = Table(displayName="Table", ref=f"A1:{row}{column}") # 名称管理器 + style = TableStyleInfo( + name="TableStyleLight11", + showFirstColumn=True, + showLastColumn=True, + showRowStripes=True, + showColumnStripes=True, + ) + tab.tableStyleInfo = style + ws.add_table(tab) + wb.save(response) + return response class ExportSerializerMixin: diff --git a/web/src/api/service.js b/web/src/api/service.js index e4c9480..fb47712 100644 --- a/web/src/api/service.js +++ b/web/src/api/service.js @@ -216,7 +216,7 @@ const refreshTken = function () { * @param method * @param filename */ -export const downloadFile = function ({ url, params, method, filename }) { +export const downloadFile = function ({ url, params, method, filename="文件导出" }) { request({ url: url, method: method, @@ -224,7 +224,7 @@ export const downloadFile = function ({ url, params, method, filename }) { responseType: 'blob' // headers: {Accept: 'application/vnd.openxmlformats-officedocument'} }).then(res => { - const fileName = window.decodeURI(filename + '.xls' || res.headers['content-disposition'].split('=')[1]) || '文件导出.xls' + const fileName = window.decodeURI(filename + '.xlsx' || res.headers['content-disposition'].split('=')[1]) || '文件导出.xlsx' if (res) { const blob = new Blob([res.data], { type: 'charset=utf-8' }) const elink = document.createElement('a') diff --git a/web/src/views/system/role/crud.js b/web/src/views/system/role/crud.js index 3468f44..79a9568 100644 --- a/web/src/views/system/role/crud.js +++ b/web/src/views/system/role/crud.js @@ -164,9 +164,10 @@ export const crudOptions = (vm) => { value: false, component: { placeholder: '请选择是否管理员', - show(context){ - return vm.info.is_superuser?true:false} - }, + show (context) { + return !!vm.info.is_superuser + } + } } }, { From 5cb38b85bb568f419707e7e0bc6f66e8c3905ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Fri, 30 Dec 2022 22:13:05 +0800 Subject: [PATCH 10/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=201?= =?UTF-8?q?.=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E4=BC=98=E5=8C=96;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/components/importExcel/index.vue | 39 +++++++------------ .../components/msg-list/index.vue | 2 +- web/src/views/system/dept/index.vue | 3 +- 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/web/src/components/importExcel/index.vue b/web/src/components/importExcel/index.vue index 2b3de92..f450664 100644 --- a/web/src/components/importExcel/index.vue +++ b/web/src/components/importExcel/index.vue @@ -21,23 +21,11 @@ 将文件拖到此处，或 点击上传
-
- - - - - -
如果导入时需要更新数据,则请选择一个字段作为更新依据
-
提示：仅允许导入“xls”或“xlsx”格式文件！
- 下载模板 + 下载导入模板 + 批量更新模板
确 定 @@ -74,13 +62,7 @@ export default { } } }, - importApi: { // 导入接口地址 - type: String, - default () { - return undefined - } - }, - updateFieldApi: { + api: { // 导入接口地址 type: String, default () { return undefined @@ -101,7 +83,17 @@ export default { /** 下载模板操作 */ importTemplate () { downloadFile({ - url: util.baseURL() + this.importApi, + url: util.baseURL() + this.api + 'import_data/', + params: {}, + method: 'get' + }) + }, + /*** + * 批量更新模板 + */ + updateTemplate () { + downloadFile({ + url: util.baseURL() + this.api + 'update_template/', params: {}, method: 'get' }) @@ -122,8 +114,7 @@ export default { method: 'post', data: { url: response.data.url, - updateSupport: that.upload.updateSupport, - updateField: that.upload.updateField + updateSupport: that.upload.updateSupport } }).then(response => { // this.$alert("导入成功！", "导入结果", { dangerouslyUseHTMLString: true }); diff --git a/web/src/layout/header-aside/components/header-message/components/msg-list/index.vue b/web/src/layout/header-aside/components/header-message/components/msg-list/index.vue index 5b542d5..eceed84 100644 --- a/web/src/layout/header-aside/components/header-message/components/msg-list/index.vue +++ b/web/src/layout/header-aside/components/header-message/components/msg-list/index.vue @@ -3,7 +3,7 @@ 消息中心

{{msgObj.title}}

-
{{msgObj.content}}
+
diff --git a/web/src/views/system/dept/index.vue b/web/src/views/system/dept/index.vue index 6990e64..e8b5063 100644 --- a/web/src/views/system/dept/index.vue +++ b/web/src/views/system/dept/index.vue @@ -17,8 +17,7 @@ > 新增 导入 From 30d019ed28cbf1e036dff0655f695d405ca3d1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Fri, 30 Dec 2022 22:14:58 +0800 Subject: [PATCH 11/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/views/system/user/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/views/system/user/index.vue b/web/src/views/system/user/index.vue index be8e519..806518d 100644 --- a/web/src/views/system/user/index.vue +++ b/web/src/views/system/user/index.vue @@ -32,7 +32,7 @@ > 导出 导入 From 8508fd851dba5afd9735c2e10ed0932278620b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Fri, 30 Dec 2022 22:42:51 +0800 Subject: [PATCH 12/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/user.py | 1 - backend/dvadmin/utils/import_export_mixin.py | 20 +++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/backend/dvadmin/system/views/user.py b/backend/dvadmin/system/views/user.py index 151f05c..046c2b6 100644 --- a/backend/dvadmin/system/views/user.py +++ b/backend/dvadmin/system/views/user.py @@ -231,7 +231,6 @@ class UserProfileImportSerializer(CustomModelSerializer): class Meta: model = Users exclude = ( - "password", "post", "user_permissions", "groups", diff --git a/backend/dvadmin/utils/import_export_mixin.py b/backend/dvadmin/utils/import_export_mixin.py index 371a128..65b4d8b 100644 --- a/backend/dvadmin/utils/import_export_mixin.py +++ b/backend/dvadmin/utils/import_export_mixin.py @@ -171,8 +171,15 @@ class ImportSerializerMixin: response["content-disposition"] = f'attachment;filename={quote(str(f"导出{get_verbose_name(queryset)}.xlsx"))}' wb = Workbook() ws = wb.active - header_data = ["序号","更新主键(勿改)", *self.import_field_dict.values()] - hidden_header = ["#","id", *self.import_field_dict.keys()] + import_field_dict = {} + for key,val in self.import_field_dict.items(): + if isinstance(val,dict): + import_field_dict[key] = val.get('title') + else: + import_field_dict[key] = val + print(data) + header_data = ["序号","更新主键(勿改)", *import_field_dict.values()] + hidden_header = ["#","id", *import_field_dict.keys()] df_len_max = [self.get_string_len(ele) for ele in header_data] row = get_column_letter(len(hidden_header) + 1) column = 1 @@ -184,12 +191,15 @@ class ImportSerializerMixin: if key == h_item: if val is None or val == "": results_list.append("") + elif isinstance(val,list): + results_list.append(str(val)) else: results_list.append(val) # 计算最大列宽度 - result_column_width = self.get_string_len(val) - if h_index != 0 and result_column_width > df_len_max[h_index]: - df_len_max[h_index] = result_column_width + if isinstance(val,str): + result_column_width = self.get_string_len(val) + if h_index != 0 and result_column_width > df_len_max[h_index]: + df_len_max[h_index] = result_column_width ws.append([index+1,*results_list]) column += 1 # 　更新列宽 From b6c12332a1585d8be7be6e11d6cd7bcca321d296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Fri, 30 Dec 2022 22:43:10 +0800 Subject: [PATCH 13/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/utils/import_export_mixin.py | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/dvadmin/utils/import_export_mixin.py b/backend/dvadmin/utils/import_export_mixin.py index 65b4d8b..40d2db5 100644 --- a/backend/dvadmin/utils/import_export_mixin.py +++ b/backend/dvadmin/utils/import_export_mixin.py @@ -177,7 +177,6 @@ class ImportSerializerMixin: import_field_dict[key] = val.get('title') else: import_field_dict[key] = val - print(data) header_data = ["序号","更新主键(勿改)", *import_field_dict.values()] hidden_header = ["#","id", *import_field_dict.keys()] df_len_max = [self.get_string_len(ele) for ele in header_data] From 3b5435cab71820d47f8e416e91a179fd6d8e4a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Sun, 1 Jan 2023 17:20:51 +0800 Subject: [PATCH 14/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=87=92=E5=8A=A0=E8=BD=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/models.py | 19 +++++++++++++++++++ backend/dvadmin/system/views/dept.py | 16 +++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/backend/dvadmin/system/models.py b/backend/dvadmin/system/models.py index bb59d12..d471438 100644 --- a/backend/dvadmin/system/models.py +++ b/backend/dvadmin/system/models.py @@ -120,6 +120,25 @@ class Dept(CoreModel): help_text="上级部门", ) + @classmethod + def recursion_dept_info(cls, dept_id: int, dept_all_list=None, dept_list=None): + """ + 递归获取部门的所有下级部门 + :param dept_id: 需要获取的id + :param dept_all_list: 所有列表 + :param dept_list: 递归list + :return: + """ + if not dept_all_list: + dept_all_list = Dept.objects.values("id", "parent") + if dept_list is None: + dept_list = [dept_id] + for ele in dept_all_list: + if ele.get("parent") == dept_id: + dept_list.append(ele.get("id")) + cls.recursion_dept_info(ele.get("id"), dept_all_list, dept_list) + return list(set(dept_list)) + class Meta: db_table = table_prefix + "system_dept" verbose_name = "部门表" diff --git a/backend/dvadmin/system/views/dept.py b/backend/dvadmin/system/views/dept.py index 52dc1df..febc74e 100644 --- a/backend/dvadmin/system/views/dept.py +++ b/backend/dvadmin/system/views/dept.py @@ -163,7 +163,21 @@ class DeptViewSet(CustomModelViewSet): else: queryset = Dept.objects.filter(parent__isnull=True).values('id', 'name', 'parent') else: - dept_list = request.user.role.values_list('dept', flat=True) + data_range = request.user.role.values_list('data_range', flat=True) + user_dept_id = request.user.dept.id + dept_list = [] + data_range_list = list(set(data_range)) + for item in data_range_list: + if item in [0,2]: + dept_list = [user_dept_id] + elif item == 1: + dept_list = Dept.recursion_dept_info(dept_id=user_dept_id) + elif item == 3: + dept_list = Dept.objects.values_list('id',flat=True) + elif item == 4: + dept_list = request.user.role.values_list('dept',flat=True) + else: + dept_list = [] if parent: queryset = Dept.objects.filter(id__in=dept_list,parent=parent).values('id', 'name', 'parent') else: From 538c0b398321ce93e79225a1a21447da1132ff64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Sun, 1 Jan 2023 18:06:46 +0800 Subject: [PATCH 15/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=201?= =?UTF-8?q?.=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=E4=BC=98=E5=8C=96;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/dept.py | 12 +++--------- web/src/views/system/dept/api.js | 4 +++- web/src/views/system/dept/crud.js | 19 +------------------ 3 files changed, 7 insertions(+), 28 deletions(-) diff --git a/backend/dvadmin/system/views/dept.py b/backend/dvadmin/system/views/dept.py index febc74e..1a2907c 100644 --- a/backend/dvadmin/system/views/dept.py +++ b/backend/dvadmin/system/views/dept.py @@ -158,14 +158,11 @@ class DeptViewSet(CustomModelViewSet): parent = self.request.query_params.get('parent') is_superuser = request.user.is_superuser if is_superuser: - if parent: - queryset = Dept.objects.filter(parent=parent).values('id', 'name', 'parent') - else: - queryset = Dept.objects.filter(parent__isnull=True).values('id', 'name', 'parent') + queryset = Dept.objects.values('id', 'name', 'parent') else: data_range = request.user.role.values_list('data_range', flat=True) user_dept_id = request.user.dept.id - dept_list = [] + dept_list = [user_dept_id] data_range_list = list(set(data_range)) for item in data_range_list: if item in [0,2]: @@ -178,10 +175,7 @@ class DeptViewSet(CustomModelViewSet): dept_list = request.user.role.values_list('dept',flat=True) else: dept_list = [] - if parent: - queryset = Dept.objects.filter(id__in=dept_list,parent=parent).values('id', 'name', 'parent') - else: - queryset = Dept.objects.filter(id__in=dept_list,parent__isnull=True).values('id', 'name', 'parent') + queryset = Dept.objects.filter(id__in=dept_list).values('id', 'name', 'parent') return DetailResponse(data=queryset, msg="获取成功") diff --git a/web/src/views/system/dept/api.js b/web/src/views/system/dept/api.js index 362d5d0..dbce636 100644 --- a/web/src/views/system/dept/api.js +++ b/web/src/views/system/dept/api.js @@ -1,6 +1,6 @@ import { request } from '@/api/service' +import XEUtils from 'xe-utils' export const urlPrefix = '/api/system/dept/' - /** * 列表查询 */ @@ -62,5 +62,7 @@ export function DeptLazy (query) { url: '/api/system/dept_lazy_tree/', method: 'get', params: query + }).then(res => { + return XEUtils.toArrayTree(res.data, { parentKey: 'parent' }) }) } diff --git a/web/src/views/system/dept/crud.js b/web/src/views/system/dept/crud.js index b9dd086..dc28d74 100644 --- a/web/src/views/system/dept/crud.js +++ b/web/src/views/system/dept/crud.js @@ -109,13 +109,6 @@ export const crudOptions = (vm) => { cache: false, getData: (url, dict, { form, component }) => { // 配置此参数会覆盖全局的getRemoteDictFunc return api.DeptLazy().then(ret => { return ret.data }) - }, - getNodes (values, data) { - // 配置行展示远程获取nodes - return new Promise((resolve, reject) => { - const row = vm.getEditRow() - resolve(row.parent !== null ? [{ name: row.parent_name, id: row.parent }] : []) - }) } }, form: { @@ -123,17 +116,7 @@ export const crudOptions = (vm) => { component: { span: 12, props: { - multiple: false, - elProps: { - lazy: true, - hasChild: 'has_children', - load (node, resolve) { - // 懒加载 - api.DeptLazy({ parent: node.data.id }).then((data) => { - resolve(data.data) - }) - } - } + multiple: false } } } From e88086e6f3d14bfb4315bf20d725bcdc10276c3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Mon, 2 Jan 2023 10:09:08 +0800 Subject: [PATCH 16/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=8C=89=E9=92=AE=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/menu_button.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/dvadmin/system/views/menu_button.py b/backend/dvadmin/system/views/menu_button.py index f32bcb4..bf06724 100644 --- a/backend/dvadmin/system/views/menu_button.py +++ b/backend/dvadmin/system/views/menu_button.py @@ -18,7 +18,7 @@ class MenuButtonSerializer(CustomModelSerializer): class Meta: model = MenuButton - fields = ['id','name','value','api','method'] + fields = ['id', 'name', 'value', 'api', 'method', 'menu'] read_only_fields = ["id"] From 9fa471022ab161df675384388063e5f5988f2314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Mon, 2 Jan 2023 10:15:02 +0800 Subject: [PATCH 17/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=8C=89=E9=92=AE=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/application/dispatch.py | 10 ++++++++++ backend/dvadmin/system/views/menu.py | 4 ++-- backend/dvadmin/system/views/menu_button.py | 11 +++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/backend/application/dispatch.py b/backend/application/dispatch.py index 6843c75..3bd364c 100644 --- a/backend/application/dispatch.py +++ b/backend/application/dispatch.py @@ -48,6 +48,16 @@ def _get_all_system_config(): value = system_config.get("value", "") if value and system_config.get("form_item_type") == 7: value = value[0].get("url") + if value and system_config.get("form_item_type") == 11: + new_value = [] + for ele in value: + new_value.append({ + "key": ele.get('key'), + "title": ele.get('title'), + "value": ele.get('value'), + }) + new_value.sort(key=lambda s: s["key"]) + value = new_value data[f"{system_config.get('parent__key')}.{system_config.get('key')}"] = value return data diff --git a/backend/dvadmin/system/views/menu.py b/backend/dvadmin/system/views/menu.py index 3078d34..16d60f4 100644 --- a/backend/dvadmin/system/views/menu.py +++ b/backend/dvadmin/system/views/menu.py @@ -10,7 +10,7 @@ from rest_framework import serializers from rest_framework.decorators import action from dvadmin.system.models import Menu, MenuButton -from dvadmin.system.views.menu_button import MenuButtonSerializer +from dvadmin.system.views.menu_button import MenuButtonInitSerializer from dvadmin.utils.json_response import SuccessResponse from dvadmin.utils.serializers import CustomModelSerializer from dvadmin.utils.viewset import CustomModelViewSet @@ -106,7 +106,7 @@ class MenuInitSerializer(CustomModelSerializer): "value": menu_button_data['value'] } instance_obj = MenuButton.objects.filter(**filter_data).first() - serializer = MenuButtonSerializer(instance_obj, data=menu_button_data, request=self.request) + serializer = MenuButtonInitSerializer(instance_obj, data=menu_button_data, request=self.request) serializer.is_valid(raise_exception=True) serializer.save() return instance diff --git a/backend/dvadmin/system/views/menu_button.py b/backend/dvadmin/system/views/menu_button.py index bf06724..97f2ced 100644 --- a/backend/dvadmin/system/views/menu_button.py +++ b/backend/dvadmin/system/views/menu_button.py @@ -16,6 +16,17 @@ class MenuButtonSerializer(CustomModelSerializer): 菜单按钮-序列化器 """ + class Meta: + model = MenuButton + fields = ['id', 'name', 'value', 'api', 'method'] + read_only_fields = ["id"] + + +class MenuButtonInitSerializer(CustomModelSerializer): + """ + 初始化菜单按钮-序列化器 + """ + class Meta: model = MenuButton fields = ['id', 'name', 'value', 'api', 'method', 'menu'] From 799876fe9bd24ccce5dcda37b6d77bf49ee0a9a7 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, 2 Jan 2023 12:04:37 +0800 Subject: [PATCH 18/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=96=B0=E5=A2=9E=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/dept.py | 8 ++++++++ web/src/views/system/dept/crud.js | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/backend/dvadmin/system/views/dept.py b/backend/dvadmin/system/views/dept.py index 1a2907c..7e0ac5d 100644 --- a/backend/dvadmin/system/views/dept.py +++ b/backend/dvadmin/system/views/dept.py @@ -105,6 +105,14 @@ class DeptCreateUpdateSerializer(CustomModelSerializer): 部门管理 创建/更新时的列化器 """ + def validate_parent(self, value): + """ + 如果没有上级部门,则上级部门为创建者的部门 + """ + if value is None: + value = self.request.user.dept_id + return value + def create(self, validated_data): instance = super().create(validated_data) instance.dept_belong_id = instance.id diff --git a/web/src/views/system/dept/crud.js b/web/src/views/system/dept/crud.js index dc28d74..be9afcf 100644 --- a/web/src/views/system/dept/crud.js +++ b/web/src/views/system/dept/crud.js @@ -108,11 +108,11 @@ export const crudOptions = (vm) => { value: 'id', cache: false, getData: (url, dict, { form, component }) => { // 配置此参数会覆盖全局的getRemoteDictFunc - return api.DeptLazy().then(ret => { return ret.data }) + return api.DeptLazy().then(ret => { return ret }) } }, form: { - helper: '默认留空为根节点', + helper: '默认留空为创建者的部门', component: { span: 12, props: { From 58be00d1c0de7ef134e94ef5ad5b2475a928939a 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, 2 Jan 2023 13:35:55 +0800 Subject: [PATCH 19/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=96=B0=E5=A2=9E=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/dept.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/backend/dvadmin/system/views/dept.py b/backend/dvadmin/system/views/dept.py index 7e0ac5d..18c5324 100644 --- a/backend/dvadmin/system/views/dept.py +++ b/backend/dvadmin/system/views/dept.py @@ -105,15 +105,10 @@ class DeptCreateUpdateSerializer(CustomModelSerializer): 部门管理 创建/更新时的列化器 """ - def validate_parent(self, value): - """ - 如果没有上级部门,则上级部门为创建者的部门 - """ - if value is None: - value = self.request.user.dept_id - return value - def create(self, validated_data): + value = validated_data.get('parent',None) + if value is None: + validated_data['parent'] = self.request.user.dept instance = super().create(validated_data) instance.dept_belong_id = instance.id instance.save() From a319030271b8d03602e8b638ae73c447fb60346b 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, 2 Jan 2023 16:39:37 +0800 Subject: [PATCH 20/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8C=89=E9=92=AE=E5=BA=8F=E5=88=97=E5=8C=96?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/menu_button.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/backend/dvadmin/system/views/menu_button.py b/backend/dvadmin/system/views/menu_button.py index 97f2ced..1f79dc1 100644 --- a/backend/dvadmin/system/views/menu_button.py +++ b/backend/dvadmin/system/views/menu_button.py @@ -32,6 +32,16 @@ class MenuButtonInitSerializer(CustomModelSerializer): fields = ['id', 'name', 'value', 'api', 'method', 'menu'] read_only_fields = ["id"] +class MenuButtonCreateUpdateSerializer(CustomModelSerializer): + """ + 初始化菜单按钮-序列化器 + """ + + class Meta: + model = MenuButton + fields = "__all__" + read_only_fields = ["id"] + class MenuButtonViewSet(CustomModelViewSet): """ @@ -44,4 +54,6 @@ class MenuButtonViewSet(CustomModelViewSet): """ queryset = MenuButton.objects.all() serializer_class = MenuButtonSerializer + create_serializer_class = MenuButtonCreateUpdateSerializer + update_serializer_class = MenuButtonCreateUpdateSerializer extra_filter_backends = [] From 62943431f290bd9e0da6542ece0f38ebd3ffe123 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, 2 Jan 2023 21:41:54 +0800 Subject: [PATCH 21/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=201?= =?UTF-8?q?.=E6=96=87=E4=BB=B6=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/components/importExcel/index.vue | 75 +++++++++++------------- web/src/views/system/role/crud.js | 2 +- 2 files changed, 35 insertions(+), 42 deletions(-) diff --git a/web/src/components/importExcel/index.vue b/web/src/components/importExcel/index.vue index f450664..21673c0 100644 --- a/web/src/components/importExcel/index.vue +++ b/web/src/components/importExcel/index.vue @@ -4,32 +4,34 @@ 导入 - - -
- 将文件拖到此处，或 - 点击上传 +
+ + +
+ 将文件拖到此处，或 + 点击上传 +
+
提示：仅允许导入“xls”或“xlsx”格式文件！
+ +
+ 下载导入模板 + 批量更新模板
-
提示：仅允许导入“xls”或“xlsx”格式文件！
- -
- 下载导入模板 - 批量更新模板
- 确 定 - 取 消 + 确 定 + 取 消
@@ -75,6 +77,11 @@ export default { } } }, + data(){ + return { + loading:false + } + }, methods: { /** 导入按钮操作 */ handleImport () { @@ -107,17 +114,17 @@ export default { const that = this // that.upload.open = false that.upload.isUploading = false + that.loading = true that.$refs.upload.clearFiles() // 是否更新已经存在的用户数据 return request({ - url: that.importApi, + url: util.baseURL() + that.api + 'import_data/', method: 'post', data: { - url: response.data.url, - updateSupport: that.upload.updateSupport + url: response.data.url } }).then(response => { - // this.$alert("导入成功！", "导入结果", { dangerouslyUseHTMLString: true }); + that.loading = false that.$alert('导入成功', '导入完成', { confirmButtonText: '确定', callback: action => { @@ -129,21 +136,7 @@ export default { // 提交上传文件 submitFileForm () { this.$refs.upload.submit() - }, - getUpdateField () { - const that = this - if (that.updateFieldApi) { - return request({ - url: that.updateFieldApi, - method: 'get' - }).then(res => { - that.fieldOptions = res.data - }) - } } - }, - mounted () { - this.getUpdateField() } } diff --git a/web/src/views/system/role/crud.js b/web/src/views/system/role/crud.js index 79a9568..e756f22 100644 --- a/web/src/views/system/role/crud.js +++ b/web/src/views/system/role/crud.js @@ -165,7 +165,7 @@ export const crudOptions = (vm) => { component: { placeholder: '请选择是否管理员', show (context) { - return !!vm.info.is_superuser + return vm.info.is_superuser } } } From c046b0e0a2cc043d9459936d7ddad3c532abf491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Tue, 3 Jan 2023 01:29:46 +0800 Subject: [PATCH 22/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=201?= =?UTF-8?q?.=E4=BC=98=E5=8C=96websocket;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/application/websocketConfig.py | 100 ++++++++++++++---- .../dvadmin/system/views/message_center.py | 53 ++++++---- web/src/api/websocket.js | 16 +-- web/src/views/system/messageCenter/index.vue | 7 +- 4 files changed, 132 insertions(+), 44 deletions(-) diff --git a/backend/application/websocketConfig.py b/backend/application/websocketConfig.py index b3c3845..1e1dffb 100644 --- a/backend/application/websocketConfig.py +++ b/backend/application/websocketConfig.py @@ -8,34 +8,43 @@ import json from channels.layers import get_channel_layer from jwt import InvalidSignatureError +from rest_framework.request import Request from application import settings +from dvadmin.system.models import MessageCenter, Users, MessageCenterTargetUser +from dvadmin.system.views.message_center import MessageCenterTargetUserSerializer +from dvadmin.utils.serializers import CustomModelSerializer send_dict = {} + # 发送消息结构体 -def set_message(sender, msg_type, msg): +def set_message(sender, msg_type, msg, unread=0): text = { 'sender': sender, 'contentType': msg_type, 'content': msg, + 'unread': unread } return text -#异步获取消息中心的目标用户 + +# 异步获取消息中心的目标用户 @database_sync_to_async def _get_message_center_instance(message_id): from dvadmin.system.models import MessageCenter - _MessageCenter = MessageCenter.objects.filter(id=message_id).values_list('target_user',flat=True) + _MessageCenter = MessageCenter.objects.filter(id=message_id).values_list('target_user', flat=True) if _MessageCenter: return _MessageCenter else: return [] + @database_sync_to_async def _get_message_unread(user_id): + """获取用户的未读消息数量""" from dvadmin.system.models import MessageCenterTargetUser - count = MessageCenterTargetUser.objects.filter(users=user_id,is_read=False).count() + count = MessageCenterTargetUser.objects.filter(users=user_id, is_read=False).count() return count or 0 @@ -44,6 +53,7 @@ def request_data(scope): qs = urllib.parse.parse_qs(query_string) return qs + class DvadminWebSocket(AsyncJsonWebsocketConsumer): async def connect(self): try: @@ -52,22 +62,23 @@ class DvadminWebSocket(AsyncJsonWebsocketConsumer): decoded_result = jwt.decode(self.service_uid, settings.SECRET_KEY, algorithms=["HS256"]) if decoded_result: self.user_id = decoded_result.get('user_id') - self.chat_group_name = "user_"+str(self.user_id) - #收到连接时候处理， + self.chat_group_name = "user_" + str(self.user_id) + # 收到连接时候处理， await self.channel_layer.group_add( self.chat_group_name, self.channel_name ) await self.accept() # 发送连接成功 - await self.send_json(set_message('system', 'SYSTEM', '连接成功')) + #await self.send_json(set_message('system', 'SYSTEM', '连接成功')) # 主动推送消息 unread_count = await _get_message_unread(self.user_id) - await self.send_json(set_message('system', 'TEXT', {"model":'message_center',"unread":unread_count})) + await self.send_json( + set_message('system', 'SYSTEM', "请查看您的未读消息~", + unread=unread_count)) except InvalidSignatureError: await self.disconnect(None) - async def disconnect(self, close_code): # Leave room group await self.channel_layer.group_discard(self.chat_group_name, self.channel_name) @@ -92,21 +103,74 @@ class MegCenter(DvadminWebSocket): ) async def push_message(self, event): + """消息发送""" message = event['json'] await self.send(text_data=json.dumps(message)) -def websocket_push(user_id, message): +class MessageCreateSerializer(CustomModelSerializer): """ - 主动推送消息 + 消息中心-新增-序列化器 """ - username = "user_"+str(user_id) - print(103,message) + class Meta: + model = MessageCenter + fields = "__all__" + read_only_fields = ["id"] + +def websocket_push(user_id,message): + username = "user_" + str(user_id) channel_layer = get_channel_layer() async_to_sync(channel_layer.group_send)( - username, - { - "type": "push.message", - "json": message - } + username, + { + "type": "push.message", + "json": message + } ) + +def create_message_push(title: str, content: str, target_type: int, target_user: list, target_dept=None, target_role=None, + message: dict = {'contentType': 'INFO', 'content': '测试~'}, request= Request): + if message is None: + message = {"contentType": "INFO", "content": None} + if target_role is None: + target_role = [] + if target_dept is None: + target_dept = [] + data = { + "title": title, + "content": content, + "target_type": target_type, + "target_user":target_user, + "target_dept":target_dept, + "target_role":target_role + } + message_center_instance = MessageCreateSerializer(data=data,request=request) + message_center_instance.is_valid(raise_exception=True) + message_center_instance.save() + users = target_user or [] + if target_type in [1]: # 按角色 + users = Users.objects.filter(role__id__in=target_role).values_list('id', flat=True) + if target_type in [2]: # 按部门 + users = Users.objects.filter(dept__id__in=target_dept).values_list('id', flat=True) + if target_type in [3]: # 系统通知 + users = Users.objects.values_list('id', flat=True) + targetuser_data = [] + for user in users: + targetuser_data.append({ + "messagecenter": message_center_instance.instance.id, + "users": user + }) + targetuser_instance = MessageCenterTargetUserSerializer(data=targetuser_data, many=True, request=request) + targetuser_instance.is_valid(raise_exception=True) + targetuser_instance.save() + for user in users: + username = "user_" + str(user) + unread_count = async_to_sync(_get_message_unread)(user) + channel_layer = get_channel_layer() + async_to_sync(channel_layer.group_send)( + username, + { + "type": "push.message", + "json": {**message,'unread':unread_count} + } + ) diff --git a/backend/dvadmin/system/views/message_center.py b/backend/dvadmin/system/views/message_center.py index 5d933c3..eae23fb 100644 --- a/backend/dvadmin/system/views/message_center.py +++ b/backend/dvadmin/system/views/message_center.py @@ -1,15 +1,14 @@ # -*- coding: utf-8 -*- import json + +from asgiref.sync import async_to_sync +from channels.layers import get_channel_layer from django_restql.fields import DynamicSerializerMethodField from rest_framework import serializers from rest_framework.decorators import action, permission_classes from rest_framework.permissions import IsAuthenticated, AllowAny -from application.websocketConfig import websocket_push from dvadmin.system.models import MessageCenter, Users, MessageCenterTargetUser -from dvadmin.system.views.dept import DeptSerializer -from dvadmin.system.views.role import RoleSerializer -from dvadmin.system.views.user import UserSerializer from dvadmin.utils.json_response import SuccessResponse, DetailResponse from dvadmin.utils.serializers import CustomModelSerializer from dvadmin.utils.viewset import CustomModelViewSet @@ -28,6 +27,7 @@ class MessageCenterSerializer(CustomModelSerializer): roles = instance.target_role.all() # You can do what ever you want in here # `parsed_query` param is passed to BookSerializer to allow further querying + from dvadmin.system.views.role import RoleSerializer serializer = RoleSerializer( roles, many=True, @@ -39,6 +39,7 @@ class MessageCenterSerializer(CustomModelSerializer): users = instance.target_user.all() # You can do what ever you want in here # `parsed_query` param is passed to BookSerializer to allow further querying + from dvadmin.system.views.user import UserSerializer serializer = UserSerializer( users, many=True, @@ -50,6 +51,7 @@ class MessageCenterSerializer(CustomModelSerializer): dept = instance.target_dept.all() # You can do what ever you want in here # `parsed_query` param is passed to BookSerializer to allow further querying + from dvadmin.system.views.dept import DeptSerializer serializer = DeptSerializer( dept, many=True, @@ -78,20 +80,33 @@ class MessageCenterTargetUserListSerializer(CustomModelSerializer): """ 目标用户序列化器-序列化器 """ + is_read = serializers.SerializerMethodField() + + def get_is_read(self, instance): + user_id = self.request.user.id + message_center_id = instance.id + queryset = MessageCenterTargetUser.objects.filter(messagecenter__id=message_center_id,users_id=user_id).first() + return queryset.is_read class Meta: - model = MessageCenterTargetUser + model = MessageCenter fields = "__all__" read_only_fields = ["id"] - def to_representation(self, instance): - data = super().to_representation(instance) - data['title'] = instance.messagecenter.title - data['content'] = instance.messagecenter.content - data['target_type'] = instance.messagecenter.target_type - data['id'] = instance.messagecenter.id - return data - +def websocket_push(user_id, message): + """ + 主动推送消息 + """ + username = "user_"+str(user_id) + print(103,message) + channel_layer = get_channel_layer() + async_to_sync(channel_layer.group_send)( + username, + { + "type": "push.message", + "json": message + } + ) class MessageCenterCreateSerializer(CustomModelSerializer): """ @@ -105,10 +120,10 @@ class MessageCenterCreateSerializer(CustomModelSerializer): # 在保存之前,根据目标类型,把目标用户查询出来并保存 users = initial_data.get('target_user', []) if target_type in [1]: # 按角色 - target_role = initial_data.get('target_role') + target_role = initial_data.get('target_role',[]) users = Users.objects.exclude(is_deleted=True).filter(role__id__in=target_role).values_list('id', flat=True) if target_type in [2]: # 按部门 - target_dept = initial_data.get('target_dept') + target_dept = initial_data.get('target_dept',[]) users = Users.objects.exclude(is_deleted=True).filter(dept__id__in=target_dept).values_list('id', flat=True) if target_type in [3]: # 系统通知 users = Users.objects.exclude(is_deleted=True).values_list('id', flat=True) @@ -166,8 +181,8 @@ class MessageCenterViewSet(CustomModelViewSet): serializer = self.get_serializer(instance) # 主动推送消息 unread_count = MessageCenterTargetUser.objects.filter(users__id=user_id, is_read=False).count() - websocket_push(user_id, {"sender": 'system', "contentType": 'TEXT', - "content": {"model": 'message_center', "unread": unread_count}}) + websocket_push(user_id, message={"sender": 'system', "contentType": 'TEXT', + "content": '您查看了一条消息~', "unread": unread_count}) return DetailResponse(data=serializer.data, msg="获取成功") @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated]) @@ -176,7 +191,9 @@ class MessageCenterViewSet(CustomModelViewSet): 获取接收到的消息 """ self_user_id = self.request.user.id - queryset = MessageCenterTargetUser.objects.filter(users__id=self_user_id).order_by('-create_datetime') + # queryset = MessageCenterTargetUser.objects.filter(users__id=self_user_id).order_by('-create_datetime') + queryset = MessageCenter.objects.filter(target_user__id=self_user_id) + print(queryset) # queryset = self.filter_queryset(queryset) page = self.paginate_queryset(queryset) if page is not None: diff --git a/web/src/api/websocket.js b/web/src/api/websocket.js index c9a47ec..093b163 100644 --- a/web/src/api/websocket.js +++ b/web/src/api/websocket.js @@ -29,9 +29,11 @@ function webSocketOnError (e) { */ function webSocketOnMessage (e) { const data = JSON.parse(e.data) + const {unread} = data + store.dispatch('d2admin/messagecenter/setUnread', unread || 0) if (data.contentType === 'SYSTEM') { ElementUI.Notification({ - title: 'websocket', + title: '系统消息', message: data.content, type: 'success', position: 'bottom-right', @@ -54,11 +56,13 @@ function webSocketOnMessage (e) { duration: 0 }) } else { - const { content } = data - if (content.model === 'message_center') { - const unread = content.unread - store.dispatch('d2admin/messagecenter/setUnread', unread) - } + ElementUI.Notification({ + title: '温馨提示', + message: data.content, + type: 'info', + position: 'bottom-right', + duration: 3000 + }) } } // 关闭websiocket diff --git a/web/src/views/system/messageCenter/index.vue b/web/src/views/system/messageCenter/index.vue index ec1fdcf..90b2fac 100644 --- a/web/src/views/system/messageCenter/index.vue +++ b/web/src/views/system/messageCenter/index.vue @@ -6,6 +6,7 @@ v-bind="_crudProps" v-on="_crudListeners" @onView="onView" + @doDialogClosed="doDialogClosed" >
@@ -39,7 +40,6 @@ export default { tabActivted: 'send' } }, - computed: { }, methods: { @@ -78,12 +78,15 @@ export default { template: viewTemplate }) this.infoRequest(row) - this.doRefresh() }, onTabClick (tab) { const { name } = tab this.tabActivted = name this.doRefresh() + }, + //关闭事件 + doDialogClosed (context) { + this.doRefresh() } } } From 910b770784a5205a968dea0a87bae3a49ea1e8b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Tue, 3 Jan 2023 01:31:17 +0800 Subject: [PATCH 23/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96websocket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/application/websocketConfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/application/websocketConfig.py b/backend/application/websocketConfig.py index 1e1dffb..c3d4894 100644 --- a/backend/application/websocketConfig.py +++ b/backend/application/websocketConfig.py @@ -128,7 +128,7 @@ def websocket_push(user_id,message): } ) -def create_message_push(title: str, content: str, target_type: int, target_user: list, target_dept=None, target_role=None, +def create_message_push(title: str, content: str, target_type: int=0, target_user: list=[], target_dept=None, target_role=None, message: dict = {'contentType': 'INFO', 'content': '测试~'}, request= Request): if message is None: message = {"contentType": "INFO", "content": None} From b57d500e0cb6a6e63952d4417c5b087a49cec2eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Tue, 3 Jan 2023 13:20:11 +0800 Subject: [PATCH 24/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96websocket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/application/asgi.py | 4 ++-- backend/dvadmin/system/views/message_center.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/application/asgi.py b/backend/application/asgi.py index b707dca..5a5c987 100644 --- a/backend/application/asgi.py +++ b/backend/application/asgi.py @@ -14,10 +14,10 @@ from channels.routing import ProtocolTypeRouter, URLRouter os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'application.settings') os.environ["DJANGO_ALLOW_ASYNC_UNSAFE"] = "true" -from application.routing import websocket_urlpatterns + http_application = get_asgi_application() - +from application.routing import websocket_urlpatterns application = ProtocolTypeRouter({ "http":http_application, 'websocket': AuthMiddlewareStack( diff --git a/backend/dvadmin/system/views/message_center.py b/backend/dvadmin/system/views/message_center.py index eae23fb..072db85 100644 --- a/backend/dvadmin/system/views/message_center.py +++ b/backend/dvadmin/system/views/message_center.py @@ -138,8 +138,8 @@ class MessageCenterCreateSerializer(CustomModelSerializer): targetuser_instance.save() for user in users: unread_count = MessageCenterTargetUser.objects.filter(users__id=user, is_read=False).count() - websocket_push(user, {"sender": 'system', "contentType": 'TEXT', - "content": {"model": 'message_center', "unread": unread_count}}) + websocket_push(user, message={"sender": 'system', "contentType": 'SYSTEM', + "content": '您有一条新消息~', "unread": unread_count}) return data class Meta: From 47125301003004901fa84aa22f671663fea35774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Tue, 3 Jan 2023 13:30:20 +0800 Subject: [PATCH 25/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96websocket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/application/websocketConfig.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/backend/application/websocketConfig.py b/backend/application/websocketConfig.py index c3d4894..115138a 100644 --- a/backend/application/websocketConfig.py +++ b/backend/application/websocketConfig.py @@ -69,13 +69,15 @@ class DvadminWebSocket(AsyncJsonWebsocketConsumer): self.channel_name ) await self.accept() - # 发送连接成功 - #await self.send_json(set_message('system', 'SYSTEM', '连接成功')) # 主动推送消息 unread_count = await _get_message_unread(self.user_id) - await self.send_json( - set_message('system', 'SYSTEM', "请查看您的未读消息~", - unread=unread_count)) + if unread_count == 0: + # 发送连接成功 + await self.send_json(set_message('system', 'SYSTEM', '连接成功')) + else: + await self.send_json( + set_message('system', 'SYSTEM', "请查看您的未读消息~", + unread=unread_count)) except InvalidSignatureError: await self.disconnect(None) From c0ed29dea27c1201de6746212ccb9c2bc36371ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Tue, 3 Jan 2023 14:58:02 +0800 Subject: [PATCH 26/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=201?= =?UTF-8?q?.=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/components/importExcel/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/src/components/importExcel/index.vue b/web/src/components/importExcel/index.vue index 21673c0..1f5241e 100644 --- a/web/src/components/importExcel/index.vue +++ b/web/src/components/importExcel/index.vue @@ -77,9 +77,9 @@ export default { } } }, - data(){ + data () { return { - loading:false + loading: false } }, methods: { @@ -90,7 +90,7 @@ export default { /** 下载模板操作 */ importTemplate () { downloadFile({ - url: util.baseURL() + this.api + 'import_data/', + url: this.api + 'import_data/', params: {}, method: 'get' }) @@ -100,7 +100,7 @@ export default { */ updateTemplate () { downloadFile({ - url: util.baseURL() + this.api + 'update_template/', + url: this.api + 'update_template/', params: {}, method: 'get' }) From 5861f7dac26ad41a88b18bfb862a9131e7235866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Wed, 4 Jan 2023 17:48:37 +0800 Subject: [PATCH 27/31] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG:=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AF=BC=E5=85=A5=E5=92=8C=E5=AF=BC=E5=85=A5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0bug=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/utils/import_export.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backend/dvadmin/utils/import_export.py b/backend/dvadmin/utils/import_export.py index 882ff4c..49534f5 100644 --- a/backend/dvadmin/utils/import_export.py +++ b/backend/dvadmin/utils/import_export.py @@ -18,6 +18,10 @@ def import_to_data(file_url, field_data, m2m_fields=None): file_path_dir = os.path.join(settings.BASE_DIR, file_url) workbook = openpyxl.load_workbook(file_path_dir) table = workbook[workbook.sheetnames[0]] + theader = tuple(table.values)[0] # Excel的表头 + is_update = '更新主键(勿改)' in theader # 是否导入更新 + if is_update is False: # 不是更新时,删除id列 + field_data.pop('id') # 获取参数映射 validation_data_dict = {} for key, value in field_data.items(): From 3a02832e08b6aa2142ed9c2b42bf1ef0204214d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Thu, 12 Jan 2023 22:02:38 +0800 Subject: [PATCH 28/31] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG:=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AF=BC=E5=85=A5=E5=92=8C=E5=AF=BC=E5=85=A5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0bug=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/utils/import_export.py | 38 ++++++++++---- backend/dvadmin/utils/import_export_mixin.py | 52 +++++++++++++++----- 2 files changed, 68 insertions(+), 22 deletions(-) diff --git a/backend/dvadmin/utils/import_export.py b/backend/dvadmin/utils/import_export.py index 49534f5..2bd6e1e 100644 --- a/backend/dvadmin/utils/import_export.py +++ b/backend/dvadmin/utils/import_export.py @@ -1,10 +1,13 @@ # -*- coding: utf-8 -*- import os import re +from datetime import datetime import openpyxl from django.conf import settings +from dvadmin.utils.validator import CustomValidationError + def import_to_data(file_url, field_data, m2m_fields=None): """ @@ -18,9 +21,9 @@ def import_to_data(file_url, field_data, m2m_fields=None): file_path_dir = os.path.join(settings.BASE_DIR, file_url) workbook = openpyxl.load_workbook(file_path_dir) table = workbook[workbook.sheetnames[0]] - theader = tuple(table.values)[0] # Excel的表头 - is_update = '更新主键(勿改)' in theader # 是否导入更新 - if is_update is False: # 不是更新时,删除id列 + theader = tuple(table.values)[0] #Excel的表头 + is_update = '更新主键(勿改)' in theader #是否导入更新 + if is_update is False: #不是更新时,删除id列 field_data.pop('id') # 获取参数映射 validation_data_dict = {} @@ -44,15 +47,30 @@ def import_to_data(file_url, field_data, m2m_fields=None): if i == 0: continue array = {} - for index, key in enumerate(field_data.keys()): + for index, item in enumerate(field_data.items()): + items = list(item) + key = items[0] + values = items[1] + value_type = 'str' + if isinstance(values, dict): + value_type = values.get('type','str') cell_value = table.cell(row=row + 1, column=index + 2).value - # 由于excel导入数字类型后，会出现数字加 .0 的，进行处理 - if type(cell_value) is float and str(cell_value).split(".")[1] == "0": - cell_value = int(str(cell_value).split(".")[0]) - if type(cell_value) is str: - cell_value = cell_value.strip(" \t\n\r") - if cell_value is None: + if cell_value is None or cell_value=='': continue + elif value_type == 'date': + print(61, datetime.strptime(str(cell_value), '%Y-%m-%d %H:%M:%S').date()) + try: + cell_value = datetime.strptime(str(cell_value), '%Y-%m-%d %H:%M:%S').date() + except: + raise CustomValidationError('日期格式不正确') + elif value_type == 'datetime': + cell_value = datetime.strptime(str(cell_value), '%Y-%m-%d %H:%M:%S') + else: + # 由于excel导入数字类型后，会出现数字加 .0 的，进行处理 + if type(cell_value) is float and str(cell_value).split(".")[1] == "0": + cell_value = int(str(cell_value).split(".")[0]) + elif type(cell_value) is str: + cell_value = cell_value.strip(" \t\n\r") if key in validation_data_dict: array[key] = validation_data_dict.get(key, {}).get(cell_value, None) if key in m2m_fields: diff --git a/backend/dvadmin/utils/import_export_mixin.py b/backend/dvadmin/utils/import_export_mixin.py index 40d2db5..44f51cc 100644 --- a/backend/dvadmin/utils/import_export_mixin.py +++ b/backend/dvadmin/utils/import_export_mixin.py @@ -57,11 +57,6 @@ class ImportSerializerMixin: length += 2.1 if ord(char) > 256 else 1 return round(length, 1) if length <= self.export_column_width else self.export_column_width - @action(methods=['get'],detail=False) - def update_field(self,request:Request): - data = [{"label":value,"value":key} for key,value in self.import_field_dict.items()] - return DetailResponse(data=data) - @action(methods=['get','post'],detail=False) @transaction.atomic # Django 事务,防止出错 def import_data(self, request: Request, *args, **kwargs): @@ -153,7 +148,7 @@ class ImportSerializerMixin: for ele in data: filter_dic = {'id':ele.get('id')} instance = filter_dic and queryset.filter(**filter_dic).first() - print(instance) + # print(156,ele) serializer = self.import_serializer_class(instance, data=ele, request=request) serializer.is_valid(raise_exception=True) serializer.save() @@ -170,15 +165,48 @@ class ImportSerializerMixin: response["Access-Control-Expose-Headers"] = f"Content-Disposition" response["content-disposition"] = f'attachment;filename={quote(str(f"导出{get_verbose_name(queryset)}.xlsx"))}' wb = Workbook() + ws1 = wb.create_sheet("data", 1) + ws1.sheet_state = "hidden" ws = wb.active import_field_dict = {} - for key,val in self.import_field_dict.items(): - if isinstance(val,dict): - import_field_dict[key] = val.get('title') + header_data = ["序号","更新主键(勿改)"] + hidden_header = ["#","id"] + #----设置选项---- + validation_data_dict = {} + for index, item in enumerate(self.import_field_dict.items()): + items = list(item) + key = items[0] + value = items[1] + if isinstance(value, dict): + header_data.append(value.get("title")) + hidden_header.append(value.get('display')) + choices = value.get("choices", {}) + if choices.get("data"): + data_list = [] + data_list.extend(choices.get("data").keys()) + validation_data_dict[value.get("title")] = data_list + elif choices.get("queryset") and choices.get("values_name"): + data_list = choices.get("queryset").values_list(choices.get("values_name"), flat=True) + validation_data_dict[value.get("title")] = list(data_list) + else: + continue + column_letter = get_column_letter(len(validation_data_dict)) + dv = DataValidation( + type="list", + formula1=f"{quote_sheetname('data')}!${column_letter}$2:${column_letter}${len(validation_data_dict[value.get('title')]) + 1}", + allow_blank=True, + ) + ws.add_data_validation(dv) + dv.add(f"{get_column_letter(index + 3)}2:{get_column_letter(index + 3)}1048576") else: - import_field_dict[key] = val - header_data = ["序号","更新主键(勿改)", *import_field_dict.values()] - hidden_header = ["#","id", *import_field_dict.keys()] + header_data.append(value) + hidden_header.append(key) + # 添加数据列 + ws1.append(list(validation_data_dict.keys())) + for index, validation_data in enumerate(validation_data_dict.values()): + for inx, ele in enumerate(validation_data): + ws1[f"{get_column_letter(index + 1)}{inx + 2}"] = ele + #-------- df_len_max = [self.get_string_len(ele) for ele in header_data] row = get_column_letter(len(hidden_header) + 1) column = 1 From 4123236854fbb046f6c38f745d41deb0ae39663c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Thu, 12 Jan 2023 22:04:15 +0800 Subject: [PATCH 29/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=201?= =?UTF-8?q?.=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/api/service.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/src/api/service.js b/web/src/api/service.js index fb47712..5b7f5ec 100644 --- a/web/src/api/service.js +++ b/web/src/api/service.js @@ -216,7 +216,7 @@ const refreshTken = function () { * @param method * @param filename */ -export const downloadFile = function ({ url, params, method, filename="文件导出" }) { +export const downloadFile = function ({ url, params, method, filename= '文件导出' }) { request({ url: url, method: method, @@ -224,7 +224,8 @@ export const downloadFile = function ({ url, params, method, filename="文件导 responseType: 'blob' // headers: {Accept: 'application/vnd.openxmlformats-officedocument'} }).then(res => { - const fileName = window.decodeURI(filename + '.xlsx' || res.headers['content-disposition'].split('=')[1]) || '文件导出.xlsx' + const xlsxName = window.decodeURI(res.headers['content-disposition'].split('=')[1]) + const fileName = xlsxName || `${filename}.xlsx` if (res) { const blob = new Blob([res.data], { type: 'charset=utf-8' }) const elink = document.createElement('a') From 51a6c569a2b00304314126796b073fcdd0f93b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Thu, 12 Jan 2023 22:29:18 +0800 Subject: [PATCH 30/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=BF=90=E8=A1=8C=E9=83=A8=E7=BD=B2=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E4=B8=BA=20gunicorn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/application/websocketConfig.py | 5 ++- backend/docker_start.sh | 2 +- backend/gunicorn.py | 48 ++++++++++++++++++++++++++ backend/requirements.txt | 4 +++ docker_env/django/DockerfileBuild | 4 +-- docker_env/web/DockerfileBuild | 3 +- 6 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 backend/gunicorn.py diff --git a/backend/application/websocketConfig.py b/backend/application/websocketConfig.py index 115138a..80515f4 100644 --- a/backend/application/websocketConfig.py +++ b/backend/application/websocketConfig.py @@ -85,7 +85,10 @@ class DvadminWebSocket(AsyncJsonWebsocketConsumer): # Leave room group await self.channel_layer.group_discard(self.chat_group_name, self.channel_name) print("连接关闭") - await self.close(close_code) + try: + await self.close(close_code) + except Exception: + pass class MegCenter(DvadminWebSocket): diff --git a/backend/docker_start.sh b/backend/docker_start.sh index 2654bc1..6042fe6 100755 --- a/backend/docker_start.sh +++ b/backend/docker_start.sh @@ -2,4 +2,4 @@ # python manage.py makemigrations # python manage.py migrate # python manage.py init -y -daphne -b 0.0.0.0 -p 8000 application.asgi:application +gunicorn -c gunicorn.py application.asgi:application diff --git a/backend/gunicorn.py b/backend/gunicorn.py new file mode 100644 index 0000000..1772fbc --- /dev/null +++ b/backend/gunicorn.py @@ -0,0 +1,48 @@ +# gunicorn.conf +# coding:utf-8 +# 启动命令：gunicorn -c gunicorn.py application.asgi:application +import multiprocessing +# 并行工作进程数, int，cpu数量*2+1 推荐进程数 +workers = multiprocessing.cpu_count() * 2 + 1 +# 指定每个进程开启的线程数 +threads = 3 +# 绑定的ip与端口 +bind = '0.0.0.0:8000' +# 设置守护进程,将进程交给第三方管理 +daemon = 'false' +# 工作模式协程，默认的是sync模式,推荐使用 gevent，此处使用与uvicorn配合使用 uvicorn.workers.UvicornWorker +worker_class = 'uvicorn.workers.UvicornWorker' +# 设置最大并发量（每个worker处理请求的工作线程数，正整数，默认为1） +worker_connections = 10000 +# 最大客户端并发数量，默认情况下这个值为1000。此设置将影响gevent和eventlet工作模式 +# 每个工作进程将在处理max_requests请求后自动重新启动该进程 +max_requests = 10000 +max_requests_jitter = 200 +# 设置进程文件目录 +pidfile = './gunicorn.pid' +# 日志级别，这个日志级别指的是错误日志的级别，而访问日志的级别无法设置 +loglevel = 'info' +# 设置gunicorn访问日志格式，错误日志无法设置 +access_log_format = '%(t)s %(p)s %(h)s "%(r)s" %(s)s %(L)s %(b)s %(f)s" "%(a)s"' +# 监听队列 +backlog = 512 +#进程名 +proc_name = 'gunicorn_process' +# 设置超时时间120s，默认为30s。按自己的需求进行设置timeout = 120 +timeout = 120 +# 超时重启 +graceful_timeout = 300 +# 在keep-alive连接上等待请求的秒数，默认情况下值为2。一般设定在1~5秒之间。 +keepalive = 3 +# HTTP请求行的最大大小，此参数用于限制HTTP请求行的允许大小，默认情况下，这个值为4094。 +# 值是0~8190的数字。此参数可以防止任何DDOS攻击 +limit_request_line = 5120 +# 限制HTTP请求中请求头字段的数量。 +# 此字段用于限制请求头字段的数量以防止DDOS攻击，与limit-request-field-size一起使用可以提高安全性。 +# 默认情况下，这个值为100，这个值不能超过32768 +limit_request_fields = 101 +# 限制HTTP请求中请求头的大小，默认情况下这个值为8190。 +# 值是一个整数或者0，当该值为0时，表示将对请求头大小不做限制 +limit_request_field_size = 0 +# 记录到标准输出 +accesslog = '-' diff --git a/backend/requirements.txt b/backend/requirements.txt index 1aa39d9..fb07b24 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -43,3 +43,7 @@ whitenoise==5.3.0 openpyxl==3.0.9 channels==3.0.5 channels-redis==3.4.1 +uvicorn==0.20.0 +gunicorn==20.1.0 +gevent==22.10.2 +websockets==10.4 diff --git a/docker_env/django/DockerfileBuild b/docker_env/django/DockerfileBuild index 4c590d2..b5d4ac3 100644 --- a/docker_env/django/DockerfileBuild +++ b/docker_env/django/DockerfileBuild @@ -2,7 +2,7 @@ FROM python:3.8-alpine RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories RUN apk update && apk add bash bash-doc bash-completion git freetds-dev jpeg-dev linux-headers mysql-client mariadb-dev build-base libffi-dev openssl-dev zlib-dev bzip2-dev pcre-dev ncurses-dev readline-dev tk-dev postgresql-dev WORKDIR /backend -COPY ./backend/requirements.txt / -COPY ./docker_env/requirements-all.txt / +COPY ./backend/requirements.txt . +COPY ./docker_env/requirements-all.txt . RUN python3 -m pip install -i https://mirrors.aliyun.com/pypi/simple/ -r /requirements.txt RUN python3 -m pip install -i https://mirrors.aliyun.com/pypi/simple/ -r /requirements-all.txt \ No newline at end of file diff --git a/docker_env/web/DockerfileBuild b/docker_env/web/DockerfileBuild index d2e687d..b123505 100644 --- a/docker_env/web/DockerfileBuild +++ b/docker_env/web/DockerfileBuild @@ -1,3 +1,4 @@ FROM node:14-alpine -COPY ./web/package.json / +WORKDIR /web/ +COPY ./web/package.json . RUN npm install --registry=https://registry.npm.taobao.org From de1071c7b81e241ef5606875f06f01ba8c058367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Fri, 13 Jan 2023 23:04:11 +0800 Subject: [PATCH 31/31] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20n?= =?UTF-8?q?pm=20run=20lint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/package.json | 2 +- web/src/api/service.js | 2 +- web/src/api/websocket.js | 2 +- web/src/views/system/messageCenter/index.vue | 2 +- web/src/views/system/rolePermission/index.vue | 7 +++---- web/src/views/system/user/index.vue | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/web/package.json b/web/package.json index 484ca41..336ae62 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "django-vue-admin", - "version": "2.0.7", + "version": "2.0.8", "scripts": { "serve": "vue-cli-service serve --open", "start": "npm run serve", diff --git a/web/src/api/service.js b/web/src/api/service.js index 5b7f5ec..e5ab0f8 100644 --- a/web/src/api/service.js +++ b/web/src/api/service.js @@ -216,7 +216,7 @@ const refreshTken = function () { * @param method * @param filename */ -export const downloadFile = function ({ url, params, method, filename= '文件导出' }) { +export const downloadFile = function ({ url, params, method, filename = '文件导出' }) { request({ url: url, method: method, diff --git a/web/src/api/websocket.js b/web/src/api/websocket.js index 093b163..83a7e9d 100644 --- a/web/src/api/websocket.js +++ b/web/src/api/websocket.js @@ -29,7 +29,7 @@ function webSocketOnError (e) { */ function webSocketOnMessage (e) { const data = JSON.parse(e.data) - const {unread} = data + const { unread } = data store.dispatch('d2admin/messagecenter/setUnread', unread || 0) if (data.contentType === 'SYSTEM') { ElementUI.Notification({ diff --git a/web/src/views/system/messageCenter/index.vue b/web/src/views/system/messageCenter/index.vue index 90b2fac..8832409 100644 --- a/web/src/views/system/messageCenter/index.vue +++ b/web/src/views/system/messageCenter/index.vue @@ -84,7 +84,7 @@ export default { this.tabActivted = name this.doRefresh() }, - //关闭事件 + // 关闭事件 doDialogClosed (context) { this.doRefresh() } diff --git a/web/src/views/system/rolePermission/index.vue b/web/src/views/system/rolePermission/index.vue index fa81c32..135f396 100644 --- a/web/src/views/system/rolePermission/index.vue +++ b/web/src/views/system/rolePermission/index.vue @@ -119,7 +119,6 @@