From af7b9dab0950ab6e3b4776b787ebb5c4e568f1e6 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 28 Feb 2022 23:01:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AF=86=E5=88=AB=20pg=20=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/provider/query/pg/PgQueryProvider.java    | 2 ++
 .../io/dataease/service/dataset/DataSetTableService.java  | 4 ++--
 frontend/src/views/dataset/data/FieldEdit.vue             | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

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 @@
                 </el-option>
               </el-select>
               <span style="margin-left: 8px;">
-                <span v-if="scope.row.deType === 0">
-                  <svg-icon v-if="scope.row.deType === 0" icon-class="field_text" class="field-icon-text" />
+                <span v-if="scope.row.deType === 0 || scope.row.deType === 6">
+                  <svg-icon v-if="scope.row.deType === 0 || scope.row.deType === 6" icon-class="field_text" class="field-icon-text" />
                   <span class="field-class">{{ $t('dataset.text') }}</span>
                 </span>
                 <span v-if="scope.row.deType === 1">
@@ -95,8 +95,8 @@
           <el-table-column property="deExtractType" :label="$t('dataset.origin_field_type')" width="100">
             <template slot-scope="scope">
               <span v-if="scope.row.extField === 0">
-                <span v-if="scope.row.deExtractType === 0">
-                  <svg-icon v-if="scope.row.deExtractType === 0" icon-class="field_text" class="field-icon-text" />
+                <span v-if="scope.row.deExtractType === 0 || scope.row.deExtractType === 6">
+                  <svg-icon v-if="scope.row.deExtractType === 0 || scope.row.deExtractType === 6" icon-class="field_text" class="field-icon-text" />
                   <span class="field-class">{{ $t('dataset.text') }}</span>
                 </span>
                 <span v-if="scope.row.deExtractType === 1">