From 71e3da644eca32a5aa40503e903efb0640748093 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 21 七月 2023 17:00:59 +0800 Subject: [PATCH] 2023-07-21 --- src/tabviews/custom/components/carousel/data-card/index.jsx | 143 ++++++++++++++++++++++++++++------------------- 1 files changed, 84 insertions(+), 59 deletions(-) diff --git a/src/tabviews/custom/components/carousel/data-card/index.jsx b/src/tabviews/custom/components/carousel/data-card/index.jsx index 50fdeb2..62fbc61 100644 --- a/src/tabviews/custom/components/carousel/data-card/index.jsx +++ b/src/tabviews/custom/components/carousel/data-card/index.jsx @@ -16,16 +16,13 @@ class DataCard extends Component { static propTpyes = { - data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁 - config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅 - mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢 + config: PropTypes.object } state = { BID: '', // 涓婄骇ID config: null, // 鍥捐〃閰嶇疆淇℃伅 loading: false, // 鏁版嵁鍔犺浇鐘舵�� - sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁 card: null, // 鍗$墖璁剧疆 data: null, // 鏁版嵁 BData: null, @@ -35,13 +32,10 @@ loaded = false UNSAFE_componentWillMount () { - const { data, initdata } = this.props - let _config = fromJS(this.props.config).toJS() + const { config } = this.props + + let _config = fromJS(config).toJS() let _card = _config.subcards[0] - - let _data = null - let _sync = _config.setting.sync === 'true' - let BID = '' let BData = '' @@ -54,24 +48,28 @@ BID = BData.$BID || '' } - if (_config.setting.sync === 'true' && data) { - _data = data[_config.dataName] || [] - _sync = false - } else if (_config.setting.sync === 'true' && initdata) { - _data = initdata || [] - _sync = false - } + let _data = null + if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) { + _data = window.GLOB.SyncData.get(_config.dataName) || [] - if (_data) { - this.loaded = true + if (_config.$cache) { + Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS()) + } + + _config.setting.sync = 'false' + _data = _data.map((item, index) => { item.key = index item.$$uuid = item[_config.setting.primaryKey] || '' item.$$BID = BID || '' item.$$BData = BData || '' - item.$Index = index + 1 + item.$Index = index + 1 + '' return item }) + + this.loaded = true + + window.GLOB.SyncData.delete(_config.dataName) } if (_card.setting.click) { @@ -88,7 +86,6 @@ _config.wrap.speed = (_config.wrap.speed || 3) * 1000 this.setState({ - sync: _sync, data: _data, BID: BID || '', BData: BData || '', @@ -96,7 +93,7 @@ card: _card, arr_field: _config.columns.map(col => col.field).join(','), }, () => { - if (_config.setting.sync !== 'true' && _config.setting.onload === 'true') { + if (config.setting.sync !== 'true' && _config.setting.onload === 'true') { setTimeout(() => { this.loadData() }, _config.setting.delay || 0) @@ -112,6 +109,14 @@ MKEmitter.addListener('resetSelectLine', this.resetParentParam) MKEmitter.addListener('queryModuleParam', this.queryModuleParam) MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult) + + if (config.setting.useMSearch) { + MKEmitter.addListener('searchRefresh', this.searchRefresh) + } + + if (config.setting.sync === 'true') { + MKEmitter.addListener('transferSyncData', this.transferSyncData) + } if (config.timer) { this.timer = new TimerTask() @@ -140,45 +145,61 @@ return !is(fromJS(this.state), fromJS(nextState)) } - UNSAFE_componentWillReceiveProps (nextProps) { - const { sync, config, BID, BData } = this.state - - if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) { - let _data = [] - if (nextProps.data && nextProps.data[config.dataName]) { - _data = nextProps.data[config.dataName] || [] - } - - _data = _data.map((item, index) => { - item.key = index - item.$$uuid = item[config.setting.primaryKey] || '' - item.$$BID = BID || '' - item.$$BData = BData || '' - item.$Index = index + 1 - return item - }) - - this.loaded = true - - this.setState({sync: false, data: _data}, () => { - this.openModal() - }) - } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) { - this.setState({}, () => { - this.loadData() - }) - } - } - componentWillUnmount () { this.setState = () => { return } + MKEmitter.removeListener('searchRefresh', this.searchRefresh) MKEmitter.removeListener('resetSelectLine', this.resetParentParam) + MKEmitter.removeListener('transferSyncData', this.transferSyncData) MKEmitter.removeListener('queryModuleParam', this.queryModuleParam) MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult) this.timer && this.timer.stop() + } + + transferSyncData = (syncId) => { + const { config } = this.state + + if (config.$syncId !== syncId) return + + const { BID, BData } = this.state + + let _data = window.GLOB.SyncData.get(config.dataName) || [] + + if (config.$cache) { + Api.writeCacheConfig(config.uuid, fromJS(_data).toJS()) + } + + _data = _data.map((item, index) => { + item.key = index + item.$$uuid = item[config.setting.primaryKey] || '' + item.$$BID = BID || '' + item.$$BData = BData || '' + item.$Index = index + 1 + '' + + return item + }) + + this.loaded = true + + this.setState({data: _data}, () => { + this.openModal() + }) + + 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() + }) } openModal = (ErrCode) => { @@ -239,12 +260,14 @@ * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁� */ queryModuleParam = (menuId, callback) => { - const { mainSearch } = this.props const { arr_field, config } = this.state if (config.uuid !== menuId) return - let searches = config.setting.useMSearch && mainSearch ? fromJS(mainSearch).toJS() : [] + let searches = [] + if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢 + searches = window.GLOB.SearchBox.get(config.$searchId) || [] + } callback({ arr_field: arr_field, @@ -255,7 +278,6 @@ } async loadData (type) { - const { mainSearch } = this.props const { config, arr_field, BID, BData } = this.state if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇� @@ -268,9 +290,12 @@ return } - let searches = config.setting.useMSearch && mainSearch ? fromJS(mainSearch).toJS() : [] - let requireFields = searches.filter(item => item.required && item.value === '') - if (requireFields.length > 0) { + let searches = [] + if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢 + searches = window.GLOB.SearchBox.get(config.$searchId) || [] + } + + if (config.$s_req && searches.filter(item => item.required && item.value === '').length > 0) { return } @@ -287,7 +312,7 @@ if (result.status) { this.loaded = true if (config.$cache && config.setting.onload !== 'false') { - Api.writeCacheConfig(config.uuid, result.data || '') + Api.writeCacheConfig(config.uuid, result.data || []) } let data = result.data.map((item, index) => { -- Gitblit v1.8.0