From a4ba5d208b8335c634dffd612c2bf310b1dea607 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 八月 2020 15:49:30 +0800
Subject: [PATCH] 2020-08-17
---
src/tabviews/zshare/calendar/index.jsx | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/zshare/calendar/index.jsx b/src/tabviews/zshare/calendar/index.jsx
index 000050d..0ebf288 100644
--- a/src/tabviews/zshare/calendar/index.jsx
+++ b/src/tabviews/zshare/calendar/index.jsx
@@ -64,8 +64,10 @@
UNSAFE_componentWillReceiveProps(nextProps) {
if (!is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let datelist = this.mountdata(this.state.datelist, nextProps.data || [])
+ let datelist = this.getDateList(this.state.selectYear)
let monthlist = null
+
+ datelist = this.mountdata(datelist, nextProps.data || [])
if (this.state.levels.includes('month') || this.state.levels.includes('year')) {
monthlist = datelist.filter(item => item.month === this.state.selectMonth)[0]
@@ -83,7 +85,7 @@
}
shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
+ return !is(fromJS(this.props.loading), fromJS(nextProps.loading)) || !is(fromJS(this.state), fromJS(nextState))
}
mountdata = (datelist, data) => {
--
Gitblit v1.8.0