From 3c50bfdd8d605b3dd449adcb54cdf7f7c25d6c16 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 04 十一月 2022 15:46:05 +0800 Subject: [PATCH] 2022-11-04 --- src/tabviews/custom/components/carousel/prop-card/index.jsx | 200 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 166 insertions(+), 34 deletions(-) diff --git a/src/tabviews/custom/components/carousel/prop-card/index.jsx b/src/tabviews/custom/components/carousel/prop-card/index.jsx index 22a2df9..6ad1652 100644 --- a/src/tabviews/custom/components/carousel/prop-card/index.jsx +++ b/src/tabviews/custom/components/carousel/prop-card/index.jsx @@ -1,23 +1,23 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' import { is, fromJS } from 'immutable' -import { Spin, notification, Carousel } from 'antd' +import { Spin, notification, Carousel, Modal, Checkbox, Button } from 'antd' +import { LeftOutlined, RightOutlined } from '@ant-design/icons' import asyncComponent from '@/utils/asyncComponent' import Api from '@/api' import UtilsDM from '@/utils/utils-datamanage.js' import MKEmitter from '@/utils/events.js' +import TimerTask from '@/utils/timer-task.js' import './index.scss' const CardItem = asyncComponent(() => import('../cardItem')) class PropCard extends Component { static propTpyes = { - BID: PropTypes.any, // 鐖剁骇Id data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁 config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅 mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢 - menuType: PropTypes.any, // 鑿滃崟绫诲瀷 } state = { @@ -25,19 +25,32 @@ config: null, // 鍥捐〃閰嶇疆淇℃伅 loading: false, // 鏁版嵁鍔犺浇鐘舵�� sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁 - data: {}, // 鏁版嵁 - BData: null + data: {$$empty: true}, + BData: null, + visible: false } UNSAFE_componentWillMount () { - const { data, initdata, BID, BData } = this.props + const { data, initdata } = this.props let _config = fromJS(this.props.config).toJS() let _cols = new Map() let _data = {$$empty: true} 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.setting && _config.wrap.datatype === 'dynamic') { _sync = _config.setting.sync === 'true' if (_sync && data) { @@ -55,6 +68,7 @@ } } + _data.$$uuid = _data[_config.setting.primaryKey] || '' _data.$$BID = BID || '' _data.$$BData = BData || '' @@ -86,18 +100,30 @@ config: _config, arr_field: _config.columns.map(col => col.field).join(','), }, () => { - if (_config.wrap.datatype !== 'static' && _config.setting && _config.setting.sync !== 'true' && _config.setting.onload === 'true') { + if (_config.wrap.datatype === 'dynamic' && _config.setting && _config.setting.sync !== 'true' && _config.setting.onload === 'true') { setTimeout(() => { this.loadData() }, _config.setting.delay || 0) + } else if (_config.wrap.display === 'modal' && _config.wrap.datatype === 'static') { + this.openModal() } }) } componentDidMount () { + const { config } = this.state + MKEmitter.addListener('reloadData', this.reloadData) MKEmitter.addListener('resetSelectLine', this.resetParentParam) - MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult) + MKEmitter.addListener('queryModuleParam', this.queryModuleParam) + MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult) + + if (config.timer && config.wrap.datatype === 'dynamic') { + this.timer = new TimerTask() + this.timer.init(config.uuid, config.timer, config.timerRepeats, () => { + this.loadData('timer') + }) + } } shouldComponentUpdate (nextProps, nextState) { @@ -110,7 +136,10 @@ } MKEmitter.removeListener('reloadData', this.reloadData) MKEmitter.removeListener('resetSelectLine', this.resetParentParam) + MKEmitter.removeListener('queryModuleParam', this.queryModuleParam) MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult) + + this.timer && this.timer.stop() } /** @@ -128,15 +157,39 @@ } } + _data.$$uuid = _data[config.setting.primaryKey] || '' _data.$$BID = BID || '' _data.$$BData = BData || '' - this.setState({sync: false, data: _data}) - } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) { + this.setState({sync: false, data: _data}, () => { + if (config.wrap.display === 'modal') { + this.openModal() + } + }) + } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) { this.setState({}, () => { this.loadData() }) } + } + + openModal = () => { + const { config, data } = this.state + + let code = config.wrap.code || ('modal' + config.uuid) + let tip = localStorage.getItem(code) + + if ((data.$$uuid && tip === data.$$uuid) || (!data.$$uuid && tip)) return + + if (config.wrap.modalContent === 'update') { + localStorage.setItem(code, data.$$uuid || 'true') + + Api.getAppVersion(true) + } + + setTimeout(() => { + this.setState({visible: true}) + }, 200) } /** @@ -150,16 +203,13 @@ if (config.uuid !== menuId) return - this.loadData() // 鏁版嵁鍒锋柊 - - if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) { - MKEmitter.emit('reloadData', btn.syncComponentId) // 鍚岀骇鏍囩鍒锋柊 + if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠� + MKEmitter.emit('reloadData', config.setting.supModule, BID) + } else { + this.loadData() } - if (position === 'mainline' && config.setting.supModule) { // 涓昏〃琛屽埛鏂� - MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty')) - } else if (position === 'popclose') { // 鏍囩鍏抽棴鍒锋柊 - config.setting.supModule && MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty')) + if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」 btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId) } } @@ -175,6 +225,25 @@ } } + /** + * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁� + */ + queryModuleParam = (menuId, callback) => { + const { mainSearch } = this.props + const { config } = this.state + + if (config.uuid !== menuId) return + + let searches = config.setting.useMSearch && mainSearch ? mainSearch : [] + + callback({ + arr_field: '', + orderBy: '', + search: searches, + menuName: config.name + }) + } + reloadData = (menuId) => { const { config } = this.state @@ -183,8 +252,8 @@ this.loadData() } - async loadData () { - const { mainSearch, menuType } = this.props + async loadData (type) { + const { mainSearch } = this.props const { config, arr_field, BID, BData } = this.state if (config.wrap.datatype === 'static') { @@ -206,12 +275,14 @@ return } - this.setState({ - loading: true - }) + if (type !== 'timer') { + this.setState({ + loading: true + }) + } 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) { @@ -222,33 +293,94 @@ } else { _data = result.data[0] } - + + _data.$$uuid = _data[config.setting.primaryKey] || '' _data.$$BID = BID || '' _data.$$BData = BData || '' this.setState({ data: _data, loading: false + }, () => { + if (config.wrap.display === 'modal') { + this.openModal() + } }) } else { this.setState({ loading: false }) - notification.error({ - top: 92, - message: result.message, - duration: 10 - }) + this.timer && this.timer.stop() + + if (result.ErrCode === 'N') { + Modal.error({ + title: result.message, + }) + } else { + notification.error({ + top: 92, + message: result.message, + duration: 10 + }) + } + } + } + + onTipChange = (e) => { + const { config, data } = this.state + + let code = config.wrap.code || ('modal' + config.uuid) + if (e.target.checked) { + localStorage.setItem(code, data.$$uuid || 'true') + } else { + localStorage.removeItem(code) } } render() { - const { config, loading, data } = this.state + const { config, loading, data, visible } = this.state - if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null + if (config.wrap.empty === 'hidden' && data.$$empty) return null + + if (config.wrap.display === 'modal') { + return <Modal + wrapClassName='mk-carousel-modal' + visible={visible} + maskClosable={false} + width={config.wrap.modalWidth} + onCancel={() => this.setState({visible: false})} + footer={null} + destroyOnClose + > + <div className="custom-prop-carousel-box" style={config.style}> + {config.subcards.length > 1 && config.wrap.autoplay === 'false' ? <div className="prev" onClick={() => this.node && this.node.prev()}><LeftOutlined /></div> : null} + {config.subcards.length > 1 && config.wrap.autoplay === 'false' ? <div className="next" onClick={() => this.node && this.node.next()}><RightOutlined /></div> : null} + <Carousel + autoplay={config.wrap.autoplay !== 'false'} + dots={config.wrap.dots !== 'false'} + dotPosition={config.wrap.dotPosition || 'bottom'} + effect={config.wrap.effect || 'scrollx'} + autoplaySpeed={config.wrap.speed} + ref={ref => this.node = ref} + > + {config.subcards.map((item, index) => ( + <div key={index}> + <CardItem card={item} cards={config} data={data}/> + </div> + ))} + </Carousel> + </div> + {config.wrap.modalContent !== 'update' ? <div className="mk-footer"> + <Checkbox defaultChecked={false} onChange={this.onTipChange}>涓嶅湪鎻愰啋</Checkbox> + <Button className="close" onClick={() => this.setState({visible: false})}>绔嬪嵆浣撻獙</Button> + </div> : <div className="mk-footer"> + <Button className="close" onClick={() => this.setState({visible: false})}>鐭ラ亾浜�</Button> + </div>} + </Modal> + } return ( - <div className="custom-prop-carousel-box" style={config.style}> + <div className="custom-prop-carousel-box" id={'anchor' + config.uuid} style={config.style}> {loading ? <div className="loading-mask"> <div className="ant-spin-blur"></div> -- Gitblit v1.8.0