From 93ace1795e0e9b1a443b1c447a646fa8932f9678 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 七月 2023 20:43:25 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/iframe/index.jsx | 92 ++++++++++++++++++++++++---------------------
1 files changed, 49 insertions(+), 43 deletions(-)
diff --git a/src/tabviews/custom/components/iframe/index.jsx b/src/tabviews/custom/components/iframe/index.jsx
index bdd506d..02c9a4d 100644
--- a/src/tabviews/custom/components/iframe/index.jsx
+++ b/src/tabviews/custom/components/iframe/index.jsx
@@ -12,9 +12,7 @@
class NormalIframe extends Component {
static propTpyes = {
- data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
- config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
- mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
+ config: PropTypes.object
}
state = {
@@ -22,18 +20,15 @@
config: null, // 鍥捐〃閰嶇疆淇℃伅
loading: false, // 鏁版嵁鍔犺浇鐘舵��
activeKey: '', // 閫変腑鏁版嵁
- sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
data: {}, // 鏁版嵁
linkUrl: ''
}
UNSAFE_componentWillMount () {
- const { data } = this.props
- let _config = fromJS(this.props.config).toJS()
+ const { config } = this.props
+ let _config = fromJS(config).toJS()
let _data = { $$empty: true }
- let _sync = false
-
let BID = ''
let BData = ''
let linkUrl = ''
@@ -48,17 +43,16 @@
}
if (_config.wrap.datatype === 'dynamic') {
- _sync = _config.setting.sync === 'true'
+ if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
+ _data = window.GLOB.SyncData.get(_config.dataName) || []
+ _data = _data[0] || {$$empty: true}
+
+ linkUrl = _data[_config.wrap.linkField] || ''
- if (_sync && data) {
- _data = data[_config.dataName] || {$$empty: true}
- if (Array.isArray(_data)) {
- _data = _data[0] || {$$empty: true}
- }
- _sync = false
+ _config.setting.sync = 'false'
+
+ window.GLOB.SyncData.delete(_config.dataName)
}
-
- linkUrl = _data[_config.wrap.linkField] || ''
} else {
if (_config.wrap.linkType !== 'input') {
linkUrl = _config.wrap.linkUrl || ''
@@ -71,13 +65,12 @@
this.setState({
linkUrl: linkUrl,
- sync: _sync,
data: _data,
BID: BID || '',
config: _config,
arr_field: _config.columns.map(col => col.field).join(','),
}, () => {
- if (_config.wrap.datatype === 'dynamic' && _config.setting.sync !== 'true' && _config.setting.onload === 'true') {
+ if (_config.wrap.datatype === 'dynamic' && config.setting.sync !== 'true' && _config.setting.onload === 'true') {
setTimeout(() => {
this.loadData()
}, _config.setting.delay || 0)
@@ -90,6 +83,14 @@
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
+
+ if (config.setting.useMSearch) {
+ MKEmitter.addListener('searchRefresh', this.searchRefresh)
+ }
+
+ if (config.setting.sync === 'true') {
+ MKEmitter.addListener('transferSyncData', this.transferSyncData)
+ }
if (config.wrap.linkType === 'input' && config.wrap.focus !== 'false') {
setTimeout(() => {
@@ -112,32 +113,36 @@
}
MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('searchRefresh', this.searchRefresh)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('transferSyncData', this.transferSyncData)
}
- /**
- * @description 鏁版嵁鏇存柊锛屽埛鏂板唴瀹�
- */
- UNSAFE_componentWillReceiveProps (nextProps) {
- const { sync, config } = this.state
+ transferSyncData = (syncId) => {
+ const { config } = this.state
- if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _data = { $$empty: true }
- if (nextProps.data && nextProps.data[config.dataName]) {
- _data = nextProps.data[config.dataName]
- if (Array.isArray(_data)) {
- _data = _data[0] || {$$empty: true}
- }
- }
+ if (config.$syncId !== syncId) return
- let linkUrl = _data[config.wrap.linkField] || ''
+ let _data = window.GLOB.SyncData.get(config.dataName) || []
+ _data = _data[0] || {$$empty: true}
+
+ let linkUrl = _data[config.wrap.linkField] || ''
- this.setState({sync: false, data: _data, linkUrl})
- } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({}, () => {
- this.loadData()
- })
- }
+ this.setState({data: _data, linkUrl})
+
+ window.GLOB.SyncData.delete(config.dataName)
+
+ MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+ }
+
+ searchRefresh = (searchId) => {
+ const { config } = this.state
+
+ if (config.$searchId !== searchId) return
+
+ this.setState({}, () => {
+ this.loadData()
+ })
}
resetParentParam = (MenuID, id, data) => {
@@ -161,7 +166,6 @@
}
async loadData () {
- const { mainSearch } = this.props
const { config, arr_field, BID } = this.state
if (config.wrap.datatype === 'static') {
@@ -176,10 +180,12 @@
return
}
- let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
+ let searches = []
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ searches = window.GLOB.SearchBox.get(config.$searchId) || []
+ }
- let requireFields = searches.filter(item => item.required && item.value === '')
- if (requireFields.length > 0) {
+ if (config.$s_req && searches.filter(item => item.required && item.value === '').length > 0) {
return
}
--
Gitblit v1.8.0