From 24842b40de5cd60700bf69dfd38a0332f5431e36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:55:07 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/data-card/index.jsx | 326 +++++++++++++++++++++++++++--------------------------
1 files changed, 167 insertions(+), 159 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index e281af7..8861386 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/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, message, Row, Col, Pagination, Modal, Switch } from 'antd'
+import { Spin, Empty, message, Row, Col, Pagination, Switch, notification } from 'antd'
import { DownOutlined } from '@ant-design/icons'
import Api from '@/api'
@@ -42,12 +42,11 @@
precards: [],
nextcards: [],
selected: 'false',
- supNodes: [],
- supComs: null,
pickup: false
}
loaded = false
+ supModules = []
UNSAFE_componentWillMount () {
const { config } = this.props
@@ -124,17 +123,12 @@
_config.wrap.selected = 'false'
}
- let supComs = null
- if (_config.wrap.supType === 'multi') {
- supComs = _config.supNodes.map(item => item.componentId)
- }
-
- _config.wrap.selStyle = _config.wrap.selStyle || 'active'
+ _config.wrap.selStyle = _config.wrap.selStyle || 'none'
_config.wrap.pagestyle = _config.wrap.pagestyle || 'page'
_config.wrap.scale = _config.wrap.scale === 'true' ? 'scale' : ''
_config.wrap.layout = (_config.wrap.layout || 'grid') + '-layout float-' + (_config.wrap.cardFloat || 'left')
- _config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${_config.wrap.scale}`
+ _config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${_config.wrap.scale} ${config.wrap.hover === 'true' ? 'mk-hover' : ''} ${config.wrap.empSign === 'hidden' ? 'mk-empty-hide' : ''}`
if (_config.wrap.shifting === 'true') {
_config.wrap.shifting = 'shifting'
@@ -192,12 +186,34 @@
window.GLOB.SyncData.delete(_config.dataName)
}
+ } else if (_config.setting.supModule && !BID && _config.wrap.supKey !== 'false') {
+ _config.setting.onload = 'false'
+ }
+
+ if (_config.wrap.zHeight) {
+ _config.wrap.zoomStyle = {}
+ if (_config.wrap.zHeight <= 100) {
+ if (_config.wrap.zHeight < 0) {
+ _config.wrap.zoomStyle.maxHeight = `calc(100vh - ${-_config.wrap.zHeight}px)`
+ _config.wrap.zoomStyle.minHeight = '100px'
+ } else {
+ _config.wrap.zoomStyle.maxHeight = _config.wrap.zHeight + 'vh'
+ }
+ } else {
+ _config.wrap.zoomStyle.maxHeight = _config.wrap.zHeight + 'px'
+ }
+
+ if (_config.style) {
+ delete _config.style.height
+ }
+ _config.wrap.layout += ' fix-height'
+ } else {
+ _config.wrap.zoomStyle = null
}
this.setState({
pageSize: _config.setting.pageSize || 10,
pageOptions,
- supComs,
selected,
precards,
nextcards,
@@ -400,9 +416,7 @@
if (config.$searchId !== searchId) return
- this.setState({pageIndex: 1}, () => {
- this.loadData()
- })
+ this.reloadIndex()
}
/**
@@ -412,14 +426,15 @@
* @param {*} btn // 鎵ц鐨勬寜閽�
*/
refreshByButtonResult = (menuId, position, btn, id = '', lines) => {
- const { config, BID, supComs, supNodes } = this.state
+ const { config, BID } = this.state
if (config.uuid !== menuId) return
- if (supComs) {
- if (position === 'mainline' || position === 'popclose') { // 涓昏〃鍒锋柊锛屽幓闄ゅ悓姝ュ埛鏂扮粍浠�
- let supNode = supNodes[supNodes.length - 1]
- supComs.forEach((item, i) => {
+ let _id = config.wrap.selected === 'always' ? id : ''
+ if (config.supNodes) {
+ if (['mainline', 'maingrid', 'popclose'].includes(position)) {
+ let supNode = this.supModules[this.supModules.length - 1]
+ config.supNodes.forEach((item, i) => {
setTimeout(() => {
if (supNode && supNode.key === item) {
MKEmitter.emit('reloadData', item, supNode.value)
@@ -431,18 +446,18 @@
} else {
if (position === 'line' || position === 'line_grid') {
if (lines && lines.length === 1) {
- this.loadLinedata(lines[0].$$uuid, position)
+ if (config.forbidLine) {
+ this.loadData(lines[0].$$uuid, 'repage')
+ } else {
+ this.loadLinedata(lines[0].$$uuid, position)
+ }
} else {
- this.loadData(id)
+ this.loadData(_id, 'repage')
}
- } else if (!btn || btn.resetPageIndex !== 'false') {
- this.setState({
- pageIndex: 1
- }, () => {
- this.loadData(id)
- })
+ } else if (btn.resetPageIndex !== 'false') {
+ this.reloadIndex()
} else {
- this.loadData(id)
+ this.loadData(_id, 'repage')
}
}
} else {
@@ -450,20 +465,20 @@
if (position === 'line' || position === 'line_grid') {
if (lines && lines.length === 1) {
- this.loadLinedata(lines[0].$$uuid, position)
+ if (config.forbidLine) {
+ this.loadData(lines[0].$$uuid, 'repage')
+ } else {
+ this.loadLinedata(lines[0].$$uuid, position)
+ }
} else {
- this.loadData(id)
+ this.loadData(_id, 'repage')
}
- } else if ((position === 'mainline' || position === 'popclose') && supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', supModule, BID)
- } else if (!btn || btn.resetPageIndex !== 'false') {
- this.setState({
- pageIndex: 1
- }, () => {
- this.loadData(id)
- })
+ } else if (['mainline', 'maingrid', 'popclose'].includes(position) && supModule) {
+ MKEmitter.emit('reloadData', supModule, position === 'maingrid' ? '' : BID)
+ } else if (btn.resetPageIndex !== 'false') {
+ this.reloadIndex()
} else {
- this.loadData(id)
+ this.loadData(_id, 'repage')
}
}
}
@@ -485,13 +500,21 @@
})
}
+ reloadIndex = () => {
+ this.setState({
+ pageIndex: 1
+ }, () => {
+ this.loadData()
+ })
+ }
+
prevCheck = (id) => {
const { selected } = this.state
if (selected === 'false' && !id) return
setTimeout(() => {
- this.checkTopLine(id)
+ this.checkTopLine(id, selected)
}, 10)
if (selected === 'init') {
@@ -499,59 +522,39 @@
}
}
- checkTopLine = (id) => {
- const { config, data, selected } = this.state
+ checkTopLine = (id, selected) => {
+ const { config, data } = this.state
- if (data.length === 0) {
- this.setState({
- activeKey: '',
- selectKeys: [],
- selectedData: []
- })
-
- MKEmitter.emit('resetSelectLine', config.uuid, '', '')
- if (config.setting.$hasSyncModule) {
- MKEmitter.emit('syncBalconyData', config.uuid, [], false)
+ let index = -1
+ let keys = []
+ let items = []
+
+ if (data.length > 0) {
+ if (id) {
+ index = data.findIndex(item => item.$$uuid === id && !item.$disabled)
}
- return
- }
-
- if (selected === 'sign') {
- let index = ''
- let keys = []
- let items = []
- let last = ''
- data.forEach((item, i) => {
- if (!item.$disabled && item.selected === 'true') {
- items.push(item)
- keys.push(i)
- index = i
- last = item
+
+ if (index !== -1) {
+ keys = [index]
+ items = [data[index]]
+ } else if (selected === 'sign') {
+ data.forEach((item, i) => {
+ if (!item.$disabled && item.selected === 'true') {
+ items.push(item)
+ keys.push(i)
+ index = i
+ }
+ })
+ } else if (selected !== 'false') {
+ if (!data[0].$disabled) {
+ index = 0
+ keys = [index]
+ items = [data[index]]
}
- })
-
- this.setState({
- activeKey: index,
- selectKeys: keys,
- selectedData: items
- })
-
- MKEmitter.emit('resetSelectLine', config.uuid, last ? last.$$uuid : '', last)
- if (config.setting.$hasSyncModule) {
- MKEmitter.emit('syncBalconyData', config.uuid, items, data.length === keys.length)
- }
- return
- }
-
- let index = 0
- if (id) {
- index = data.findIndex(item => item.$$uuid === id)
- if (index === -1) {
- index = 0
}
}
- if (data[index].$disabled) {
+ if (index === -1) {
this.setState({
activeKey: '',
selectKeys: [],
@@ -564,16 +567,18 @@
}
return
}
+
+ let item = items[items.length - 1]
this.setState({
activeKey: index,
- selectKeys: [index],
- selectedData: [data[index]]
+ selectKeys: keys,
+ selectedData: items
})
- MKEmitter.emit('resetSelectLine', config.uuid, data[index].$$uuid, data[index])
+ MKEmitter.emit('resetSelectLine', config.uuid, item.$$uuid, item)
if (config.setting.$hasSyncModule) {
- MKEmitter.emit('syncBalconyData', config.uuid, [data[index]], data.length === 1)
+ MKEmitter.emit('syncBalconyData', config.uuid, items, data.length === keys.length)
}
}
@@ -606,7 +611,7 @@
MKEmitter.emit('resetSelectLine', config.uuid, last ? last.$$uuid : '', last)
MKEmitter.emit('syncBalconyData', config.uuid, items, data.length > 0 && data.length === keys.length)
if (items.length === 0) {
- message.warning('鏈幏鍙栧埌鏁版嵁锛�')
+ message.warning(window.GLOB.dict['no_data'] || '鏈幏鍙栧埌鏁版嵁锛�')
}
} else {
this.setState({
@@ -671,41 +676,43 @@
if (config.uuid !== menuId) return
if (!id) {
- this.loadData()
+ this.reloadIndex()
+ } else if (config.forbidLine) {
+ this.loadData(id, 'repage')
} else {
this.loadLinedata(id)
}
}
resetParentParam = (MenuID, id, data) => {
- const { config, supComs } = this.state
+ const { config } = this.state
- if (supComs) {
- if (!supComs.includes(MenuID)) return
- let supNodes = this.state.supNodes.filter(item => item.key !== MenuID)
+ if (config.supNodes) {
+ if (!config.supNodes.includes(MenuID)) return
+ this.supModules = this.supModules.filter(item => item.key !== MenuID)
let bid = ''
let _data = null
if (id) {
- supNodes.push({key: MenuID, value: id, data})
+ this.supModules.push({key: MenuID, value: id, data})
}
- if (supNodes.length > 0) {
- bid = supNodes[supNodes.length - 1].value
- _data = supNodes[supNodes.length - 1].data
+ if (this.supModules.length > 0) {
+ bid = this.supModules[this.supModules.length - 1].value
+ _data = this.supModules[this.supModules.length - 1].data
}
if (bid !== this.state.BID || bid !== '') {
- this.setState({ BID: bid, BData: _data, pageIndex: 1, supNodes }, () => {
+ this.setState({ BID: bid, BData: _data, pageIndex: 1 }, () => {
this.loadData()
})
- } else {
- this.setState({ supNodes })
}
} else {
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()
+ }
})
}
}
@@ -741,6 +748,7 @@
if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.loaded = true
+ this.requestId = ''
this.setState({
activeKey: '',
@@ -752,13 +760,13 @@
loading: false
})
- if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
- this.prevCheck(id)
- } else {
- MKEmitter.emit('resetSelectLine', config.uuid, '', '')
- if (config.setting.$hasSyncModule) {
- MKEmitter.emit('syncBalconyData', config.uuid, [], false)
- }
+ MKEmitter.emit('resetSelectLine', config.uuid, '', '')
+ if (config.setting.$hasSyncModule) {
+ MKEmitter.emit('syncBalconyData', config.uuid, [], false)
+ }
+ if (config.$hasTopModule) {
+ window.GLOB.CacheData.set(config.uuid + 'tb', { $$empty: true, $$uuid: '' })
+ MKEmitter.emit('mkPublicData', config.uuid + 'tb', { $$empty: true, $$uuid: '' })
}
return
}
@@ -787,8 +795,17 @@
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
+
+ if (type === 'repage' && result.data.length === 0 && pageIndex > 1) {
+ this.reloadIndex()
+ return
+ }
+
let start = 1
if (config.setting.laypage) {
start = pageSize * (pageIndex - 1) + 1
@@ -799,7 +816,7 @@
Api.writeCacheConfig(config.uuid, result.data || [], BID)
}
- if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
+ if (selected !== 'false' || id) {
this.prevCheck(id)
} else {
MKEmitter.emit('resetSelectLine', config.uuid, '', '')
@@ -858,43 +875,26 @@
loading: false
})
+ if (config.$hasTopModule) {
+ window.GLOB.CacheData.set(config.uuid + 'tb', data[0] || { $$empty: true, $$uuid: '' })
+ MKEmitter.emit('mkPublicData', config.uuid + 'tb', data[0] || { $$empty: true, $$uuid: '' })
+ }
+
if (config.timer && config.clearField && result.data && result.data[0]) {
let vals = (config.clearValue || '').split(',')
if (vals.includes(result.data[0][config.clearField])) {
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)
}
}
@@ -903,15 +903,6 @@
*/
async loadLinedata (id, position) {
const { config, pageIndex, pageSize, search, BID, BData, orderBy } = this.state
-
- if (config.forbidLine) {
- this.setState({
- pageIndex: 1
- }, () => {
- this.loadData()
- })
- return
- }
let searches = fromJS(search).toJS()
if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
@@ -934,7 +925,7 @@
let result = await Api.genericInterface(param)
if (result.status) {
if (position === 'line_grid' && (!result.data || !result.data[0])) {
- this.loadData()
+ this.reloadIndex()
return
}
@@ -948,6 +939,12 @@
_data.$$uuid = _data[config.setting.primaryKey] || ''
_data.$$BID = BID || ''
_data.$$BData = BData || ''
+
+ if (config.wrap.controlField) {
+ if (config.wrap.controlVal.includes(_data[config.wrap.controlField] + '')) {
+ _data.$disabled = true
+ }
+ }
data = data.map(item => {
if (item.$$uuid === _data.$$uuid) {
@@ -1036,11 +1033,8 @@
this.setState({
loading: false
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+
+ UtilsDM.queryFail(result)
}
}
@@ -1092,6 +1086,20 @@
}
refreshSearch = (list) => {
+ const { config, BID } = this.state
+
+ if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') {
+ notification.warning({
+ top: 92,
+ message: config.setting.supModTip || window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ duration: 5
+ })
+ this.setState({
+ search: list
+ })
+ return
+ }
+
this.setState({
search: list,
pageIndex: 1
@@ -1227,10 +1235,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={`data-zoom ${config.wrap.wrapClass}`}>
{switchable ? <div className={'prev-page ' + (pageIndex === 1 ? 'disabled' : '')} onClick={this.prevPage}><div><div><img src={preImg} alt=""/></div></div></div> : null}
- <Row className={'card-row-list ' + config.wrap.layout}>
+ <Row className={'card-row-list ' + config.wrap.layout} style={config.wrap.zoomStyle}>
{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}>
@@ -1244,7 +1252,7 @@
let className = 'mk-card '
if (config.wrap.parity === 'true') {
if (index % 2 === 1) {
- className += 'mk-parity-bg '
+ className += 'mk-even-line '
}
}
if (item.$disabled) {
@@ -1276,8 +1284,8 @@
{switchable ? <div className={'prev-page ' + (total <= _total ? 'disabled' : '')} onClick={this.nextPage}><div><div><img src={nextImg} alt=""/></div></div></div> : null}
</div>
{config.$empty && data.length === 0 ? <Empty description={false}/> : null}
- {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