From e990b37433c90f852a0dbc94fcbecf2d50cdca39 Mon Sep 17 00:00:00 2001
From: pisces <30692337+p1scess@users.noreply.github.com>
Date: Wed, 20 Nov 2024 12:04:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=BB=BA=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=EF=BC=8C=E5=AD=98=E5=9C=A8=E5=A4=9A=E4=B8=AA=E5=BA=A6=E9=87=8F?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E5=BA=A6=E9=87=8F?=
 =?UTF-8?q?=E7=9A=84=E6=89=A9=E5=B1=95=E9=85=8D=E7=BD=AE=E5=9D=87=E4=BC=9A?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=88=90=E7=AC=AC1=E4=B8=AA=E5=BA=A6?=
 =?UTF-8?q?=E9=87=8F=E4=B8=AD=E7=9A=84=E5=80=BC;=20(#1909)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(semantic-model): 新建模型，存在多个度量的情况下，度量的扩展配置均会显示成第1个度量中的值

* refactor(semantic-model): 新建模型，扩展配置的取值方式，find重构成解构

---------

Co-authored-by: tristanliu <37809633+sevenliu1896@users.noreply.github.com>
---
 .../Datasource/components/ModelFieldForm.tsx  | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

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 bf412100e..50cfaa67b 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
@@ -1,19 +1,19 @@
 import React, { useState } from 'react';
-import { Table, Select, Checkbox, Input, Space, Tooltip, Form, Switch, Row, Col } from 'antd';
+import { Checkbox, Form, Input, Select, Space, Switch, Table, Tooltip } from 'antd';
 import TableTitleTooltips from '../../components/TableTitleTooltips';
 import { isUndefined } from 'lodash';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 import SqlEditor from '@/components/SqlEditor';
 import { ISemantic } from '../../data';
 import {
-  TYPE_OPTIONS,
-  DATE_FORMATTER,
   AGG_OPTIONS,
-  EnumDataSourceType,
+  DATE_FORMATTER,
   DATE_OPTIONS,
   DIM_OPTIONS,
+  EnumDataSourceType,
   EnumModelDataType,
   PARTITION_TIME_FORMATTER,
+  TYPE_OPTIONS,
 } from '../constants';
 import styles from '../style.less';
 
@@ -90,8 +90,7 @@ const ModelFieldForm: React.FC<Props> = ({
       dataIndex: 'type',
       width: 250,
       render: (_: any, record: FieldItem) => {
-        const type = fields.find((field) => field.bizName === record.bizName)?.type;
-        const classType = fields.find((field) => field.bizName === record.bizName)?.classType;
+        const { type, classType } = record;
         const selectTypeValue = [EnumModelDataType.DIMENSION].includes(classType)
           ? classType
           : type;
@@ -229,13 +228,10 @@ const ModelFieldForm: React.FC<Props> = ({
           );
         }
         if (type === EnumDataSourceType.MEASURES) {
-          const agg = record.expr
-            ? fields.find((field) => field.expr === record.expr)?.agg
-            : undefined;
           return (
             <Select
               placeholder="度量算子"
-              value={agg}
+              value={record.agg}
               onChange={(value) => {
                 handleFieldChange(record, 'agg', value);
               }}
@@ -251,7 +247,6 @@ const ModelFieldForm: React.FC<Props> = ({
             </Select>
           );
         }
-
         if (process.env.SHOW_TAG) {
           if (type === EnumDataSourceType.CATEGORICAL) {
             const isTag = fields.find((field) => field.bizName === record.bizName)?.isTag;
@@ -299,10 +294,7 @@ const ModelFieldForm: React.FC<Props> = ({
           }
         }
         if ([EnumDataSourceType.TIME, EnumDataSourceType.PARTITION_TIME].includes(type)) {
-          const dateFormat = fields.find((field) => field.bizName === record.bizName)?.dateFormat;
-          const timeGranularity = fields.find(
-            (field) => field.bizName === record.bizName,
-          )?.timeGranularity;
+          const { dateFormat, timeGranularity } = record;
           const dateFormatterOptions =
             type === EnumDataSourceType.PARTITION_TIME ? PARTITION_TIME_FORMATTER : DATE_FORMATTER;