From 474c68f0fea10cc62977c67d186732b3346cdd53 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 一月 2023 18:04:45 +0800
Subject: [PATCH] 2023-01-17
---
src/tabviews/custom/components/code/sand-box/index.jsx | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/components/code/sand-box/index.jsx b/src/tabviews/custom/components/code/sand-box/index.jsx
index 2456f8b..a9edce6 100644
--- a/src/tabviews/custom/components/code/sand-box/index.jsx
+++ b/src/tabviews/custom/components/code/sand-box/index.jsx
@@ -24,6 +24,8 @@
html: '',
}
+ loaded = false
+
UNSAFE_componentWillMount () {
const { data, initdata } = this.props
let _config = fromJS(this.props.config).toJS()
@@ -49,12 +51,15 @@
if (_sync && data) {
_data = data[_config.dataName] || {}
_sync = false
+ this.loaded = true
} else if (_sync && initdata) {
_data = initdata || {}
_sync = false
+ this.loaded = true
}
} else {
_data = {}
+ this.loaded = true
}
if (_config.css) {
@@ -84,7 +89,19 @@
}
componentDidMount () {
+ const { config } = this.state
+
MKEmitter.addListener('reloadData', this.reloadData)
+
+ if (config.$cache && !this.loaded) {
+ Api.getLCacheConfig(config.uuid).then(res => {
+ if (!res || this.loaded) return
+
+ this.setState({data: res[0]}, () => {
+ this.renderView()
+ })
+ })
+ }
}
shouldComponentUpdate (nextProps, nextState) {
@@ -110,9 +127,15 @@
_data = nextProps.data[config.dataName]
}
- this.setState({sync: false, data: _data}, () => {
- this.renderView()
- })
+ this.loaded = true
+
+ this.setState({sync: false, data: _data})
+
+ if (!is(fromJS(this.state.data), fromJS(_data))) {
+ setTimeout(() => {
+ this.renderView()
+ }, 10)
+ }
} else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
this.loadData()
@@ -143,6 +166,7 @@
data: {},
loading: false
})
+ this.loaded = true
return
}
@@ -164,12 +188,21 @@
if (result.status) {
let _data = result.data || {}
+ this.loaded = true
+ if (config.$cache) {
+ Api.writeCacheConfig(config.uuid, result.data || '')
+ }
+
this.setState({
data: _data,
loading: false
- }, () => {
- this.renderView()
})
+
+ if (!is(fromJS(this.state.data), fromJS(_data))) {
+ setTimeout(() => {
+ this.renderView()
+ }, 10)
+ }
} else {
this.setState({
loading: false
--
Gitblit v1.8.0