From 1031e469264d74bd07ddbe99ac6c5649ce2b85b7 Mon Sep 17 00:00:00 2001
From: pengandpeng <peng6907743@163.com>
Date: Sat, 6 Feb 2021 13:46:43 +0800
Subject: [PATCH] fix: table scroll.x throw error when use expandedRowRender
 (#3626)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

表头固定与展开行不存在冲突，结合使用时不应该报错
---
 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 96921909f..73e7a9933 100755
--- a/components/table/Table.jsx
+++ b/components/table/Table.jsx
@@ -141,7 +141,7 @@ export default {
     // this.columns = props.columns || normalizeColumns(props.children)
     const props = getOptionProps(this);
     warning(
-      !props.expandedRowRender || !('scroll' in props),
+      !props.expandedRowRender || !('scroll' in props) || !props.scroll.x,
       '`expandedRowRender` and `scroll` are not compatible. Please use one of them at one time.',
     );
     this.CheckboxPropsCache = {};