diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceBasicForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceBasicForm.tsx
index e53016dd4..726920e46 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceBasicForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceBasicForm.tsx
@@ -1,8 +1,9 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Form, Input, Spin, Select, message } from 'antd';
 import type { FormInstance } from 'antd/lib/form';
-import { getDbNames, getTables } from '../../service';
+import { getDbNames, getTables, getDimensionList } from '../../service';
 import { ISemantic } from '../../data';
+import FormItemTitle from '@/components/FormHelper/FormItemTitle';
 import { isString } from 'lodash';
 
 const FormItem = Form.Item;
@@ -11,15 +12,45 @@ const { TextArea } = Input;
 type Props = {
   isEdit?: boolean;
   databaseConfigList: ISemantic.IDatabaseItemList;
+  modelItem: ISemantic.IModelItem;
   form: FormInstance<any>;
   mode?: 'normal' | 'fast';
 };
 
-const DataSourceBasicForm: React.FC<Props> = ({ isEdit, databaseConfigList, mode = 'normal' }) => {
+const DataSourceBasicForm: React.FC<Props> = ({
+  isEdit,
+  modelItem,
+  databaseConfigList,
+  mode = 'normal',
+}) => {
   const [currentDbLinkConfigId, setCurrentDbLinkConfigId] = useState<number>();
   const [dbNameList, setDbNameList] = useState<any[]>([]);
   const [tableNameList, setTableNameList] = useState<any[]>([]);
   const [loading, setLoading] = useState<boolean>(false);
+  const [dimensionOptions, setDimensionOptions] = useState<{ label: string; value: number }[]>([]);
+
+  useEffect(() => {
+    if (modelItem?.id) {
+      queryDimensionList();
+    }
+  }, [modelItem]);
+
+  const queryDimensionList = async () => {
+    const { code, data, msg } = await getDimensionList({ modelId: modelItem?.id });
+    if (code === 200 && Array.isArray(data?.list)) {
+      setDimensionOptions(
+        data.list.map((item: ISemantic.IDimensionItem) => {
+          return {
+            label: item.name,
+            value: item.id,
+          };
+        }),
+      );
+    } else {
+      message.error(msg);
+    }
+  };
+
   const queryDbNameList = async (databaseId: number) => {
     setLoading(true);
     const { code, data, msg } = await getDbNames(databaseId);
@@ -129,7 +160,7 @@ const DataSourceBasicForm: React.FC<Props> = ({ isEdit, databaseConfigList, mode
         }}
         getValueProps={(value) => {
           return {
-            value: isString(value) ? value.split(',') : [],
+            value: value && isString(value) ? value.split(',') : [],
           };
         }}
       >
@@ -140,6 +171,23 @@ const DataSourceBasicForm: React.FC<Props> = ({ isEdit, databaseConfigList, mode
           maxTagCount={9}
         />
       </FormItem>
+      <FormItem
+        name="drillDownDimensions"
+        label={
+          <FormItemTitle
+            title={'默认下钻维度'}
+            subTitle={'配置之后,可在指标主页和问答指标卡处选择用来对指标进行下钻和过滤'}
+          />
+        }
+        hidden={!modelItem?.id}
+      >
+        <Select
+          mode="multiple"
+          options={dimensionOptions}
+          placeholder="请选择默认下钻维度"
+          maxTagCount={9}
+        />
+      </FormItem>
       <FormItem name="description" label="模型描述">
         <TextArea placeholder="请输入模型描述" />
       </FormItem>
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 5bd0e15b9..67f7c8cb4 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
@@ -9,7 +9,7 @@ import { updateModel, createModel, getColumns } from '../../service';
 import type { Dispatch } from 'umi';
 import type { StateType } from '../../model';
 import { connect } from 'umi';
-import { IDataSource } from '../../data';
+import { IDataSource, ISemantic } from '../../data';
 
 export type CreateFormProps = {
   domainManger: StateType;
@@ -17,7 +17,7 @@ export type CreateFormProps = {
   createModalVisible: boolean;
   sql?: string;
   databaseId?: number;
-  dataSourceItem: IDataSource.IDataSourceItem;
+  modelItem: ISemantic.IModelItem;
   onCancel?: () => void;
   onSubmit?: (dataSourceInfo: any) => void;
   scriptColumns?: any[] | undefined;
@@ -34,21 +34,21 @@ const initFormVal = {
   description: '', // 模型描述
 };
 
-const DataSourceCreateForm: React.FC<CreateFormProps> = ({
+const ModelCreateForm: React.FC<CreateFormProps> = ({
   domainManger,
   onCancel,
   createModalVisible,
   scriptColumns,
   sql = '',
   onSubmit,
-  dataSourceItem,
+  modelItem,
   databaseId,
   basicInfoFormMode,
   onDataSourceBtnClick,
   onOpenDataSourceEdit,
   children,
 }) => {
-  const isEdit = !!dataSourceItem?.id;
+  const isEdit = !!modelItem?.id;
   const [fields, setFields] = useState<any[]>([]);
   const [currentStep, setCurrentStep] = useState(0);
   const [saveLoading, setSaveLoading] = useState(false);
@@ -170,10 +170,10 @@ const DataSourceCreateForm: React.FC<CreateFormProps> = ({
       const { dbName, tableName } = submitForm;
       const queryParams = {
         ...submitForm,
-        databaseId: databaseId || dataSourceItem?.databaseId || formDatabaseId,
-        modelId: isEdit ? dataSourceItem.modelId : modelId,
+        databaseId: databaseId || modelItem?.databaseId || formDatabaseId,
+        modelId: isEdit ? modelItem.id : modelId,
         filterSql: sqlFilter,
-        domainId: isEdit ? dataSourceItem.domainId : selectDomainId,
+        domainId: isEdit ? modelItem.domainId : selectDomainId,
         modelDetail: {
           ...submitForm,
           queryType: basicInfoFormMode === 'fast' ? 'table_query' : 'sql_query',
@@ -198,6 +198,10 @@ const DataSourceCreateForm: React.FC<CreateFormProps> = ({
   };
 
   const initFields = (fieldsClassifyList: any[], columns: any[]) => {
+    if (Array.isArray(columns) && columns.length === 0) {
+      setFields(fieldsClassifyList || []);
+      return;
+    }
     const columnFields: any[] = columns.map((item: any) => {
       const { type, nameEn } = item;
       const oldItem =
@@ -235,13 +239,13 @@ const DataSourceCreateForm: React.FC<CreateFormProps> = ({
   };
 
   const initData = async () => {
-    const { queryType, tableQuery } = dataSourceItem?.modelDetail || {};
+    const { queryType, tableQuery } = modelItem?.modelDetail || {};
     let tableQueryInitValue = {};
     let columns = fieldColumns || [];
     if (queryType === 'table_query') {
       const tableQueryString = tableQuery || '';
       const [dbName, tableName] = tableQueryString.split('.');
-      columns = await queryTableColumnList(dataSourceItem.databaseId, dbName, tableName);
+      columns = await queryTableColumnList(modelItem.databaseId, dbName, tableName);
       tableQueryInitValue = {
         dbName,
         tableName,
@@ -251,8 +255,17 @@ const DataSourceCreateForm: React.FC<CreateFormProps> = ({
   };
 
   const formatterInitData = (columns: any[], extendParams: Record<string, any> = {}) => {
-    const { id, name, bizName, description, modelDetail, databaseId, filterSql, alias } =
-      dataSourceItem as any;
+    const {
+      id,
+      name,
+      bizName,
+      description,
+      modelDetail,
+      databaseId,
+      filterSql,
+      alias,
+      drillDownDimensions = [],
+    } = modelItem;
     const { dimensions, identifiers, measures } = modelDetail || {};
     const initValue = {
       id,
@@ -262,6 +275,11 @@ const DataSourceCreateForm: React.FC<CreateFormProps> = ({
       databaseId,
       filterSql,
       alias,
+      drillDownDimensions: Array.isArray(drillDownDimensions)
+        ? drillDownDimensions.map((item) => {
+            return item.dimensionId;
+          })
+        : [],
       ...extendParams,
     };
     const editInitFormVal = {
@@ -280,7 +298,7 @@ const DataSourceCreateForm: React.FC<CreateFormProps> = ({
   };
 
   useEffect(() => {
-    const { queryType } = dataSourceItem?.modelDetail || {};
+    const { queryType } = modelItem?.modelDetail || {};
     if (queryType === 'table_query') {
       if (isEdit) {
         initData();
@@ -288,10 +306,10 @@ const DataSourceCreateForm: React.FC<CreateFormProps> = ({
         initFields([], fieldColumns);
       }
     }
-  }, [dataSourceItem]);
+  }, [modelItem]);
 
   useEffect(() => {
-    const { queryType } = dataSourceItem?.modelDetail || {};
+    const { queryType } = modelItem?.modelDetail || {};
     if (queryType !== 'table_query') {
       if (isEdit) {
         initData();
@@ -299,7 +317,7 @@ const DataSourceCreateForm: React.FC<CreateFormProps> = ({
         initFields([], fieldColumns);
       }
     }
-  }, [dataSourceItem, fieldColumns]);
+  }, [modelItem, fieldColumns]);
 
   const handleFieldChange = (fieldName: string, data: any) => {
     const result = fields.map((field) => {
@@ -353,6 +371,7 @@ const DataSourceCreateForm: React.FC<CreateFormProps> = ({
             form={form}
             isEdit={isEdit}
             mode={basicInfoFormMode}
+            modelItem={modelItem}
             databaseConfigList={databaseConfigList}
           />
         </div>
@@ -368,8 +387,7 @@ const DataSourceCreateForm: React.FC<CreateFormProps> = ({
             上一步
           </Button>
           <Button onClick={onCancel}>取 消</Button>
-          {(dataSourceItem?.modelDetail?.queryType === 'sql_query' ||
-            basicInfoFormMode !== 'fast') && (
+          {(modelItem?.modelDetail?.queryType === 'sql_query' || basicInfoFormMode !== 'fast') && (
             <Button
               type="primary"
               onClick={() => {
@@ -465,4 +483,4 @@ const DataSourceCreateForm: React.FC<CreateFormProps> = ({
 
 export default connect(({ domainManger }: { domainManger: StateType }) => ({
   domainManger,
-}))(DataSourceCreateForm);
+}))(ModelCreateForm);
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx
index 81a83322d..7b7b551e1 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx
@@ -61,11 +61,11 @@ const FieldForm: React.FC<Props> = ({ fields, sql, onFieldChange, onSqlChange })
       dataIndex: 'bizName',
       width: 100,
     },
-    {
-      title: '数据类型',
-      dataIndex: 'sqlType',
-      width: 80,
-    },
+    // {
+    //   title: '数据类型',
+    //   dataIndex: 'sqlType',
+    //   width: 80,
+    // },
     {
       title: '字段类型',
       dataIndex: 'type',
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 db7f5abda..df5e4a165 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDataSourceTypeModal.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDataSourceTypeModal.tsx
@@ -72,7 +72,8 @@ const ClassDataSourceTypeModal: React.FC<Props> = ({
   };
 
   useEffect(() => {
-    queryTableColumnListByScript(dataSourceItem);
+    // queryTableColumnListByScript(dataSourceItem);
+    setSql(dataSourceItem?.modelDetail?.sqlQuery);
   }, [dataSourceItem]);
 
   const fetchTaskResult = (params) => {
@@ -89,7 +90,6 @@ const ClassDataSourceTypeModal: React.FC<Props> = ({
     });
     if (code === 200) {
       fetchTaskResult(data);
-      setSql(dataSource?.modelDetail?.sqlQuery);
     }
   };
 
@@ -153,7 +153,7 @@ const ClassDataSourceTypeModal: React.FC<Props> = ({
         <DataSourceCreateForm
           sql={fastModeSql}
           basicInfoFormMode="fast"
-          dataSourceItem={dataSourceItem}
+          modelItem={dataSourceItem}
           onCancel={() => {
             setDataSourceModalVisible(false);
             handleCancel();
@@ -173,7 +173,7 @@ const ClassDataSourceTypeModal: React.FC<Props> = ({
           sql={sql}
           databaseId={currentDatabaseId}
           basicInfoFormMode="normal"
-          dataSourceItem={dataSourceItem}
+          modelItem={dataSourceItem}
           scriptColumns={scriptColumns}
           onCancel={() => {
             setCreateModalVisible(false);
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionInfoModal.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionInfoModal.tsx
index ee4fdb2a5..eb65415f9 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionInfoModal.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionInfoModal.tsx
@@ -243,9 +243,9 @@ const DimensionInfoModal: React.FC<CreateFormProps> = ({
             ))}
           </Select>
         </FormItem>
-        <FormItem name="commonDimensionId" label="公共维度">
+        {/* <FormItem name="commonDimensionId" label="公共维度">
           <Select placeholder="请绑定公共维度" allowClear options={commonDimensionOptions} />
-        </FormItem>
+        </FormItem> */}
         <FormItem name="defaultValues" label="默认值">
           <InfoTagList />
         </FormItem>
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/data.d.ts b/webapp/packages/supersonic-fe/src/pages/SemanticModel/data.d.ts
index 42e7dc119..3d2855621 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/data.d.ts
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/data.d.ts
@@ -98,28 +98,30 @@ export declare namespace ISemantic {
   }
 
   interface IModelItem {
-    createdBy?: string;
-    updatedBy?: string;
-    createdAt?: string;
-    updatedAt?: string;
     id: number;
     name: string;
     bizName: string;
-    description: any;
+    description: string;
+    sensitiveLevel: SensitiveLevel;
+    domainId: number;
+    databaseId: number;
+    modelDetail: IDataSourceDetail;
     status?: StatusEnum;
     typeEnum?: any;
     sensitiveLevel?: number;
     parentId: number;
+    filterSql: string;
+    alias: string;
     fullPath?: string;
     viewers?: any[];
     viewOrgs?: any[];
     admins?: string[];
     adminOrgs?: any[];
-    isOpen?: number;
-    entity?: { entityId: number; names: string[] };
-    dimensionCnt?: number;
-    metricCnt?: number;
     drillDownDimensions: IDrillDownDimensionItem[];
+    createdBy: UserName;
+    updatedBy: UserName;
+    createdAt: ISODateString;
+    updatedAt: ISODateString;
   }
 
   interface IDimensionItem {