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 | 227 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 140 insertions(+), 87 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 15e95c4..b654209 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -54,6 +54,14 @@
let precards = []
let nextcards = []
+ if (_config.wrap.controlField) {
+ if (_config.wrap.controlVal) {
+ _config.wrap.controlVal = _config.wrap.controlVal.split(',')
+ } else {
+ _config.wrap.controlVal = ['']
+ }
+ }
+
_config.subcards.forEach(item => {
if (item.setting.click === 'button' && !item.setting.linkbtn) {
item.elements.forEach(ele => {
@@ -90,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) {
@@ -116,6 +112,12 @@
item.$$BID = BID || ''
item.$$BData = BData || ''
item.$Index = index + 1 + ''
+
+ if (_config.wrap.controlField) {
+ if (_config.wrap.controlVal.includes(item[_config.wrap.controlField])) {
+ item.$disabled = true
+ }
+ }
return item
})
@@ -130,18 +132,19 @@
}
_config.columns.forEach(item => {
+ if (item.type !== 'number') return
_cols.set(item.field, item)
})
_card.elements = _card.elements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
_card.backElements = _card.backElements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
@@ -150,6 +153,12 @@
if (_config.wrap.supType === 'multi') {
supComs = _config.supNodes.map(item => item.componentId)
}
+
+ _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}`
this.setState({
supComs,
@@ -166,7 +175,9 @@
arr_field: _config.columns.map(col => col.field).join(','),
}, () => {
if (_config.setting.sync !== 'true' && _config.setting.onload === 'true') {
- this.loadData()
+ setTimeout(() => {
+ this.loadData()
+ }, _config.setting.delay || 0)
}
})
}
@@ -196,6 +207,13 @@
item.$$BID = BID || ''
item.$$BData = BData || ''
item.$Index = index + 1 + ''
+
+ if (config.wrap.controlField) {
+ if (config.wrap.controlVal.includes(item[config.wrap.controlField])) {
+ item.$disabled = true
+ }
+ }
+
return item
})
@@ -234,30 +252,13 @@
* @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 (position === 'line' && lines && lines.length === 1) {
- this.loadLinedata(lines[0].$$uuid)
- } else if (!btn || btn.resetPageIndex !== 'false') {
- this.setState({
- pageIndex: 1
- }, () => {
- this.loadData()
- })
- } else {
- this.loadData()
- }
-
-
if (supComs) {
- if (btn.syncComponentId && btn.syncComponentId !== config.uuid && !supComs.includes(btn.syncComponentId)) {
- MKEmitter.emit('reloadData', btn.syncComponentId) // 鍚岀骇鏍囩鍒锋柊
- }
-
- if (position === 'mainline' || position === 'popclose') { // 涓昏〃琛屽埛鏂�
+ if (position === 'mainline' || position === 'popclose') { // 涓昏〃鍒锋柊锛屽幓闄ゅ悓姝ュ埛鏂扮粍浠�
let supNode = supNodes[supNodes.length - 1]
supComs.forEach((item, i) => {
setTimeout(() => {
@@ -268,28 +269,62 @@
}
}, i * 10)
})
- if (position === 'popclose') { // 鏍囩鍏抽棴鍒锋柊
- btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
+ } else {
+ if (position === 'line') {
+ if (lines && lines.length === 1) {
+ this.loadLinedata(lines[0].$$uuid)
+ } else {
+ this.loadData(id)
+ }
+ } else if (!btn || btn.resetPageIndex !== 'false') {
+ this.setState({
+ pageIndex: 1
+ }, () => {
+ this.loadData(id)
+ })
+ } else {
+ this.loadData(id)
}
}
} else {
- if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
- MKEmitter.emit('reloadData', btn.syncComponentId) // 鍚岀骇鏍囩鍒锋柊
+ let supModule = config.setting.supModule
+
+ if (position === 'line') {
+ if (lines && lines.length === 1) {
+ this.loadLinedata(lines[0].$$uuid)
+ } else {
+ 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)
}
-
- 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'))
- btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
- }
+ }
+
+ if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
+ btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
- checkTopLine = () => {
+ checkTopLine = (id) => {
const { config, data } = this.state
- if (!data || data.length === 0) {
+ 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: [],
@@ -304,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)
}
}
@@ -348,7 +383,6 @@
const { config } = this.state
if (config.uuid !== menuId) return
- if (id === 'empty') return
if (!id) {
this.loadData()
@@ -375,9 +409,11 @@
}
if (bid !== this.state.BID || bid !== '') {
- this.setState({ BID: bid, BData: _data, pageIndex: 1 }, () => {
+ this.setState({ BID: bid, BData: _data, pageIndex: 1, supNodes }, () => {
this.loadData()
})
+ } else {
+ this.setState({ supNodes })
}
} else {
if (!config.setting.supModule || config.setting.supModule !== MenuID) return
@@ -416,11 +452,11 @@
})
}
- async loadData () {
+ async loadData (id) {
const { mainSearch, menuType } = this.props
const { config, arr_field, pageIndex, search, BID, BData, selected } = this.state
- if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
+ if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
activeKey: '',
selectKeys: [],
@@ -431,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'})
@@ -476,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'})
@@ -500,6 +536,13 @@
item.$$BID = BID || ''
item.$$BData = BData || ''
item.$Index = index + start + ''
+
+ if (config.wrap.controlField) {
+ if (config.wrap.controlVal.includes(item[config.wrap.controlField])) {
+ item.$disabled = true
+ }
+ }
+
return item
}),
total: result.total,
@@ -553,7 +596,7 @@
_data.key = item.key
_data.$$uuid = _data[config.setting.primaryKey] || ''
_data.$$BID = BID || ''
- item.$$BData = BData || ''
+ _data.$$BData = BData || ''
_data.$Index = item.$Index
return _data
} else {
@@ -563,6 +606,8 @@
} catch (e) {
console.warn('鏁版嵁鏌ヨ閿欒')
}
+
+ MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
}
this.setState({
@@ -627,6 +672,7 @@
const { config, selectKeys, selectedData, activeKey, data } = this.state
if (!config.wrap.cardType) return
+ if (item.$disabled) return
let _selectKeys = []
let _selectedData = []
@@ -637,12 +683,12 @@
_selectKeys = selectKeys.filter(key => key !== index)
_selectedData = selectedData.filter(cell => cell.key !== index)
_activeKey = _selectKeys.slice(-1)[0]
- _item = selectedData.slice(-1)[0] || ''
+ _item = _selectedData.slice(-1)[0] || ''
} else if (selectKeys.indexOf(index) > -1) {
_selectKeys = selectKeys.filter(key => key !== index)
_selectedData = selectedData.filter(cell => cell.key !== index)
_activeKey = activeKey
- _item = selectedData.filter(cell => cell.key === activeKey)[0] || ''
+ _item = _selectedData.filter(cell => cell.key === activeKey)[0] || ''
} else {
_selectKeys = [...selectKeys, index]
_selectedData = [...selectedData, item]
@@ -670,26 +716,23 @@
render() {
const { config, precards, nextcards, loading, data, pageIndex, total, card, activeKey, BID, BData, selectedData, selectKeys } = this.state
+ if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) return null
+
let _total = 0
let switchable = false
if (config.wrap.pagestyle === 'switch' && config.pageable && config.setting.laypage && total > config.setting.pageSize && data) {
_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}
@@ -707,23 +750,33 @@
selectedData={selectedData}
/> : null
}
- <div className={`data-zoom ${config.wrap.selStyle !== 'none' ? (config.wrap.cardType || '') : ''} ${config.wrap.scale || ''}`}>
+ <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, $$type: 'extendCard'}}/>
+ <CardItem card={item} cards={config} data={extendData}/>
</Col>
))}
- {data && data.map((item, index) => (
- <Col className={(config.wrap.selStyle !== 'none' ? (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>
- ))}
+ {data && data.map((item, index) => {
+ let className = card.setting.click ? 'mk-card pointer ' : 'mk-card '
+ if (item.$disabled) {
+ className = 'mk-disabled'
+ } else if (activeKey === index) {
+ className += 'active'
+ } else if (selectKeys.indexOf(index) > -1) {
+ className += 'selected'
+ }
+
+ return (
+ <Col className={className} 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" span={item.setting.width || 6}>
- <CardItem card={item} cards={config} data={{$$BID: BID, $$BData: BData, $$type: 'extendCard'}}/>
+ <CardItem card={item} cards={config} data={extendData}/>
</Col>
))}
</Row>
--
Gitblit v1.8.0