fix(table): use lastFullRow insteadOf $lastFullRow

Tencent · Jul 5, 2022 · 652db4f · 652db4f
1 parent 4f940b2
commit 652db4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/table/editable-cell.tsx b/src/table/editable-cell.tsx
@@ -178,7 +178,7 @@ export default defineComponent({
       row,
       (row) => {
         let val = get(row, col.value.colKey);
-        if (typeof val === 'object') {
+        if (typeof val === 'object' && val !== null) {
           val = val instanceof Array ? [...val] : { ...val };
         }
         editValue.value = val;

diff --git a/src/table/tbody.tsx b/src/table/tbody.tsx
@@ -235,7 +235,7 @@ export default defineComponent({
       trNodeList,
       getFullRow(h, columnLength, 'last-full-row'),
     ];
-    const isEmpty = !this.data?.length && !this.loading && !this.firstFullRow && !this.$lastFullRow;
+    const isEmpty = !this.data?.length && !this.loading && !this.firstFullRow && !this.lastFullRow;
 
     const translate = `translate(0, ${this.translateY}px)`;
     const posStyle = {