From da64ab0923bf8817fc8599a6e37b953ce38f64c8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 18:37:36 +0800
Subject: [PATCH] 2023-08-27
---
src/tabviews/custom/components/code/sand-box/index.jsx | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/tabviews/custom/components/code/sand-box/index.jsx b/src/tabviews/custom/components/code/sand-box/index.jsx
index 560976e..d5b40b7 100644
--- a/src/tabviews/custom/components/code/sand-box/index.jsx
+++ b/src/tabviews/custom/components/code/sand-box/index.jsx
@@ -48,7 +48,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'
@@ -72,8 +72,7 @@
this.setState({
data: _data,
BID: BID || '',
- config: _config,
- arr_field: _config.columns.map(col => col.field).join(',')
+ config: _config
})
}
@@ -107,16 +106,16 @@
}
initExec = () => {
- const { config } = this.state
+ const { config, BID } = this.state
if (config.wrap.datatype !== 'static') {
if (config.$cache) {
if (config.$time) {
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()
+ this.loadData('init')
}, config.setting.delay || 0)
}
@@ -131,7 +130,7 @@
}
} 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
this.setState({data: res.data}, () => {
@@ -142,7 +141,7 @@
if (config.setting.onload === 'true') {
setTimeout(() => {
- this.loadData()
+ this.loadData('init')
}, config.setting.delay || 0)
} else if (this.loaded) {
this.renderView()
@@ -161,14 +160,14 @@
}
transferSyncData = (syncId) => {
- const { config } = this.state
+ const { config, BID } = this.state
if (config.$syncId !== syncId) return
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)
}
if (!is(fromJS(this.state.data), fromJS(_data))) {
@@ -204,8 +203,8 @@
this.loadData()
}
- async loadData () {
- const { config, arr_field, BID } = this.state
+ async loadData (type) {
+ const { config, BID } = this.state
if (config.wrap.datatype === 'static') {
this.setState({
@@ -236,15 +235,15 @@
})
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID)
+ let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, 1, 1, BID)
let result = await Api.genericInterface(param)
if (result.status) {
let _data = result.data || []
this.loaded = true
- if (config.$cache && config.setting.onload !== 'false') {
- Api.writeCacheConfig(config.uuid, result.data || [])
+ if (config.$cache && type === 'init') {
+ Api.writeCacheConfig(config.uuid, result.data || [], BID)
}
if (!is(fromJS(this.state.data), fromJS(_data))) {
--
Gitblit v1.8.0