From 6c9de7146c94354a3928d194c96299b6f2c0f512 Mon Sep 17 00:00:00 2001
From: tanjinzhou <415800467@qq.com>
Date: Fri, 11 Oct 2019 18:25:23 +0800
Subject: [PATCH] fix: table warning #1267

---
 components/table/Table.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/table/Table.jsx b/components/table/Table.jsx
index fa362f519..e44d42f52 100755
--- a/components/table/Table.jsx
+++ b/components/table/Table.jsx
@@ -87,7 +87,7 @@ export default {
     // this.columns = props.columns || normalizeColumns(props.children)
     const props = getOptionProps(this);
     warning(
-      !('expandedRowRender' in props) || !('scroll' in props),
+      !props.expandedRowRender || !('scroll' in props),
       '`expandedRowRender` and `scroll` are not compatible. Please use one of them at one time.',
     );
     this.createComponents(this.components);