From c6f8e27d35cd31bb6393a1e7f747b6b2593dbd7a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 六月 2022 13:56:57 +0800
Subject: [PATCH] 2022-06-08
---
src/tabviews/custom/components/card/data-card/index.jsx | 121 ++++++++++++++++-----------------------
1 files changed, 50 insertions(+), 71 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index c13c422..b654209 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -98,23 +98,11 @@
_sync = false
}
- if (_config.wrap.cardFloat && _config.wrap.cardFloat !== 'left') {
- let _width = 0
- precards.forEach(card => {
- _width += card.setting.width
- })
- nextcards.forEach(card => {
- _width += card.setting.width
- })
-
- _config.$offset = _width
- } else {
- _config.wrap.cardFloat = null
- }
-
let selected = 'false'
if (_config.wrap.selected === 'always' || _config.wrap.selected === 'init') {
selected = _config.wrap.selected
+ } else {
+ _config.wrap.selected = 'false'
}
if (_data) {
@@ -168,6 +156,7 @@
_config.wrap.selStyle = _config.wrap.selStyle || 'active'
_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}`
@@ -263,19 +252,15 @@
* @param {*} position // 鍒锋柊浣嶇疆
* @param {*} btn // 鎵ц鐨勬寜閽�
*/
- refreshByButtonResult = (menuId, position, btn, id, lines) => {
+ refreshByButtonResult = (menuId, position, btn, id = '', lines) => {
const { config, BID, supComs, supNodes } = this.state
if (config.uuid !== menuId) return
if (supComs) {
- btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
-
if (position === 'mainline' || position === 'popclose') { // 涓昏〃鍒锋柊锛屽幓闄ゅ悓姝ュ埛鏂扮粍浠�
let supNode = supNodes[supNodes.length - 1]
supComs.forEach((item, i) => {
- if (item === btn.syncComponentId) return
-
setTimeout(() => {
if (supNode && supNode.key === item) {
MKEmitter.emit('reloadData', item, supNode.value)
@@ -284,50 +269,42 @@
}
}, i * 10)
})
- } else if (!btn.syncComponentId || !supComs.includes(btn.syncComponentId)) {
+ } else {
if (position === 'line') {
if (lines && lines.length === 1) {
this.loadLinedata(lines[0].$$uuid)
} else {
- this.loadData()
+ this.loadData(id)
}
} else if (!btn || btn.resetPageIndex !== 'false') {
this.setState({
pageIndex: 1
}, () => {
- this.loadData()
+ this.loadData(id)
})
} else {
- this.loadData()
+ this.loadData(id)
}
}
} else {
let supModule = config.setting.supModule
- btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
-
- if (!btn.syncComponentId || btn.syncComponentId !== supModule) {
- if (position === 'line') {
- if (lines && lines.length === 1) {
- this.loadLinedata(lines[0].$$uuid)
- } else {
- this.loadData()
- }
- } else if (position === 'mainline' || position === 'popclose') { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- if (supModule && BID) {
- MKEmitter.emit('reloadData', supModule, BID)
- } else {
- this.loadData()
- }
- } else if (!btn || btn.resetPageIndex !== 'false') {
- this.setState({
- pageIndex: 1
- }, () => {
- this.loadData()
- })
+ if (position === 'line') {
+ if (lines && lines.length === 1) {
+ this.loadLinedata(lines[0].$$uuid)
} else {
- this.loadData()
+ this.loadData(id)
}
+ } 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 {
+ this.loadData(id)
}
}
@@ -336,10 +313,18 @@
}
}
- checkTopLine = () => {
+ checkTopLine = (id) => {
const { config, data } = this.state
- if (!data || data.length === 0 || data[0].$disabled) {
+ let index = 0
+ if (id && data) {
+ index = data.findIndex(item => item.$$uuid === id)
+ if (index === -1) {
+ index = 0
+ }
+ }
+
+ if (!data || data.length === 0 || data[index].$disabled) {
this.setState({
activeKey: '',
selectKeys: [],
@@ -354,14 +339,14 @@
}
this.setState({
- activeKey: 0,
- selectKeys: [0],
- selectedData: [data[0]]
+ activeKey: index,
+ selectKeys: [index],
+ selectedData: [data[index]]
})
- MKEmitter.emit('resetSelectLine', config.uuid, data[0].$$uuid, data[0])
+ MKEmitter.emit('resetSelectLine', config.uuid, data[index].$$uuid, data[index])
if (config.setting.$hasSyncModule) {
- MKEmitter.emit('syncBalconyData', config.uuid, [data[0]], data.length === 1)
+ MKEmitter.emit('syncBalconyData', config.uuid, [data[index]], data.length === 1)
}
}
@@ -467,7 +452,7 @@
})
}
- async loadData () {
+ async loadData (id) {
const { mainSearch, menuType } = this.props
const { config, arr_field, pageIndex, search, BID, BData, selected } = this.state
@@ -482,9 +467,9 @@
loading: false
})
- if (selected !== 'false') {
+ if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
setTimeout(() => {
- this.checkTopLine()
+ this.checkTopLine(id)
}, 200)
if (selected === 'init') {
this.setState({selected: 'false'})
@@ -527,9 +512,9 @@
start = config.setting.pageSize * (pageIndex - 1) + 1
}
- if (selected !== 'false') {
+ if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
setTimeout(() => {
- this.checkTopLine()
+ this.checkTopLine(id)
}, 200)
if (selected === 'init') {
this.setState({selected: 'false'})
@@ -739,20 +724,15 @@
_total = config.setting.pageSize * pageIndex
switchable = true
}
- let offset = 0
- if (config.wrap.cardFloat) {
- let length = data ? data.length : 0
- if (card.setting.width * length + config.$offset < 24) {
- offset = 24 - card.setting.width * length - config.$offset
- if (config.wrap.cardFloat === 'center') {
- offset = Math.floor(offset / 2)
- }
- }
+ let extendData = {$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}
+
+ if (data && data[0]) {
+ extendData = {...extendData, ...data[0]}
}
return (
- <div className="custom-data-card-box" style={config.style}>
+ <div className="custom-data-card-box" id={'anchor' + config.uuid} style={config.style}>
{loading ?
<div className="loading-mask">
{data ? <div className="ant-spin-blur"></div> : null}
@@ -772,11 +752,10 @@
}
<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">
- {offset ? <Col span={offset} style={{height: '10px'}}> </Col> : null}
+ <Row className={'card-row-list ' + config.wrap.layout}>
{precards.map((item, index) => (
<Col key={'pre' + index} className="extend-card" span={item.setting.width || 6}>
- <CardItem card={item} cards={config} data={{$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}}/>
+ <CardItem card={item} cards={config} data={extendData}/>
</Col>
))}
{data && data.map((item, index) => {
@@ -797,7 +776,7 @@
})}
{nextcards.map((item, index) => (
<Col key={'next' + index} className="extend-card" span={item.setting.width || 6}>
- <CardItem card={item} cards={config} data={{$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}}/>
+ <CardItem card={item} cards={config} data={extendData}/>
</Col>
))}
</Row>
--
Gitblit v1.8.0