From 7facbed508592e842f9bca085cf0ffaebcbfc571 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 12 十一月 2020 19:22:37 +0800
Subject: [PATCH] 2020-11-12
---
src/tabviews/custom/components/card/table-card/index.jsx | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/custom/components/card/table-card/index.jsx b/src/tabviews/custom/components/card/table-card/index.jsx
index abbc960..63a2e77 100644
--- a/src/tabviews/custom/components/card/table-card/index.jsx
+++ b/src/tabviews/custom/components/card/table-card/index.jsx
@@ -34,7 +34,7 @@
}
UNSAFE_componentWillMount () {
- const { data } = this.props
+ const { data, initdata } = this.props
let _config = fromJS(this.props.config).toJS()
let _cols = new Map()
@@ -43,6 +43,9 @@
if (_config.setting.sync === 'true' && data) {
_data = data[_config.dataName] || []
+ _sync = false
+ } else if (_config.setting.sync === 'true' && initdata) {
+ _data = initdata || []
_sync = false
}
@@ -80,10 +83,6 @@
}, () => {
if (_config.setting.sync !== 'true' && _config.setting.onload === 'true') {
this.loadData()
- } else if (_sync && !_data) {
- this.setState({
- loading: true
- })
}
})
}
@@ -115,7 +114,7 @@
_data = nextProps.data[config.dataName] || []
}
- this.setState({sync: false, loading: false, data: _data})
+ this.setState({sync: false, data: _data})
} else if (!is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
if (config.setting.syncRefresh === 'true') {
this.setState({}, () => {
--
Gitblit v1.8.0