From e20c1a375d88aeda437e1077f1f802ccfd1261cf Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 21 Apr 2022 16:30:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=88=A0=E9=99=A4=E6=97=B6=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + frontend/src/views/dataset/group/Group.vue | 8 +++++++- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 1b908c0752..2ab6ac7ebf 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1103,6 +1103,7 @@ export default { rename: 'Rename', tips: 'Tips', confirm_delete: 'confirm_delete', + confirm_delete_msg: 'Deleting a dataset will affect its related user-defined dataset, associated dataset and dashboard. Confirm the delete?', delete_success: 'delete_success', confirm: 'confirm', cancel: 'cancel', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 420d0effdd..ba96d54137 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1103,6 +1103,7 @@ export default { rename: '重命名', tips: '提示', confirm_delete: '確認刪除', + confirm_delete_msg: '刪除數據機,會影響與其相關的自定義數據機、 關聯數據機、儀表板,確認刪除', delete_success: '刪除成功', confirm: '確認', cancel: '取消', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 759e36a20c..dccbecd8b7 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1106,6 +1106,7 @@ export default { rename: '重命名', tips: '提示', confirm_delete: '确认删除', + confirm_delete_msg: '数据集删除,会影响与其相关的自定义数据集、关联数据集、仪表板,确认删除?', delete_success: '删除成功', confirm: '确认', cancel: '取消', diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue index 04b01bde01..6ab89471b9 100644 --- a/frontend/src/views/dataset/group/Group.vue +++ b/frontend/src/views/dataset/group/Group.vue @@ -475,7 +475,13 @@ export default { }, deleteTable(data) { - this.$confirm(this.$t('dataset.confirm_delete'), this.$t('dataset.tips'), { + let confirm_delete_msg = '' + if(data.modelInnerType === 'union' || data.modelInnerType === 'custom'){ + confirm_delete_msg = this.$t('dataset.confirm_delete') + }else { + confirm_delete_msg = this.$t('dataset.confirm_delete_msg') + } + this.$confirm(confirm_delete_msg, this.$t('dataset.tips'), { confirmButtonText: this.$t('dataset.confirm'), cancelButtonText: this.$t('dataset.cancel'), type: 'warning'