forked from github/dataease
feat: 重复的数据源连接,保存时增加提示
This commit is contained in:
parent
aa2a44da0e
commit
5c351ea5e4
@ -1270,7 +1270,8 @@ export default {
|
|||||||
schema: 'Database Schema',
|
schema: 'Database Schema',
|
||||||
please_choose_schema: 'Please select 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?',
|
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',
|
in_valid: 'Invalid datasource',
|
||||||
initial_pool_size: 'Initial connections',
|
initial_pool_size: 'Initial connections',
|
||||||
min_pool_size: 'Minimum of connections',
|
min_pool_size: 'Minimum of connections',
|
||||||
|
@ -1271,7 +1271,8 @@ export default {
|
|||||||
schema: '數據庫 Schema',
|
schema: '數據庫 Schema',
|
||||||
please_choose_schema: '請選擇數據庫 Schema',
|
please_choose_schema: '請選擇數據庫 Schema',
|
||||||
edit_datasource_msg: '修改數據源信息,可能會導致改數據源下的數據集不可用,確認修改?',
|
edit_datasource_msg: '修改數據源信息,可能會導致改數據源下的數據集不可用,確認修改?',
|
||||||
repeat_datasource_msg: '已經存在相同配置的數據源信息,確認?',
|
repeat_datasource_msg: '已經存在相同配置的數據源信息,',
|
||||||
|
confirm_save: '確認保存?',
|
||||||
in_valid: '無效數據源',
|
in_valid: '無效數據源',
|
||||||
initial_pool_size: '初始連接數',
|
initial_pool_size: '初始連接數',
|
||||||
min_pool_size: '最小連接數',
|
min_pool_size: '最小連接數',
|
||||||
|
@ -1275,7 +1275,8 @@ export default {
|
|||||||
schema: '数据库 Schema',
|
schema: '数据库 Schema',
|
||||||
please_choose_schema: '请选择数据库 Schema',
|
please_choose_schema: '请选择数据库 Schema',
|
||||||
edit_datasource_msg: '修改数据源信息,可能会导致该数据源下的数据集不可用,确认修改?',
|
edit_datasource_msg: '修改数据源信息,可能会导致该数据源下的数据集不可用,确认修改?',
|
||||||
repeat_datasource_msg: '已经存在相同配置的数据源信息,确认?',
|
repeat_datasource_msg: '已经存在相同配置的数据源信息, ',
|
||||||
|
confirm_save: '确认保存?',
|
||||||
in_valid: '无效数据源',
|
in_valid: '无效数据源',
|
||||||
initial_pool_size: '初始连接数',
|
initial_pool_size: '初始连接数',
|
||||||
min_pool_size: '最小连接数',
|
min_pool_size: '最小连接数',
|
||||||
|
@ -351,6 +351,7 @@ export default {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
let repeat = false
|
let repeat = false
|
||||||
|
let repeatDsName = ''
|
||||||
this.tData.forEach(item => {
|
this.tData.forEach(item => {
|
||||||
if(item.id === this.form.type){
|
if(item.id === this.form.type){
|
||||||
item.children.forEach(child => {
|
item.children.forEach(child => {
|
||||||
@ -365,6 +366,7 @@ export default {
|
|||||||
case 'mariadb':
|
case 'mariadb':
|
||||||
if(configuration.host == this.form.configuration.host && configuration.dataBase == this.form.configuration.dataBase && configuration.port == this.form.configuration.port){
|
if(configuration.host == this.form.configuration.host && configuration.dataBase == this.form.configuration.dataBase && configuration.port == this.form.configuration.port){
|
||||||
repeat = true
|
repeat = true
|
||||||
|
repeatDsName = child.name
|
||||||
}
|
}
|
||||||
break
|
break
|
||||||
case 'pg':
|
case 'pg':
|
||||||
@ -397,7 +399,7 @@ export default {
|
|||||||
form.configuration = JSON.stringify(form.configuration)
|
form.configuration = JSON.stringify(form.configuration)
|
||||||
if (this.formType === 'modify' && this.originConfiguration !== form.configuration) {
|
if (this.formType === 'modify' && this.originConfiguration !== form.configuration) {
|
||||||
if(repeat){
|
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'), () => {
|
$confirm(i18n.t('datasource.edit_datasource_msg'), () => {
|
||||||
this.method(method, form)
|
this.method(method, form)
|
||||||
})
|
})
|
||||||
@ -410,7 +412,7 @@ export default {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if(repeat){
|
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)
|
this.method(method, form)
|
||||||
})
|
})
|
||||||
}else {
|
}else {
|
||||||
|
Loading…
Reference in New Issue
Block a user