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

增加了注释

Browse Source
This commit is contained in:
吕昊泽 2022-05-29 22:54:05 +08:00
parent 2ace1cbb68
commit 1df069bc28
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java
View File

@ -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);

2
backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
View File

@ -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":

2
backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
View File

@ -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":

2
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -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;
}
}

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

@ -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',

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

@ -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賬戶',

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

@ -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账户',

2
frontend/src/views/system/SysParam/BasicSetting.vue
View File

@ -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'
}