From 5e1d4d5155c57c43739d61914e2d29a64f9bb683 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 17:40:38 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/card/data-card/index.jsx | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 0360c81..96e55f2 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -157,7 +157,7 @@
_data = window.GLOB.SyncData.get(_config.dataName) || []
if (_config.$cache) {
- Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS())
+ Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS(), BID)
}
_config.setting.sync = 'false'
@@ -252,14 +252,14 @@
}
initExec = () => {
- const { config } = this.state
+ const { config, BID } = this.state
this.loaded && this.prevCheck()
if (config.$cache) {
if (config.$time && !config.setting.laypage) {
if (!this.loaded) {
- Api.getLCacheConfig(config.uuid, config.$time).then(res => {
+ Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
if (!res.valid && config.setting.onload === 'true') {
setTimeout(() => {
this.loadData('', 'init')
@@ -282,12 +282,14 @@
return item
})
- this.setState({data: _data})
+ this.setState({data: _data}, () => {
+ this.prevCheck()
+ })
})
}
} else {
if (!this.loaded) {
- Api.getLCacheConfig(config.uuid, 0).then(res => {
+ Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
if (!res.data || this.loaded) return
let _data = res.data.map((item, index) => {
@@ -331,7 +333,7 @@
let _data = window.GLOB.SyncData.get(config.dataName) || []
if (config.$cache) {
- Api.writeCacheConfig(config.uuid, fromJS(_data).toJS())
+ Api.writeCacheConfig(config.uuid, fromJS(_data).toJS(), BID)
}
_data = _data.map((item, index) => {
@@ -762,7 +764,7 @@
this.loaded = true
if (config.$cache && type === 'init') {
- Api.writeCacheConfig(config.uuid, result.data || [])
+ Api.writeCacheConfig(config.uuid, result.data || [], BID)
}
if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
@@ -869,6 +871,15 @@
async loadLinedata (id) {
const { config, pageIndex, pageSize, search, BID, BData, orderBy } = this.state
+ if (config.forbidLine) {
+ this.setState({
+ pageIndex: 1
+ }, () => {
+ this.loadData()
+ })
+ return
+ }
+
let searches = fromJS(search).toJS()
if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
--
Gitblit v1.8.0