diff --git a/packages/api/src/core/metadata-instances.ts b/packages/api/src/core/metadata-instances.ts
index 4e57c2235..4a9282bf2 100644
--- a/packages/api/src/core/metadata-instances.ts
+++ b/packages/api/src/core/metadata-instances.ts
@@ -345,6 +345,7 @@ export interface CompareResultStatistics {
     MissingApply: 0
     DifferentApply: 0
     Different: 0
+    PrimaryKeyInconsistency: 0
   }
 }
 
diff --git a/packages/dag/src/components/form/compare-schema/index.tsx b/packages/dag/src/components/form/compare-schema/index.tsx
index 499e21be6..dae04eca1 100644
--- a/packages/dag/src/components/form/compare-schema/index.tsx
+++ b/packages/dag/src/components/form/compare-schema/index.tsx
@@ -67,7 +67,10 @@ const CompareSchema = defineComponent({
 
       const details = []
       const total =
-        (map.CannotWrite || 0) + (map.Missing || 0) + (map.Different || 0)
+        (map.CannotWrite || 0) +
+        (map.Missing || 0) +
+        (map.Different || 0) +
+        (map.PrimaryKeyInconsistency || 0)
       const resolved =
         (map.CannotWriteApply || 0) +
         (map.MissingApply || 0) +
@@ -135,15 +138,26 @@ const CompareSchema = defineComponent({
         )
       }
 
+      if (map.PrimaryKeyInconsistency) {
+        details.push(
+          t('packages_dag_compare_result_detail_primary_key_inconsistency', {
+            primaryKeyInconsistency: map.PrimaryKeyInconsistency,
+          }),
+        )
+      }
+
       return {
         type,
         title: t('packages_dag_compare_result_alert', {
           time1,
           time2,
-          result: t('packages_dag_compare_result_with_diff', {
-            count: total,
-            details: `(${details.join(',')})`,
-          }),
+          result:
+            details.length > 1
+              ? t('packages_dag_compare_result_with_diff', {
+                  count: total,
+                  details: `(${details.join(',')})`,
+                })
+              : details[0],
         }),
       }
     })
diff --git a/packages/dag/src/components/form/field-inference/CompareResultDialog.vue b/packages/dag/src/components/form/field-inference/CompareResultDialog.vue
index 4a7eef918..681757a90 100644
--- a/packages/dag/src/components/form/field-inference/CompareResultDialog.vue
+++ b/packages/dag/src/components/form/field-inference/CompareResultDialog.vue
@@ -43,6 +43,7 @@ type TableItem = {
   additionalNum: number
   missingNum: number
   cannotWriteNum: number
+  primaryKeyInconsistencyNum: number
 }
 
 const { t } = useI18n()
@@ -60,61 +61,73 @@ const invalidApplyNum = ref<number>(0)
 const pageSize = ref<number>(10)
 const currentPage = ref<number>(1)
 const applyCompareRules = ref<string[]>(props.rules)
-const filterType = ref(['Different', 'Missing', 'CannotWrite'])
+const filterType = ref([
+  'PrimaryKeyInconsistency',
+  'Different',
+  'Missing',
+  'CannotWrite',
+])
 
-const typeMap = {
-  Different: {
-    text: t('packages_dag_compare_different'),
+const filterOptions = ref([
+  {
+    label: t('packages_dag_compare_primary_key_inconsistency'),
+    value: 'PrimaryKeyInconsistency',
     type: 'warning',
-    doneText: 'packages_dag_compare_done_modify',
-    btnText: t('public_button_revise'),
-    numKey: 'differentNum',
-  },
-  Missing: {
-    text: t('packages_dag_compare_missing'),
-    type: 'danger',
-    doneText: 'packages_dag_compare_done_delete',
-    btnText: t('public_button_delete'),
-    numKey: 'missingNum',
-  },
-  CannotWrite: {
-    text: t('packages_dag_compare_cannot_write'),
-    type: 'danger',
-    doneText: 'packages_dag_compare_done_delete',
-    btnText: t('public_button_delete'),
-    numKey: 'cannotWriteNum',
+    numKey: 'primaryKeyInconsistencyNum',
   },
-}
-
-const filterOptions = ref([
   {
     label: t('packages_dag_compare_different'),
     value: 'Different',
+    type: 'warning',
+    numKey: 'differentNum',
+    doneText: 'packages_dag_compare_done_modify',
+    actionText: t('public_button_update'),
   },
   {
     label: t('packages_dag_compare_missing'),
     value: 'Missing',
+    type: 'danger',
+    numKey: 'missingNum',
+    doneText: 'packages_dag_compare_done_delete',
+    actionText: t('public_button_delete'),
   },
   {
     label: t('packages_dag_compare_cannot_write'),
     value: 'CannotWrite',
+    type: 'danger',
+    numKey: 'cannotWriteNum',
+    doneText: 'packages_dag_compare_done_delete',
+    actionText: t('public_button_delete'),
   },
   {
     label: t('packages_dag_compare_missing_source'),
     value: 'Additional',
+    type: 'info',
   },
   {
     label: t('packages_dag_compare_precision'),
     value: 'Precision',
+    type: 'info',
+    doneText: 'packages_dag_compare_done_modify',
+    actionText: t('public_button_update'),
   },
 ])
 
 const ruleOptions = filterOptions.value.filter((item) => {
-  return item.value !== 'Additional'
+  return !!item.actionText
 })
 
 const totalMap = ref<Record<string, number>>({})
 
+const typeMap = filterOptions.value.reduce((acc: Record<string, any>, item) => {
+  acc[item.value] = item
+  return acc
+}, {})
+
+const importantOptions = filterOptions.value.filter((item) => {
+  return ['warning', 'danger'].includes(item.type)
+})
+
 const isLoading = computed(() => {
   return compareResultLoading.value || compareStatus.value === 'running'
 })
@@ -179,25 +192,29 @@ const {
         Additional: 0,
         Missing: 0,
         CannotWrite: 0,
+        PrimaryKeyInconsistency: 0,
       }
       const fields: TableItem['fields'] = []
 
       item.differenceFieldList.forEach((field) => {
-        if (!field.applyType) totalMap[field.type as keyof typeof totalMap]++
+        if (!field.applyType) {
+          totalMap[field.type as keyof typeof totalMap]++
+          if (field.type !== 'PrimaryKeyInconsistency' && field.isPrimaryKey) {
+            // 只要是主键，其他差异也需要算进来
+            totalMap.PrimaryKeyInconsistency++
+          }
+        }
 
         let fieldType
-        let isPrimaryKey
         let isNullable
         let icon
 
         if (field.sourceField) {
           fieldType = field.sourceField.data_type
-          isPrimaryKey = field.sourceField.primary_key_position > 0
           isNullable = field.sourceField.is_nullable
           icon = getFieldIcon(field.sourceField.tapType)
         } else {
           fieldType = field.targetField.data_type
-          isPrimaryKey = field.targetField.primary_key_position > 0
           isNullable = field.targetField.is_nullable
           icon = getFieldIcon(field.targetField.tapType)
         }
@@ -212,9 +229,11 @@ const {
             field.sourceField?.data_type,
             field.targetField?.data_type,
           ),
+          sourcePrimaryKey: field.sourceField?.primaryKey,
+          targetPrimaryKey: field.targetField?.primaryKey,
           fieldType,
           icon,
-          isPrimaryKey,
+          isPrimaryKey: field.isPrimaryKey,
           isNullable,
         })
       })
@@ -227,6 +246,7 @@ const {
         additionalNum: totalMap.Additional,
         missingNum: totalMap.Missing,
         cannotWriteNum: totalMap.CannotWrite,
+        primaryKeyInconsistencyNum: totalMap.PrimaryKeyInconsistency,
       }
     })
 
@@ -294,10 +314,6 @@ const handleApplyTable = () => {
   ])
 }
 
-const handleApplyAll = () => {
-  saveApply(true)
-}
-
 const handleUndo = (item: Partial<ItemDifferenceFieldList>) => {
   deleteApply(false, [
     {
@@ -316,10 +332,6 @@ const handleUndoTable = () => {
   ])
 }
 
-const handleUndoAll = () => {
-  deleteApply(true)
-}
-
 let unwatch: () => void
 
 const handleCompareTargetModel = async () => {
@@ -468,6 +480,8 @@ onBeforeUnmount(() => {
     width="60%"
     class="p-0 overflow-hidden compare-result-dialog"
     :show-close="false"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
     @open="onOpen"
     @close="onClose"
   >
@@ -561,7 +575,7 @@ onBeforeUnmount(() => {
               <el-tag
                 v-for="item in data"
                 :key="item.value"
-                :type="typeMap[item.value]?.type || 'info'"
+                :type="typeMap[item.value]?.type"
                 closable
                 @close="deleteTag($event, item)"
               >
@@ -603,19 +617,11 @@ onBeforeUnmount(() => {
             :label="item.label"
             :value="item.value"
           >
-            <el-tag
-              disable-transitions
-              :type="typeMap[item.value]?.type || 'info'"
-              class="px-1.5"
-            >
+            <el-tag disable-transitions :type="item.type" class="px-1.5">
               <span class="flex align-center">
                 {{ item.label }}
                 <el-icon><i-lucide-chevrons-right /></el-icon>
-                {{
-                  item.value === 'Different' || item.value === 'Precision'
-                    ? $t('public_button_update')
-                    : $t('public_button_delete')
-                }}
+                {{ item.actionText }}
               </span>
             </el-tag>
           </el-checkbox>
@@ -716,15 +722,18 @@ onBeforeUnmount(() => {
                     >
                   </div>
                   <div class="flex gap-1 flex-wrap mt-1 table-item-tags">
-                    <template v-for="(v, key) in typeMap" :key="key">
+                    <template
+                      v-for="option in importantOptions"
+                      :key="option.value"
+                    >
                       <el-tag
-                        v-if="item[v.numKey] > 0"
-                        :type="v.type"
+                        v-if="item[option.numKey] > 0"
+                        :type="option.type"
                         size="small"
                         class="px-1"
                       >
-                        {{ v.text
-                        }}<span class="ml-0.5">{{ item[v.numKey] }}</span>
+                        {{ option.label
+                        }}<span class="ml-0.5">{{ item[option.numKey] }}</span>
                       </el-tag>
                     </template>
                   </div>
@@ -763,16 +772,19 @@ onBeforeUnmount(() => {
                 <template v-if="singleTable">
                   <el-divider direction="vertical" class="mx-3" />
                   <div class="flex gap-2 flex-wrap">
-                    <template v-for="(v, key) in typeMap" :key="key">
+                    <template
+                      v-for="(item, index) in importantOptions"
+                      :key="index"
+                    >
                       <el-tag
-                        v-if="selectedTable[v.numKey] > 0"
-                        :type="v.type"
+                        v-if="selectedTable[item.numKey] > 0"
+                        :type="item.type"
                         size="small"
                         class="px-1"
                       >
-                        {{ t(v.text)
+                        {{ t(item.label)
                         }}<span class="ml-0.5">{{
-                          selectedTable[v.numKey]
+                          selectedTable[item.numKey]
                         }}</span>
                       </el-tag>
                     </template>
@@ -805,6 +817,8 @@ onBeforeUnmount(() => {
                     <el-tooltip
                       :content="t('packages_dag_compare_result_apply_table')"
                       placement="top"
+                      :enterable="false"
+                      :hide-after="0"
                     >
                       <el-button
                         type="primary"
@@ -821,6 +835,8 @@ onBeforeUnmount(() => {
                     <el-tooltip
                       :content="t('packages_dag_compare_result_undo_table')"
                       placement="top"
+                      :enterable="false"
+                      :hide-after="0"
                     >
                       <el-button
                         type="primary"
@@ -862,6 +878,12 @@ onBeforeUnmount(() => {
                             (field.type === 'Missing' ||
                               field.type === 'CannotWrite'),
                         }"
+                        ><VIcon
+                          v-if="field.sourcePrimaryKey"
+                          size="12"
+                          class="text-warning mr-1"
+                        >
+                          key </VIcon
                         >{{ field.fieldName }}</span
                       >
                       <div class="flex align-center">
@@ -880,16 +902,9 @@ onBeforeUnmount(() => {
                         >
                           <el-icon><i-mingcute-check-line /></el-icon>
                           {{
-                            t(
-                              typeMap[
-                                field.type === 'Precision'
-                                  ? 'Different'
-                                  : field.type
-                              ].doneText,
-                              {
-                                type: t('public_automatically'),
-                              },
-                            )
+                            t(typeMap[field.type].doneText, {
+                              type: t('public_automatically'),
+                            })
                           }}
                         </div>
                         <div
@@ -898,16 +913,9 @@ onBeforeUnmount(() => {
                         >
                           <el-icon><i-mingcute-check-line /></el-icon>
                           {{
-                            t(
-                              typeMap[
-                                field.type === 'Precision'
-                                  ? 'Different'
-                                  : field.type
-                              ].doneText,
-                              {
-                                type: t('public_manually'),
-                              },
-                            )
+                            t(typeMap[field.type].doneText, {
+                              type: t('public_manually'),
+                            })
                           }}
                         </div>
                       </div>
@@ -971,7 +979,15 @@ onBeforeUnmount(() => {
                     >
                     <div v-else>
                       <div class="mb-1 flex align-center gap-1">
-                        <span>{{ field.fieldName }}</span>
+                        <span
+                          ><VIcon
+                            v-if="field.targetPrimaryKey"
+                            size="12"
+                            class="text-warning mr-1"
+                          >
+                            key </VIcon
+                          >{{ field.fieldName }}</span
+                        >
                         <el-tag
                           v-if="field.type === 'CannotWrite'"
                           type="danger"
diff --git a/packages/dag/src/locale/lang/en.js b/packages/dag/src/locale/lang/en.js
index 52e9bc81b..23c06b998 100644
--- a/packages/dag/src/locale/lang/en.js
+++ b/packages/dag/src/locale/lang/en.js
@@ -1107,11 +1107,12 @@ export default {
   packages_dag_applyCompareRules_Different: 'Update Field Type',
   packages_dag_applyCompareRules_CannotWrite: 'Delete Read-Only Fields',
   packages_dag_view_compare_result: 'View Schema Comparison Result',
-  packages_dag_compare_different: 'Type Different',
+  packages_dag_compare_different: 'Type Diff',
   packages_dag_compare_missing: 'Missing',
   packages_dag_compare_missing_source: 'Not Defined',
-  packages_dag_compare_precision: 'Type Different (General)',
+  packages_dag_compare_precision: 'Type Diff (General)',
   packages_dag_compare_cannot_write: 'Read-Only',
+  packages_dag_compare_primary_key_inconsistency: 'PK Diff',
   packages_dag_compare_done_modify: '{type} Modified',
   packages_dag_compare_done_add: '{type} Added',
   packages_dag_compare_done_delete: '{type} Deleted',
@@ -1145,7 +1146,9 @@ export default {
     '{time1} No Database Model Found, No Comparison',
   packages_dag_compare_result_detail_readonly: '{readonly} Read-Only',
   packages_dag_compare_result_detail_missing: '{missing} Missing',
-  packages_dag_compare_result_detail_different: '{different} Type Different',
+  packages_dag_compare_result_detail_different: '{different} Type Diff',
+  packages_dag_compare_result_detail_primary_key_inconsistency:
+    '{primaryKeyInconsistency} PK Diff',
   packages_dag_compare_result_detail_precision:
     '{precision} Precision Different',
   packages_dag_compare_result_detail_all: 'All Differences',
diff --git a/packages/dag/src/locale/lang/zh-CN.js b/packages/dag/src/locale/lang/zh-CN.js
index f9dc02743..55dca3aa8 100644
--- a/packages/dag/src/locale/lang/zh-CN.js
+++ b/packages/dag/src/locale/lang/zh-CN.js
@@ -966,6 +966,7 @@ export default {
   packages_dag_compare_missing_source: '字段未定义',
   packages_dag_compare_precision: '类型差异(一般)',
   packages_dag_compare_cannot_write: '字段只读',
+  packages_dag_compare_primary_key_inconsistency: '主键差异',
   packages_dag_compare_done_modify: '已{type}修改',
   packages_dag_compare_done_add: '已{type}添加',
   packages_dag_compare_done_delete: '已{type}删除',
@@ -1000,6 +1001,8 @@ export default {
   packages_dag_compare_result_detail_readonly: '{readonly} 个只读',
   packages_dag_compare_result_detail_missing: '{missing} 个缺失',
   packages_dag_compare_result_detail_different: '{different} 个类型差异',
+  packages_dag_compare_result_detail_primary_key_inconsistency:
+    '{primaryKeyInconsistency} 个主键差异',
   packages_dag_compare_result_detail_all: '全部差异',
   packages_dag_compare_result_auto_process: '自动处理差异',
   packages_dag_compare_result_display_field: '显示字段',
diff --git a/packages/dag/src/locale/lang/zh-TW.js b/packages/dag/src/locale/lang/zh-TW.js
index 03520504c..408a1959d 100644
--- a/packages/dag/src/locale/lang/zh-TW.js
+++ b/packages/dag/src/locale/lang/zh-TW.js
@@ -951,6 +951,7 @@ export default {
   packages_dag_compare_missing_source: '字段未定義',
   packages_dag_compare_precision: '類型差異(一般)',
   packages_dag_compare_cannot_write: '字段只讀',
+  packages_dag_compare_primary_key_inconsistency: '主鍵差異',
   packages_dag_compare_done_modify: '已{type}修改',
   packages_dag_compare_done_add: '已{type}添加',
   packages_dag_compare_done_delete: '已{type}刪除',
@@ -983,6 +984,8 @@ export default {
   packages_dag_compare_result_detail_missing: '{missing} 個缺失',
   packages_dag_compare_result_detail_different: '{different} 個不同',
   packages_dag_compare_result_detail_precision: '{precision} 個精度差異',
+  packages_dag_compare_result_detail_primary_key_inconsistency:
+    '{primaryKeyInconsistency} 個主鍵差異',
   packages_dag_compare_result_detail_all: '全部差異',
   packages_dag_compare_result_auto_process: '自動處理差異',
   packages_dag_compare_result_display_field: '顯示字段',