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/iframe/index.jsx | 187 +++++++++++++++++++++++++++-------------------
1 files changed, 109 insertions(+), 78 deletions(-)
diff --git a/src/tabviews/custom/components/iframe/index.jsx b/src/tabviews/custom/components/iframe/index.jsx
index e8d4fd5..1178319 100644
--- a/src/tabviews/custom/components/iframe/index.jsx
+++ b/src/tabviews/custom/components/iframe/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Input, Modal, notification, Empty } from 'antd'
+import { Input, Empty, Spin } from 'antd'
import Api from '@/api'
import UtilsDM from '@/utils/utils-datamanage.js'
@@ -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,42 +43,62 @@
}
if (_config.wrap.datatype === 'dynamic') {
- _sync = _config.setting.sync === 'true'
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : _config.setting.onload || 'true'
- if (_sync && data) {
- _data = data[_config.dataName] || {$$empty: true}
- if (Array.isArray(_data)) {
- _data = _data[0] || {$$empty: true}
- }
- _sync = false
+ 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}
+
+ linkUrl = _data[_config.wrap.linkField] || ''
- linkUrl = _data[_config.wrap.linkField] || ''
+ _config.setting.sync = 'false'
+
+ window.GLOB.SyncData.delete(_config.dataName)
+ }
} else {
if (_config.wrap.linkType !== 'input') {
linkUrl = _config.wrap.linkUrl || ''
}
}
+ if (_config.wrap.height === '100vh') {
+ _config.wrap.height = 'calc(100vh - 92px)'
+ }
+
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') {
- setTimeout(() => {
- this.loadData()
- }, _config.setting.delay || 0)
- }
+ config: _config
})
}
componentDidMount () {
+ const { config } = this.state
+
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(() => {
+ let node = document.getElementById(config.uuid)
+ node && node.select && node.select()
+ }, 200)
+ }
+
+ this.initExec()
}
shouldComponentUpdate (nextProps, nextState) {
@@ -99,32 +114,46 @@
}
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
-
- 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}
- }
- }
-
- 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({}, () => {
+ initExec = () => {
+ const { config } = this.state
+
+ if (config.wrap.datatype === 'dynamic' && config.setting.onload === 'true') {
+ setTimeout(() => {
this.loadData()
- })
+ }, config.setting.delay || 0)
}
+ }
+
+ transferSyncData = (syncId) => {
+ const { config } = this.state
+
+ if (config.$syncId !== syncId) return
+
+ let _data = window.GLOB.SyncData.get(config.dataName) || []
+ _data = _data[0] || {$$empty: true}
+
+ let linkUrl = _data[config.wrap.linkField] || ''
+
+ 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) => {
@@ -148,8 +177,7 @@
}
async loadData () {
- const { mainSearch } = this.props
- const { config, arr_field, BID } = this.state
+ const { config, BID } = this.state
if (config.wrap.datatype === 'static') {
this.setState({
@@ -163,15 +191,17 @@
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
}
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID)
+ let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, 1, 1, BID)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -183,24 +213,12 @@
this.setState({
linkUrl: _data[config.wrap.linkField] || '',
- data: _data,
- loading: false
+ data: _data
})
+
+ UtilsDM.querySuccess(result)
} else {
- this.setState({
- loading: false
- })
- if (result.ErrCode === 'N') {
- Modal.error({
- title: result.message,
- })
- } else {
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
- }
+ UtilsDM.queryFail(result)
}
}
@@ -215,31 +233,44 @@
}
if (submit) {
- this.setState({linkUrl: val}, () => {
- let node = document.getElementById(this.state.config.uuid)
- node && node.select && node.select()
+ this.setState({linkUrl: '', loading: true}, () => {
+ this.setState({linkUrl: val})
})
+
+ setTimeout(() => {
+ this.setState({loading: false}, () => {
+ let node = document.getElementById(this.state.config.uuid)
+ node && node.select && node.select()
+ })
+ }, 500)
}
}
enterUrl = (val) => {
- this.setState({linkUrl: val}, () => {
- let node = document.getElementById(this.state.config.uuid)
- node && node.select && node.select()
+ this.setState({linkUrl: '', loading: true}, () => {
+ this.setState({linkUrl: val})
})
+
+ setTimeout(() => {
+ this.setState({loading: false}, () => {
+ let node = document.getElementById(this.state.config.uuid)
+ node && node.select && node.select()
+ })
+ }, 500)
}
render() {
- const { config, linkUrl } = this.state
+ const { config, linkUrl, loading } = this.state
return (
<div className="menu-iframe-box" style={config.style}>
{config.wrap.title || config.wrap.linkType === 'input' ? <div className="iframe-header" style={config.headerStyle}>
<span className="title">{config.wrap.title}</span>
- {config.wrap.linkType === 'input' ? <Search id={config.uuid} placeholder="璇疯緭鍏ュ湴鍧�" onChange={this.inputUrl} onSearch={this.enterUrl} enterButton="纭畾"/> : null}
+ {config.wrap.linkType === 'input' ? <Search id={config.uuid} disabled={loading} placeholder="璇疯緭鍏ュ湴鍧�" onChange={this.inputUrl} onSearch={this.enterUrl} enterButton="纭畾"/> : null}
</div> : null}
<div className="iframe-wrap" style={{height: config.wrap.height}}>
- {linkUrl ? <iframe title="mk" className="iframe" src={linkUrl} frameBorder="0"></iframe> : <Empty description={false}/>}
+ {loading ? <div className="mask"><Spin size="large" /></div> : null}
+ {linkUrl ? <iframe title="mk" className="iframe" src={linkUrl.replace(/@loginuid@/ig, sessionStorage.getItem('LoginUID'))} frameBorder="0"></iframe> : <Empty description={false}/>}
</div>
</div>
)
--
Gitblit v1.8.0