From 5a22590661e8ddb7393e19ca35f2cbca6ab5a1e1 Mon Sep 17 00:00:00 2001
From: jacktpy <48015717+jacktpy@users.noreply.github.com>
Date: Thu, 20 Feb 2025 18:24:33 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E4=BF=AE=E5=A4=8D=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A8=A1=E5=9E=8B=E6=97=B6=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BA=E7=BB=B4=E5=BA=A6=20(#2083?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supersonic/headless/server/utils/ModelConverter.java    | 3 +--
 .../SemanticModel/Datasource/components/ModelFieldForm.tsx  | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java
index 3ccb49069..a5b091234 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java
@@ -109,8 +109,7 @@ public class ModelConverter {
         dimensionReq.setModelId(modelDO.getId());
         dimensionReq.setExpr(dim.getExpr());
         dimensionReq.setType(dim.getType().name());
-        dimensionReq
-                .setDescription(Objects.isNull(dim.getDescription()) ? "" : dim.getDescription());
+        dimensionReq.setDescription(Objects.isNull(dim.getDescription()) ? dimensionReq.getDescription() : dim.getDescription());
         dimensionReq.setTypeParams(dim.getTypeParams());
         return dimensionReq;
     }
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx
index 3a35a3bea..b8b5d4120 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx
@@ -51,6 +51,7 @@ const getCreateFieldName = (type: EnumDataSourceType) => {
     EnumDataSourceType.CATEGORICAL,
     EnumDataSourceType.TIME,
     EnumDataSourceType.PARTITION_TIME,
+    EnumDataSourceType.FOREIGN,
   ].includes(type as EnumDataSourceType)
     ? 'isCreateDimension'
     : 'isCreateMetric';
@@ -101,7 +102,7 @@ const ModelFieldForm: React.FC<Props> = ({
               value={selectTypeValue}
               allowClear
               onChange={(value) => {
-                let defaultParams = {};
+                let defaultParams:any = {};
                 if (value === EnumDataSourceType.MEASURES) {
                   defaultParams = {
                     agg: AGG_OPTIONS[0].value,
@@ -127,12 +128,13 @@ const ModelFieldForm: React.FC<Props> = ({
                   };
                 } else {
                   defaultParams = {
+                    type: value,
                     agg: undefined,
                     dateFormat: undefined,
                     timeGranularity: undefined,
                   };
                 }
-                const isCreateName = getCreateFieldName(value);
+                const isCreateName = getCreateFieldName(defaultParams.type);
                 const editState = !isUndefined(record[isCreateName])
                   ? !!record[isCreateName]
                   : true;