From 07c005cf28acf74e3afde82122e4c53e1000d70c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 六月 2023 12:06:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/code/sand-box/index.jsx | 136 +++++++++++++++++++++++++++++++-------------
1 files changed, 95 insertions(+), 41 deletions(-)
diff --git a/src/tabviews/custom/components/code/sand-box/index.jsx b/src/tabviews/custom/components/code/sand-box/index.jsx
index 1fd9fa9..fa09f57 100644
--- a/src/tabviews/custom/components/code/sand-box/index.jsx
+++ b/src/tabviews/custom/components/code/sand-box/index.jsx
@@ -10,11 +10,9 @@
class SandBoxComponent extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
}
state = {
@@ -22,39 +20,54 @@
config: null, // 鍥捐〃閰嶇疆淇℃伅
loading: false, // 鏁版嵁鍔犺浇鐘舵��
sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
- data: {}, // 鏁版嵁
+ data: [], // 鏁版嵁
html: '',
}
+ loaded = false
+
UNSAFE_componentWillMount () {
- const { data, initdata, BID } = this.props
+ const { data, initdata } = this.props
let _config = fromJS(this.props.config).toJS()
- let _data = {}
+ 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] || {}
- }
+ _data = data[_config.dataName] || []
_sync = false
+ this.loaded = true
} else if (_sync && initdata) {
_data = initdata || {}
- if (_data && Array.isArray(_data)) {
- _data = _data[0] || {}
- }
_sync = false
+ this.loaded = true
}
} else {
_data = {}
+ this.loaded = true
}
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)
}
@@ -67,14 +80,28 @@
arr_field: _config.columns.map(col => col.field).join(','),
}, () => {
if (_config.wrap.datatype !== 'static' && _config.setting && _config.setting.sync !== 'true' && _config.setting.onload === 'true') {
- this.loadData()
+ setTimeout(() => {
+ this.loadData()
+ }, _config.setting.delay || 0)
}
this.renderView()
})
}
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}, () => {
+ this.renderView()
+ })
+ })
+ }
}
shouldComponentUpdate (nextProps, nextState) {
@@ -95,18 +122,21 @@
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]
- 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))) {
+ this.loaded = true
+
+ if (!is(fromJS(this.state.data), fromJS(_data))) {
+ setTimeout(() => {
+ this.renderView()
+ }, 10)
+ }
+
+ this.setState({sync: false, data: _data})
+ } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
this.loadData()
})
@@ -122,20 +152,21 @@
}
async loadData () {
- const { mainSearch, menuType } = this.props
+ const { mainSearch } = this.props
const { config, arr_field, BID } = this.state
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
return
}
@@ -151,17 +182,26 @@
})
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID, menuType)
+ let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID)
let result = await Api.genericInterface(param)
if (result.status) {
- let _data = result.data && result.data[0] ? result.data[0] : {}
+ let _data = result.data || []
+
+ this.loaded = true
+ if (config.$cache && config.setting.onload !== 'false') {
+ Api.writeCacheConfig(config.uuid, result.data || '')
+ }
+
+ if (!is(fromJS(this.state.data), fromJS(_data))) {
+ setTimeout(() => {
+ this.renderView()
+ }, 10)
+ }
this.setState({
data: _data,
loading: false
- }, () => {
- this.renderView()
})
} else {
this.setState({
@@ -181,22 +221,36 @@
let _html = html
if (_html && wrap.datatype !== 'static') {
- 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 (/@[\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 {
- // eslint-disable-next-line no-eval
- eval(js)
- } catch {
- console.warn('JS 鎵ц澶辫触锛�')
+ // 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)
}
}
})
@@ -206,7 +260,7 @@
const { config, loading, html } = this.state
return (
- <div className="custom-sand-box" style={{...config.style}}>
+ <div className="custom-sand-box" id={'anchor' + config.uuid} style={{...config.style}}>
{loading ?
<div className="loading-mask">
<div className="ant-spin-blur"></div>
--
Gitblit v1.8.0