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 0c63ba51ab..55eebb6755 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 @@ -86,6 +86,8 @@ public class PgQueryProvider extends QueryProvider { return DeTypeConstants.DE_FLOAT;// 浮点 case "TINYINT": return DeTypeConstants.DE_BOOL;// 布尔 + case "bytea": + return DeTypeConstants.DE_BINARY;// 二进制 default: return DeTypeConstants.DE_STRING; } diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index e63fe1f17a..4d95d8f4bf 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -1629,7 +1629,7 @@ public class DataSetTableService { datasetTableField.setDeExtractType(transFieldType(filed.getFieldType())); } else { Integer fieldType = qp.transFieldType(filed.getFieldType()); - datasetTableField.setDeType(fieldType == 4 ? 2 : fieldType); + datasetTableField.setDeType(fieldType == 4 ? 2 : (fieldType == 6 ? 0 : fieldType)); datasetTableField.setDeExtractType(fieldType); } datasetTableField.setSize(filed.getFieldSize()); @@ -1637,7 +1637,7 @@ public class DataSetTableService { datasetTableField.setColumnIndex(i); datasetTableField.setLastSyncTime(syncTime); datasetTableField.setExtField(0); - datasetTableField.setGroupType(datasetTableField.getDeType() < 2 ? "d" : "q"); + datasetTableField.setGroupType((datasetTableField.getDeType() < 2 || datasetTableField.getDeType() == 6) ? "d" : "q"); } dataSetTableFieldsService.save(datasetTableField); } diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue index c44b889b9d..4358303629 100644 --- a/frontend/src/views/dataset/data/FieldEdit.vue +++ b/frontend/src/views/dataset/data/FieldEdit.vue @@ -72,8 +72,8 @@ - - + + {{ $t('dataset.text') }} @@ -95,8 +95,8 @@