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/double-data-card/index.jsx | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index 9dea605..53048cb 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -243,7 +243,7 @@
}
initExec = () => {
- const { config } = this.state
+ const { config, BID } = this.state
if (config.$cache) {
let getData = (res) => {
@@ -286,7 +286,7 @@
}
if (config.$time && !config.setting.laypage) {
- Api.getLCacheConfig(config.uuid, config.$time).then(res => {
+ Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
if (!res.valid) {
setTimeout(() => {
this.loadData('', 'init')
@@ -298,7 +298,7 @@
this.setState({data: getData(res.data)})
})
} else {
- Api.getLCacheConfig(config.uuid, 0).then(res => {
+ Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
if (!res.data || this.loaded) return
this.setState({data: getData(res.data)})
@@ -608,7 +608,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')) {
@@ -772,6 +772,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