From 2bccb9ec7bdefe23292a22bc153463cfa1479a49 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 21 六月 2024 16:25:42 +0800 Subject: [PATCH] 2024-06-21 --- src/tabviews/custom/components/card/double-data-card/index.jsx | 181 +++++++++++++++++++++++++------------------- 1 files changed, 103 insertions(+), 78 deletions(-) diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx index bda5137..a5fd92e 100644 --- a/src/tabviews/custom/components/card/double-data-card/index.jsx +++ b/src/tabviews/custom/components/card/double-data-card/index.jsx @@ -1,7 +1,7 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' import { is, fromJS } from 'immutable' -import { Spin, Empty, notification, Row, Col, Pagination, Modal, Switch } from 'antd' +import { Spin, Empty, Row, Col, Pagination, Switch } from 'antd' import { DownOutlined, UpOutlined, PlusSquareOutlined, MinusSquareOutlined } from '@ant-design/icons' import Api from '@/api' @@ -36,7 +36,7 @@ loading: false, // 鏁版嵁鍔犺浇鐘舵�� card: null, // 鍗$墖璁剧疆 data: [], // 鏁版嵁 - total: null, + total: 0, precards: [], nextcards: [], selected: 'false', @@ -129,6 +129,32 @@ _config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''}` + if (_config.wrap.zHeight || _config.wrap.minWidth) { + if (_config.wrap.zHeight) { + if (_config.wrap.zHeight <= 100) { + if (_config.wrap.zHeight < 0) { + _config.wrap.zHeight = `calc(100vh - ${-_config.wrap.zHeight}px)` + } else { + _config.wrap.zHeight = _config.wrap.zHeight + 'vh' + } + } + _config.wrap.wrapClass += ' fix-height' + } + _config.wrap.minWidth = _config.wrap.minWidth ? _config.wrap.minWidth + 'px' : '100%' + _config.wrap.zoomStyle = { + maxHeight: _config.wrap.zHeight || 'none', + '--mk-data-zoom-width': _config.wrap.minWidth + } + } else { + _config.wrap.zoomStyle = null + } + + if (_config.wrap.shifting === 'true') { + _config.wrap.shifting = 'shifting' + } else { + _config.wrap.shifting = '' + } + let wrapStyle = null let subcard = fromJS(_card).toJS() let subconfig = fromJS(_config).toJS() @@ -164,19 +190,9 @@ pageOptions.push(size) pageOptions = pageOptions.sort((a, b) => a - b) } - } - - if (_config.wrap.zHeight) { - _config.wrap.zHeight = _config.wrap.zHeight <= 100 ? _config.wrap.zHeight + 'vh' : _config.wrap.zHeight - } - - if (_config.wrap.zHeight || _config.wrap.minWidth) { - _config.wrap.zoomStyle = { - border: `1px solid ${_config.wrap.zBColor || 'transparent'}`, - height: _config.wrap.zHeight || 'auto' + if (_config.wrap.maxPageSize) { + pageOptions = pageOptions.filter(item => item <= _config.wrap.maxPageSize) } - } else { - _config.wrap.zoomStyle = null } this.setState({ @@ -223,6 +239,8 @@ if (config.setting.onload === 'true') { this.initExec() } + + this.autoExec() } shouldComponentUpdate (nextProps, nextState) { @@ -316,6 +334,25 @@ } } + autoExec = (times) => { + const { config } = this.state + + if (!config.wrap.autoExec) return + + let btn = document.getElementById('button' + config.wrap.autoExec) + + this.autoTimer && clearTimeout(this.autoTimer) + + if (btn) { + MKEmitter.emit('triggerBtnId', config.wrap.autoExec, []) + } else if (!times || times < 20) { + times = times ? times + 1 : 1 + this.autoTimer = setTimeout(() => { + this.autoExec(times) + }, 1000) + } + } + searchRefresh = (searchId) => { const { config } = this.state @@ -336,14 +373,14 @@ let supModule = config.setting.supModule - if (position === 'line') { + if (position === 'line' || position === 'line_grid') { if (lines && lines.length === 1) { - this.loadLinedata(lines[0].$$parentId || lines[0].$$uuid) + this.loadLinedata(lines[0].$$parentId || lines[0].$$uuid, position) } else { this.loadData(id) } - } else if ((position === 'mainline' || position === 'popclose') && supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠� - MKEmitter.emit('reloadData', supModule, BID) + } else if (['mainline', 'maingrid', 'popclose'].includes(position) && supModule) { + MKEmitter.emit('reloadData', supModule, position === 'maingrid' ? '' : BID) } else if (!btn || btn.resetPageIndex !== 'false') { this.setState({ pageIndex: 1 @@ -516,7 +553,9 @@ if (!config.setting.supModule || config.setting.supModule !== MenuID) return if (id !== this.state.BID || id !== '') { this.setState({ BID: id, BData: data, pageIndex: 1 }, () => { - this.loadData() + if (!config.checkBid) { + this.loadData() + } }) } } @@ -551,6 +590,7 @@ if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇� this.loaded = true + this.requestId = '' this.setState({ activeKey: '', @@ -562,17 +602,8 @@ total: 0, loading: false }) - - if (selected !== 'false' || (id && config.wrap.selected !== 'false')) { - setTimeout(() => { - this.checkTopLine(id) - }, 10) - if (selected === 'init') { - this.setState({selected: 'false'}) - } - } else { - MKEmitter.emit('resetSelectLine', config.uuid, '', '') - } + + MKEmitter.emit('resetSelectLine', config.uuid, '', '') return } @@ -600,8 +631,12 @@ let _orderBy = orderBy || config.setting.order || '' let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, pageIndex, pageSize, BID) - let result = await Api.genericInterface(param) + this.requestId = config.uuid + new Date().getTime() + + let result = await Api.genericInterface(param, '', '', this.requestId) if (result.status) { + if (result.$requestId && this.requestId !== result.$requestId) return + let start = 1 if (config.setting.laypage) { start = pageSize * (pageIndex - 1) + 1 @@ -734,44 +769,22 @@ this.timer && this.timer.stop() } } - if (result.message) { - if (result.ErrCode === 'Y') { - Modal.success({ - title: result.message - }) - } else if (result.ErrCode === 'S') { - notification.success({ - top: 92, - message: result.message, - duration: 2 - }) - } - } + + UtilsDM.querySuccess(result) } else { this.setState({ loading: false }) this.timer && this.timer.stop() - if (!result.message) return - if (result.ErrCode === 'N') { - Modal.error({ - title: result.message, - }) - } else if (result.ErrCode !== '-2') { - notification.error({ - top: 92, - message: result.message, - duration: 10 - }) - } + UtilsDM.queryFail(result) } } /** * @description 鑾峰彇鍗曡鏁版嵁 */ - async loadLinedata (id) { + async loadLinedata (id, position) { const { config, pageIndex, pageSize, search, BID, BData, orderBy } = this.state if (config.forbidLine) { @@ -803,6 +816,11 @@ let result = await Api.genericInterface(param) if (result.status) { + if (position === 'line_grid' && (!result.data || !result.data[0])) { + this.loadData() + return + } + let data = fromJS(this.state.data).toJS() let selectedData = fromJS(this.state.selectedData).toJS() let selectKeys = fromJS(this.state.selectKeys).toJS() @@ -917,11 +935,8 @@ this.setState({ loading: false }) - notification.error({ - top: 92, - message: result.message, - duration: 10 - }) + + UtilsDM.queryFail(result) } } @@ -1050,17 +1065,13 @@ if (!menu) return - menu.param = {} + menu.param = {$BID: item.$$uuid || ''} - if (card.setting.joint === 'true') { - menu.param.$BID = item.$$uuid || '' - - Object.keys(item).forEach(key => { - if (/^\$/.test(key)) return - if (key === 'children') return - menu.param[key] = item[key] - }) - } + Object.keys(item).forEach(key => { + if (/^\$/.test(key)) return + if (key === 'children') return + menu.param[key] = item[key] + }) MKEmitter.emit('modifyTabs', menu, true) } @@ -1130,7 +1141,7 @@ } return ( - <div className="double-data-card-box" id={'anchor' + config.uuid} style={config.style}> + <div className={'double-data-card-box ' + config.wrap.shifting} id={'anchor' + config.uuid} style={config.style}> {loading ? <div className="loading-mask"> {data.length ? <div className="ant-spin-blur"></div> : null} @@ -1148,10 +1159,10 @@ selectedData={selectedData} /> : null } - {config.wrap.pickup === 'true' && this.state.data.length > 0 ? <div className="pickup-wrap"><Switch title="鏀惰捣" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /></div> : null} + {config.wrap.pickup === 'true' && this.state.data.length > 0 ? <div className="pickup-wrap"><Switch title="鏀惰捣" checkedChildren={window.GLOB.dict['open'] || '寮�'} unCheckedChildren={window.GLOB.dict['shut'] || '鍏�'} checked={pickup} onChange={this.pickupChange} /></div> : null} <div className={config.wrap.zoomStyle ? 'data-zoom-box' : ''} style={config.wrap.zoomStyle}> - <div className={`data-zoom ${config.wrap.wrapClass}`} style={config.wrap.minWidth ? {minWidth: config.wrap.minWidth} : null}> - <Row className={'card-row-list '}> + <div className={`data-zoom ${config.wrap.wrapClass}`}> + <Row className="card-row-list"> {precards.map((item, index) => ( <Col key={'pre' + index} className="extend-card" style={item.wStyle} span={item.setting.width || 6}> {item.setting.cardRole === 'header' ? <TableHeader card={item} data={extendData} refresh={this.refreshByHeader}> @@ -1181,6 +1192,20 @@ } else { subClass = opens.indexOf(item.key) > -1 ? 'mk-unfold' : 'mk-collapse' unfold = opens.indexOf(item.key) > -1 + } + + if (!unfold && item.children.length > 5) { + return ( + <Col key={index} span={card.setting.width} style={card.wStyle}> + <div className={className} style={wrapStyle}> + <CardItem card={card} cards={config} data={item} onDoubleClick={() => this.onDoubleClick(item.key, subClass)} onClick={() => {this.changeCard(item.key, item, subClass)}}> + <span className="circle-select"></span> + {card.setting.controlIcon === 'left' ? <PlusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, item.key, subClass)}/> : null} + {card.setting.controlIcon === 'right' ? <UpOutlined className={subClass} onClick={(e) => this.changeUnfold(e, item.key, subClass)}/> : null} + </CardItem> + </div> + </Col> + ) } } @@ -1214,8 +1239,8 @@ </div> {config.$empty && data.length === 0 ? <Empty description={false}/> : null} </div> - {config.wrap.pagestyle === 'page' ? <Pagination size="small" total={total} showTotal={(t, range) => total > 0 ? `${range[0]}-${range[1]} 鍏� ${total} 鏉 : `鍏� ${total} 鏉} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null} - {config.wrap.pagestyle === 'more' && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : null} + {config.wrap.pagestyle === 'page' ? <Pagination size="small" total={total} showTotal={(t, range) => total > 0 ? `${range[0]}-${range[1]} ${window.GLOB.dict['of'] || '鍏�'} ${total} ${window.GLOB.dict['items'] || '鏉�'}` : `${total} ${window.GLOB.dict['items'] || '鏉�'}`} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null} + {config.wrap.pagestyle === 'more' && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>{window.GLOB.dict['view_more'] || '鏌ョ湅鏇村'}<DownOutlined/></div> : null} </div> ) } -- Gitblit v1.8.0