diff --git a/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java b/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java index 589f1fd453..f00673a3ce 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java @@ -70,7 +70,7 @@ public class SystemParameterController { int timeout = Integer.parseInt(systemParameter.stream().filter( parameter -> parameter.getParamKey().equals("basic.frontTimeOut") ).findFirst().get().getParamValue()); - if (timeout < 0 || timeout > 300) { + if (timeout < 0 || timeout > 300) { //增加了合法性检验 throw new NumberFormatException("Timeout Range Error!"); } systemParameterService.editBasic(systemParameter); diff --git a/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java index 0d12494d6c..ef589b72a8 100644 --- a/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java @@ -62,7 +62,7 @@ public class MysqlQueryProvider extends QueryProvider { case "MEDIUMINT": case "INTEGER": case "BIGINT": - case "LONG": + case "LONG": //增加了LONG类型 return 2;// 整型 case "FLOAT": case "DOUBLE": diff --git a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java index 4d00409706..cf6bd3b53c 100644 --- a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java @@ -63,7 +63,7 @@ public class MysqlQueryProvider extends QueryProvider { case "MEDIUMINT": case "INTEGER": case "BIGINT": - case "LONG": + case "LONG": //增加了LONG类型 return 2;// 整型 case "FLOAT": case "DOUBLE": diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index fdc9280797..91a817b14e 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -1614,7 +1614,7 @@ public class DataSetTableService { TableUtils.fieldName(field.getTableId() + "_" + field.getDataeaseName()), tableField.getFieldName())) { tableField.setRemarks(field.getName()); - tableField.setFieldType(field.getType()); + tableField.setFieldType(field.getType()); //将原有的type赋值给新创建的数据列 break; } } diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index d6bd11fad5..f22b513270 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -640,7 +640,7 @@ export default { login_type: 'Default login type', empty_front: 'If empty then default value is 10s', empty_msg: 'If empty then default value is 30 days', - front_error: 'Valid ranger [0 - 300]', + front_error: 'Valid ranger [0 - 300]', //修改了提示信息 msg_error: 'Valid ranger [1 - 365]', SMTP_port: 'SMTP Port', SMTP_account: 'SMTP Account', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index f84284fc55..eeb69f7b51 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -642,7 +642,7 @@ export default { login_type: '默認登錄方式', empty_front: '為空則默認取值10秒', empty_msg: '為空則默認取值30天', - front_error: '請填寫0-300正整數', + front_error: '請填寫0-300正整數', //修改了提示信息 msg_error: '請填寫1-365正整數', SMTP_port: 'SMTP端口', SMTP_account: 'SMTP賬戶', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 214dd8e45d..3a6527bc69 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -643,7 +643,7 @@ export default { login_type: '默认登录方式', empty_front: '为空则默认取10秒', empty_msg: '为空则默认取30天', - front_error: '请填写0-300正整数', + front_error: '请填写0-300正整数', //修改了提示信息 msg_error: '请填写1-365正整数', SMTP_port: 'SMTP端口', SMTP_account: 'SMTP账户', diff --git a/frontend/src/views/system/SysParam/BasicSetting.vue b/frontend/src/views/system/SysParam/BasicSetting.vue index 0da6667bb4..6e3657abe1 100644 --- a/frontend/src/views/system/SysParam/BasicSetting.vue +++ b/frontend/src/views/system/SysParam/BasicSetting.vue @@ -86,7 +86,7 @@ export default { rules: { frontTimeOut: [ { - pattern: '^([0-9]|\\b[1-9]\\d\\b|\\b[1-2]\\d\\d\\b|\\b300\\b)$', + pattern: '^([0-9]|\\b[1-9]\\d\\b|\\b[1-2]\\d\\d\\b|\\b300\\b)$', //修改了正则表达式,让其正确匹配0-300的数值 message: this.$t('system_parameter_setting.front_error'), trigger: 'blur' }