diff --git a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java index 3973a697e1..99f855c936 100644 --- a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java @@ -172,7 +172,7 @@ public class SqlserverQueryProvider extends QueryProvider { @Override public String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup, Datasource ds, List fieldCustomFilter) { String schema = new Gson().fromJson(ds.getConfiguration(), JdbcConfiguration.class).getSchema(); - return String.format("SELECT top %s * from %s ", limit.toString(), schema + "." + table); + return String.format("SELECT top %s * from %s ", limit.toString(), schema + "." + String.format(SqlServerSQLConstants.KEYWORD_TABLE, table)); } @Override diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index d5dd073338..cfc7c8cf24 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1268,7 +1268,7 @@ export default { delete_warning: 'Confirm to delete?', input_name: 'Please input name', input_limit_2_25: '2-25 chars', - input_limit_0_50: '0-50 chars', + input_limit_2_50: '2-50 chars', oracle_connection_type: 'Service Name/SID', oracle_sid: 'SID', oracle_service_name: 'Service Name', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 1d2d9a9423..f070820e2a 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1269,7 +1269,7 @@ export default { delete_warning: '確定要刪除嗎?', input_name: '請輸入名稱', input_limit_2_25: '2-25字符', - input_limit_0_50: '0-50字符', + input_limit_2_50: '2-50字符', oracle_connection_type: '服務名/SID', oracle_sid: 'SID', oracle_service_name: '服務名', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index ceb041e923..dc1050ce88 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1273,7 +1273,7 @@ export default { delete_warning: '确定要删除吗?', input_name: '请输入名称', input_limit_2_25: '2-25字符', - input_limit_0_50: '0-50字符', + input_limit_2_50: '2-50字符', oracle_connection_type: '服务名/SID', oracle_sid: 'SID', oracle_service_name: '服务名', diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index 7edfb41b68..bf041dbdcd 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -379,7 +379,7 @@ export default { taskFormRules: { name: [ { required: true, message: this.$t('dataset.required'), trigger: 'change' }, - { min: 2, max: 50, message: this.$t('datasource.input_limit_0_50', [2, 50]), trigger: 'blur' } + { min: 2, max: 50, message: this.$t('datasource.input_limit_2_50', [2, 50]), trigger: 'blur' } ], type: [ { required: true, message: this.$t('dataset.required'), trigger: 'change' } diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue index 634c66f17f..5a4813f571 100644 --- a/frontend/src/views/system/datasource/form.vue +++ b/frontend/src/views/system/datasource/form.vue @@ -215,7 +215,7 @@ export default { rule: { name: [{required: true, message: i18n.t('datasource.input_name'), trigger: 'blur'}, {min: 2, max: 25, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur'}], - desc: [{min: 0, max: 50, message: i18n.t('datasource.input_limit_0_50'), trigger: 'blur'}], + desc: [{min: 2, max: 50, message: i18n.t('datasource.input_limit_2_50'), trigger: 'blur'}], type: [{required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'change'}], 'configuration.dataBase': [{ required: true, @@ -351,7 +351,7 @@ export default { return } let repeat = false - let repeatDsName = '' + let repeatDsName = [] this.tData.forEach(item => { if(item.id === this.form.type){ item.children.forEach(child => { @@ -369,7 +369,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 + repeatDsName.push(child.name) } break case 'pg': @@ -378,13 +378,13 @@ export default { case 'oracle': case 'db2': if(configuration.host == this.form.configuration.host && configuration.dataBase == this.form.configuration.dataBase && configuration.port == this.form.configuration.port && configuration.schema == this.form.configuration.schema){ - repeatDsName = child.name + repeatDsName.push(child.name) repeat = true } break case 'es': if(configuration.url == this.form.configuration.url){ - repeatDsName = child.name + repeatDsName.push(child.name) repeat = true } break @@ -404,7 +404,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') + '[' + repeatDsName + '], ' + i18n.t('datasource.confirm_save'), () => { + $confirm(i18n.t('datasource.repeat_datasource_msg') + '[' + repeatDsName.join(',') + '], ' + i18n.t('datasource.confirm_save'), () => { $confirm(i18n.t('datasource.edit_datasource_msg'), () => { this.method(method, form) }) @@ -417,7 +417,7 @@ export default { return } if(repeat){ - $confirm(i18n.t('datasource.repeat_datasource_msg') + '[' + repeatDsName + '], ' + i18n.t('datasource.confirm_save'), () => { + $confirm(i18n.t('datasource.repeat_datasource_msg') + '[' + repeatDsName.join(',') + '], ' + i18n.t('datasource.confirm_save'), () => { this.method(method, form) }) }else { diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue index 1267d2c1a3..238f21c9ad 100644 --- a/frontend/src/views/system/task/DatasetTaskList.vue +++ b/frontend/src/views/system/task/DatasetTaskList.vue @@ -325,7 +325,7 @@ export default { taskFormRules: { name: [ { required: true, message: this.$t('dataset.required'), trigger: 'change' }, - { min: 2, max: 50, message: this.$t('datasource.input_limit_0_50', [2, 50]), trigger: 'blur' } + { min: 2, max: 50, message: this.$t('datasource.input_limit_2_50', [2, 50]), trigger: 'blur' } ], type: [ { required: true, message: this.$t('dataset.required'), trigger: 'change' }