dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8649 from dataease/pr@dev@featdriver

Browse Source 
Pr@dev@featdriver
This commit is contained in:
taojinlong 2024-03-22 15:53:32 +08:00 committed by GitHub
commit 82654b999f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
View File

@ -99,7 +99,7 @@ public class DorisDDLProvider extends DDLProviderImpl {
} }
switch (datasetTableField.getDeExtractType()) { switch (datasetTableField.getDeExtractType()) {
case 0: case 0:
if (size <= 65533 || (keys != null && keys.contains(datasetTableField.getDataeaseName()))) { if (keys != null && keys.contains(datasetTableField.getDataeaseName())) {
Column_Fields.append("VARCHAR(length)".replace("length", String.valueOf(size))).append(",`"); Column_Fields.append("VARCHAR(length)".replace("length", String.valueOf(size))).append(",`");
} else { } else {
Column_Fields.append("STRING".replace("length", String.valueOf(size))).append(",`"); Column_Fields.append("STRING".replace("length", String.valueOf(size))).append(",`");

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

@ -567,8 +567,8 @@ public class ExtractDataService {
} catch (Exception e) { } catch (Exception e) {
throw e; throw e;
} finally { } finally {
// File deleteFile = new File(root_path + datasetTable.getId() + ".sh"); File deleteFile = new File(root_path + datasetTable.getId() + ".sh");
// FileUtils.forceDelete(deleteFile); FileUtils.forceDelete(deleteFile);
} }
} }

10
core/frontend/src/views/dataset/data/FieldEdit.vue
View File

@ -151,11 +151,6 @@
@change="saveEdit(scope.row)" @change="saveEdit(scope.row)"
> >
<template slot-scope="{ node, data }"> <template slot-scope="{ node, data }">
<span
v-if="node.level === 2 && data.label === 'yyyy-MM-dd'"
class="format-title"
:style="popPosition"
>{{ $t('chart.date_format') }}</span>
<span> <span>
<svg-icon <svg-icon
v-if="data.value === 0" v-if="data.value === 0"
@ -506,11 +501,6 @@
@change="saveEdit(scope.row)" @change="saveEdit(scope.row)"
> >
<template slot-scope="{ node, data }"> <template slot-scope="{ node, data }">
<span
v-if="node.level === 2 && data.label === 'yyyy-MM-dd'"
class="format-title"
:style="popPosition"
>{{ $t('chart.date_format') }}</span>
<span> <span>
<svg-icon <svg-icon
v-if="data.value === 0" v-if="data.value === 0"