diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 7e52ef1a6d..d5561c0148 100644
--- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -2436,10 +2436,11 @@ public class DataSetTableService {
             });
             data = (isPreview && noModelDataListener.getData().size() > 1000 ? new ArrayList<>(data.subList(0, 1000)) : data);
             if (isPreview) {
-                for (List<String> datum : data) {
-                    for (int i = 0; i < datum.size(); i++) {
-                        if (i < fields.size()) {
-                            cellType(datum.get(i), i, fields.get(i));
+                for (int i = 0; i < data.size(); i++) {
+                    List<String> datum = data.get(i);
+                    for (int j = 0; j < datum.size(); j++) {
+                        if (j < fields.size()) {
+                            cellType(datum.get(j), i, fields.get(j));
                         }
                     }
                 }
@@ -2759,7 +2760,7 @@ public class DataSetTableService {
             }
         }
         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));
         }
     }
 
diff --git a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index ea634adeb7..d8a0f693b1 100644
--- a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -223,7 +223,7 @@ public class ExtractDataService {
                         for (DatasetTableField datasetTableField : datasetTableFields) {
                             boolean add = true;
                             for (DatasetTableField oldField : oldFields) {
-                                if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName())) {
+                                if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName()) && oldField.getType().equalsIgnoreCase(datasetTableField.getType())) {
                                     add = false;
                                 }
                             }
diff --git a/core/frontend/src/views/system/datasource/DsConfiguration.vue b/core/frontend/src/views/system/datasource/DsConfiguration.vue
index 270e2aa8d9..0b59837c3d 100644
--- a/core/frontend/src/views/system/datasource/DsConfiguration.vue
+++ b/core/frontend/src/views/system/datasource/DsConfiguration.vue
@@ -998,6 +998,7 @@ export default {
         'apiQueryTimeout': [
           {
             required: true,
+            validator: this.isNumber,
             message: i18n.t('datasource.please_input_query_timeout'),
             trigger: 'blur'
           }
@@ -1158,6 +1159,21 @@ export default {
       }
       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() {
       if (this.active === 1) {
         let hasRepeatName = false