From 7b0127a5ea4ee8c45d01a4437e4779b2d08f07d1 Mon Sep 17 00:00:00 2001 From: "xinxin.wu" Date: Mon, 28 Aug 2023 19:01:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=91=98=E5=92=8C=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E7=BB=86=E8=8A=82bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/member/components/addMemberModal.vue | 10 +++++++++- .../src/views/setting/organization/member/index.vue | 6 ++++-- .../views/setting/organization/member/locale/en-US.ts | 2 +- .../views/setting/organization/member/locale/zh-CN.ts | 2 +- .../serviceIntegration/components/serviceList.vue | 1 + .../system/pluginManager/components/pluginTable.vue | 2 +- .../pluginManager/components/updatePluginModal.vue | 2 +- 7 files changed, 18 insertions(+), 7 deletions(-) diff --git a/frontend/src/views/setting/organization/member/components/addMemberModal.vue b/frontend/src/views/setting/organization/member/components/addMemberModal.vue index 4cd82b2c1f..8d7759692a 100644 --- a/frontend/src/views/setting/organization/member/components/addMemberModal.vue +++ b/frontend/src/views/setting/organization/member/components/addMemberModal.vue @@ -7,7 +7,11 @@ :cancel-text="t('organization.member.Cancel')" >
@@ -102,11 +106,15 @@ form.value = { ...initFormValue }; dialogVisible.value = false; }; + + const memberName = ref(''); + const edit = (record: MemberItem) => { const { userRoleIdNameMap, projectIdNameMap } = record; form.value.memberIds = [record.id as string]; form.value.userRoleIds = (userRoleIdNameMap || []).map((item) => item.id); form.value.projectIds = (projectIdNameMap || []).map((item) => item.id); + memberName.value = record.name; }; const handleOK = () => { memberFormRef.value?.validate(async (errors: undefined | Record) => { diff --git a/frontend/src/views/setting/organization/member/index.vue b/frontend/src/views/setting/organization/member/index.vue index 2edd5efb4f..306e0b9842 100644 --- a/frontend/src/views/setting/organization/member/index.vue +++ b/frontend/src/views/setting/organization/member/index.vue @@ -9,6 +9,7 @@ { + const addProjectOrAddUserGroup = async (target: string[], type: string) => { const currentType = batchList.find((item) => item.type === type); const params: BatchAddProjectModel = { organizationId: lastOrganizationId, @@ -315,7 +316,8 @@ } else { params.userRoleIds = target; } - if (currentType) batchModalRef.value.batchRequestFun(currentType.request, params); + if (currentType) await batchModalRef.value.batchRequestFun(currentType.request, params); + loadList(); }; // 批量操作 const handleTableBatch = (actionItem: any) => { diff --git a/frontend/src/views/setting/organization/member/locale/en-US.ts b/frontend/src/views/setting/organization/member/locale/en-US.ts index 5079c0e1a9..18b4ffe526 100644 --- a/frontend/src/views/setting/organization/member/locale/en-US.ts +++ b/frontend/src/views/setting/organization/member/locale/en-US.ts @@ -1,6 +1,6 @@ export default { 'organization.member.addMember': 'Add Member', - 'organization.member.updateMember': 'Update Member', + 'organization.member.updateMember': 'Update Member（{name}）', 'organization.member.searchMember': 'Search by name or email address', 'organization.member.remove': 'Remove', 'organization.member.edit': 'Edit', diff --git a/frontend/src/views/setting/organization/member/locale/zh-CN.ts b/frontend/src/views/setting/organization/member/locale/zh-CN.ts index 07e305b2f4..fdaf47d36a 100644 --- a/frontend/src/views/setting/organization/member/locale/zh-CN.ts +++ b/frontend/src/views/setting/organization/member/locale/zh-CN.ts @@ -1,6 +1,6 @@ export default { 'organization.member.addMember': '添加成员', - 'organization.member.updateMember': '更新成员', + 'organization.member.updateMember': '更新成员（{name}）', 'organization.member.searchMember': '通过名称或邮箱搜索搜索', 'organization.member.remove': '移除', 'organization.member.edit': '编辑', diff --git a/frontend/src/views/setting/organization/serviceIntegration/components/serviceList.vue b/frontend/src/views/setting/organization/serviceIntegration/components/serviceList.vue index a1252a2841..fa8aeee8df 100644 --- a/frontend/src/views/setting/organization/serviceIntegration/components/serviceList.vue +++ b/frontend/src/views/setting/organization/serviceIntegration/components/serviceList.vue @@ -8,6 +8,7 @@ v-model="keyword" :placeholder="t('organization.service.searchService')" :max-length="250" + allow-clear @search="searchHandler" @press-enter="searchHandler" /> diff --git a/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue b/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue index 71fcdb8ff1..5431de2864 100644 --- a/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue +++ b/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue @@ -6,7 +6,7 @@ {{ t('system.plugin.uploadPlugin') }} - + {{ t(item.label) }} diff --git a/frontend/src/views/setting/system/pluginManager/components/updatePluginModal.vue b/frontend/src/views/setting/system/pluginManager/components/updatePluginModal.vue index 128dbed01b..cb3eb5a3f7 100644 --- a/frontend/src/views/setting/system/pluginManager/components/updatePluginModal.vue +++ b/frontend/src/views/setting/system/pluginManager/components/updatePluginModal.vue @@ -109,7 +109,7 @@ const { id, name, organizationIds, global, description } = form.value; const params = { id, - name, + name: name || title.value, organizationIds, global, description,