From dc258e4600bea2fba1e25054d163a2f4b1326a85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 八月 2023 10:23:38 +0800
Subject: [PATCH] 2023-08-08

---
 src/tabviews/custom/components/table/normal-table/index.jsx |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index af23f19..ae27a14 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -215,15 +215,15 @@
       if (config.$time && !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.loadmaindata()
               }, config.setting.delay || 0)
             }
   
-            if (!res || this.loaded) return
+            if (!res.data || this.loaded) return
 
-            this.setState({data: res.map((item, index) => {
+            this.setState({data: res.data.map((item, index) => {
               item.key = index
               item.$$uuid = item[config.setting.primaryKey] || ''
               item.$$key = '' + item.key + item.$$uuid
@@ -250,9 +250,9 @@
       } else {
         if (!this.loaded) {
           Api.getLCacheConfig(config.uuid, 0).then(res => {
-            if (!res || this.loaded) return
+            if (!res.data || this.loaded) return
     
-            this.setState({data: res.map((item, index) => {
+            this.setState({data: res.data.map((item, index) => {
               item.key = index
               item.$$uuid = item[config.setting.primaryKey] || ''
               item.$$key = '' + item.key + item.$$uuid
@@ -549,8 +549,7 @@
       let data = fromJS(this.state.data).toJS()
       let selectedData = fromJS(this.state.selectedData).toJS()
 
-      if (!result.data) {
-      // if (result.data && result.data[0]) {
+      if (result.data && result.data[0]) {
         let _data = result.data[0]
         _data.$$uuid = _data[setting.primaryKey] || ''
         _data.$$BID = BID || ''

--
Gitblit v1.8.0