diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 3181b20daba8f69364c72846054f409ce5caac53..bbde404c07b004e5379415e49ca783ee03e109fa 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -1,3 +1,10 @@
+### 🐛 Bug Fixes
+
+- **BasicTable** 修复可编辑单元格某些情况下无法提交的问题
+- **BasicModal**
+  - 修复点击遮罩、按下`Esc`键都不能关闭`Modal`的问题
+  - 修复点击关闭按钮、最大化按钮旁边的空白区域也会导致`Modal`关闭的问题
+
 ## 2.7.2(2021-09-14)
 
 ### ✨ Features
diff --git a/src/components/Table/src/components/editable/EditableCell.vue b/src/components/Table/src/components/editable/EditableCell.vue
index a0a3ff854e6f8da79a1b37dac04b4544c072f6d9..a53ac8dc7856a5843d5fe4a217c620a86cec86a3 100644
--- a/src/components/Table/src/components/editable/EditableCell.vue
+++ b/src/components/Table/src/components/editable/EditableCell.vue
@@ -246,7 +246,7 @@
         if (!record) return false;
         const { key, dataIndex } = column;
         const value = unref(currentValueRef);
-        if (!key || !dataIndex) return;
+        if (!key && !dataIndex) return;
 
         const dataKey = (dataIndex || key) as string;