diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx
index 599f60395..714cce1ea 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx
@@ -286,7 +286,7 @@ const ModelCreateForm: React.FC<CreateFormProps> = ({
       return;
     }
     const columnFields: any[] = columns.map((item: IDataSource.IExecuteSqlColumn) => {
-      const { type, nameEn, comment } = item;
+      const { type, nameEn, comment, name } = item;
       const oldItem =
         fieldsClassifyList.find((oItem) => {
           return oItem.fieldName === item.nameEn;
@@ -296,6 +296,7 @@ const ModelCreateForm: React.FC<CreateFormProps> = ({
         bizName: nameEn,
         fieldName: nameEn,
         dataType: type,
+        name: name || comment,
         comment,
       };
     });
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 8859bb773..732ef1270 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
@@ -110,11 +110,12 @@ const ModelFieldForm: React.FC<Props> = ({
               }
               const isCreateName = getCreateFieldName(value);
               const editState = !isUndefined(record[isCreateName]) ? !!record[isCreateName] : true;
+              const { name, comment } = record;
               // handleFieldChange(record, 'type', value);
               onFieldChange(record.bizName, {
                 ...record,
                 type: value,
-                name: '',
+                name: name || comment,
                 [isCreateName]: editState,
                 ...defaultParams,
               });
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Edit.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Edit.tsx
index ff5419bf3..abcf8432d 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Edit.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Edit.tsx
@@ -1,32 +1,19 @@
-import { message, Tabs, Button, Space } from 'antd';
+import { message } from 'antd';
 import React, { useState, useEffect } from 'react';
-import { getMetricData, getDimensionList, getDrillDownDimension } from '../service';
-import { connect, useParams, history } from 'umi';
-import type { StateType } from '../model';
+import { getMetricData } from '../service';
+import { useParams } from '@umijs/max';
 import styles from './style.less';
-import { ArrowLeftOutlined } from '@ant-design/icons';
-import MetricTrendSection from '@/pages/SemanticModel/Metric/components/MetricTrendSection';
 import { ISemantic } from '../data';
-import MetricBasicInfo from './components/MetricBasicInfo';
-import DimensionAndMetricRelationModal from '../components/DimensionAndMetricRelationModal';
 import MetricInfoEditSider from './MetricInfoEditSider';
 import MetricInfoCreateForm from './components/MetricInfoCreateForm';
-import { MetricSettingKey, MetricSettingWording } from './constants';
+import { MetricSettingKey } from './constants';
 
 type Props = Record<string, any>;
 
 const MetricDetail: React.FC<Props> = () => {
   const params: any = useParams();
   const metricId = params.metricId;
-  const [metricRelationModalOpenState, setMetricRelationModalOpenState] = useState<boolean>(false);
   const [metircData, setMetircData] = useState<ISemantic.IMetricItem>();
-  const [dimensionList, setDimensionList] = useState<ISemantic.IDimensionItem[]>([]);
-  const [drillDownDimension, setDrillDownDimension] = useState<ISemantic.IDrillDownDimensionItem[]>(
-    [],
-  );
-  const [relationDimensionOptions, setRelationDimensionOptions] = useState<
-    { value: string; label: string; modelId: number }[]
-  >([]);
 
   const [settingKey, setSettingKey] = useState<MetricSettingKey>(MetricSettingKey.BASIC);
 
@@ -35,7 +22,6 @@ const MetricDetail: React.FC<Props> = () => {
       return;
     }
     queryMetricData(metricId);
-    queryDrillDownDimension(metricId);
   }, [metricId]);
 
   const queryMetricData = async (metricId: string) => {
@@ -47,42 +33,6 @@ const MetricDetail: React.FC<Props> = () => {
     message.error(msg);
   };
 
-  const queryDrillDownDimension = async (metricId: number) => {
-    const { code, data, msg } = await getDrillDownDimension(metricId);
-    if (code === 200 && Array.isArray(data)) {
-      setDrillDownDimension(data);
-      const ids = data.map((item) => item.dimensionId);
-      queryDimensionList(ids);
-      return data;
-    } else {
-      setDimensionList([]);
-      setRelationDimensionOptions([]);
-    }
-    if (code !== 200) {
-      message.error(msg);
-    }
-    return [];
-  };
-
-  const queryDimensionList = async (ids: number[]) => {
-    if (!(Array.isArray(ids) && ids.length > 0)) {
-      setRelationDimensionOptions([]);
-      return;
-    }
-    const { code, data, msg } = await getDimensionList({ ids });
-    if (code === 200 && Array.isArray(data?.list)) {
-      setDimensionList(data.list);
-      setRelationDimensionOptions(
-        data.list.map((item: ISemantic.IMetricItem) => {
-          return { label: item.name, value: item.bizName, modelId: item.modelId };
-        }),
-      );
-      return data.list;
-    }
-    message.error(msg);
-    return [];
-  };
-
   return (
     <>
       <div className={styles.metricEditWrapper}>
@@ -96,29 +46,9 @@ const MetricDetail: React.FC<Props> = () => {
             />
           </div>
           <div className={styles.tabContainer}>
-            {/* {metircData && ( */}
-            <MetricInfoCreateForm
-              settingKey={settingKey}
-              // domainId={metircData?.domainId}
-              // modelId={metircData?.modelId}
-              metricItem={metircData}
-            />
-            {/* )} */}
+            <MetricInfoCreateForm settingKey={settingKey} metricItem={metircData} />
           </div>
         </div>
-        <DimensionAndMetricRelationModal
-          metricItem={metircData}
-          relationsInitialValue={drillDownDimension}
-          open={metricRelationModalOpenState}
-          onCancel={() => {
-            setMetricRelationModalOpenState(false);
-          }}
-          onSubmit={(relations) => {
-            queryMetricData(metricId);
-            queryDrillDownDimension(metricId);
-            setMetricRelationModalOpenState(false);
-          }}
-        />
       </div>
     </>
   );
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricInfoCreateForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricInfoCreateForm.tsx
index e97efd8dc..4c36dcfd8 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricInfoCreateForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricInfoCreateForm.tsx
@@ -100,8 +100,6 @@ const MetricInfoCreateForm: React.FC<CreateFormProps> = ({
     },
   } as any);
 
-  // const [exprTypeParamsState, setExprTypeParamsState] = useState<ISemantic.IMeasure[]>([]);
-
   const [defineType, setDefineType] = useState(METRIC_DEFINE_TYPE.MEASURE);
 
   const [createNewMetricList, setCreateNewMetricList] = useState<ISemantic.IMetricItem[]>([]);
@@ -123,11 +121,11 @@ const MetricInfoCreateForm: React.FC<CreateFormProps> = ({
     ISemantic.IDrillDownDimensionItem[]
   >([]);
 
-  const forward = () => setCurrentStep(currentStep + 1);
-  const backward = () => setCurrentStep(currentStep - 1);
-
   const queryModelDetail = async () => {
-    const { code, data } = await getModelDetail({ modelId: modelId || metricItem?.modelId });
+    if (!modelId) {
+      return;
+    }
+    const { code, data } = await getModelDetail({ modelId });
     if (code === 200) {
       if (Array.isArray(data?.modelDetail?.fields)) {
         if (Array.isArray(metricItem?.metricDefineByFieldParams?.fields)) {
@@ -817,32 +815,7 @@ const MetricInfoCreateForm: React.FC<CreateFormProps> = ({
       </>
     );
   };
-  const renderFooter = () => {
-    if (!hasMeasuresState) {
-      return <Button onClick={onCancel}>取消</Button>;
-    }
-    if (currentStep === 1) {
-      return (
-        <>
-          <Button style={{ float: 'left' }} onClick={backward}>
-            上一步
-          </Button>
-          <Button onClick={onCancel}>取消</Button>
-          <Button type="primary" onClick={handleSave}>
-            完成
-          </Button>
-        </>
-      );
-    }
-    return (
-      <>
-        <Button onClick={onCancel}>取消</Button>
-        <Button type="primary" onClick={handleSave}>
-          下一步
-        </Button>
-      </>
-    );
-  };
+
   return (
     <>
       {hasMeasuresState ? (
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/OverviewContainer.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/OverviewContainer.tsx
index 66422a771..88103390d 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/OverviewContainer.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/OverviewContainer.tsx
@@ -5,7 +5,7 @@ import DomainListTree from './components/DomainList';
 import styles from './components/style.less';
 import { LeftOutlined, RightOutlined } from '@ant-design/icons';
 import { ISemantic } from './data';
-import { getDomainList, getModelList } from './service';
+import { getDomainList } from './service';
 import DomainManagerTab from './components/DomainManagerTab';
 
 type Props = {
@@ -33,7 +33,6 @@ const OverviewContainer: React.FC<Props> = ({ mode }) => {
   const { MrefreshMetricList } = metricModel;
   const { MrefreshDatabaseList } = databaseModel;
   const menuKey = params.menuKey ? params.menuKey : !Number(modelId) ? 'overview' : '';
-  // const [modelList, setModelList] = useState<ISemantic.IModelItem[]>([]);
   const [isModel, setIsModel] = useState<boolean>(false);
   const [collapsedState, setCollapsedState] = useState(true);
   const [activeKey, setActiveKey] = useState<string>(menuKey);
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx
index 651eed109..22da44b6b 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx
@@ -52,6 +52,9 @@ const ClassDimensionTable: React.FC<Props> = ({}) => {
   const actionRef = useRef<ActionType>();
 
   const queryDimensionList = async (params: any) => {
+    if (!modelId) {
+      return;
+    }
     setLoading(true);
     const { code, data, msg } = await getDimensionList({
       ...pagination,
@@ -85,7 +88,7 @@ const ClassDimensionTable: React.FC<Props> = ({}) => {
 
   useEffect(() => {
     queryDimensionList({ ...filterParams, ...defaultPagination });
-  }, [filterParams]);
+  }, [filterParams, modelId]);
 
   useEffect(() => {
     queryDataSourceList();
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx
index 940d27b5f..88f94946a 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx
@@ -108,9 +108,12 @@ const ClassMetricTable: React.FC<Props> = ({ onEmptyMetricData }) => {
 
   useEffect(() => {
     queryMetricList({ ...filterParams, ...defaultPagination });
-  }, [filterParams]);
+  }, [filterParams, modelId]);
 
   const queryMetricList = async (params: any) => {
+    if (!modelId) {
+      return;
+    }
     setLoading(true);
     const { code, data, msg } = await queryMetric({
       ...pagination,
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DomainManagerTab.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DomainManagerTab.tsx
index 170de78b2..e9b1a0694 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DomainManagerTab.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DomainManagerTab.tsx
@@ -205,7 +205,7 @@ const DomainManagerTab: React.FC<Props> = ({
       />
       <Tabs
         className={styles.tab}
-        items={!isModel ? tabItem : isModelItem}
+        items={!isModel ? tabItem : selectModelId ? isModelItem : []}
         activeKey={getActiveKey()}
         // destroyInactiveTabPane
         tabBarExtraContent={{
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx
index b82f12c99..f2907b563 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx
@@ -1,7 +1,7 @@
-import React, { useState, useRef, useEffect } from 'react';
-import { Button, Tag, Space } from 'antd';
+import React, { useState, useEffect } from 'react';
+import { Tag, Space } from 'antd';
 import { ProTable } from '@ant-design/pro-components';
-import { ProCard } from  '@ant-design/pro-components';
+import { ProCard } from '@ant-design/pro-components';
 import SqlEditor from '@/components/SqlEditor';
 import styles from './style.less';
 import FormLabelRequire from './FormLabelRequire';