From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/custom/components/code/sand-box/index.jsx |   55 ++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/tabviews/custom/components/code/sand-box/index.jsx b/src/tabviews/custom/components/code/sand-box/index.jsx
index 5eb969e..2456f8b 100644
--- a/src/tabviews/custom/components/code/sand-box/index.jsx
+++ b/src/tabviews/custom/components/code/sand-box/index.jsx
@@ -10,7 +10,6 @@
 
 class SandBoxComponent extends Component {
   static propTpyes = {
-    BID: PropTypes.any,              // 鐖剁骇Id
     data: PropTypes.array,           // 缁熶竴鏌ヨ鏁版嵁
     config: PropTypes.object,        // 缁勪欢閰嶇疆淇℃伅
     mainSearch: PropTypes.any,       // 澶栧眰鎼滅储鏉′欢
@@ -26,26 +25,32 @@
   }
 
   UNSAFE_componentWillMount () {
-    const { data, initdata, BID } = this.props
+    const { data, initdata } = this.props
     let _config = fromJS(this.props.config).toJS()
 
     let _data = {}
     let _sync = false
+
+    let BID = ''
+    let BData = ''
+
+    if (_config.setting.supModule) {
+      BData = window.GLOB.CacheData.get(_config.setting.supModule)
+    } else {
+      BData = window.GLOB.CacheData.get(_config.$pageId)
+    }
+    if (BData) {
+      BID = BData.$BID || ''
+    }
     
-    if (_config.setting && _config.wrap.datatype !== 'static') {
+    if (_config.wrap.datatype !== 'static') {
       _sync = _config.setting.sync === 'true'
 
       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 {
@@ -53,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)
     }
@@ -99,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()
       })
@@ -156,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,
@@ -181,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