From f545fb9ccb0116ad213de79fdfc8880ab8ffde9c Mon Sep 17 00:00:00 2001 From: song-tianyang Date: Thu, 29 Feb 2024 15:20:26 +0800 Subject: [PATCH] =?UTF-8?q?docs(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86=E4=B8=80=E6=8F=BD=E5=AD=90?= =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1036321 --user=宋天阳 【用例管理】回收站-彻底删除提示与设计稿一致 https://www.tapd.cn/55049933/s/1466846；--bug=1036372 --user=宋天阳 【用例管理】批量复制/移动-搜索分组名称未匹配到时-提示暂无数据 https://www.tapd.cn/55049933/s/1466847； --- .../caseManagementFeature/components/caseTree.vue | 2 +- .../caseManagementFeature/components/recycleCaseTable.vue | 8 ++++---- .../case-management/caseManagementFeature/locale/en-US.ts | 2 ++ .../case-management/caseManagementFeature/locale/zh-CN.ts | 3 +++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue index e422221a84..e956cf05e3 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue @@ -13,7 +13,7 @@ :keyword="groupKeyword" :node-more-actions="caseMoreActions" :expand-all="props.isExpandAll" - :empty-text="t('caseManagement.featureCase.caseEmptyContent')" + :empty-text="t('common.noData')" draggable :virtual-list-props="virtualListProps" block-node diff --git a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue index 5cbaa61e67..55e519445c 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue @@ -731,8 +731,8 @@ async function handleBatchDelete() { openModal({ type: 'error', - title: t('caseManagement.featureCase.batchDelete', { number: batchParams.value.currentSelectCount }), - content: t('caseManagement.featureCase.cleanOutDeleteTip'), + title: t('caseManagement.featureCase.batchDeleteCompleted', {number: batchParams.value.currentSelectCount}), + content: t('caseManagement.featureCase.cleanOutDeleteOnRecycleTip'), okText: t('common.confirmDelete'), cancelText: t('common.cancel'), okButtonProps: { @@ -791,8 +791,8 @@ function handleBatchCleanOut(record: CaseManagementTable) { openModal({ type: 'error', - title: t('caseManagement.featureCase.deleteCaseTitle', { name: characterLimit(record.name) }), - content: t('caseManagement.featureCase.cleanOutDeleteTip'), + title: t('caseManagement.featureCase.completedDeleteCaseTitle', {name: characterLimit(record.name)}), + content: t('caseManagement.featureCase.cleanOutDeleteOnRecycleTip'), okText: t('common.confirmDelete'), cancelText: t('common.cancel'), okButtonProps: { diff --git a/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts b/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts index 53641c2c21..9200f19589 100644 --- a/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts +++ b/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts @@ -78,6 +78,7 @@ export default { 'caseManagement.featureCase.selectAttrs': 'select attributes', 'caseManagement.featureCase.batchUpdate': 'Batch update to', 'caseManagement.featureCase.batchDelete': 'Are you sure to delete the use case {number} ?', + 'caseManagement.featureCase.batchDeleteCompleted': 'Are you sure to completed delete the use case {number} ?', 'caseManagement.featureCase.batchMoveTitle': 'Batch Move', 'caseManagement.featureCase.batchMove': '({number} selected use cases)', 'caseManagement.featureCase.batchMoveSelectedModules': 'Batch Move', @@ -115,6 +116,7 @@ export default { 'caseManagement.featureCase.recoveredSuccessfully': 'Recovered successfully', 'caseManagement.featureCase.cleanOutDeleteTip': 'After deletion, the data will not be recovered, please operate with caution!', + 'caseManagement.featureCase.cleanOutDeleteOnRecycleTip': 'After deletion, the case will not be recovered, please operate with caution!', 'caseManagement.featureCase.pleaseEnterInputTags': 'Please enter content Enter add label', 'caseManagement.featureCase.copy': 'Copy', 'caseManagement.featureCase.copyCase': 'Copy case', diff --git a/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts b/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts index 7b34a61f79..fd0cded78f 100644 --- a/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts +++ b/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts @@ -50,6 +50,7 @@ export default { 'caseManagement.featureCase.tableColumnActions': '操作', 'caseManagement.featureCase.beforeDeleteCase': '删除后的内容将放入回收站，可在回收站内进行恢复数据', 'caseManagement.featureCase.deleteCaseTitle': '确认删除 {name} 用例 ？', + 'caseManagement.featureCase.completedDeleteCaseTitle': '确认彻底删除 {name} 用例 ？', 'caseManagement.featureCase.export': '导出', 'caseManagement.featureCase.exportExcel': '导出 Excel 表格 (xlsx)', 'caseManagement.featureCase.exportXMind': '导出思维导图 (xmind)', @@ -76,6 +77,7 @@ export default { 'caseManagement.featureCase.selectAttrs': '选择属性', 'caseManagement.featureCase.batchUpdate': '批量更新为', 'caseManagement.featureCase.batchDelete': '确认删除 {number} 条用例吗？', + 'caseManagement.featureCase.batchDeleteCompleted': '确认彻底删除 {number} 条用例吗？', 'caseManagement.featureCase.batchMoveTitle': '批量移动', 'caseManagement.featureCase.batchMove': '(已选 { number } 条用例)', 'caseManagement.featureCase.batchMoveSelectedModules': '移动 { number } 个用例至已选模块', @@ -113,6 +115,7 @@ export default { 'caseManagement.featureCase.batchCleanOut': '彻底删除', 'caseManagement.featureCase.recoveredSuccessfully': '恢复成功', 'caseManagement.featureCase.cleanOutDeleteTip': '删除后，数据将无法恢复，请谨慎操作！', + 'caseManagement.featureCase.cleanOutDeleteOnRecycleTip': '删除后，用例无法恢复，请谨慎操作！', 'caseManagement.featureCase.pleaseEnterInputTags': '请输入内容回车添加标签', 'caseManagement.featureCase.copy': '复制', 'caseManagement.featureCase.copyCase': '复制用例',