diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java
index f998cfa398..59744d8384 100644
--- a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java
+++ b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java
@@ -125,12 +125,11 @@ public class ExcelXlsReader implements HSSFListener {
         return data;
     }
 
-    public void setData(List<List<String>>  data) {
+    public void setData(List<List<String>> data) {
         this.data = data;
     }
 
 
-
     /**
      * 遍历excel下所有的sheet
      *
@@ -212,8 +211,8 @@ public class ExcelXlsReader implements HSSFListener {
                 thisColumn = frec.getColumn();
                 thisStr = String.valueOf(frec.getValue());
                 String fieldType = checkType(thisStr, thisColumn);
-                if(fieldType.equalsIgnoreCase("LONG") && thisStr.endsWith(".0")){
-                    thisStr = thisStr.substring(0, thisStr.length() -2);
+                if (fieldType != null && fieldType.equalsIgnoreCase("LONG") && thisStr.endsWith(".0")) {
+                    thisStr = thisStr.substring(0, thisStr.length() - 2);
                 }
                 cellList.add(thisColumn, thisStr);
                 checkRowIsNull(thisStr);  //如果里面某个单元格含有值，则标识该行不为空行
@@ -268,9 +267,9 @@ public class ExcelXlsReader implements HSSFListener {
                 value = value.equals("") ? "" : value;
                 //向容器加入列值
                 cellList.add(thisColumn, value);
-                if(formatIndex == 59 || formatIndex== 14){
-                    totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType("DATETIME");
-                }else {
+                if (formatIndex == 59 || formatIndex == 14) {
+                    totalSheets.get(totalSheets.size() - 1).getFields().get(thisColumn).setFieldType("DATETIME");
+                } else {
                     checkType(value, thisColumn);
                 }
                 checkRowIsNull(value);  //如果里面某个单元格含有值，则标识该行不为空行
@@ -308,7 +307,7 @@ public class ExcelXlsReader implements HSSFListener {
             }
             lastColumnNumber = -1;
 
-            if(!totalSheets.stream().map(ExcelSheetData::getExcelLabel).collect(Collectors.toList()).contains(sheetName)){
+            if (!totalSheets.stream().map(ExcelSheetData::getExcelLabel).collect(Collectors.toList()).contains(sheetName)) {
                 ExcelSheetData excelSheetData = new ExcelSheetData();
                 excelSheetData.setExcelLabel(sheetName);
                 excelSheetData.setData(new ArrayList<>());
@@ -316,7 +315,7 @@ public class ExcelXlsReader implements HSSFListener {
                 totalSheets.add(excelSheetData);
             }
 
-            if(curRow == 0){
+            if (curRow == 0) {
                 for (String s : cellList) {
                     TableField tableField = new TableField();
                     tableField.setFieldType("TEXT");
@@ -324,13 +323,13 @@ public class ExcelXlsReader implements HSSFListener {
                     tableField.setFieldName(s);
                     tableField.setRemarks(s);
                     this.fields.add(tableField);
-                    totalSheets.get(totalSheets.size() -1).getFields().add(tableField);
+                    totalSheets.get(totalSheets.size() - 1).getFields().add(tableField);
                 }
             }
 
 
             if (flag && curRow != 0) { //该行不为空行且该行不是第一行，发送（第一行为列名，不需要）
-                if(!totalSheets.stream().map(ExcelSheetData::getExcelLabel).collect(Collectors.toList()).contains(sheetName)){
+                if (!totalSheets.stream().map(ExcelSheetData::getExcelLabel).collect(Collectors.toList()).contains(sheetName)) {
                     ExcelSheetData excelSheetData = new ExcelSheetData();
                     excelSheetData.setData(new ArrayList<>(data));
                     excelSheetData.setExcelLabel(sheetName);
@@ -339,13 +338,13 @@ public class ExcelXlsReader implements HSSFListener {
                     excelSheetData.getData().add(tmp);
                     totalRows++;
                     totalSheets.add(excelSheetData);
-                }else {
+                } else {
                     List<String> tmp = new ArrayList<>(cellList);
-                    if(obtainedNum != null && totalSheets.stream().filter(s->s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().size() < obtainedNum){
-                        totalSheets.stream().filter(s->s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp);
+                    if (obtainedNum != null && totalSheets.stream().filter(s -> s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().size() < obtainedNum) {
+                        totalSheets.stream().filter(s -> s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp);
                     }
-                    if(obtainedNum == null){
-                        totalSheets.stream().filter(s->s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp);
+                    if (obtainedNum == null) {
+                        totalSheets.stream().filter(s -> s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp);
                     }
                     totalRows++;
                 }
@@ -369,7 +368,7 @@ public class ExcelXlsReader implements HSSFListener {
     }
 
 
-    private String checkType(String str, int thisColumn){
+    private String checkType(String str, int thisColumn) {
         String type = null;
         try {
             double d = Double.valueOf(str);
@@ -382,22 +381,20 @@ public class ExcelXlsReader implements HSSFListener {
                     type = "DOUBLE";
                 }
             } catch (Exception e) {
-                type = "TEXT";
             }
-        }catch (Exception e){
-            type = "TEXT";
+        } catch (Exception e) {
         }
 
-        if(curRow==1){
-            totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType(type);
+        if (curRow == 1) {
+            totalSheets.get(totalSheets.size() - 1).getFields().get(thisColumn).setFieldType(type == null ? "TEXT" : type);
         }
-        if(curRow > 1) {
-            String oldType = totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).getFieldType();
-            if(type.equalsIgnoreCase("TEXT")){
-                totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType(type);
+        if (curRow > 1 && type != null) {
+            String oldType = totalSheets.get(totalSheets.size() - 1).getFields().get(thisColumn).getFieldType();
+            if (type.equalsIgnoreCase("TEXT")) {
+                totalSheets.get(totalSheets.size() - 1).getFields().get(thisColumn).setFieldType(type);
             }
-            if(type.equalsIgnoreCase("DOUBLE") && oldType.equalsIgnoreCase("LONG")){
-                totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType(type);
+            if (type.equalsIgnoreCase("DOUBLE") && oldType.equalsIgnoreCase("LONG")) {
+                totalSheets.get(totalSheets.size() - 1).getFields().get(thisColumn).setFieldType(type);
             }
         }
         return type;
diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
index 1d7be1dc7d..d144b05d7d 100644
--- a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
+++ b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
@@ -1,4 +1,5 @@
 package io.dataease.commons.utils;
+
 import io.dataease.dto.dataset.ExcelSheetData;
 import io.dataease.i18n.Translator;
 import io.dataease.plugins.common.dto.datasource.TableField;
@@ -35,7 +36,8 @@ public class ExcelXlsxReader extends DefaultHandler {
     /**
      * 自定义获取表格某些信
      */
-    public Map map = new TreeMap<String,String>();
+    public Map map = new TreeMap<String, String>();
+
     /**
      * 单元格中的数据可能的数据类型
      */
@@ -56,7 +58,7 @@ public class ExcelXlsxReader extends DefaultHandler {
     /**
      * 总行数
      */
-    private int totalRows=0;
+    private int totalRows = 0;
 
     /**
      * 一行内cell集合
@@ -101,7 +103,6 @@ public class ExcelXlsxReader extends DefaultHandler {
     private String formatString;
 
 
-
     //定义前一个元素和当前元素的位置，用来计算其中空的单元格数量，如A6和A8等
     private String preRef = null, ref = null;
 
@@ -143,7 +144,7 @@ public class ExcelXlsxReader extends DefaultHandler {
         return data;
     }
 
-    public void setData(List<List<String>>  data) {
+    public void setData(List<List<String>> data) {
         this.data = data;
     }
 
@@ -190,11 +191,11 @@ public class ExcelXlsxReader extends DefaultHandler {
      */
     @Override
     public void startElement(String uri, String localName, String name, Attributes attributes) throws SAXException {
-        if(this.obtainedNum !=null && curRow>this.obtainedNum){
+        if (this.obtainedNum != null && curRow > this.obtainedNum) {
             return;
         }
 
-        if(name.equalsIgnoreCase("mergeCell")){
+        if (name.equalsIgnoreCase("mergeCell")) {
             throw new RuntimeException(Translator.get("i18n_excel_have_merge_region"));
         }
         //c => 单元格
@@ -221,6 +222,7 @@ public class ExcelXlsxReader extends DefaultHandler {
      * 得到单元格对应的索引值或是内容值
      * 如果单元格类型是字符串、INLINESTR、数字、日期，lastIndex则是索引值
      * 如果单元格类型是布尔值、错误、公式，lastIndex则是内容值
+     *
      * @param ch
      * @param start
      * @param length
@@ -228,7 +230,7 @@ public class ExcelXlsxReader extends DefaultHandler {
      */
     @Override
     public void characters(char[] ch, int start, int length) throws SAXException {
-        if(this.obtainedNum !=null && curRow>this.obtainedNum){
+        if (this.obtainedNum != null && curRow > this.obtainedNum) {
             return;
         }
         lastIndex += new String(ch, start, length);
@@ -244,14 +246,14 @@ public class ExcelXlsxReader extends DefaultHandler {
      */
     @Override
     public void endElement(String uri, String localName, String name) throws SAXException {
-        if(this.obtainedNum !=null && curRow>this.obtainedNum){
+        if (this.obtainedNum != null && curRow > this.obtainedNum) {
             return;
         }
         //t元素也包含字符串
         if (isTElement) {       //这个程序没经过
             //将单元格内容加入rowlist中，在这之前先去掉字符串前后的空白符
             String value = lastIndex.trim();
-            if(curRow==1){
+            if (curRow == 1) {
                 TableField tableField = new TableField();
                 tableField.setFieldType("TEXT");
                 tableField.setFieldSize(65533);
@@ -271,21 +273,21 @@ public class ExcelXlsxReader extends DefaultHandler {
             String value = this.getDataValue(lastIndex.trim(), "");//根据索引值获取对应的单元格值
             if (preRef == null) {
                 preRef = "A" + curRow;
-                if(!preRef.equalsIgnoreCase(ref)){
+                if (!preRef.equalsIgnoreCase(ref)) {
                     cellList.add(curCol, "");
                     curCol++;
                 }
             }
 
             //补全单元格之间的空单元格
-            if (!"A".equals(preRef.substring(0, 1)) && curRow==1 && preRef.equalsIgnoreCase(ref)) {
+            if (!"A".equals(preRef.substring(0, 1)) && curRow == 1 && preRef.equalsIgnoreCase(ref)) {
                 throw new RuntimeException(Translator.get("i18n_excel_empty_column"));
-            }else if (!ref.equals(preRef)) {
+            } else if (!ref.equals(preRef)) {
                 int len = countNullCell(ref, preRef);
                 for (int i = 0; i < len; i++) {
-                    if(curCol < this.fields.size()){
+                    if (curCol < this.fields.size()) {
                         cellList.add(curCol, "");
-                        if(curRow==1){
+                        if (curRow == 1) {
                             addField("", curCol);
                         }
                         curCol++;
@@ -293,7 +295,7 @@ public class ExcelXlsxReader extends DefaultHandler {
                 }
             }
 
-            if(curCol < this.fields.size()){
+            if (curCol < this.fields.size()) {
                 cellList.add(curCol, value);
             }
             curCol++;
@@ -309,8 +311,8 @@ public class ExcelXlsxReader extends DefaultHandler {
                 if (curRow == 1) {
                     maxRef = ref;
                 }
-                if(curRow>1){
-                    for (int i=cellList.size();i<this.fields.size();i++){
+                if (curRow > 1) {
+                    for (int i = cellList.size(); i < this.fields.size(); i++) {
                         cellList.add("");
                     }
                     List<String> tmp = new ArrayList<>(cellList);
@@ -322,7 +324,7 @@ public class ExcelXlsxReader extends DefaultHandler {
                 curCol = 0;
                 preRef = null;
                 ref = null;
-                flag=false;
+                flag = false;
             }
         }
     }
@@ -357,9 +359,8 @@ public class ExcelXlsxReader extends DefaultHandler {
             formatIndex = style.getDataFormat();
             formatString = style.getDataFormatString();
             short format = this.formatIndex;
-            if ( (14 <= format && format <= 17) || format == 20 || format == 22 || format == 31 || format == 35 || format == 45 || format == 46 || format == 47 || (57 <= format && format <= 59)
-                    || (175 < format && format < 178) || (182 <= format && format <= 196) || (210 <= format && format <= 213) || (208 == format))
-            { // 日期
+            if ((14 <= format && format <= 17) || format == 20 || format == 22 || format == 31 || format == 35 || format == 45 || format == 46 || format == 47 || (57 <= format && format <= 59)
+                    || (175 < format && format < 178) || (182 <= format && format <= 196) || (210 <= format && format <= 213) || (208 == format)) { // 日期
                 isDateFormat = true;
             }
 
@@ -369,6 +370,7 @@ public class ExcelXlsxReader extends DefaultHandler {
 
     /**
      * 对解析出来的数据进行类型处理
+     *
      * @param value   单元格的值，
      *                value代表解析：BOOL的为0或1， ERROR的为内容值，FORMULA的为内容值，INLINESTR的为索引值需转换为内容值，
      *                SSTINDEX的为索引值需转换为内容值， NUMBER为内容值，DATE为内容值
@@ -377,7 +379,7 @@ public class ExcelXlsxReader extends DefaultHandler {
      */
     @SuppressWarnings("deprecation")
     public String getDataValue(String value, String thisStr) {
-        String type = "TEXT";
+        String type = null;
         switch (nextDataType) {
             // 这几个的顺序不能随便交换，交换了很可能会导致数据错误
             case BOOL: //布尔值
@@ -401,11 +403,11 @@ public class ExcelXlsxReader extends DefaultHandler {
                 String sstIndex = value.toString();
                 try {
                     int idx = Integer.parseInt(sstIndex);
-                    if(sst != null){
+                    if (sst != null) {
                         XSSFRichTextString rtss = new XSSFRichTextString(sst.getEntryAt(idx));//根据idx索引值获取内容值
                         thisStr = rtss.toString();
                         rtss = null;
-                    }else {
+                    } else {
                         thisStr = value.toString();
                     }
 
@@ -422,12 +424,13 @@ public class ExcelXlsxReader extends DefaultHandler {
                 }
                 thisStr = thisStr.replace("_", "").trim();
 
-                if(isDateFormat ){
-                    type = "DATETIME";isDateFormat = false;
-                    if(formatString != null && formatString.contains("%")){
+                if (isDateFormat) {
+                    type = "DATETIME";
+                    isDateFormat = false;
+                    if (formatString != null && formatString.contains("%")) {
                         type = getType(thisStr);
                     }
-                }else {
+                } else {
                     type = getType(thisStr);
                 }
                 break;
@@ -441,60 +444,67 @@ public class ExcelXlsxReader extends DefaultHandler {
                 thisStr = " ";
                 break;
         }
-        if(curRow==1){
+        if (curRow == 1) {
             addField(thisStr, null);
-        }else {
-            if(CollectionUtils.isEmpty(this.getFields())){
+        } else {
+            if (CollectionUtils.isEmpty(this.getFields())) {
                 throw new RuntimeException(Translator.get("i18n_excel_header_empty"));
             }
-            if(curCol >= this.fields.size()){
+            if (curCol >= this.fields.size()) {
                 return thisStr;
             }
-            if(curRow==2){
-                this.getFields().get(curCol).setFieldType(type);
-            }else {
-                if(type.equalsIgnoreCase("TEXT")){
+            if (curRow == 2) {
+                if (type != null) {
                     this.getFields().get(curCol).setFieldType(type);
                 }
-                if(type.equalsIgnoreCase("DOUBLE") && this.getFields().get(curCol).getFieldType().equalsIgnoreCase("LONG")){
-                    this.getFields().get(curCol).setFieldType(type);
-                }
-                if(type.equalsIgnoreCase("DATETIME")){
-                    this.getFields().get(curCol).setFieldType(type);
+            } else {
+                if (type != null) {
+                    if (type.equalsIgnoreCase("TEXT")) {
+                        this.getFields().get(curCol).setFieldType(type);
+                    }
+                    if (type.equalsIgnoreCase("DOUBLE") && this.getFields().get(curCol).getFieldType().equalsIgnoreCase("LONG")) {
+                        this.getFields().get(curCol).setFieldType(type);
+                    }
+                    if (type.equalsIgnoreCase("DATETIME")) {
+                        this.getFields().get(curCol).setFieldType(type);
+                    }
                 }
             }
         }
         return thisStr;
     }
 
-    private void addField(String columeName, Integer index){
+    private void addField(String columeName, Integer index) {
         TableField tableField = new TableField();
         tableField.setFieldType("TEXT");
         tableField.setFieldSize(65533);
         tableField.setFieldName(columeName);
         tableField.setRemarks(columeName);
-        if(index != null){
+        if (index != null) {
             this.fields.add(index, tableField);
-        }else {
+        } else {
             this.fields.add(tableField);
         }
     }
-    private String getType(String thisStr){
-        if(totalRows==0){
+
+    private String getType(String thisStr) {
+        if (totalRows == 0) {
             return "TEXT";
         }
-        try{
-            if(thisStr.endsWith("%")){
-                thisStr = thisStr.substring(0, thisStr.length()-1);
-                thisStr = String.valueOf(Double.valueOf(thisStr)/100);
+
+        try {
+            if (thisStr.endsWith("%")) {
+                thisStr = thisStr.substring(0, thisStr.length() - 1);
+                thisStr = String.valueOf(Double.valueOf(thisStr) / 100);
             }
             Long.valueOf(thisStr);
             return "LONG";
-        }catch (Exception e){
+        } catch (Exception e) {
             try {
                 Double.valueOf(thisStr);
                 return "DOUBLE";
-            }catch (Exception ignore){ }
+            } catch (Exception ignore) {
+            }
         }
         return "TEXT";
     }
diff --git a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
index 8f2c593918..2b8e0b1008 100644
--- a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
@@ -1,5 +1,6 @@
 package io.dataease.provider.query.ck;
 
+import com.alibaba.fastjson.JSONArray;
 import io.dataease.commons.utils.BeanUtils;
 import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
 import io.dataease.plugins.common.base.domain.DatasetTableField;
@@ -17,6 +18,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj;
 import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
 import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
 import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem;
+import io.dataease.plugins.datasource.entity.Dateformat;
 import io.dataease.plugins.datasource.entity.PageInfo;
 import io.dataease.plugins.datasource.query.QueryProvider;
 import io.dataease.plugins.datasource.query.Utils;
@@ -1400,4 +1402,15 @@ public class CKQueryProvider extends QueryProvider {
             return sql;
         }
     }
+
+    public List<Dateformat> dateformat() {
+        return JSONArray.parseArray("[\n" +
+                "{\"dateformat\": \"%Y%m%d\"},\n" +
+                "{\"dateformat\": \"%Y/%m/%d\"},\n" +
+                "{\"dateformat\": \"%Y-%m-%d\"},\n" +
+                "{\"dateformat\": \"%Y%m%d %H:%M:%S\"},\n" +
+                "{\"dateformat\": \"%Y/%m/%d %H:%M:%S\"},\n" +
+                "{\"dateformat\": \"%Y-%m-%d %H:%M:%S\"}\n" +
+                "]", Dateformat.class);
+    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java b/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
index 7fad9ee875..e1cdf780f5 100644
--- a/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
@@ -1,5 +1,6 @@
 package io.dataease.provider.query.db2;
 
+import com.alibaba.fastjson.JSONArray;
 import com.google.gson.Gson;
 import io.dataease.dto.datasource.Db2Configuration;
 import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
@@ -18,6 +19,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj;
 import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
 import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
 import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem;
+import io.dataease.plugins.datasource.entity.Dateformat;
 import io.dataease.plugins.datasource.entity.JdbcConfiguration;
 import io.dataease.plugins.datasource.entity.PageInfo;
 import io.dataease.plugins.datasource.query.QueryProvider;
@@ -1378,4 +1380,15 @@ public class Db2QueryProvider extends QueryProvider {
         schema = String.format(Db2Constants.KEYWORD_TABLE, schema);
         return "SELECT * FROM " + schema + "." + String.format(Db2Constants.KEYWORD_TABLE, table);
     }
+
+    public List<Dateformat> dateformat() {
+        return JSONArray.parseArray("[\n" +
+                "{\"dateformat\": \"YYYYMMDD\"},\n" +
+                "{\"dateformat\": \"YYYY/MM/DD\"},\n" +
+                "{\"dateformat\": \"YYYY-MM-DD\"},\n" +
+                "{\"dateformat\": \"YYYYMMDD HH24:MI:SS\"},\n" +
+                "{\"dateformat\": \"YYYY/MM/DD HH24:MI:SS\"},\n" +
+                "{\"dateformat\": \"YYYY-MM-DD HH24:MI:SS\"}\n" +
+                "]", Dateformat.class);
+    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
index 673392fabc..2a7c7134fe 100644
--- a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
@@ -1,5 +1,6 @@
 package io.dataease.provider.query.es;
 
+import com.alibaba.fastjson.JSONArray;
 import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
 import io.dataease.plugins.common.base.domain.DatasetTableField;
 import io.dataease.plugins.common.base.domain.DatasetTableFieldExample;
@@ -16,6 +17,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj;
 import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
 import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
 import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem;
+import io.dataease.plugins.datasource.entity.Dateformat;
 import io.dataease.plugins.datasource.query.QueryProvider;
 import io.dataease.plugins.datasource.query.Utils;
 import org.apache.commons.collections4.CollectionUtils;
@@ -1311,4 +1313,15 @@ public class EsQueryProvider extends QueryProvider {
             return sql;
         }
     }
+
+    public List<Dateformat> dateformat() {
+        return JSONArray.parseArray("[\n" +
+                "{\"dateformat\": \"yyyy/MM/dd\"},\n" +
+                "{\"dateformat\": \"yyyy/MMdd\"},\n" +
+                "{\"dateformat\": \"yyyy-MM-dd\"},\n" +
+                "{\"dateformat\": \"yyyyMMdd HH:mm:ss\"},\n" +
+                "{\"dateformat\": \"yyyy/MMdd HH:mm:ss\"},\n" +
+                "{\"dateformat\": \"yyyy-MM-dd HH:mm:ss\"}\n" +
+                "]", Dateformat.class);
+    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
index ce089d53c9..14fa0d1b06 100644
--- a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
@@ -1,5 +1,6 @@
 package io.dataease.provider.query.hive;
 
+import com.alibaba.fastjson.JSONArray;
 import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
 import io.dataease.plugins.common.base.domain.DatasetTableField;
 import io.dataease.plugins.common.base.domain.DatasetTableFieldExample;
@@ -16,6 +17,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj;
 import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
 import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
 import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem;
+import io.dataease.plugins.datasource.entity.Dateformat;
 import io.dataease.plugins.datasource.entity.PageInfo;
 import io.dataease.plugins.datasource.query.QueryProvider;
 import io.dataease.plugins.datasource.query.Utils;
@@ -1299,4 +1301,15 @@ public class HiveQueryProvider extends QueryProvider {
             return sql;
         }
     }
+
+    public List<Dateformat> dateformat() {
+        return JSONArray.parseArray("[\n" +
+                "{\"dateformat\": \"yyyyMMdd\"},\n" +
+                "{\"dateformat\": \"yyyy/MM/dd\"},\n" +
+                "{\"dateformat\": \"yyyy-MM-dd\"},\n" +
+                "{\"dateformat\": \"yyyy/MM/dd HH:mm:ss\"},\n" +
+                "{\"dateformat\": \"yyyyMMdd HH:mm:ss\"},\n" +
+                "{\"dateformat\": \"yyyy-MM-dd HH:mm:ss\"}\n" +
+                "]", Dateformat.class);
+    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
index edfd4a8810..2e33fc8d93 100644
--- a/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
@@ -1,5 +1,6 @@
 package io.dataease.provider.query.impala;
 
+import com.alibaba.fastjson.JSONArray;
 import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
 import io.dataease.plugins.common.base.domain.DatasetTableField;
 import io.dataease.plugins.common.base.domain.DatasetTableFieldExample;
@@ -16,6 +17,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj;
 import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
 import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
 import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem;
+import io.dataease.plugins.datasource.entity.Dateformat;
 import io.dataease.plugins.datasource.entity.PageInfo;
 import io.dataease.plugins.datasource.query.QueryProvider;
 import io.dataease.plugins.datasource.query.Utils;
@@ -1276,4 +1278,15 @@ public class ImpalaQueryProvider extends QueryProvider {
             return sql;
         }
     }
+
+    public List<Dateformat> dateformat() {
+        return JSONArray.parseArray("[\n" +
+                "{\"dateformat\": \"yyyy-MM-dd\"},\n" +
+                "{\"dateformat\": \"yyyy/MM/dd\"},\n" +
+                "{\"dateformat\": \"yyyyMMdd\"},\n" +
+                "{\"dateformat\": \"yyyy-MM-dd HH:mm:ss\"},\n" +
+                "{\"dateformat\": \"yyyy/MMdd HH:mm:ss\"},\n" +
+                "{\"dateformat\": \"yyyyMMdd HH:mm:ss\"}\n" +
+                "]", Dateformat.class);
+    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
index 1a11a1d232..34730987a4 100644
--- a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
@@ -1,5 +1,6 @@
 package io.dataease.provider.query.mongodb;
 
+import com.alibaba.fastjson.JSONArray;
 import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
 import io.dataease.plugins.common.base.domain.DatasetTableField;
 import io.dataease.plugins.common.base.domain.DatasetTableFieldExample;
@@ -16,6 +17,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj;
 import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
 import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
 import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem;
+import io.dataease.plugins.datasource.entity.Dateformat;
 import io.dataease.plugins.datasource.entity.PageInfo;
 import io.dataease.plugins.datasource.query.QueryProvider;
 import io.dataease.plugins.datasource.query.Utils;
@@ -1150,4 +1152,15 @@ public class MongoQueryProvider extends QueryProvider {
             return sql;
         }
     }
+
+    public List<Dateformat> dateformat() {
+        return JSONArray.parseArray("[\n" +
+                "{\"dateformat\": \"%Y-%m-%d\"},\n" +
+                "{\"dateformat\": \"%Y/%m/%d\"},\n" +
+                "{\"dateformat\": \"%Y%m%d\"},\n" +
+                "{\"dateformat\": \"%Y-%m-%d %H:%i:%S\"},\n" +
+                "{\"dateformat\": \"%Y/%m/%d %H:%i:%S\"},\n" +
+                "{\"dateformat\": \"%Y%m%d %H:%i:%S\"}\n" +
+                "]", Dateformat.class);
+    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
index 8d1c685527..c3ce406b2d 100644
--- a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
@@ -1,5 +1,6 @@
 package io.dataease.provider.query.oracle;
 
+import com.alibaba.fastjson.JSONArray;
 import com.google.gson.Gson;
 import io.dataease.dto.datasource.OracleConfiguration;
 import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
@@ -18,6 +19,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj;
 import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
 import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
 import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem;
+import io.dataease.plugins.datasource.entity.Dateformat;
 import io.dataease.plugins.datasource.entity.JdbcConfiguration;
 import io.dataease.plugins.datasource.entity.PageInfo;
 import io.dataease.plugins.datasource.query.QueryProvider;
@@ -1427,4 +1429,15 @@ public class OracleQueryProvider extends QueryProvider {
         schema = String.format(OracleConstants.KEYWORD_TABLE, schema);
         return "SELECT * FROM " + schema + "." + String.format(OracleConstants.KEYWORD_TABLE, table);
     }
+
+    public List<Dateformat> dateformat() {
+        return JSONArray.parseArray("[\n" +
+                "{\"dateformat\": \"YYYY-MM-DD\"},\n" +
+                "{\"dateformat\": \"YYYY/MM/DD\"},\n" +
+                "{\"dateformat\": \"YYYYMMDD\"},\n" +
+                "{\"dateformat\": \"YYYY-MM-DD HH24:MI:SS\"},\n" +
+                "{\"dateformat\": \"YYYY/MM/DD HH24:MI:SS\"},\n" +
+                "{\"dateformat\": \"YYYYMMDD HH24:MI:SS\"}\n" +
+                "]", Dateformat.class);
+    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
index ead69fa59f..227fb75f1d 100644
--- a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
@@ -1,5 +1,6 @@
 package io.dataease.provider.query.pg;
 
+import com.alibaba.fastjson.JSONArray;
 import com.google.gson.Gson;
 import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
 import io.dataease.plugins.common.base.domain.DatasetTableField;
@@ -18,6 +19,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj;
 import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
 import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
 import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem;
+import io.dataease.plugins.datasource.entity.Dateformat;
 import io.dataease.plugins.datasource.entity.JdbcConfiguration;
 import io.dataease.plugins.datasource.entity.PageInfo;
 import io.dataease.plugins.datasource.query.QueryProvider;
@@ -1301,4 +1303,15 @@ public class PgQueryProvider extends QueryProvider {
         schema = String.format(PgConstants.KEYWORD_TABLE, schema);
         return "SELECT * FROM " + schema + "." + String.format(PgConstants.KEYWORD_TABLE, table);
     }
+
+    public List<Dateformat> dateformat() {
+        return JSONArray.parseArray("[\n" +
+                "{\"dateformat\": \"YYYY-MM-DD\"},\n" +
+                "{\"dateformat\": \"YYYY/MM/DD\"},\n" +
+                "{\"dateformat\": \"YYYYMMDD\"},\n" +
+                "{\"dateformat\": \"YYYY-MM-DD HH24:MI:SS\"},\n" +
+                "{\"dateformat\": \"YYYY/MM/DD HH24:MI:SS\"},\n" +
+                "{\"dateformat\": \"YYYYMMDD HH24:MI:SS\"}\n" +
+                "]", Dateformat.class);
+    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
index 2ba6bc0e15..4a8fa038aa 100644
--- a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
@@ -1,5 +1,6 @@
 package io.dataease.provider.query.redshift;
 
+import com.alibaba.fastjson.JSONArray;
 import com.google.gson.Gson;
 import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
 import io.dataease.plugins.common.base.domain.DatasetTableField;
@@ -16,6 +17,7 @@ import io.dataease.plugins.common.dto.sqlObj.SQLObj;
 import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
 import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
 import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem;
+import io.dataease.plugins.datasource.entity.Dateformat;
 import io.dataease.plugins.datasource.entity.JdbcConfiguration;
 import io.dataease.plugins.datasource.entity.PageInfo;
 import io.dataease.plugins.datasource.query.QueryProvider;
@@ -1286,4 +1288,15 @@ public class RedshiftQueryProvider extends QueryProvider {
         schema = String.format(PgConstants.KEYWORD_TABLE, schema);
         return "SELECT * FROM " + schema + "." + String.format(PgConstants.KEYWORD_TABLE, table);
     }
+
+    public List<Dateformat> dateformat() {
+        return JSONArray.parseArray("[\n" +
+                "{\"dateformat\": \"YYYY-MM-DD\"},\n" +
+                "{\"dateformat\": \"YYYY/MM/DD\"},\n" +
+                "{\"dateformat\": \"YYYYMMDD\"},\n" +
+                "{\"dateformat\": \"YYYY-MM-DD HH24:MI:SS\"},\n" +
+                "{\"dateformat\": \"YYYY/MM/DD HH24:MI:SS\"},\n" +
+                "{\"dateformat\": \"YYYYMMDD HH24:MI:SS\"}\n" +
+                "]", Dateformat.class);
+    }
 }
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 165d5058fe..c85d2224ef 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -919,6 +919,7 @@ export default {
     layer_controller: 'Quota switch',
     suspension: 'Suspension',
     chart_background: 'Component background',
+    date_format: 'Select date resolution format',
     solid_color: 'Solid color',
     split_gradient: 'Split gradient',
     continuous_gradient: 'Continuous gradient',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 84c00ab284..8ace68307a 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -919,6 +919,7 @@ export default {
     layer_controller: '指標切換',
     suspension: '懸浮',
     chart_background: '組件背景',
+    date_format: '選擇日期解析格式',
     solid_color: '純色',
     split_gradient: '分離漸變',
     continuous_gradient: '連續漸變',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 6d2997c4dc..11dabf102d 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -918,6 +918,7 @@ export default {
     layer_controller: '指标切换',
     suspension: '悬浮',
     chart_background: '组件背景',
+    date_format: '请选择日期解析格式',
     solid_color: '纯色',
     split_gradient: '分离渐变',
     continuous_gradient: '连续渐变',
diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue
index 6e879d8947..dc35dffd72 100644
--- a/frontend/src/views/dataset/data/FieldEdit.vue
+++ b/frontend/src/views/dataset/data/FieldEdit.vue
@@ -141,46 +141,49 @@
             min-width="200"
           >
             <template slot-scope="scope">
-              <el-select
+              <el-cascader
                 v-model="scope.row.deType"
                 size="small"
-                class="select-type"
+                popper-class="select-date-resolution-format"
                 :disabled="!hasDataPermission('manage', param.privileges)"
+                class="select-type"
+                :options="fields"
+                @visible-change="getPopPosition"
                 @change="saveEdit(scope.row)"
               >
-                <el-option
-                  v-for="item in fields"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                  <span style="float: left">
+                <template slot-scope="{ node, data }">
+                  <span
+                    v-if="node.level === 2 && node.label === '%Y-%m-%d'"
+                    class="format-title"
+                    :style="popPosition"
+                  >{{ $t('chart.date_format') }}</span>
+                  <span>
                     <svg-icon
-                      v-if="item.value === 0"
+                      v-if="data.value === 0"
                       icon-class="field_text"
                       class="field-icon-text field-icon-dimension"
                     />
                     <svg-icon
-                      v-if="item.value === 1"
+                      v-if="data.value === 1"
                       icon-class="field_time"
                       class="field-icon-time field-icon-dimension"
                     />
                     <svg-icon
-                      v-if="item.value === 2 || item.value === 3"
+                      v-if="data.value === 2 || data.value === 3"
                       icon-class="field_value"
                       class="field-icon-value field-icon-dimension"
                     />
                     <svg-icon
-                      v-if="item.value === 5"
+                      v-if="data.value === 5"
                       icon-class="field_location"
                       class="field-icon-location field-icon-dimension"
                     />
                   </span>
-                  <span style="float: left; color: #8492a6; font-size: 12px">{{
-                    item.label
+                  <span style="color: #8492a6; font-size: 12px">{{
+                    data.label
                   }}</span>
-                </el-option>
-              </el-select>
+                </template>
+              </el-cascader>
               <span class="select-svg-icon">
                 <span v-if="scope.row.deType === 0 || scope.row.deType === 6">
                   <svg-icon
@@ -478,46 +481,49 @@
             min-width="200"
           >
             <template slot-scope="scope">
-              <el-select
+              <el-cascader
                 v-model="scope.row.deType"
                 size="small"
-                class="select-type"
+                popper-class="select-date-resolution-format"
                 :disabled="!hasDataPermission('manage', param.privileges)"
+                class="select-type"
+                :options="fields"
+                @visible-change="getPopPosition"
                 @change="saveEdit(scope.row)"
               >
-                <el-option
-                  v-for="item in fields"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                  <span style="float: left">
+                <template slot-scope="{ node, data }">
+                  <span
+                    v-if="node.level === 2 && node.label === '%Y-%m-%d'"
+                    class="format-title"
+                    :style="popPosition"
+                  >{{ $t('chart.date_format') }}</span>
+                  <span>
                     <svg-icon
-                      v-if="item.value === 0"
+                      v-if="data.value === 0"
                       icon-class="field_text"
-                      class="field-icon-text field-icon-quota"
+                      class="field-icon-text field-icon-dimension"
                     />
                     <svg-icon
-                      v-if="item.value === 1"
+                      v-if="data.value === 1"
                       icon-class="field_time"
-                      class="field-icon-time field-icon-quota"
+                      class="field-icon-time field-icon-dimension"
                     />
                     <svg-icon
-                      v-if="item.value === 2 || item.value === 3"
+                      v-if="data.value === 2 || data.value === 3"
                       icon-class="field_value"
-                      class="field-icon-value field-icon-quota"
+                      class="field-icon-value field-icon-dimension"
                     />
                     <svg-icon
-                      v-if="item.value === 5"
+                      v-if="data.value === 5"
                       icon-class="field_location"
-                      class="field-icon-location field-icon-quota"
+                      class="field-icon-location field-icon-dimension"
                     />
                   </span>
-                  <span style="float: left; color: #8492a6; font-size: 12px">{{
-                    item.label
+                  <span style="color: #8492a6; font-size: 12px">{{
+                    data.label
                   }}</span>
-                </el-option>
-              </el-select>
+                </template>
+              </el-cascader>
               <span class="select-svg-icon">
                 <span v-if="scope.row.deType === 0">
                   <svg-icon
@@ -757,7 +763,6 @@ export default {
   },
   data() {
     return {
-      dateFormats: [],
       maxHeight: 'auto',
       tableFields: {
         dimensionList: [],
@@ -765,17 +770,8 @@ export default {
         dimensionListData: [],
         quotaListData: []
       },
-      fields: [
-        { label: this.$t('dataset.text'), value: 0 },
-        { label: this.$t('dataset.time'), value: 1 },
-        { label: this.$t('dataset.value'), value: 2 },
-        {
-          label:
-            this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')',
-          value: 3
-        },
-        { label: this.$t('dataset.location'), value: 5 }
-      ],
+      popPosition: {},
+      fields: [],
       fieldActiveNames: ['d', 'q'],
       searchField: '',
       editCalcField: false,
@@ -811,6 +807,18 @@ export default {
         that.maxHeight = currentHeight - 56 - 30 - 35 - 26 - 10 - 10 + 'px'
       }, 10)
     },
+    getPopPosition(val) {
+      if (!val) return
+      // setTimeout(() => {
+
+      // }, 50)
+      this.$nextTick(() => {
+        const list = document.querySelectorAll('body > .select-date-resolution-format')
+        const ele = list[list.length - 1]
+        const { top, left } = ele?.style
+        this.popPosition = { top: parseInt(top) - 18 + 'px', left: parseInt(left) + 181 + 'px', position: 'fixed' }
+      })
+    },
     initField() {
       fieldListDQ(this.param.id).then((response) => {
         this.tableFields = response.data
@@ -825,7 +833,19 @@ export default {
         this.quotaChange()
       })
       dateformats(this.param.id).then((response) => {
-        this.dateFormats = response.data
+        const children = (response?.data || []).map(ele => ({ label: ele.dateformat, value: ele.dateformat }))
+        children.push({ label: '自定义', value: 'custom' })
+        this.fields = [
+          { label: this.$t('dataset.text'), value: 0 },
+          { label: this.$t('dataset.time'), value: 1, children },
+          { label: this.$t('dataset.value'), value: 2 },
+          {
+            label:
+            this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')',
+            value: 3
+          },
+          { label: this.$t('dataset.location'), value: 5 }
+        ]
       })
     },
     saveEdit(item) {
@@ -1153,3 +1173,16 @@ span {
   border-bottom: 0 solid #e6ebf5 !important;
 }
 </style>
+
+<style lang="scss">
+.select-date-resolution-format {
+  .format-title {
+    position: fixed;
+    display: inline-block;
+    height: 30px;
+    background: #dfe6ec;
+    width: 192px;
+    padding-left: 30px;
+  }
+}
+</style>