From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/editor/braft-editor/index.jsx | 122 +++++++++++++++++++++++++++++++++-------
1 files changed, 101 insertions(+), 21 deletions(-)
diff --git a/src/tabviews/custom/components/editor/braft-editor/index.jsx b/src/tabviews/custom/components/editor/braft-editor/index.jsx
index bac965b..5158f7d 100644
--- a/src/tabviews/custom/components/editor/braft-editor/index.jsx
+++ b/src/tabviews/custom/components/editor/braft-editor/index.jsx
@@ -21,14 +21,14 @@
BID: '', // 涓婄骇ID
config: null, // 鍥捐〃閰嶇疆淇℃伅
loading: false, // 鏁版嵁鍔犺浇鐘舵��
- data: {} // 鏁版嵁
+ data: [] // 鏁版嵁
}
UNSAFE_componentWillMount () {
const { config } = this.props
let _config = fromJS(config).toJS()
- let _data = { $$empty: true }
+ let _data = []
let BID = ''
let BData = ''
@@ -43,12 +43,14 @@
}
if (_config.wrap.datatype === 'dynamic') {
- _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : _config.setting.onload || 'true'
+ if (_config.setting.supModule && !BID) {
+ _config.setting.onload = 'false'
+ }
+
if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
_data = window.GLOB.SyncData.get(_config.dataName) || []
- _data = _data[0] || {$$empty: true}
-
_config.setting.sync = 'false'
window.GLOB.SyncData.delete(_config.dataName)
@@ -56,6 +58,25 @@
} else if (_config.wrap.datatype === 'public' && window.GLOB.CacheData.has(_config.wrap.publicId)) {
_data = window.GLOB.CacheData.get(_config.wrap.publicId)
_data = fromJS(_data).toJS()
+ if (_data.$$empty) {
+ _data = []
+ } else {
+ _data = [_data]
+ }
+ } else if (_config.html) {
+ if (_config.wrap.prefunc) {
+ let _html = ''
+ try {
+ // eslint-disable-next-line
+ let func = new Function('html', 'data', _config.wrap.prefunc)
+ _html = func(_config.html, {})
+ } catch (e) {
+ _html = ''
+ console.warn(e)
+ }
+
+ _config.html = _html || _config.html
+ }
}
if (_config.wrap.minHeight) {
@@ -66,7 +87,7 @@
}
this.setState({
- data: _data,
+ data: this.decodeHtml(_data, _config.wrap),
BID: BID || '',
config: _config,
})
@@ -122,9 +143,8 @@
if (config.$syncId !== syncId) return
let _data = window.GLOB.SyncData.get(config.dataName) || []
- _data = _data[0] || {$$empty: true}
- this.setState({data: _data})
+ this.setState({data: this.decodeHtml(_data, config.wrap)})
window.GLOB.SyncData.delete(config.dataName)
@@ -146,8 +166,13 @@
if (config.wrap.datatype === 'public' && config.wrap.publicId === publicId) {
let _data = fromJS(data).toJS()
+ if (_data.$$empty) {
+ _data = []
+ } else {
+ _data = [_data]
+ }
- this.setState({data: _data})
+ this.setState({data: this.decodeHtml(_data, config.wrap)})
}
}
@@ -157,7 +182,9 @@
if (!config.setting.supModule || config.setting.supModule !== MenuID) return
if (id !== this.state.BID || id !== '') {
this.setState({ BID: id }, () => {
- this.loadData()
+ if (config.wrap.datatype !== 'public') {
+ this.loadData()
+ }
})
}
}
@@ -180,13 +207,13 @@
if (config.wrap.datatype === 'static') {
this.setState({
- data: {$$empty: true},
+ data: [],
loading: false
})
return
} else if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
- data: {$$empty: true},
+ data: [],
loading: false
})
return
@@ -210,11 +237,8 @@
let result = await Api.genericInterface(param)
if (result.status) {
- let _data = result.data || []
- _data = _data[0] || {$$empty: true}
-
this.setState({
- data: _data,
+ data: this.decodeHtml(result.data, config.wrap),
loading: false
})
@@ -228,10 +252,63 @@
}
}
+ decodeHtml = (data, wrap) => {
+ if (!data || data.length === 0) return []
+
+ data.forEach(item => {
+ item.$html = item[wrap.field] || ''
+ if (item.$html) {
+ if (wrap.encryption === 'true') {
+ try {
+ item.$html = window.decodeURIComponent(window.atob(item.$html))
+ } catch (e) {
+ item.$html = item[wrap.field] || ''
+ }
+ }
+
+ delete item[wrap.field]
+
+ if (/\$[\s\S]+\$/.test(item.$html)) {
+ Object.keys(item).forEach(key => {
+ if (/^\$/.test(key)) return
+ let reg = new RegExp('\\$' + key + '\\$', 'ig')
+ item.$html = item.$html.replace(reg, item[key])
+ })
+ }
+
+ if (wrap.prefunc) {
+ let _html = ''
+ try {
+ // eslint-disable-next-line
+ let func = new Function('html', 'data', wrap.prefunc)
+ _html = func(item.$html, item)
+ } catch (e) {
+ _html = ''
+ console.warn(e)
+ }
+
+ item.$html = _html || item.$html
+ }
+ // if (/\$blank_space_\d+\$/ig.test(item.$html)) {
+ // item.$html = item.$html.replace(/\$blank_space_\d+\$/ig, (w) => {
+ // let n = +w.replace(/blank_space_|\$/ig, '')
+ // if (n) {
+ // return new Array(n).fill(' ').join('')
+ // }
+
+ // return w
+ // })
+ // }
+ }
+ })
+
+ return data
+ }
+
render() {
const { config, loading, data } = this.state
- if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null
+ if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) return null
return (
<div className={'custom-braft-editor-box ' + (config.wrap.tbStyle || '')} id={'anchor' + config.uuid} style={config.style}>
@@ -242,10 +319,13 @@
</div> : null
}
<NormalHeader config={config}/>
- <BraftContent
- value={config.wrap.datatype !== 'static' ? (data[config.wrap.field] || '') : config.html}
- encryption={config.wrap.datatype !== 'static' ? config.wrap.encryption : 'false'}
- />
+ {config.wrap.datatype === 'static' ? <BraftContent
+ value={config.html}
+ /> : data.map((item, index) => <BraftContent
+ key={index}
+ value={item.$html}
+ script={config.wrap.loadedfunc || ''}
+ />)}
</div>
)
}
--
Gitblit v1.8.0