From c51f5e007a3e03c9d6731ab7f28f0080de009990 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 17 十一月 2021 18:38:32 +0800 Subject: [PATCH] 2021-11-17 --- src/tabviews/custom/components/card/data-card/index.jsx | 239 ++++++++++++++++++++++++++++------------------------------- 1 files changed, 114 insertions(+), 125 deletions(-) diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx index 943a158..5b91693 100644 --- a/src/tabviews/custom/components/card/data-card/index.jsx +++ b/src/tabviews/custom/components/card/data-card/index.jsx @@ -1,7 +1,6 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' import { is, fromJS } from 'immutable' -import { connect } from 'react-redux' import { Spin, Empty, notification, message, Row, Col, Pagination } from 'antd' import Api from '@/api' @@ -11,7 +10,6 @@ import nextImg from '@/assets/img/next.png' import MKEmitter from '@/utils/events.js' import asyncComponent from '@/utils/asyncComponent' -import { modifyTabview } from '@/store/action' import './index.scss' const CardItem = asyncComponent(() => import('../cardItem')) @@ -43,10 +41,11 @@ total: null, precards: [], nextcards: [], + selected: 'false' } UNSAFE_componentWillMount () { - const { data, initdata, BID } = this.props + const { data, initdata, BID, BData } = this.props let _config = fromJS(this.props.config).toJS() let _card = null @@ -54,12 +53,15 @@ let nextcards = [] _config.subcards.forEach(item => { - item.setting.$click = '' - if (item.setting.click === 'button') { - if (item.elements.filter(ele => ele.eleType === 'button').length < 2) { - item.setting.$click = ' trigger-button' + if (item.setting.click === 'button' && !item.setting.linkbtn) { + item.elements.forEach(ele => { + if (ele.eleType === 'button') { + item.setting.linkbtn = ele.uuid + } + }) + if (!item.setting.linkbtn) { + item.setting.click = '' } - item.setting.click = '' } if (item.$cardType !== 'extendCard') { @@ -100,14 +102,29 @@ _config.wrap.cardFloat = null } + let selected = 'false' + if (_config.wrap.selected === 'always' || _config.wrap.selected === 'init') { + selected = _config.wrap.selected + } + if (_data) { _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 }) + + if (selected !== 'false') { + setTimeout(() => { + this.checkTopLine() + }, 200) + if (selected === 'init') { + selected = 'false' + } + } } _config.columns.forEach(item => { @@ -128,11 +145,13 @@ }) this.setState({ + selected, precards, nextcards, sync: _sync, data: _data, BID: BID || '', + BData: BData || '', config: _config, card: _card, search: Utils.initMainSearch(_config.search), @@ -157,21 +176,30 @@ } UNSAFE_componentWillReceiveProps (nextProps) { - const { sync, config, BID } = this.state + const { sync, config, BID, BData, selected } = 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 + }) - _data = _data.map((item, index) => { - item.key = index - item.$$uuid = item[config.setting.primaryKey] || '' - item.$$BID = BID || '' - item.$Index = index + 1 + '' - return item - }) + if (selected !== 'false') { + setTimeout(() => { + this.checkTopLine() + }, 200) + if (selected === 'init') { + this.setState({selected: 'false'}) + } + } + } this.setState({sync: false, data: _data}) } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) { @@ -198,12 +226,14 @@ * @param {*} position // 鍒锋柊浣嶇疆 * @param {*} btn // 鎵ц鐨勬寜閽� */ - refreshByButtonResult = (menuId, position, btn) => { + refreshByButtonResult = (menuId, position, btn, id, lines) => { const { config, BID } = this.state if (config.uuid !== menuId) return - if (!btn || btn.resetPageIndex !== 'false') { + if (position === 'line' && lines && lines.length === 1) { + this.loadLinedata(lines[0].$$uuid) + } else if (!btn || btn.resetPageIndex !== 'false') { this.setState({ pageIndex: 1 }, () => { @@ -222,6 +252,35 @@ } else if (position === 'popclose') { // 鏍囩鍏抽棴鍒锋柊 config.setting.supModule && MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty')) btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId) + } + } + + checkTopLine = () => { + const { config, data } = this.state + + if (!data || data.length === 0) { + this.setState({ + activeKey: '', + selectKeys: [], + selectedData: [] + }) + + MKEmitter.emit('resetSelectLine', config.uuid, '', '') + if (config.setting.$hasSyncModule) { + MKEmitter.emit('syncBalconyData', config.uuid, [], false) + } + return + } + + this.setState({ + activeKey: 0, + selectKeys: [0], + selectedData: [data[0]] + }) + + MKEmitter.emit('resetSelectLine', config.uuid, data[0].$$uuid, data[0]) + if (config.setting.$hasSyncModule) { + MKEmitter.emit('syncBalconyData', config.uuid, [data[0]], data.length === 1) } } @@ -271,7 +330,7 @@ const { config } = this.state if (!config.setting.supModule || config.setting.supModule !== MenuID) return - if (id !== this.state.BID) { + if (id !== this.state.BID || id !== '') { this.setState({ BID: id, BData: data, pageIndex: 1 }, () => { this.loadData() }) @@ -307,7 +366,7 @@ async loadData () { const { mainSearch, menuType } = this.props - const { config, arr_field, pageIndex, search, BID, BData } = this.state + const { config, arr_field, pageIndex, search, BID, BData, selected } = this.state if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇� this.setState({ @@ -319,9 +378,19 @@ total: 0, loading: false }) - MKEmitter.emit('resetSelectLine', config.uuid, '', '') - if (config.setting.$hasSyncModule) { - MKEmitter.emit('syncBalconyData', config.uuid, [], false) + + if (selected !== 'false') { + setTimeout(() => { + this.checkTopLine() + }, 200) + if (selected === 'init') { + this.setState({selected: 'false'}) + } + } else { + MKEmitter.emit('resetSelectLine', config.uuid, '', '') + if (config.setting.$hasSyncModule) { + MKEmitter.emit('syncBalconyData', config.uuid, [], false) + } } return } @@ -355,6 +424,20 @@ start = config.setting.pageSize * (pageIndex - 1) + 1 } + if (selected !== 'false') { + setTimeout(() => { + this.checkTopLine() + }, 200) + if (selected === 'init') { + this.setState({selected: 'false'}) + } + } else { + MKEmitter.emit('resetSelectLine', config.uuid, '', '') + if (config.setting.$hasSyncModule) { + MKEmitter.emit('syncBalconyData', config.uuid, [], false) + } + } + this.setState({ activeKey: '', selectKeys: [], @@ -370,10 +453,6 @@ total: result.total, loading: false }) - MKEmitter.emit('resetSelectLine', config.uuid, '', '') - if (config.setting.$hasSyncModule) { - MKEmitter.emit('syncBalconyData', config.uuid, [], false) - } } else { this.setState({ loading: false @@ -429,7 +508,7 @@ return item } }) - } catch { + } catch (e) { console.warn('鏁版嵁鏌ヨ閿欒') } } @@ -495,8 +574,6 @@ changeCard = (index, item) => { const { config, selectKeys, selectedData, activeKey, data } = this.state - this.openView(item) - if (!config.wrap.cardType) return let _selectKeys = [] @@ -535,83 +612,6 @@ MKEmitter.emit('resetSelectLine', config.uuid, (_item ? _item.$$uuid : ''), _item) if (config.setting.$hasSyncModule) { MKEmitter.emit('syncBalconyData', config.uuid, _selectedData, data.length === _selectedData.length) - } - } - - openView = (item) => { - const { card } = this.state - - if (card.setting.click === 'menu') { - let menu = null - - if (card.setting.menu && card.setting.menu.length > 0) { - let menu_id = card.setting.menu.slice(-1)[0] - menu = this.props.permMenus.filter(m => m.MenuID === menu_id)[0] || '' - } - - if (!menu) { - notification.warning({ - top: 92, - message: '鑿滃崟宸插垹闄ゆ垨娌℃湁璁块棶鏉冮檺锛�', - duration: 5 - }) - return - } - - let newtab = { - ...menu, - selected: true, - param: {} - } - - if (card.setting.joint === 'true') { - newtab.param.$BID = item.$$uuid - } - - if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) { - this.props.modifyTabview([newtab]) - } else { - let tabs = this.props.tabviews.filter((tab, i) => { - tab.selected = false - return tab.MenuID !== newtab.MenuID - }) - - if (this.props.tabviews.length > tabs.length) { - this.props.modifyTabview(fromJS(tabs).toJS()) - } - - this.setState({}, () => { - tabs.push(newtab) - this.props.modifyTabview(tabs) - }) - } - } else if (card.setting.click === 'link') { - let src = card.setting.linkurl - - if (src.indexOf('paramsmain/') > -1) { - try { - let _url = src.split('paramsmain/')[0] + 'paramsmain/' - let _param = JSON.parse(window.decodeURIComponent(window.atob(src.split('paramsmain/')[1]))) - - _param.UserID = sessionStorage.getItem('UserID') - _param.LoginUID = sessionStorage.getItem('LoginUID') - _param.User_Name = sessionStorage.getItem('User_Name') - _param.param = { BID: item.$$uuid } - src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param))) - } catch { - console.warn('鑿滃崟鍙傛暟瑙f瀽閿欒锛�') - } - } else if (card.setting.joint === 'true') { - let con = '?' - - if (/\?/ig.test(src)) { - con = '&' - } - - src = src + `${con}id=${item.$$uuid}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}` - } - - window.open(src) } } @@ -660,18 +660,18 @@ <Row className="card-row-list"> {offset ? <Col span={offset} style={{height: '10px'}}> </Col> : null} {precards.map((item, index) => ( - <Col key={'pre' + index} className={'extend-card ' + item.setting.$click} span={item.setting.width || 6}> - <CardItem card={item} cards={config} data={{$$BID: BID, $$type: 'extendCard'}}/> + <Col key={'pre' + index} className="extend-card" span={item.setting.width || 6}> + <CardItem card={item} cards={config} data={{$$BID: BID, $$BData: BData, $$type: 'extendCard'}}/> </Col> ))} {data && data.map((item, index) => ( - <Col className={(activeKey === index ? ' active' : (selectKeys.indexOf(index) > -1 ? ' selected' : '')) + (card.setting.$click ? ' pointer' : '') + card.setting.$click} key={index} span={card.setting.width} onClick={() => {this.changeCard(index, item)}}> + <Col className={(activeKey === index ? ' active' : (selectKeys.indexOf(index) > -1 ? ' selected' : '')) + (card.setting.click ? ' pointer' : '')} key={index} span={card.setting.width} onClick={() => {this.changeCard(index, item)}}> <CardItem card={card} cards={config} data={item}/> </Col> ))} {nextcards.map((item, index) => ( - <Col key={'next' + index} className={'extend-card ' + item.setting.$click} span={item.setting.width || 6}> - <CardItem card={item} cards={config} data={{$$BID: BID, $$type: 'extendCard'}}/> + <Col key={'next' + index} className="extend-card" span={item.setting.width || 6}> + <CardItem card={item} cards={config} data={{$$BID: BID, $$BData: BData, $$type: 'extendCard'}}/> </Col> ))} </Row> @@ -684,17 +684,6 @@ } } -const mapStateToProps = (state) => { - return { - permMenus: state.permMenus, - tabviews: state.tabviews, - } -} -const mapDispatchToProps = (dispatch) => { - return { - modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews)) - } -} -export default connect(mapStateToProps, mapDispatchToProps)(DataCard) \ No newline at end of file +export default DataCard \ No newline at end of file -- Gitblit v1.8.0