From e0aff8f4c0e9c8f16d1ba07863cf600638067514 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 四月 2021 15:08:47 +0800
Subject: [PATCH] 2021-04-13

---
 src/menu/components/table/normal-table/columns/index.jsx |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index 2e38088..06139cc 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-table/columns/index.jsx
@@ -37,13 +37,15 @@
 
   shouldComponentUpdate (nextProps, nextState) {
 
+    if (this.props.rowSpan !== nextProps.rowSpan || this.props.colSpan !== nextProps.colSpan) {
+      return true
+    }
+
     if (!nextProps.column) return false
 
     return !is(fromJS(this.props.column), fromJS(nextProps.column)) ||
       !is(fromJS(this.props.fields), fromJS(nextProps.fields)) ||
-      this.props.index !== nextProps.index ||
-      this.props.rowSpan !== nextProps.rowSpan ||
-      this.props.colSpan !== nextProps.colSpan
+      this.props.index !== nextProps.index
   }
 
   render() {

--
Gitblit v1.8.0