diff --git a/src/component/CommonTable/index.tsx b/src/component/CommonTable/index.tsx
index d59329667..74955b8c8 100644
--- a/src/component/CommonTable/index.tsx
+++ b/src/component/CommonTable/index.tsx
@@ -189,7 +189,7 @@ const CommonTable: <RecordType extends object = any>(
       (tableProps?.pagination as TablePaginationConfig)?.pageSize ??
       Math.max(
         Math.floor(
-          (tableRef.current.offsetHeight -
+          (tableRef.current?.offsetHeight -
             TOOLBAR_HEIGHT -
             TABLE_HEAD_HEIGHT -
             INFO_BAR_HEIGHT -
@@ -200,7 +200,7 @@ const CommonTable: <RecordType extends object = any>(
         1,
       );
     setPageSize(computedPageSize);
-    setWrapperHeight(tableRef.current.offsetHeight);
+    setWrapperHeight(tableRef.current?.offsetHeight);
   }
 
   function computeTableScrollHeight() {
diff --git a/src/d.ts/database.ts b/src/d.ts/database.ts
index 5a1288ae7..192489a0d 100644
--- a/src/d.ts/database.ts
+++ b/src/d.ts/database.ts
@@ -26,6 +26,7 @@ export enum DatabaseSyncStatus {
 
 export interface IDatabase {
   id: number;
+  databaseId?: string;
   name: string;
   project: IProject;
   lockDatabaseUserRequired: boolean;
diff --git a/src/page/Project/Sensitive/SensitiveContext.ts b/src/page/Project/Sensitive/SensitiveContext.ts
index 4eb839495..f499acf84 100644
--- a/src/page/Project/Sensitive/SensitiveContext.ts
+++ b/src/page/Project/Sensitive/SensitiveContext.ts
@@ -43,6 +43,11 @@ interface ISensitiveContext {
   sensitiveRuleIdMap: {
     [key in any]: string;
   };
+  setSensitiveRuleIdMap: (
+    sensitiveRuleIdMap: {
+      [key in any]: string;
+    },
+  ) => void;
 }
 
 const SensitiveContext = React.createContext<Partial<ISensitiveContext>>({
@@ -58,6 +63,7 @@ const SensitiveContext = React.createContext<Partial<ISensitiveContext>>({
   tables: [],
   sensitiveRules: [],
   sensitiveRuleIdMap: {},
+  setSensitiveRuleIdMap: (sensitiveRuleIdMap = {}) => {},
 });
 
 export default SensitiveContext;
diff --git a/src/page/Project/Sensitive/components/SensitiveColumn/components/FormSensitiveColumnDrawer.tsx b/src/page/Project/Sensitive/components/SensitiveColumn/components/FormSensitiveColumnDrawer.tsx
index 897f199f1..2734e840c 100644
--- a/src/page/Project/Sensitive/components/SensitiveColumn/components/FormSensitiveColumnDrawer.tsx
+++ b/src/page/Project/Sensitive/components/SensitiveColumn/components/FormSensitiveColumnDrawer.tsx
@@ -20,11 +20,9 @@ import {
   ScannResultType,
   startScanning,
 } from '@/common/network/sensitiveColumn';
-import { IDatabase } from '@/d.ts/database';
-import { ISensitiveColumn } from '@/d.ts/sensitiveColumn';
+import { ESensitiveColumnType, ISensitiveColumn } from '@/d.ts/sensitiveColumn';
 import ProjectContext from '@/page/Project/ProjectContext';
 import { AddSensitiveColumnType, ScanTableData } from '@/page/Project/Sensitive/interface';
-import SensitiveContext from '@/page/Project/Sensitive/SensitiveContext';
 import { formatMessage } from '@/util/intl';
 import { Button, Drawer, message, Space } from 'antd';
 import { useForm } from 'antd/es/form/Form';
@@ -33,7 +31,6 @@ import styles from './index.less';
 import ScanForm from './ScanForm';
 import tracert from '@/util/tracert';
 import SensitiveRule from '../../SensitiveRule';
-import { merge } from 'lodash';
 const defaultScanTableData: Array<ScanTableData> = [];
 const checkResult = (resData: Array<ScanTableData> = []) =>
   resData?.length > 0 ? resData : defaultScanTableData;
@@ -49,12 +46,11 @@ const FormSensitiveColumnDrawer = ({
   const [_formRef] = useForm();
   const timer = useRef(null);
   const context = useContext(ProjectContext);
-  const sensitiveContext = useContext(SensitiveContext);
   const [scanTableData, setScanTableData] = useState<ScanTableData[]>([]);
   const [originScanTableData, setOriginScanTableData] = useState<ScanTableData[]>([]);
   const [submiting, setSubmiting] = useState<boolean>(false);
   const [sensitiveColumns, setSensitiveColumns] = useState<ISensitiveColumn[]>([]);
-  const [sensitiveColumnMap, setSensitiveColumnMap] = useState(new Map());
+  const [sensitiveColumnMap, setSensitiveColumnMap] = useState<Map<string, any>>(new Map());
   const [taskId, setTaskId] = useState<string>();
   const [scanStatus, setScanStatus] = useState<ScannResultType>();
   const [scanLoading, setScanLoading] = useState<boolean>(false);
@@ -65,6 +61,8 @@ const FormSensitiveColumnDrawer = ({
   const [manageSensitiveRuleDrawerOpen, setManageSensitiveRuleDrawerOpen] = useState<boolean>(
     false,
   );
+  const [scanTableDataMap, setScanTableDataMap] = useState<Object>({});
+  const [activeKeys, setActiveKeys] = useState<string | string[]>(['0']);
   const handleSearchChange = (e) => {
     setSearchText(e.target.value);
   };
@@ -116,57 +114,6 @@ const FormSensitiveColumnDrawer = ({
     setSearchText('');
     clearTimeout(timer.current);
   };
-  const handleScanTableDataChange = async (
-    key: string,
-    columnName: string,
-    maskingAlgorithmId: number,
-  ) => {
-    const resData = [];
-    if (!!searchText) {
-      const newDataSource = sensitiveColumnMap.get(key).dataSource.map((item) => {
-        if (item.columnName === columnName) {
-          item.maskingAlgorithmId = maskingAlgorithmId;
-        }
-        return item;
-      });
-      sensitiveColumnMap.get(key).dataSource = newDataSource;
-      sensitiveColumnMap.forEach((sc, key) => {
-        const filterColumn = sc?.dataSource?.filter((item) =>
-          item?.columnName?.toLowerCase()?.includes(searchText?.toLocaleLowerCase()),
-        );
-        if (filterColumn?.length > 0) {
-          resData.push({
-            header: sc?.header,
-            dataSource: filterColumn,
-          });
-        }
-      });
-    } else {
-      const newDataSource = sensitiveColumnMap.get(key).dataSource.map((item) => {
-        if (item.columnName === columnName) {
-          item.maskingAlgorithmId = maskingAlgorithmId;
-        }
-        return item;
-      });
-      sensitiveColumnMap.get(key).dataSource = newDataSource;
-      sensitiveColumnMap?.forEach((ds) => {
-        resData.push(ds);
-      });
-    }
-    setScanTableData(checkResult(resData));
-    setOriginScanTableData(checkResult(resData));
-    setSensitiveColumnMap(sensitiveColumnMap);
-    const fieldsValue = await _formRef.getFieldsValue();
-    await _formRef.setFieldsValue(
-      merge(fieldsValue, {
-        scanTableData: {
-          [`${key}`]: {
-            [`${columnName}`]: maskingAlgorithmId,
-          },
-        },
-      }),
-    );
-  };
   const handleScanTableDataDelete = (database: string, tableName: string, columnName: string) => {
     const key = `${database}_${tableName}`;
     const filterDataSource =
@@ -194,8 +141,10 @@ const FormSensitiveColumnDrawer = ({
         resData.push(dsItem);
       });
     }
-    setScanTableData(checkResult(resData));
-    setOriginScanTableData(checkResult(resData));
+    const newTableData = checkResult(resData);
+    setScanTableData(newTableData);
+    setOriginScanTableData(newTableData);
+    newTableData?.length === 0 && setActiveKeys(['0']);
     setSensitiveColumnMap(sensitiveColumnMap);
   };
   const handleScanTableDataDeleteByTableName = (database: string, tableName: string) => {
@@ -213,7 +162,9 @@ const FormSensitiveColumnDrawer = ({
           originResData.push(dsItem);
         }
       });
-      setOriginScanTableData(checkResult(originResData));
+      const newTableData = checkResult(originResData);
+      newTableData?.length === 0 && setActiveKeys(['0']);
+      setOriginScanTableData(newTableData);
       sensitiveColumnMap?.forEach((dsItem, dsKey) => {
         if (dsItem?.dataSource?.length > 0) {
           resData.push(dsItem);
@@ -226,7 +177,9 @@ const FormSensitiveColumnDrawer = ({
       sensitiveColumnMap?.forEach((dsItem) => {
         resData.push(dsItem);
       });
-      setOriginScanTableData(checkResult(resData));
+      const newTableData = checkResult(resData);
+      setOriginScanTableData(newTableData);
+      newTableData?.length === 0 && setActiveKeys(['0']);
     }
     setScanTableData(checkResult(resData));
     setSensitiveColumnMap(sensitiveColumnMap);
@@ -258,8 +211,49 @@ const FormSensitiveColumnDrawer = ({
       reset();
     }
   };
+  const parseData = (rawFormData: Object) => {
+    const data = [];
+    Object.keys(rawFormData)?.forEach((database) => {
+      if (rawFormData[database]?.[ESensitiveColumnType.TABLE_COLUMN]) {
+        for (const tableName in rawFormData[database]?.[ESensitiveColumnType.TABLE_COLUMN]) {
+          for (const columnName in rawFormData[database]?.[ESensitiveColumnType.TABLE_COLUMN][
+            tableName
+          ]) {
+            const item = {
+              ...scanTableDataMap[
+                `${database}_${ESensitiveColumnType.TABLE_COLUMN}_${tableName}_${columnName}`
+              ],
+              maskingAlgorithmId:
+                rawFormData[database]?.[ESensitiveColumnType.TABLE_COLUMN][tableName][columnName],
+              enabled: true,
+            };
+            data.push(item);
+          }
+        }
+      }
+      if (rawFormData[database]?.[ESensitiveColumnType.VIEW_COLUMN]) {
+        for (const viewName in rawFormData[database]?.[ESensitiveColumnType.VIEW_COLUMN]) {
+          for (const columnName in rawFormData[database]?.[ESensitiveColumnType.VIEW_COLUMN][
+            viewName
+          ]) {
+            const item = {
+              ...scanTableDataMap[
+                `${database}_${ESensitiveColumnType.VIEW_COLUMN}_${viewName}_${columnName}`
+              ],
+              maskingAlgorithmId:
+                rawFormData[database]?.[ESensitiveColumnType.VIEW_COLUMN][viewName][columnName],
+              enabled: true,
+            };
+            data.push(item);
+          }
+        }
+      }
+    });
+    return data;
+  };
   const handleScanSubmit = async () => {
     await formRef.validateFields().catch();
+    const { scanTableData: rawFormData } = await _formRef.validateFields().catch();
     const rawData = [];
     sensitiveColumns.forEach((sensitiveColumn) => {
       const key = `${sensitiveColumn.database.name}_${sensitiveColumn.tableName}`;
@@ -276,19 +270,13 @@ const FormSensitiveColumnDrawer = ({
         }
       }
     });
-    let data = [];
-    if (!!searchText) {
-      data = rawData.filter((d) =>
-        d.columnName.toLocaleLowerCase().includes(searchText.toLocaleLowerCase()),
-      );
-    } else {
-      data = rawData;
-    }
+    const data = parseData(rawFormData);
     if (data?.length === 0) {
       return;
     }
     setSubmiting(true);
     const res = await batchCreateSensitiveColumns(context.projectId, data);
+    setSubmiting(false);
     if (res) {
       tracert.click('a3112.b64002.c330861.d367391');
       message.success(
@@ -300,7 +288,6 @@ const FormSensitiveColumnDrawer = ({
       onOk();
       reset();
       resetScanTableData();
-      setSubmiting(false);
     } else {
       message.error(
         formatMessage({
@@ -318,6 +305,7 @@ const FormSensitiveColumnDrawer = ({
       setScanTableData(defaultScanTableData);
       setOriginScanTableData(defaultScanTableData);
       setSensitiveColumnMap(new Map());
+      setScanTableDataMap({});
       setSensitiveColumns([]);
       setTaskId(null);
       setScanStatus(null);
@@ -327,6 +315,32 @@ const FormSensitiveColumnDrawer = ({
       clearTimeout(timer.current);
     });
   };
+
+  const initScanTableDataMap = (rawFormData: ScanTableData[]) => {
+    const scanTableData = {};
+    const newScanTableDataMap = {};
+    rawFormData?.forEach(({ dataSource = [], header = {} }) => {
+      const { database = '', tableName, type, databaseId } = header;
+      scanTableData[database] = scanTableData?.[database] || {
+        [ESensitiveColumnType.TABLE_COLUMN]: {},
+        [ESensitiveColumnType.VIEW_COLUMN]: {},
+      };
+      scanTableData[database][type][tableName] = {};
+      dataSource?.forEach(({ columnName, maskingAlgorithmId }) => {
+        scanTableData[database][type][tableName][columnName] = maskingAlgorithmId;
+        newScanTableDataMap[
+          `${database}_${type}_${tableName}_${columnName}`
+        ] = sensitiveColumns?.find(
+          (item) =>
+            item?.database?.databaseId === databaseId &&
+            item.type === type &&
+            item.tableName === tableName &&
+            item.columnName === columnName,
+        );
+      });
+    });
+    return { scanTableData, newScanTableDataMap };
+  };
   const handleScanning = async (taskId: string) => {
     const rawData = await getScanningResults(context.projectId, taskId);
     const { status, sensitiveColumns, allTableCount, finishedTableCount } = rawData;
@@ -345,6 +359,7 @@ const FormSensitiveColumnDrawer = ({
           dataSourceMap.set(key, {
             header: {
               database: d.database.name,
+              databaseId: d.database.databaseId,
               tableName: d.tableName,
               type: d.type,
             },
@@ -358,13 +373,58 @@ const FormSensitiveColumnDrawer = ({
           });
         }
       });
+      dataSourceMap.forEach((value, key) => {
+        value.dataSource = value.dataSource.sort((a, b) =>
+          a?.columnName?.localeCompare(b?.columnName),
+        );
+        dataSourceMap.set(key, value);
+      });
       setSensitiveColumnMap(dataSourceMap);
       const resData = [];
       dataSourceMap?.forEach((ds) => {
         resData.push(ds);
       });
-      setScanTableData(checkResult(resData));
-      setOriginScanTableData(checkResult(resData));
+      const rawFormData = checkResult(resData);
+      setActiveKeys(
+        rawFormData?.length === 0
+          ? ['0']
+          : rawFormData?.map(
+              ({ header: { database, tableName, type }, dataSource }, index) =>
+                `${database}_${type}_${tableName}`,
+            ),
+      );
+      setScanTableData(rawFormData);
+      setOriginScanTableData(rawFormData);
+      // const {
+      //   scanTableData,
+      //   newScanTableDataMap
+      // } = initScanTableDataMap(rawFormData);
+      const scanTableData = {};
+      const newScanTableDataMap = {};
+      rawFormData?.forEach(({ dataSource = [], header = {} }) => {
+        const { database = '', tableName, type, databaseId } = header;
+        scanTableData[database] = scanTableData?.[database] || {
+          [ESensitiveColumnType.TABLE_COLUMN]: {},
+          [ESensitiveColumnType.VIEW_COLUMN]: {},
+        };
+        scanTableData[database][type][tableName] = {};
+        dataSource?.forEach(({ columnName, maskingAlgorithmId }) => {
+          scanTableData[database][type][tableName][columnName] = maskingAlgorithmId;
+          newScanTableDataMap[
+            `${database}_${type}_${tableName}_${columnName}`
+          ] = sensitiveColumns?.find(
+            (item) =>
+              item?.database?.databaseId === databaseId &&
+              item.type === type &&
+              item.tableName === tableName &&
+              item.columnName === columnName,
+          );
+        });
+      });
+      setScanTableDataMap(newScanTableDataMap);
+      await _formRef.setFieldsValue({
+        scanTableData,
+      });
       setScanStatus(ScannResultType.SUCCESS);
       setSuccessful(true);
       setPercent(Math.floor((finishedTableCount * 100) / allTableCount));
@@ -372,6 +432,8 @@ const FormSensitiveColumnDrawer = ({
     } else {
       setScanStatus(ScannResultType.RUNNING);
       setHasScan(true);
+      setActiveKeys(['0']);
+      setScanTableDataMap({});
       setPercent(Math.floor((finishedTableCount * 100) / allTableCount));
       timer.current = setTimeout(() => {
         handleScanning(taskId);
@@ -447,7 +509,7 @@ const FormSensitiveColumnDrawer = ({
               </Button>
               <Button
                 type="primary"
-                disabled={sensitiveColumnMap?.size === 0 || submiting}
+                disabled={submiting || sensitiveColumnMap?.size === 0}
                 onClick={handleScanSubmit}
               >
                 {
@@ -462,28 +524,26 @@ const FormSensitiveColumnDrawer = ({
         className={styles.drawer}
       >
         <ScanForm
-          {...{
-            formRef,
-            _formRef,
-            hasScan,
-            originScanTableData,
-            resetSearch,
-            resetScanTableData,
-            reset,
-            handleStartScan,
-            scanLoading,
-            successful,
-            searchText,
-            handleSearchChange,
-            onSearch,
-            scanTableData,
-            percent,
-            sensitiveContext,
-            handleScanTableDataChange,
-            handleScanTableDataDelete,
-            handleScanTableDataDeleteByTableName,
-            setManageSensitiveRuleDrawerOpen,
-          }}
+          formRef={formRef}
+          _formRef={_formRef}
+          hasScan={hasScan}
+          percent={percent}
+          activeKeys={activeKeys}
+          successful={successful}
+          searchText={searchText}
+          scanLoading={scanLoading}
+          scanTableData={scanTableData}
+          originScanTableData={originScanTableData}
+          reset={reset}
+          onSearch={onSearch}
+          resetSearch={resetSearch}
+          setActiveKeys={setActiveKeys}
+          handleStartScan={handleStartScan}
+          resetScanTableData={resetScanTableData}
+          handleSearchChange={handleSearchChange}
+          handleScanTableDataDelete={handleScanTableDataDelete}
+          setManageSensitiveRuleDrawerOpen={setManageSensitiveRuleDrawerOpen}
+          handleScanTableDataDeleteByTableName={handleScanTableDataDeleteByTableName}
         />
       </Drawer>
 
diff --git a/src/page/Project/Sensitive/components/SensitiveColumn/components/ScanForm.tsx b/src/page/Project/Sensitive/components/SensitiveColumn/components/ScanForm.tsx
index feff4cbbb..0ba250d99 100644
--- a/src/page/Project/Sensitive/components/SensitiveColumn/components/ScanForm.tsx
+++ b/src/page/Project/Sensitive/components/SensitiveColumn/components/ScanForm.tsx
@@ -22,6 +22,7 @@ import {
   Descriptions,
   Empty,
   Form,
+  FormInstance,
   Input,
   Progress,
   Select,
@@ -29,7 +30,7 @@ import {
   Table,
   Tooltip,
 } from 'antd';
-import { ScanTableDataItem } from '../../../interface';
+import { ScanTableData, ScanTableDataItem } from '../../../interface';
 import styles from './index.less';
 import ScanRule from './SacnRule';
 import classnames from 'classnames';
@@ -38,10 +39,81 @@ import TableOutlined from '@/svgr/menuTable.svg';
 import ViewSvg from '@/svgr/menuView.svg';
 import { MaskRyleTypeMap } from '@/d.ts';
 import { PopoverContainer } from '..';
-import { useCallback } from 'react';
-const ScanForm = ({
+import { useCallback, useContext, useEffect, useLayoutEffect, useState } from 'react';
+import SensitiveContext from '../../../SensitiveContext';
+const EmptyOrSpin: React.FC<{
+  hasScan: boolean;
+  percent: number;
+  successful: boolean;
+  scanLoading: boolean;
+}> = ({ scanLoading, hasScan, percent, successful }) => {
+  return (
+    <div
+      style={{
+        height: '300px',
+        display: 'flex',
+        flexDirection: 'column',
+        justifyContent: 'center',
+      }}
+    >
+      {scanLoading ? (
+        <div>
+          <div
+            style={{
+              marginLeft: '16px',
+            }}
+          >
+            {
+              formatMessage({
+                id: 'odc.SensitiveColumn.components.ScanForm.ScanningTheScanningTimeMay',
+              }) /*正在扫描中。扫描时间可能较长请耐心等待…*/
+            }
+          </div>
+          <Progress
+            percent={percent}
+            style={{
+              maxWidth: '628px',
+              margin: '0px 16px',
+            }}
+          />
+        </div>
+      ) : hasScan && successful ? (
+        <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+      ) : (
+        <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+      )}
+    </div>
+  );
+};
+
+const ScanForm: React.FC<{
+  formRef: FormInstance<any>;
+  _formRef: FormInstance<any>;
+
+  hasScan: boolean;
+  percent: number;
+  successful: boolean;
+  activeKeys: string | string[];
+  searchText: string;
+  scanLoading: boolean;
+  scanTableData: ScanTableData[];
+  originScanTableData: ScanTableData[];
+
+  reset: () => void;
+  onSearch: () => void;
+  resetSearch: () => void;
+  setActiveKeys: (keys: string[]) => void;
+  handleStartScan: () => Promise<void>;
+  resetScanTableData: () => void;
+  handleSearchChange: (e: any) => void;
+  handleScanTableDataDelete: (database: string, tableName: string, columnName: string) => void;
+  setManageSensitiveRuleDrawerOpen: React.Dispatch<React.SetStateAction<boolean>>;
+  handleScanTableDataDeleteByTableName: (database: string, tableName: string) => void;
+}> = ({
   formRef,
   _formRef,
+  activeKeys,
+  setActiveKeys,
   resetSearch,
   originScanTableData,
   reset,
@@ -54,58 +126,134 @@ const ScanForm = ({
   onSearch,
   scanTableData,
   percent,
-  sensitiveContext,
   setManageSensitiveRuleDrawerOpen,
-  handleScanTableDataChange,
   handleScanTableDataDelete,
   handleScanTableDataDeleteByTableName,
 }) => {
+  const sensitiveContext = useContext(SensitiveContext);
   const { maskingAlgorithms } = sensitiveContext;
-  const EmptyOrSpin = ({ scanLoading, hasScan, percent, successful }) => {
-    return (
-      <div
-        style={{
-          height: '300px',
-          display: 'flex',
-          flexDirection: 'column',
-          justifyContent: 'center',
-        }}
-      >
-        {scanLoading ? (
-          <div>
-            <div
-              style={{
-                marginLeft: '16px',
-              }}
+  const getColumns = (database: string, type: ESensitiveColumnType, tableName: string) => {
+    return [
+      {
+        title: formatMessage({
+          id: 'odc.SensitiveColumn.components.ScanForm.Column',
+        }),
+        //列
+        width: 146,
+        dataIndex: 'columnName',
+        key: 'columnName',
+      },
+      {
+        title: formatMessage({
+          id: 'odc.SensitiveColumn.components.ScanForm.IdentificationRules',
+        }),
+        //识别规则
+        width: 126,
+        dataIndex: 'sensitiveRuleId',
+        key: 'sensitiveRuleId',
+        render: (text) => sensitiveContext?.sensitiveRuleIdMap?.[text],
+      },
+      {
+        title: formatMessage({
+          id: 'odc.SensitiveColumn.components.ScanForm.DesensitizationAlgorithm',
+        }),
+        //脱敏算法
+        width: 180,
+        dataIndex: 'maskingAlgorithmId',
+        key: 'maskingAlgorithmId',
+        render: (text, record, _index) => {
+          return (
+            <Form.Item name={['scanTableData', database, type, tableName, record.columnName]}>
+              <Select
+                key={_index}
+                style={{
+                  width: '144px',
+                }}
+                defaultValue={record?.maskingAlgorithmId}
+                showSearch
+                filterOption={(input, option) =>
+                  (option?.label ?? '')?.toString()?.toLowerCase().includes(input.toLowerCase())
+                }
+                optionLabelProp="label"
+              >
+                {sensitiveContext?.maskingAlgorithmOptions?.map((option, index) => {
+                  const target = maskingAlgorithms?.find(
+                    (maskingAlgorithm) => maskingAlgorithm?.id === option?.value,
+                  );
+                  return (
+                    <Select.Option value={option?.value} key={index} label={option?.label}>
+                      <PopoverContainer
+                        key={index}
+                        title={option?.label}
+                        descriptionsData={[
+                          {
+                            label: formatMessage({
+                              id:
+                                'odc.src.page.Project.Sensitive.components.SensitiveColumn.components.DesensitizationMethod.1',
+                            }) /* 脱敏方式 */,
+                            value: MaskRyleTypeMap?.[target?.type],
+                          },
+                          {
+                            label: formatMessage({
+                              id:
+                                'odc.src.page.Project.Sensitive.components.SensitiveColumn.components.TestData.1',
+                            }) /* 测试数据 */,
+                            value: target?.sampleContent,
+                          },
+                          {
+                            label: formatMessage({
+                              id:
+                                'odc.src.page.Project.Sensitive.components.SensitiveColumn.components.Preview.1',
+                            }) /* 结果预览 */,
+                            value: target?.maskedContent,
+                          },
+                        ]}
+                        children={() => <div>{option?.label}</div>}
+                      />
+                    </Select.Option>
+                  );
+                })}
+              </Select>
+            </Form.Item>
+          );
+        },
+      },
+      {
+        title: formatMessage({
+          id: 'odc.SensitiveColumn.components.ScanForm.Operation',
+        }),
+        //操作
+        width: 88,
+        key: 'action',
+        render: (_, record) => (
+          <Space>
+            <a
+              onClick={() =>
+                handleScanTableDataDelete(
+                  database,
+                  tableName,
+                  (record as ScanTableDataItem)?.columnName,
+                )
+              }
             >
               {
                 formatMessage({
-                  id: 'odc.SensitiveColumn.components.ScanForm.ScanningTheScanningTimeMay',
-                }) /*正在扫描中。扫描时间可能较长请耐心等待…*/
+                  id: 'odc.SensitiveColumn.components.ScanForm.Delete',
+                }) /*删除*/
               }
-            </div>
-            <Progress
-              percent={percent}
-              style={{
-                maxWidth: '628px',
-                margin: '0px 16px',
-              }}
-            />
-          </div>
-        ) : hasScan && successful ? (
-          <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
-        ) : (
-          <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
-        )}
-      </div>
-    );
+            </a>
+          </Space>
+        ),
+      },
+    ];
   };
-  const WrapCollapse = useCallback(
-    () => (
+  const WrapCollapse = useCallback(() => {
+    return (
       <Collapse
-        defaultActiveKey={
-          scanTableData?.length === 0 ? [0] : scanTableData?.map((_, index) => index)
-        }
+        defaultActiveKey={activeKeys}
+        onChange={(keys) => {
+          setActiveKeys(Array.isArray(keys) ? keys : [keys]);
+        }}
         className={
           scanTableData?.length === 0
             ? classnames(styles.collapse)
@@ -114,7 +262,7 @@ const ScanForm = ({
       >
         {scanTableData?.length === 0 ? (
           <Collapse.Panel
-            key={0}
+            key={'0'}
             header={
               <Descriptions column={2} layout="horizontal" className={styles.descriptions}>
                 <Descriptions.Item
@@ -140,12 +288,10 @@ const ScanForm = ({
             }
           >
             <EmptyOrSpin
-              {...{
-                scanLoading,
-                percent,
-                hasScan,
-                successful,
-              }}
+              percent={percent}
+              hasScan={hasScan}
+              scanLoading={scanLoading}
+              successful={successful}
             />
           </Collapse.Panel>
         ) : (
@@ -219,6 +365,7 @@ const ScanForm = ({
                                 e.preventDefault();
                                 e.stopPropagation();
                                 handleScanTableDataDeleteByTableName(database, tableName);
+                                return;
                               }}
                             />
                           </Tooltip>
@@ -226,146 +373,16 @@ const ScanForm = ({
                       </Descriptions.Item>
                     </Descriptions>
                   }
-                  key={index}
+                  key={`${database}_${type}_${tableName}`}
                 >
                   <Table
                     className={styles.bigTable}
-                    columns={[
-                      {
-                        title: formatMessage({
-                          id: 'odc.SensitiveColumn.components.ScanForm.Column',
-                        }),
-                        //列
-                        width: 146,
-                        dataIndex: 'columnName',
-                        key: 'columnName',
-                      },
-                      {
-                        title: formatMessage({
-                          id: 'odc.SensitiveColumn.components.ScanForm.IdentificationRules',
-                        }),
-                        //识别规则
-                        width: 126,
-                        dataIndex: 'sensitiveRuleId',
-                        key: 'sensitiveRuleId',
-                        render: (text) => sensitiveContext?.sensitiveRuleIdMap?.[text],
-                      },
-                      {
-                        title: formatMessage({
-                          id: 'odc.SensitiveColumn.components.ScanForm.DesensitizationAlgorithm',
-                        }),
-                        //脱敏算法
-                        width: 180,
-                        dataIndex: 'maskingAlgorithmId',
-                        key: 'maskingAlgorithmId',
-                        render: (text, record, _index) => {
-                          return (
-                            <Form.Item
-                              name={[
-                                'scanTableData',
-                                `${database}_${tableName}`,
-                                record.columnName,
-                              ]}
-                            >
-                              <Select
-                                key={index}
-                                style={{
-                                  width: '144px',
-                                }}
-                                defaultValue={record?.maskingAlgorithmId}
-                                onChange={(v) =>
-                                  handleScanTableDataChange(
-                                    `${database}_${tableName}`,
-                                    (record as ScanTableDataItem)?.columnName,
-                                    v,
-                                  )
-                                }
-                                showSearch
-                                filterOption={(input, option) =>
-                                  (option?.label ?? '')
-                                    ?.toString()
-                                    ?.toLowerCase()
-                                    .includes(input.toLowerCase())
-                                }
-                                optionLabelProp="label"
-                              >
-                                {sensitiveContext?.maskingAlgorithmOptions?.map((option, index) => {
-                                  const target = maskingAlgorithms?.find(
-                                    (maskingAlgorithm) => maskingAlgorithm?.id === option?.value,
-                                  );
-                                  return (
-                                    <Select.Option
-                                      value={option?.value}
-                                      key={index}
-                                      label={option?.label}
-                                    >
-                                      <PopoverContainer
-                                        key={index}
-                                        title={option?.label}
-                                        descriptionsData={[
-                                          {
-                                            label: formatMessage({
-                                              id:
-                                                'odc.src.page.Project.Sensitive.components.SensitiveColumn.components.DesensitizationMethod.1',
-                                            }) /* 脱敏方式 */,
-                                            value: MaskRyleTypeMap?.[target?.type],
-                                          },
-                                          {
-                                            label: formatMessage({
-                                              id:
-                                                'odc.src.page.Project.Sensitive.components.SensitiveColumn.components.TestData.1',
-                                            }) /* 测试数据 */,
-                                            value: target?.sampleContent,
-                                          },
-                                          {
-                                            label: formatMessage({
-                                              id:
-                                                'odc.src.page.Project.Sensitive.components.SensitiveColumn.components.Preview.1',
-                                            }) /* 结果预览 */,
-                                            value: target?.maskedContent,
-                                          },
-                                        ]}
-                                        children={() => <div>{option?.label}</div>}
-                                      />
-                                    </Select.Option>
-                                  );
-                                })}
-                              </Select>
-                            </Form.Item>
-                          );
-                        },
-                      },
-                      {
-                        title: formatMessage({
-                          id: 'odc.SensitiveColumn.components.ScanForm.Operation',
-                        }),
-                        //操作
-                        width: 88,
-                        key: 'action',
-                        render: (_, record) => (
-                          <Space>
-                            <a
-                              onClick={() =>
-                                handleScanTableDataDelete(
-                                  database,
-                                  tableName,
-                                  (record as ScanTableDataItem)?.columnName,
-                                )
-                              }
-                            >
-                              {
-                                formatMessage({
-                                  id: 'odc.SensitiveColumn.components.ScanForm.Delete',
-                                }) /*删除*/
-                              }
-                            </a>
-                          </Space>
-                        ),
-                      },
-                    ]}
+                    columns={getColumns(database, type, tableName)}
                     dataSource={dataSource}
                     pagination={{
                       showSizeChanger: false,
+                      pageSize: 10,
+                      hideOnSinglePage: dataSource?.length > 10 ? false : true,
                     }}
                   />
                 </Collapse.Panel>
@@ -374,9 +391,8 @@ const ScanForm = ({
           </>
         )}
       </Collapse>
-    ),
-    [scanTableData],
-  );
+    );
+  }, [scanTableData, activeKeys]);
   return (
     <>
       <Form form={formRef} layout="vertical" requiredMark="optional">
@@ -473,7 +489,13 @@ const ScanForm = ({
           overflowY: 'scroll',
         }}
       >
-        <Form form={_formRef} layout="vertical">
+        <Form
+          form={_formRef}
+          layout="vertical"
+          initialValues={{
+            scanTableData: {},
+          }}
+        >
           <WrapCollapse />
         </Form>
       </div>
diff --git a/src/page/Project/Sensitive/components/SensitiveColumn/components/index.less b/src/page/Project/Sensitive/components/SensitiveColumn/components/index.less
index 3d42858f5..e49d39c16 100644
--- a/src/page/Project/Sensitive/components/SensitiveColumn/components/index.less
+++ b/src/page/Project/Sensitive/components/SensitiveColumn/components/index.less
@@ -31,8 +31,8 @@
 .collapses {
   :global {
     .ant-collapse-content-box {
-      max-height: 480px;
-      overflow: auto;
+      display: flex;
+      flex-direction: column;
     }
   }
 }
diff --git a/src/page/Project/Sensitive/components/SensitiveRule/components/ViewSensitiveRuleDrawer.tsx b/src/page/Project/Sensitive/components/SensitiveRule/components/ViewSensitiveRuleDrawer.tsx
index 293f2968b..778f5ecb2 100644
--- a/src/page/Project/Sensitive/components/SensitiveRule/components/ViewSensitiveRuleDrawer.tsx
+++ b/src/page/Project/Sensitive/components/SensitiveRule/components/ViewSensitiveRuleDrawer.tsx
@@ -24,6 +24,7 @@ import { getLocalFormatDateTime } from '@/util/utils';
 import { Button, Descriptions, Divider, Drawer } from 'antd';
 import { useEffect, useLayoutEffect, useState } from 'react';
 import styles from './index.less';
+import { CommonTableMode } from '@/component/CommonTable/interface';
 
 const renderByType = (type: SensitiveRuleType, params?: any) => {
   switch (type) {
@@ -117,13 +118,10 @@ const renderByType = (type: SensitiveRuleType, params?: any) => {
           >
             &nbsp;
           </Descriptions.Item>
-          <div
-            style={{
-              width: '500px',
-            }}
-          >
+          <div className={styles.viewDrawerTable}>
             <CommonTable
               titleContent={null}
+              mode={CommonTableMode.SMALL}
               showToolbar={false}
               filterContent={{
                 searchPlaceholder: formatMessage({
@@ -160,6 +158,7 @@ const renderByType = (type: SensitiveRuleType, params?: any) => {
                 dataSource: dataSource,
                 rowKey: 'id',
                 pagination: {
+                  hideOnSinglePage: true,
                   pageSize: 4,
                 },
                 scroll: {
diff --git a/src/page/Project/Sensitive/components/SensitiveRule/components/index.less b/src/page/Project/Sensitive/components/SensitiveRule/components/index.less
index ef5ef6f07..12b23d32c 100644
--- a/src/page/Project/Sensitive/components/SensitiveRule/components/index.less
+++ b/src/page/Project/Sensitive/components/SensitiveRule/components/index.less
@@ -59,3 +59,12 @@
     }
   }
 }
+
+.viewDrawerTable {
+  width: 500px;
+  :global {
+    .ant-spin-nested-loading > .ant-spin-container {
+      padding-bottom: 0px !important;
+    }
+  }
+}
diff --git a/src/page/Project/Sensitive/components/SensitiveRule/index.tsx b/src/page/Project/Sensitive/components/SensitiveRule/index.tsx
index f05720b26..0876d1495 100644
--- a/src/page/Project/Sensitive/components/SensitiveRule/index.tsx
+++ b/src/page/Project/Sensitive/components/SensitiveRule/index.tsx
@@ -249,7 +249,9 @@ const getColumns: (columnsFunction: {
 };
 const SensitiveRule = ({ projectId }) => {
   const tableRef = useRef<ITableInstance>();
-  const { maskingAlgorithmIdMap, maskingAlgorithms } = useContext(SensitiveContext);
+  const { maskingAlgorithmIdMap, maskingAlgorithms, setSensitiveRuleIdMap } = useContext(
+    SensitiveContext,
+  );
   const [selectedRecord, setSelectedRecord] = useState<ISensitiveRule>();
   const [isEdit, setIsEdit] = useState<boolean>(false);
   const [formDrawerVisible, setFormDrawerVisible] = useState<boolean>(false);
@@ -304,6 +306,11 @@ const SensitiveRule = ({ projectId }) => {
     data.enabled = enabled?.length ? enabled : undefined;
     data.sort = column ? `${column.dataIndex},${order === 'ascend' ? 'asc' : 'desc'}` : undefined;
     const rawData = await listSensitiveRules(projectId, data);
+    const map = {};
+    rawData?.contents?.forEach((d) => {
+      map[d.id] = d.name;
+    });
+    setSensitiveRuleIdMap(map);
     setSensitiveRules(rawData);
   };
   const handleFormDrawerClose = (fn?: () => void) => {
diff --git a/src/page/Project/Sensitive/index.tsx b/src/page/Project/Sensitive/index.tsx
index 486621beb..b65816e6c 100644
--- a/src/page/Project/Sensitive/index.tsx
+++ b/src/page/Project/Sensitive/index.tsx
@@ -161,6 +161,7 @@ const Sensitive: React.FC<{ id: number }> = ({ id }) => {
         maskingAlgorithmIdMap,
         maskingAlgorithmOptions,
         sensitiveRuleIdMap,
+        setSensitiveRuleIdMap,
       }}
     >
       <div className={styles.sensitive}>
diff --git a/src/page/Project/Sensitive/interface.ts b/src/page/Project/Sensitive/interface.ts
index b9c961067..9bc4dd54d 100644
--- a/src/page/Project/Sensitive/interface.ts
+++ b/src/page/Project/Sensitive/interface.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { ESensitiveColumnType } from '@/d.ts/sensitiveColumn';
 import { formatMessage } from '@/util/intl';
 export enum AddSensitiveColumnType {
   Manual,
@@ -38,6 +39,8 @@ export interface ScanTableData {
   header: {
     database: string;
     tableName: string;
+    type: ESensitiveColumnType;
+    databaseId: string;
   };
   dataSource: ScanTableDataItem[];
 }