From 8d7c3eed8bdac1e77c8de90a3227d801708c358e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 五月 2023 21:12:56 +0800
Subject: [PATCH] 2023-05-15
---
src/tabviews/custom/components/code/sand-box/index.jsx | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/src/tabviews/custom/components/code/sand-box/index.jsx b/src/tabviews/custom/components/code/sand-box/index.jsx
index 8ccc32b..fa09f57 100644
--- a/src/tabviews/custom/components/code/sand-box/index.jsx
+++ b/src/tabviews/custom/components/code/sand-box/index.jsx
@@ -20,7 +20,7 @@
config: null, // 鍥捐〃閰嶇疆淇℃伅
loading: false, // 鏁版嵁鍔犺浇鐘舵��
sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
- data: {}, // 鏁版嵁
+ data: [], // 鏁版嵁
html: '',
}
@@ -30,7 +30,7 @@
const { data, initdata } = this.props
let _config = fromJS(this.props.config).toJS()
- let _data = {}
+ let _data = []
let _sync = false
let BID = ''
@@ -49,7 +49,7 @@
_sync = _config.setting.sync === 'true'
if (_sync && data) {
- _data = data[_config.dataName] || {}
+ _data = data[_config.dataName] || []
_sync = false
this.loaded = true
} else if (_sync && initdata) {
@@ -122,7 +122,7 @@
const { sync, config } = this.state
if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _data = {}
+ let _data = []
if (nextProps.data && nextProps.data[config.dataName]) {
_data = nextProps.data[config.dataName]
}
@@ -157,13 +157,13 @@
if (config.wrap.datatype === 'static') {
this.setState({
- data: {},
+ data: [],
loading: false
})
return
} else if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
- data: {},
+ data: [],
loading: false
})
this.loaded = true
@@ -186,7 +186,7 @@
let result = await Api.genericInterface(param)
if (result.status) {
- let _data = result.data || {}
+ let _data = result.data || []
this.loaded = true
if (config.$cache && config.setting.onload !== 'false') {
@@ -220,32 +220,35 @@
const { html, js, wrap, columns } = this.state.config
let _html = html
- 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 reg = new RegExp('@' + col.field + '@', 'ig')
+ if (_html && wrap.datatype !== 'static') {
+ if (/@[\u4E00-\u9FA50-9a-zA-Z_]+@/ig.test(_html)) {
+ let _data = data[0] || {}
- _html = _html.replace(reg, val)
- }
- })
+ columns.forEach(col => {
+ if (col.field) {
+ let val = _data[col.field] !== undefined ? _data[col.field] : ''
+ let reg = new RegExp('@' + col.field + '@', 'ig')
+
+ _html = _html.replace(reg, val)
+ }
+ })
+ }
}
this.setState({html: _html}, () => {
if (js) {
try {
- 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)
- }
+ // eslint-disable-next-line
+ let evalfunc = eval('(true && function (data) {' + js + '})')
+ evalfunc(data)
+ // 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(e)
}
--
Gitblit v1.8.0