From f6626b05f1275cc2f8ca77f773d4f6a6af1b0a89 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:11:55 +0800
Subject: [PATCH] 2022-11-21
---
src/tabviews/custom/components/code/sand-box/index.jsx | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/tabviews/custom/components/code/sand-box/index.jsx b/src/tabviews/custom/components/code/sand-box/index.jsx
index 66338af..2456f8b 100644
--- a/src/tabviews/custom/components/code/sand-box/index.jsx
+++ b/src/tabviews/custom/components/code/sand-box/index.jsx
@@ -48,15 +48,9 @@
if (_sync && data) {
_data = data[_config.dataName] || {}
- if (_data && Array.isArray(_data)) {
- _data = _data[0] || {}
- }
_sync = false
} else if (_sync && initdata) {
_data = initdata || {}
- if (_data && Array.isArray(_data)) {
- _data = _data[0] || {}
- }
_sync = false
}
} else {
@@ -64,7 +58,11 @@
}
if (_config.css) {
+ let node = document.getElementById(_config.uuid)
+ node && node.remove()
+
let ele = document.createElement('style')
+ ele.id = _config.uuid
ele.innerHTML = _config.css
document.getElementsByTagName('head')[0].appendChild(ele)
}
@@ -110,15 +108,12 @@
let _data = {}
if (nextProps.data && nextProps.data[config.dataName]) {
_data = nextProps.data[config.dataName]
- if (_data && Array.isArray(_data)) {
- _data = _data[0]
- }
}
this.setState({sync: false, data: _data}, () => {
this.renderView()
})
- } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
this.loadData()
})
@@ -167,7 +162,7 @@
let result = await Api.genericInterface(param)
if (result.status) {
- let _data = result.data && result.data[0] ? result.data[0] : {}
+ let _data = result.data || {}
this.setState({
data: _data,
@@ -192,23 +187,34 @@
const { html, js, wrap, columns } = this.state.config
let _html = html
- if (_html && wrap.datatype !== 'static') {
+ if (_html && wrap.datatype !== 'static' && wrap.compileMode !== 'custom') {
+ let _data = data
+ if (Array.isArray(_data)) {
+ _data = _data[0] || {}
+ }
columns.forEach(col => {
if (col.field) {
- let val = (data[col.field] || data[col.field] === 0) ? data[col.field] : ''
+ let val = (_data[col.field] || _data[col.field] === 0) ? _data[col.field] : ''
let reg = new RegExp('@' + col.field + '@', 'ig')
_html = _html.replace(reg, val)
}
})
}
+
this.setState({html: _html}, () => {
if (js) {
try {
- // eslint-disable-next-line no-eval
- eval(js)
+ if (wrap.compileMode !== 'custom') {
+ // eslint-disable-next-line no-eval
+ eval(js)
+ } else {
+ // eslint-disable-next-line
+ let evalfunc = eval('(true && function (data) {' + js + '})')
+ evalfunc(data)
+ }
} catch (e) {
- console.warn('JS 鎵ц澶辫触锛�')
+ console.warn(e)
}
}
})
--
Gitblit v1.8.0