From 98a24d63796f24b0cd999578a56c076688d24095 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 21 Mar 2024 16:02:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/views/dataset/data/FieldEdit.vue | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/core/frontend/src/views/dataset/data/FieldEdit.vue b/core/frontend/src/views/dataset/data/FieldEdit.vue
index 177d662385..510cdea70e 100644
--- a/core/frontend/src/views/dataset/data/FieldEdit.vue
+++ b/core/frontend/src/views/dataset/data/FieldEdit.vue
@@ -151,11 +151,6 @@
                 @change="saveEdit(scope.row)"
               >
                 <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>
                     <svg-icon
                       v-if="data.value === 0"
@@ -506,11 +501,6 @@
                 @change="saveEdit(scope.row)"
               >
                 <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>
                     <svg-icon
                       v-if="data.value === 0"

From c2e0a569ff9687749a429873757570745b53bc5e Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Fri, 22 Mar 2024 15:42:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20Doris?=
 =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E6=BA=90=E5=AE=9A=E6=97=B6=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=89=A7=E8=A1=8C=E6=88=90=E5=8A=9F=E6=97=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/provider/engine/doris/DorisDDLProvider.java   | 2 +-
 .../java/io/dataease/service/dataset/ExtractDataService.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
index 79378adcc3..768fceb54b 100644
--- a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
@@ -99,7 +99,7 @@ public class DorisDDLProvider extends DDLProviderImpl {
             }
             switch (datasetTableField.getDeExtractType()) {
                 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(",`");
                     } else {
                         Column_Fields.append("STRING".replace("length", String.valueOf(size))).append(",`");
diff --git a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index ef5ef50634..bf8180936c 100644
--- a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -567,8 +567,8 @@ public class ExtractDataService {
         } catch (Exception e) {
             throw e;
         } finally {
-//            File deleteFile = new File(root_path + datasetTable.getId() + ".sh");
-//            FileUtils.forceDelete(deleteFile);
+            File deleteFile = new File(root_path + datasetTable.getId() + ".sh");
+            FileUtils.forceDelete(deleteFile);
         }
 
     }