diff --git a/webapp/packages/supersonic-fe/package.json b/webapp/packages/supersonic-fe/package.json
index 6b4beb226..d3a967ed5 100644
--- a/webapp/packages/supersonic-fe/package.json
+++ b/webapp/packages/supersonic-fe/package.json
@@ -58,7 +58,7 @@
     "@ant-design/pro-layout": "^7.17.15",
     "@ant-design/pro-table": "^3.13.9",
     "@antv/dom-util": "^2.0.4",
-    "@antv/g6": "^4.8.14",
+    "@antv/g6": "^4.8.23",
     "@antv/g6-core": "^0.8.23",
     "@antv/layout": "^0.3.20",
     "@antv/xflow": "^1.0.55",
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx
index 0debb9bfc..5bd0e15b9 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx
@@ -432,7 +432,9 @@ const DataSourceCreateForm: React.FC<CreateFormProps> = ({
       maskClosable={false}
       open={createModalVisible}
       footer={renderFooter()}
-      onCancel={onCancel}
+      onCancel={() => {
+        onCancel?.();
+      }}
     >
       <Steps style={{ marginBottom: 28 }} size="small" current={currentStep}>
         <Step title="基本信息" />
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx
index 9c3a21b16..025db547a 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx
@@ -142,6 +142,9 @@ const MetricTrendSection: React.FC<Props> = ({ metircData }) => {
   };
 
   const queryDimensionList = async (ids: number[]) => {
+    if (!(Array.isArray(ids) && ids.length > 0)) {
+      return;
+    }
     const { code, data, msg } = await getDimensionList({ ids });
     if (code === 200 && Array.isArray(data?.list)) {
       setDimensionList(data.list);
@@ -162,6 +165,9 @@ const MetricTrendSection: React.FC<Props> = ({ metircData }) => {
       const ids = data.map((item) => item.dimensionId);
       queryDimensionList(ids);
       return data;
+    } else {
+      setDimensionList([]);
+      setRelationDimensionOptions([]);
     }
     if (code !== 200) {
       message.error(msg);
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/SemanticGraph/index.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/SemanticGraph/index.tsx
index 0685ecdae..56ecc80d9 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/SemanticGraph/index.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/SemanticGraph/index.tsx
@@ -1070,7 +1070,8 @@ const DomainManger: React.FC<Props> = ({ domainManger, dispatch }) => {
           }}
         />
       )}
-      {
+
+      {createDataSourceModalOpen && (
         <ClassDataSourceTypeModal
           open={createDataSourceModalOpen}
           onCancel={() => {
@@ -1082,7 +1083,7 @@ const DomainManger: React.FC<Props> = ({ domainManger, dispatch }) => {
             updateGraphData();
           }}
         />
-      }
+      )}
       {
         <DeleteConfirmModal
           open={confirmModalOpenState}
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDataSourceTypeModal.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDataSourceTypeModal.tsx
index 2dc079623..355edf52c 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDataSourceTypeModal.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDataSourceTypeModal.tsx
@@ -43,8 +43,8 @@ const ClassDataSourceTypeModal: React.FC<Props> = ({
   const [scriptColumns, setScriptColumns] = useState<any[]>([]);
 
   useEffect(() => {
-    if (!dataSourceItem || !open) {
-      setCreateDataSourceModalOpen(open);
+    if (!dataSourceItem?.id || !open) {
+      setCreateDataSourceModalOpen(true);
       return;
     }
     if (dataSourceItem?.modelDetail?.queryType === 'table_query') {
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionAndMetricRelationModal.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionAndMetricRelationModal.tsx
index b3617086f..69bf7b98c 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionAndMetricRelationModal.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionAndMetricRelationModal.tsx
@@ -32,8 +32,7 @@ const DimensionAndMetricRelationModal: React.FC<Props> = ({
     };
     const { code, msg } = await updateExprMetric(queryParams);
     if (code === 200) {
-      // message.success('编辑指标成功');
-      // onSubmit?.(queryParams);
+      onSubmit(relationList);
       return;
     }
     message.error(msg);
@@ -46,7 +45,6 @@ const DimensionAndMetricRelationModal: React.FC<Props> = ({
         <Button
           type="primary"
           onClick={() => {
-            onSubmit(relationList);
             saveMetric(relationList);
           }}
         >
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx
index ccf14126a..358b404e4 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx
@@ -9,8 +9,6 @@ import type { StateType } from '../model';
 import { deleteModel, updateModel } from '../service';
 import ClassDataSourceTypeModal from './ClassDataSourceTypeModal';
 
-import ModelCreateFormModal from './ModelCreateFormModal';
-
 import moment from 'moment';
 import styles from './style.less';
 import { ISemantic } from '../data';
@@ -23,15 +21,7 @@ type Props = {
   domainManger: StateType;
 };
 
-const ModelTable: React.FC<Props> = ({
-  modelList,
-  domainManger,
-  disabledEdit = false,
-  onModelChange,
-  dispatch,
-}) => {
-  const { selectModelId: modelId, selectDomainId } = domainManger;
-  const [modelCreateFormModalVisible, setModelCreateFormModalVisible] = useState<boolean>(false);
+const ModelTable: React.FC<Props> = ({ modelList, disabledEdit = false, onModelChange }) => {
   const [modelItem, setModelItem] = useState<ISemantic.IModelItem>();
   const [saveLoading, setSaveLoading] = useState<boolean>(false);
   const [createDataSourceModalOpen, setCreateDataSourceModalOpen] = useState(false);
@@ -143,7 +133,6 @@ const ModelTable: React.FC<Props> = ({
               key="metricEditBtn"
               onClick={() => {
                 setModelItem(record);
-                // setModelCreateFormModalVisible(true);
                 setCreateDataSourceModalOpen(true);
               }}
             >
@@ -220,8 +209,6 @@ const ModelTable: React.FC<Props> = ({
                   type="primary"
                   onClick={() => {
                     setModelItem(undefined);
-                    // setModelCreateFormModalVisible(true);
-
                     setCreateDataSourceModalOpen(true);
                   }}
                 >
@@ -235,28 +222,14 @@ const ModelTable: React.FC<Props> = ({
           open={createDataSourceModalOpen}
           dataSourceItem={modelItem}
           onSubmit={() => {
-            // actionRef.current?.reload();
-            // setCreateDataSourceModalOpen(false);
             onModelChange?.();
+            setCreateDataSourceModalOpen(false);
           }}
           onCancel={() => {
             setCreateDataSourceModalOpen(false);
           }}
         />
       )}
-      {modelCreateFormModalVisible && (
-        <ModelCreateFormModal
-          domainId={selectDomainId}
-          basicInfo={modelItem}
-          onSubmit={() => {
-            setModelCreateFormModalVisible(false);
-            onModelChange?.();
-          }}
-          onCancel={() => {
-            setModelCreateFormModalVisible(false);
-          }}
-        />
-      )}
     </>
   );
 };
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/style.less b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/style.less
index 94a8a7fe6..13e8366c2 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/style.less
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/style.less
@@ -374,6 +374,10 @@
   :global {
     .ant-breadcrumb-link {
       height: 28px;
+      color: #709bf1;
+      &:hover{
+        color: #296df3;
+      }
     }
     .anticon {
       font-size: 18px;