From f650d0c78da6998b2acd4c686e1f5a5ac4710c5d Mon Sep 17 00:00:00 2001 From: "xinxin.wu" Date: Wed, 3 Jan 2024 10:08:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99=E9=98=BB=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ms-rich-text/extensions/mention/suggestion.ts | 1 - .../src/components/pure/ms-table/base-table.vue | 6 ++++++ frontend/src/components/pure/ms-upload/index.vue | 2 +- .../projectAndPermission/member/index.vue | 12 ++++++------ .../template/components/fieldSetting.vue | 13 ++++++++++++- .../setting/organization/template/locale/en-US.ts | 5 +++++ .../setting/organization/template/locale/zh-CN.ts | 7 +++++-- 7 files changed, 35 insertions(+), 11 deletions(-) diff --git a/frontend/src/components/pure/ms-rich-text/extensions/mention/suggestion.ts b/frontend/src/components/pure/ms-rich-text/extensions/mention/suggestion.ts index f85843c3c2..66e691cec7 100644 --- a/frontend/src/components/pure/ms-rich-text/extensions/mention/suggestion.ts +++ b/frontend/src/components/pure/ms-rich-text/extensions/mention/suggestion.ts @@ -37,7 +37,6 @@ export default { return { onStart: (props: Record) => { - debugger; component = new VueRenderer(MentionList, { props, editor: props.editor, diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue index a23a7cec97..094e52a2b6 100644 --- a/frontend/src/components/pure/ms-table/base-table.vue +++ b/frontend/src/components/pure/ms-table/base-table.vue @@ -176,6 +176,12 @@ class="mt-[16px] flex h-[32px] flex-row flex-nowrap items-center" :class="{ 'justify-between': showBatchAction }" > + {{ t('msTable.batch.selected', { count: selectCurrent }) }} + {{ + t('msTable.batch.clear') + }}
{ - resizeObserver.value.disconnect(); + if (props.isAllScreen) resizeObserver.value.disconnect(); }); diff --git a/frontend/src/views/project-management/projectAndPermission/member/index.vue b/frontend/src/views/project-management/projectAndPermission/member/index.vue index 24c53e5298..aa8b0c7a8e 100644 --- a/frontend/src/views/project-management/projectAndPermission/member/index.vue +++ b/frontend/src/views/project-management/projectAndPermission/member/index.vue @@ -74,7 +74,7 @@ :user-group-options="userGroupOptions" @success="loadList()" /> - appStore.getCurrentProjectId); + const lastProjectId = computed(() => appStore.currentProjectId); const columns: MsTableColumn = [ { @@ -266,7 +266,7 @@ const removeMember = async (record: ProjectMemberItem) => { deleteLoading.value = true; try { - if (lastProjectId && record.id) { + if (lastProjectId.value && record.id) { await removeProjectMember(lastProjectId.value, record.id); Message.success(t('project.member.deleteMemberSuccess')); loadList(); @@ -287,7 +287,7 @@ // 添加到用户组 const addUserGroup = async (target: string[]) => { const params = { - projectId: lastProjectId, + projectId: lastProjectId.value, userIds: selectData.value, roleIds: target, }; @@ -309,7 +309,7 @@ if (event.eventTag === 'batchAddUserGroup') { batchVisible.value = true; batchAction.value = event.eventTag; - batchModalRef.value.getTreeList(getProjectUserGroup, lastProjectId); + batchModalRef.value.getTreeList(getProjectUserGroup, lastProjectId.value); } }; diff --git a/frontend/src/views/setting/organization/template/components/fieldSetting.vue b/frontend/src/views/setting/organization/template/components/fieldSetting.vue index 0245a9479e..00e9efd075 100644 --- a/frontend/src/views/setting/organization/template/components/fieldSetting.vue +++ b/frontend/src/views/setting/organization/template/components/fieldSetting.vue @@ -48,7 +48,7 @@ @@ -162,6 +162,17 @@ const currentOrd = computed(() => appStore.currentOrgId); const currentProjectId = computed(() => appStore.currentProjectId); + const templateType = computed(() => { + switch (route.query.type) { + case 'API': + return t('system.orgTemplate.templateApi'); + case 'BUG': + return t('system.orgTemplate.templateBug'); + default: + return t('system.orgTemplate.templateCase'); + } + }); + const fieldColumns: MsTableColumn = [ { title: 'system.orgTemplate.name', diff --git a/frontend/src/views/setting/organization/template/locale/en-US.ts b/frontend/src/views/setting/organization/template/locale/en-US.ts index e4d77718fa..00052d2607 100644 --- a/frontend/src/views/setting/organization/template/locale/en-US.ts +++ b/frontend/src/views/setting/organization/template/locale/en-US.ts @@ -62,6 +62,8 @@ export default { 'system.orgTemplate.optionsPlaceholder': 'Please enter options', 'system.orgTemplate.optionsIdPlaceholder': 'Please enter options ID', 'system.orgTemplate.optionsIdTip': 'The option ID cannot be empty', + 'system.orgTemplate.updateTip': 'Are you sure to update {name}?', + 'system.orgTemplate.updateDescription': 'After the update, use {type} will be an update of the field', 'system.orgTemplate.columnTemplateName': 'Template name', 'system.orgTemplate.copy': 'Copy', 'system.orgTemplate.defaultValue': 'Default value', @@ -170,4 +172,7 @@ export default { 'system.orgTemplate.modules': 'module', 'system.orgTemplate.tags': 'tags', 'system.orgTemplate.optionKeyValue': 'Option KEY value', + 'system.orgTemplate.templateCase': 'Case', + 'system.orgTemplate.templateApi': 'Api', + 'system.orgTemplate.templateBug': 'Bug', }; diff --git a/frontend/src/views/setting/organization/template/locale/zh-CN.ts b/frontend/src/views/setting/organization/template/locale/zh-CN.ts index eb67ab2c9c..3e9e22a8bf 100644 --- a/frontend/src/views/setting/organization/template/locale/zh-CN.ts +++ b/frontend/src/views/setting/organization/template/locale/zh-CN.ts @@ -61,8 +61,8 @@ export default { 'system.orgTemplate.optionsPlaceholder': '请输入选项', 'system.orgTemplate.optionsIdPlaceholder': '请输入选项ID', 'system.orgTemplate.optionsIdTip': '选项ID不能为空', - 'system.orgTemplate.updateTip': '确认更新 `{name}` 吗？', - 'system.orgTemplate.updateDescription': '更新后，所使用该字段模版将一起修改', + 'system.orgTemplate.updateTip': '确认更新 {name} 吗？', + 'system.orgTemplate.updateDescription': '更新后，使用该字段的{type}将同步更新', 'system.orgTemplate.confirm': '确定', 'system.orgTemplate.columnTemplateName': '模版名称', 'system.orgTemplate.copy': '复制', @@ -161,4 +161,7 @@ export default { 'system.orgTemplate.modules': '模块', 'system.orgTemplate.tags': '标签', 'system.orgTemplate.optionKeyValue': '选项KEY值', + 'system.orgTemplate.templateCase': '用例', + 'system.orgTemplate.templateApi': '接口', + 'system.orgTemplate.templateBug': '缺陷', };