From 0e6b6da4595e01971c2303d8667860553c88a34e Mon Sep 17 00:00:00 2001 From: RubyLiu Date: Thu, 1 Feb 2024 19:03:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=80=E6=9C=89=E7=9A=84=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E7=82=B9=E5=87=BB=E9=81=AE=E7=BD=A9=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/business/ms-user-group-comp/authTable.vue | 1 + frontend/src/hooks/useModal.ts | 1 + .../projectAndPermission/userGroup/addUserModal.vue | 1 + .../projectAndPermission/userGroup/locale/en-US.ts | 1 + .../projectAndPermission/userGroup/locale/zh-CN.ts | 1 + .../projectAndPermission/userGroup/projectUserGroup.vue | 1 + .../projectAndPermission/userGroup/userDrawer.vue | 2 +- .../organization/project/components/addProjectModal.vue | 1 + .../organization/project/components/addUserModal.vue | 1 + .../setting/organization/project/components/userDrawer.vue | 4 ++-- .../src/views/setting/organization/project/locale/en-US.ts | 1 + .../src/views/setting/organization/project/locale/zh-CN.ts | 3 ++- .../organizationAndProject/components/addProjectModal.vue | 1 + .../organizationAndProject/components/addUserModal.vue | 1 + .../organizationAndProject/components/systemProject.vue | 4 ++-- .../system/organizationAndProject/components/userDrawer.vue | 3 ++- .../setting/system/organizationAndProject/locale/zh-CN.ts | 6 ++++-- frontend/src/views/setting/system/usergroup/locale/zh-CN.ts | 2 +- 18 files changed, 25 insertions(+), 10 deletions(-) diff --git a/frontend/src/components/business/ms-user-group-comp/authTable.vue b/frontend/src/components/business/ms-user-group-comp/authTable.vue index f832127360..176700529c 100644 --- a/frontend/src/components/business/ms-user-group-comp/authTable.vue +++ b/frontend/src/components/business/ms-user-group-comp/authTable.vue @@ -465,6 +465,7 @@ permissions, }); } + canSave.value = false; Message.success(t('common.saveSuccess')); initData(props.current.id); } catch (error) { diff --git a/frontend/src/hooks/useModal.ts b/frontend/src/hooks/useModal.ts index 7a62d57f38..231eca9a83 100644 --- a/frontend/src/hooks/useModal.ts +++ b/frontend/src/hooks/useModal.ts @@ -65,6 +65,7 @@ export default function useModal() { okText: t('common.confirmDelete'), cancelText: t('common.cancel'), hideCancel: false, + simple: false, okButtonProps: { status: 'danger' }, titleAlign: 'start', modalClass: `ms-usemodal ms-usemodal-warning ms-usemodal-small`, diff --git a/frontend/src/views/project-management/projectAndPermission/userGroup/addUserModal.vue b/frontend/src/views/project-management/projectAndPermission/userGroup/addUserModal.vue index 141d4a7a40..6f970ba31d 100644 --- a/frontend/src/views/project-management/projectAndPermission/userGroup/addUserModal.vue +++ b/frontend/src/views/project-management/projectAndPermission/userGroup/addUserModal.vue @@ -5,6 +5,7 @@ class="ms-modal-form ms-modal-medium" :ok-text="t('system.organization.addMember')" unmount-on-close + :mask-closable="false" @cancel="handleCancel(false)" > diff --git a/frontend/src/views/project-management/projectAndPermission/userGroup/locale/en-US.ts b/frontend/src/views/project-management/projectAndPermission/userGroup/locale/en-US.ts index 8df7d18e0e..17f6720db6 100644 --- a/frontend/src/views/project-management/projectAndPermission/userGroup/locale/en-US.ts +++ b/frontend/src/views/project-management/projectAndPermission/userGroup/locale/en-US.ts @@ -5,6 +5,7 @@ export default { 'project.usergroup.memberCount': 'Member Count', 'project.userGroup.viewAuth': 'View Auth', 'project.userGroup.deleteName': 'Are you sure to delete: {name}?', + 'project.userGroup.removeTip': 'Delete it, you`ll lose project auth', 'project.userGroup.deleteTip': 'After deletion, the user group data under the project will be deleted together, please operate with caution!', }; diff --git a/frontend/src/views/project-management/projectAndPermission/userGroup/locale/zh-CN.ts b/frontend/src/views/project-management/projectAndPermission/userGroup/locale/zh-CN.ts index 7e03f05156..e2f44f3a75 100644 --- a/frontend/src/views/project-management/projectAndPermission/userGroup/locale/zh-CN.ts +++ b/frontend/src/views/project-management/projectAndPermission/userGroup/locale/zh-CN.ts @@ -8,4 +8,5 @@ export default { 'project.userGroup.deleteTip': '删除后，项目下用户组数据将一起删除，请谨慎操作！', 'project.userGroup.addRequired': '用户组名称不能为空', 'project.userGroup.addUserGroup': '添加用户组', + 'project.userGroup.removeTip': '移除后，将失去用户组权限', }; diff --git a/frontend/src/views/project-management/projectAndPermission/userGroup/projectUserGroup.vue b/frontend/src/views/project-management/projectAndPermission/userGroup/projectUserGroup.vue index b09ee4f222..0c6f33a12c 100644 --- a/frontend/src/views/project-management/projectAndPermission/userGroup/projectUserGroup.vue +++ b/frontend/src/views/project-management/projectAndPermission/userGroup/projectUserGroup.vue @@ -87,6 +87,7 @@ :ok-text="t('common.create')" title-align="start" class="ms-modal-form ms-modal-small" + :mask-closable="false" >
diff --git a/frontend/src/views/project-management/projectAndPermission/userGroup/userDrawer.vue b/frontend/src/views/project-management/projectAndPermission/userGroup/userDrawer.vue index f4bdf2e6fe..313da6df55 100644 --- a/frontend/src/views/project-management/projectAndPermission/userGroup/userDrawer.vue +++ b/frontend/src/views/project-management/projectAndPermission/userGroup/userDrawer.vue @@ -34,7 +34,7 @@ diff --git a/frontend/src/views/setting/organization/project/components/addProjectModal.vue b/frontend/src/views/setting/organization/project/components/addProjectModal.vue index 0fbf8f3c34..f06e9fd206 100644 --- a/frontend/src/views/setting/organization/project/components/addProjectModal.vue +++ b/frontend/src/views/setting/organization/project/components/addProjectModal.vue @@ -4,6 +4,7 @@ title-align="start" class="ms-modal-form ms-modal-medium" unmount-on-close + :mask-closable="false" @cancel="handleCancel(false)" > diff --git a/frontend/src/views/setting/organization/project/locale/en-US.ts b/frontend/src/views/setting/organization/project/locale/en-US.ts index 94da755c6e..3dfb1fdd05 100644 --- a/frontend/src/views/setting/organization/project/locale/en-US.ts +++ b/frontend/src/views/setting/organization/project/locale/en-US.ts @@ -76,4 +76,5 @@ export default { 'system.project.createProjectSuccess': 'Create project success', 'system.project.updateProjectSuccess': 'Update project success', 'system.project.resourcePool': 'Resource pool', + 'system.project.removeName': 'Confirm remove the {name}', }; diff --git a/frontend/src/views/setting/organization/project/locale/zh-CN.ts b/frontend/src/views/setting/organization/project/locale/zh-CN.ts index 7c1042c6f0..bb56acd0e5 100644 --- a/frontend/src/views/setting/organization/project/locale/zh-CN.ts +++ b/frontend/src/views/setting/organization/project/locale/zh-CN.ts @@ -6,7 +6,7 @@ export default { 'system.organization.edit': '编辑', 'system.organization.save': '保存', 'system.organization.end': '结束', - 'system.organization.removeName': '确认移除 {name} 这个用户吗', + 'system.organization.removeName': '确认移除 {name} 这个用户吗？', 'system.organization.removeTip': '移除后，将失去组织权限', 'system.organization.addMember': '添加成员', 'system.organization.addMemberPlaceholder': '请选择成员', @@ -70,4 +70,5 @@ export default { 'system.project.createProjectSuccess': '创建项目成功', 'system.project.updateProjectSuccess': '更新项目成功', 'system.project.resourcePool': '资源池', + 'system.project.removeName': '确认移除 {name} 这个用户吗？', }; diff --git a/frontend/src/views/setting/system/organizationAndProject/components/addProjectModal.vue b/frontend/src/views/setting/system/organizationAndProject/components/addProjectModal.vue index e73010d786..9ace2d7dea 100644 --- a/frontend/src/views/setting/system/organizationAndProject/components/addProjectModal.vue +++ b/frontend/src/views/setting/system/organizationAndProject/components/addProjectModal.vue @@ -5,6 +5,7 @@ :ok-text="isEdit ? t('common.update') : t('common.create')" title-align="start" unmount-on-close + :mask-closable="false" @cancel="handleCancel(false)" >