From 7e46c386be5c2cfc20af3936d26839ad3fce44b0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 16 八月 2023 17:40:32 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/code/sand-box/index.jsx | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/custom/components/code/sand-box/index.jsx b/src/tabviews/custom/components/code/sand-box/index.jsx
index 9027a05..4119dea 100644
--- a/src/tabviews/custom/components/code/sand-box/index.jsx
+++ b/src/tabviews/custom/components/code/sand-box/index.jsx
@@ -114,15 +114,15 @@
if (config.$time) {
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()
+ this.loadData('init')
}, config.setting.delay || 0)
}
- if (!res || this.loaded) return
+ if (!res.data || this.loaded) return
- this.setState({data: res}, () => {
+ this.setState({data: res.data}, () => {
this.renderView()
})
})
@@ -132,9 +132,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}, () => {
+ this.setState({data: res.data}, () => {
this.renderView()
})
})
@@ -142,7 +142,7 @@
if (config.setting.onload === 'true') {
setTimeout(() => {
- this.loadData()
+ this.loadData('init')
}, config.setting.delay || 0)
} else if (this.loaded) {
this.renderView()
@@ -204,7 +204,7 @@
this.loadData()
}
- async loadData () {
+ async loadData (type) {
const { config, arr_field, BID } = this.state
if (config.wrap.datatype === 'static') {
@@ -243,7 +243,7 @@
let _data = result.data || []
this.loaded = true
- if (config.$cache && config.setting.onload !== 'false') {
+ if (config.$cache && type === 'init') {
Api.writeCacheConfig(config.uuid, result.data || [])
}
@@ -319,8 +319,8 @@
if (js) {
try {
// eslint-disable-next-line
- let evalfunc = eval('(true && function (data, result) {' + js + '})')
- evalfunc(data, result)
+ let evalfunc = eval('(true && function (data, result, Api, notification) {' + js + '})')
+ evalfunc(data, result, Api, notification)
} catch (e) {
console.warn(e)
}
--
Gitblit v1.8.0