From 7cfd25aebe5869244e40dbbcd6384f115f35e66e Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 14 六月 2023 09:37:21 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/tabviews/custom/components/code/sand-box/index.jsx | 19 ++++++++----------- 1 files changed, 8 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 fa09f57..dc1a995 100644 --- a/src/tabviews/custom/components/code/sand-box/index.jsx +++ b/src/tabviews/custom/components/code/sand-box/index.jsx @@ -22,6 +22,7 @@ sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁 data: [], // 鏁版嵁 html: '', + result: {} } loaded = false @@ -199,8 +200,12 @@ }, 10) } + let _result = {...result} + delete _result.data + this.setState({ data: _data, + result: _result, loading: false }) } else { @@ -216,7 +221,7 @@ } renderView = () => { - const { data } = this.state + const { data, result } = this.state const { html, js, wrap, columns } = this.state.config let _html = html @@ -239,16 +244,8 @@ if (js) { try { // 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) - // } + let evalfunc = eval('(true && function (data, result) {' + js + '})') + evalfunc(data, result) } catch (e) { console.warn(e) } -- Gitblit v1.8.0