From 22c9b94be213ff93064d7c463d82344023ffab1c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 八月 2023 10:35:29 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/data-card/index.jsx | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 2604d6c..f629d61 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -261,15 +261,15 @@
if (config.$time && !config.setting.laypage) {
if (!this.loaded) {
Api.getLCacheConfig(config.uuid, config.$time).then(res => {
- if (!res && config.setting.onload === 'true') {
+ if (!res.valid && config.setting.onload === 'true') {
setTimeout(() => {
this.loadData()
}, config.setting.delay || 0)
}
-
- if (!res || this.loaded) return
- let _data = res.map((item, index) => {
+ if (!res.data || this.loaded) return
+
+ let _data = res.data.map((item, index) => {
item.key = index
item.$$uuid = item[config.setting.primaryKey] || ''
item.$Index = index + 1 + ''
@@ -289,9 +289,9 @@
} else {
if (!this.loaded) {
Api.getLCacheConfig(config.uuid, 0).then(res => {
- if (!res || this.loaded) return
+ if (!res.data || this.loaded) return
- let _data = res.map((item, index) => {
+ let _data = res.data.map((item, index) => {
item.key = index
item.$$uuid = item[config.setting.primaryKey] || ''
item.$Index = index + 1 + ''
--
Gitblit v1.8.0