center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 校验查询超时

Browse Source
This commit is contained in:
taojinlong 2023-11-29 12:22:58 +08:00
parent f337c73c11
commit 02d678a9b6
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/frontend/src/lang/en.js
View File

@ -1944,7 +1944,7 @@ export default {
please_input_max_pool_size: 'Please enter the maximum number of connections',
please_input_max_idle_time: 'Please enter the maximum idle (seconds)',
please_input_acquire_increment: 'Please enter the growth number',
please_input_query_timeout: 'Please enter query timeout',
please_input_query_timeout: 'Please enter query timeout，no less then zero',
please_input_connect_timeout: 'Please enter the connection timeout (seconds)',
no_less_then_0: 'Parameters in advanced settings cannot be less than zero',
port_no_less_then_0: 'Port cannot be less than zero',

2
core/frontend/src/lang/tw.js
View File

@ -1936,7 +1936,7 @@ export default {
please_input_max_pool_size: '請輸入最大連接數',
please_input_max_idle_time: '請輸入最大空閑(秒)',
please_input_acquire_increment: '請輸入增長數',
please_input_query_timeout: '請輸入查詢超時',
please_input_query_timeout: '請輸入查詢超時，不小于零',
please_input_connect_timeout: '請輸輸入連接超時(秒)',
no_less_then_0: '高級設置中的參數不能小於零',
port_no_less_then_0: '端口不能小於零',

2
core/frontend/src/lang/zh.js
View File

@ -1936,7 +1936,7 @@ export default {
please_input_max_pool_size: '请输入最大连接数',
please_input_max_idle_time: '请输入最大空闲(秒)',
please_input_acquire_increment: '请输入增长数',
please_input_query_timeout: '请输入查询超时',
please_input_query_timeout: '请输入查询超时,不小于零',
please_input_connect_timeout: '请输入连接超时(秒)',
no_less_then_0: '高级设置中的参数不能小于零',
port_no_less_then_0: '端口不能小于零',

7
core/frontend/src/views/system/datasource/DsConfiguration.vue
View File

@ -999,8 +999,7 @@ export default {
{
required: true,
validator: this.isNumber,
message: i18n.t('datasource.please_input_query_timeout'),
trigger: 'blur'
trigger: ['blur', 'change']
}
],
dataPath: [
@ -1161,6 +1160,7 @@ export default {
},
isNumber(rule, value, callback) {
console.log(value)
console.log(!value)
if (!value) {
callback(new Error(i18n.t('datasource.please_input_query_timeout')))
return
@ -1168,8 +1168,9 @@ export default {
let isNumber = false
var reg = /^\d+$/;
isNumber = reg.test(value);
console.log(!isNumber)
if (!isNumber) {
callback(new Error(i18n.t('chart.value_error')))
callback(new Error(i18n.t('datasource.please_input_query_timeout')))
return
}
callback()