From 26bda142b0e94c07d8c349f075b5f884fe86e838 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 一月 2023 18:01:35 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/timeline/normal-timeline/index.jsx | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
index b189d5d..d8ed53e 100644
--- a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
+++ b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
@@ -32,6 +32,8 @@
description: false
}
+ loaded = false
+
/**
* @description 鍒濆鍖栧鐞�
* 1銆� initdata 涓烘墦鍗版椂浣跨敤鐨勬暟鎹泦
@@ -66,6 +68,7 @@
}
if (_data) {
+ this.loaded = true
_data = _data.map((item, index) => {
item.key = index
item.$$uuid = item[_config.setting.primaryKey] || ''
@@ -123,6 +126,20 @@
this.loadData(true)
})
}
+
+ if (config.$cache && !this.loaded) {
+ Api.getLCacheConfig(config.uuid).then(res => {
+ if (!res || this.loaded) return
+
+ this.setState({data: res.map((item, index) => {
+ item.key = index
+ item.$$uuid = item[config.setting.primaryKey] || ''
+ item.$Index = index + 1 + ''
+
+ return item
+ })})
+ })
+ }
}
shouldComponentUpdate (nextProps, nextState) {
@@ -161,6 +178,8 @@
item.$Index = index + 1 + ''
return item
})
+
+ this.loaded = true
this.setState({sync: false, data: _data})
} else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
@@ -246,6 +265,7 @@
this.setState({
data: [],
})
+ this.loaded = true
return
}
@@ -280,6 +300,11 @@
let result = await Api.genericInterface(param)
if (result.status) {
+ this.loaded = true
+ if (config.$cache) {
+ Api.writeCacheConfig(config.uuid, result.data || '')
+ }
+
this.setState({
data: result.data.map((item, index) => {
item.key = index
--
Gitblit v1.8.0