From 5c351ea5e4c53697216b9206cbdeea499f62ea95 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 18 Jan 2022 16:21:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E5=A4=8D=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E8=BF=9E=E6=8E=A5=EF=BC=8C=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                       | 3 ++-
 frontend/src/lang/tw.js                       | 3 ++-
 frontend/src/lang/zh.js                       | 3 ++-
 frontend/src/views/system/datasource/form.vue | 6 ++++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index e8d7af9ded..74d9debbe4 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1270,7 +1270,8 @@ export default {
     schema: 'Database Schema',
     please_choose_schema: 'Please select Schema',
     edit_datasource_msg: 'Modifying the data source information may make the data set under the modified data source unavailable. Confirm the modification？',
-    repeat_datasource_msg: 'Data source information with the same configuration already exists. Confirm？',
+    repeat_datasource_msg: 'Data source information with the same configuration already exists, ',
+    confirm_save: 'Confirm save?',
     in_valid: 'Invalid datasource',
     initial_pool_size: 'Initial connections',
     min_pool_size: 'Minimum of connections',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index c378fb7015..6844cb175d 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1271,7 +1271,8 @@ export default {
     schema: '數據庫 Schema',
     please_choose_schema: '請選擇數據庫 Schema',
     edit_datasource_msg: '修改數據源信息，可能會導致改數據源下的數據集不可用，確認修改？',
-    repeat_datasource_msg: '已經存在相同配置的數據源信息，確認？',
+    repeat_datasource_msg: '已經存在相同配置的數據源信息，',
+    confirm_save: '確認保存?',
     in_valid: '無效數據源',
     initial_pool_size: '初始連接數',
     min_pool_size: '最小連接數',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 40822edfd0..593f16ffec 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1275,7 +1275,8 @@ export default {
     schema: '数据库 Schema',
     please_choose_schema: '请选择数据库 Schema',
     edit_datasource_msg: '修改数据源信息，可能会导致该数据源下的数据集不可用，确认修改？',
-    repeat_datasource_msg: '已经存在相同配置的数据源信息，确认？',
+    repeat_datasource_msg: '已经存在相同配置的数据源信息, ',
+    confirm_save: '确认保存?',
     in_valid: '无效数据源',
     initial_pool_size: '初始连接数',
     min_pool_size: '最小连接数',
diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue
index bef5c8889b..616a40343d 100644
--- a/frontend/src/views/system/datasource/form.vue
+++ b/frontend/src/views/system/datasource/form.vue
@@ -351,6 +351,7 @@ export default {
         return
       }
       let repeat = false
+      let repeatDsName = ''
       this.tData.forEach(item => {
         if(item.id === this.form.type){
           item.children.forEach(child => {
@@ -365,6 +366,7 @@ export default {
               case 'mariadb':
                 if(configuration.host == this.form.configuration.host && configuration.dataBase == this.form.configuration.dataBase && configuration.port == this.form.configuration.port){
                   repeat = true
+                  repeatDsName = child.name
                 }
                 break
               case 'pg':
@@ -397,7 +399,7 @@ export default {
         form.configuration = JSON.stringify(form.configuration)
         if (this.formType === 'modify' && this.originConfiguration !== form.configuration) {
           if(repeat){
-            $confirm(i18n.t('datasource.repeat_datasource_msg'), () => {
+            $confirm(i18n.t('datasource.repeat_datasource_msg') + '[' + repeatDsName + '], ' + i18n.t('datasource.confirm_save'), () => {
               $confirm(i18n.t('datasource.edit_datasource_msg'), () => {
                 this.method(method, form)
               })
@@ -410,7 +412,7 @@ export default {
           return
         }
         if(repeat){
-          $confirm(i18n.t('datasource.repeat_datasource_msg'), () => {
+          $confirm(i18n.t('datasource.repeat_datasource_msg') + '[' + repeatDsName + '], ' + i18n.t('datasource.confirm_save'), () => {
             this.method(method, form)
           })
         }else {