From bf96e9f1c0c4b047b2db58b73044726eb651ea91 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Fri, 1 Mar 2024 17:27:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dip=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=99=A8=E5=8F=AA=E6=94=AF=E6=8C=81=E5=8D=95=E9=80=89?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=8B=E5=8F=B3=E4=BE=A7=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E8=BF=98=E6=9C=89=E5=8F=AF=E4=BB=A5=E5=8B=BE=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/choose-ip/topology-tree.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/choose-ip/topology-tree.vue b/frontend/src/components/choose-ip/topology-tree.vue index 555bbe07f..6533d27fe 100644 --- a/frontend/src/components/choose-ip/topology-tree.vue +++ b/frontend/src/components/choose-ip/topology-tree.vue @@ -234,7 +234,7 @@ @@ -669,7 +669,7 @@ } if (!async && expanded) { return { - 'paddingLeft': `${16 + level * 8}px` + 'paddingLeft': `16px` }; } }; From 31edd37559e04c51bf361d8c31e31e5f145546bc Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Fri, 1 Mar 2024 17:55:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=20=E6=9D=83=E9=99=90=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=90=9C=E7=B4=A2=E6=8E=A5=E5=8F=A3=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=97=A0=E6=B3=95=E6=90=9C=E7=B4=A2=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/perm-template/index.vue | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/frontend/src/views/perm-template/index.vue b/frontend/src/views/perm-template/index.vue index b67196055..4e4353ab6 100644 --- a/frontend/src/views/perm-template/index.vue +++ b/frontend/src/views/perm-template/index.vue @@ -147,7 +147,7 @@ import IamGuide from '@/components/iam-guide/index.vue'; import { fuzzyRtxSearch } from '@/common/rtx'; import { buildURLParams } from '@/common/url'; - import { formatCodeData, getWindowHeight } from '@/common/util'; + import { formatCodeData, getWindowHeight, delLocationHref } from '@/common/util'; export default { name: '', components: { @@ -290,9 +290,8 @@ refreshCurrentQuery () { const params = {}; const queryParams = { - ...this.searchParams, - ...this.$route.query, - ...this.queryParams + ...this.searchParams, + ...this.queryParams }; if (Object.keys(queryParams).length) { window.history.replaceState({}, '', `?${buildURLParams(queryParams)}`); @@ -341,6 +340,11 @@ count: 0 }); }, + + resetLocationHref () { + const urlFields = [...this.searchData.map(item => item.id), ...['current', 'limit']]; + delLocationHref(urlFields); + }, async handleEmptyClear () { this.searchParams = {}; @@ -380,9 +384,9 @@ this.tableLoading = isLoading; this.setCurrentQueryCache(this.refreshCurrentQuery()); const params = { - ...this.searchParams, - limit: this.pagination.limit, - offset: this.pagination.limit * (this.pagination.current - 1) + ...this.searchParams, + limit: this.pagination.limit, + offset: this.pagination.limit * (this.pagination.current - 1) }; delete params.current; try { @@ -475,7 +479,12 @@ this.searchParams = payload; this.searchList = result; this.emptyData.tipType = 'search'; + this.queryParams = Object.assign(this.queryParams, { current: 1, limit: 10 }); this.resetPagination(); + if (!result.length) { + this.resetLocationHref(); + window.localStorage.removeItem('templateList'); + } this.fetchTemplateList(true); }, From a219354e86660091c0754e49683d8c9776957cb7 Mon Sep 17 00:00:00 2001 From: Timmy Date: Mon, 4 Mar 2024 10:52:18 +0800 Subject: [PATCH 3/3] fix: update group batch member renew (#2550) --- saas/backend/apps/group/views.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/saas/backend/apps/group/views.py b/saas/backend/apps/group/views.py index 0f59c3d99..4114e4ed1 100644 --- a/saas/backend/apps/group/views.py +++ b/saas/backend/apps/group/views.py @@ -567,7 +567,7 @@ class GroupsMemberRenewViewSet(GenericViewSet): group_biz = GroupBiz() @swagger_auto_schema( - operation_description="批量用户组添加成员", + operation_description="批量用户组成员续期", request_body=BatchGroupMemberUpdateExpiredAtSLZ(label="成员"), responses={status.HTTP_200_OK: serializers.Serializer()}, tags=["group"], @@ -598,7 +598,9 @@ def create(self, request, *args, **kwargs): ) # 写入审计上下文 - audit_context_setter(group=group, members=data["members"]) + audit_context_setter(group=group, members=group_member) + provider = GroupMemberRenewAuditProvider(request) + log_api_event(request, provider) return Response({})