fix(Table): 修复Empty 在表格中未沾满tbody问题 #768 (#770)

uiwjs · Apr 15, 2022 · e4716ec · e4716ec
1 parent 3b6b458
commit e4716ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/react-table/src/index.tsx b/packages/react-table/src/index.tsx
@@ -288,7 +288,6 @@ export default function Table<T extends { [key: string]: V }, V>(props: TablePro
   }, [scroll]);
   const cls = [prefixCls, className, bordered ? `${prefixCls}-bordered` : null].filter(Boolean).join(' ').trim();
   const { header, render, ellipsis } = getLevelItems(self.selfColumns);
-
   return (
     <React.Fragment>
       <div className={cls} {...other} style={{ ...other.style, ...style.div }}>
@@ -324,7 +323,7 @@ export default function Table<T extends { [key: string]: V }, V>(props: TablePro
           {data && data.length === 0 && empty && (
             <tbody>
               <tr>
-                <td colSpan={columns.length} style={{ position: 'relative', left: 0 }}>
+                <td colSpan={self.keys.length} style={{ position: 'relative', left: 0 }}>
                   {empty}
                 </td>
               </tr>

diff --git a/packages/react-table/src/util.ts b/packages/react-table/src/util.ts
@@ -124,6 +124,8 @@ export function getAllColumnsKeys<T>(data: TableColumns<T>[], keys: TableColumns
       keys = keys.concat(getAllColumnsKeys(data[i].children || []));
     } else if (data[i].key) {
       keys.push(data[i]);
+    } else {
+      keys.push({ ...data[i], key: i.toString() });
     }
   }
   return keys;