center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 识别 pg 类型

Browse Source
This commit is contained in:
taojinlong 2022-02-28 23:01:29 +08:00
parent 4d0319d44c
commit af7b9dab09
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
View File

@ -86,6 +86,8 @@ public class PgQueryProvider extends QueryProvider {
return DeTypeConstants.DE_FLOAT;// 浮点 return DeTypeConstants.DE_FLOAT;// 浮点
case "TINYINT": case "TINYINT":
return DeTypeConstants.DE_BOOL;// 布尔 return DeTypeConstants.DE_BOOL;// 布尔
case "bytea":
return DeTypeConstants.DE_BINARY;// 二进制
default: default:
return DeTypeConstants.DE_STRING; return DeTypeConstants.DE_STRING;
} }

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

@ -1629,7 +1629,7 @@ public class DataSetTableService {
datasetTableField.setDeExtractType(transFieldType(filed.getFieldType())); datasetTableField.setDeExtractType(transFieldType(filed.getFieldType()));
} else { } else {
Integer fieldType = qp.transFieldType(filed.getFieldType()); 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.setDeExtractType(fieldType);
} }
datasetTableField.setSize(filed.getFieldSize()); datasetTableField.setSize(filed.getFieldSize());
@ -1637,7 +1637,7 @@ public class DataSetTableService {
datasetTableField.setColumnIndex(i); datasetTableField.setColumnIndex(i);
datasetTableField.setLastSyncTime(syncTime); datasetTableField.setLastSyncTime(syncTime);
datasetTableField.setExtField(0); datasetTableField.setExtField(0);
datasetTableField.setGroupType(datasetTableField.getDeType() < 2 ? "d" : "q"); datasetTableField.setGroupType((datasetTableField.getDeType() < 2 || datasetTableField.getDeType() == 6) ? "d" : "q");
} }
dataSetTableFieldsService.save(datasetTableField); dataSetTableFieldsService.save(datasetTableField);
} }

8
frontend/src/views/dataset/data/FieldEdit.vue
View File

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