dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6839 from dataease/pr@dev@fixSql

Browse Source 
Pr@dev@fix sql
This commit is contained in:
taojinlong 2023-11-24 02:02:27 -06:00 committed by GitHub
commit 88b47ca368
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2436,10 +2436,11 @@ public class DataSetTableService {
}); });
data = (isPreview && noModelDataListener.getData().size() > 1000 ? new ArrayList<>(data.subList(0, 1000)) : data); data = (isPreview && noModelDataListener.getData().size() > 1000 ? new ArrayList<>(data.subList(0, 1000)) : data);
if (isPreview) { if (isPreview) {
for (List<String> datum : data) { for (int i = 0; i < data.size(); i++) {
for (int i = 0; i < datum.size(); i++) { List<String> datum = data.get(i);
if (i < fields.size()) { for (int j = 0; j < datum.size(); j++) {
cellType(datum.get(i), i, fields.get(i)); if (j < fields.size()) {
cellType(datum.get(j), i, fields.get(j));
} }
} }
} }
@ -2759,7 +2760,7 @@ public class DataSetTableService {
} }
} }
if(CollectionUtils.isNotEmpty(repeat)){ if(CollectionUtils.isNotEmpty(repeat)){
DataEaseException.throwException(Translator.get("i18n_excel_field_repeat") + ": " + String.valueOf(repeat)); DataEaseException.throwException(Translator.get("i18n_excel_field_repeat") + "" + String.valueOf(repeat));
} }
} }

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

@ -223,7 +223,7 @@ public class ExtractDataService {
for (DatasetTableField datasetTableField : datasetTableFields) { for (DatasetTableField datasetTableField : datasetTableFields) {
boolean add = true; boolean add = true;
for (DatasetTableField oldField : oldFields) { for (DatasetTableField oldField : oldFields) {
if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName())) { if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName()) && oldField.getType().equalsIgnoreCase(datasetTableField.getType())) {
add = false; add = false;
} }
} }

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

@ -998,6 +998,7 @@ export default {
'apiQueryTimeout': [ 'apiQueryTimeout': [
{ {
required: true, required: true,
validator: this.isNumber,
message: i18n.t('datasource.please_input_query_timeout'), message: i18n.t('datasource.please_input_query_timeout'),
trigger: 'blur' trigger: 'blur'
} }
@ -1158,6 +1159,21 @@ export default {
} }
callback() callback()
}, },
isNumber(rule, value, callback) {
console.log(value)
if (!value) {
callback(new Error(i18n.t('datasource.please_input_query_timeout')))
return
}
let isNumber = false
var reg = /^\d+$/;
isNumber = reg.test(value);
if (!isNumber) {
callback(new Error(i18n.t('chart.value_error')))
return
}
callback()
},
next() { next() {
if (this.active === 1) { if (this.active === 1) {
let hasRepeatName = false let hasRepeatName = false