From 25fbc16aa14667064ac5de854183b09e01105f2c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 30 三月 2022 15:44:05 +0800
Subject: [PATCH] 2022-03-30
---
src/tabviews/custom/components/card/prop-card/index.jsx | 155 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 105 insertions(+), 50 deletions(-)
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index 2e00b88..5a8912e 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -31,7 +31,8 @@
sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
data: {}, // 鏁版嵁
timer: null, // 瀹氭椂鍣ㄦ椂闂撮棿闅�
- BData: ''
+ BData: '',
+ selected: 'false',
}
UNSAFE_componentWillMount () {
@@ -42,30 +43,32 @@
let _data = { $$empty: true }
let _sync = false
- if (_config.setting && _config.wrap.datatype !== 'static') {
+ if (_config.wrap.datatype !== 'static') {
_sync = _config.setting.sync === 'true'
if (_sync && data) {
- _data = data[_config.dataName] || {}
- if (_data && Array.isArray(_data)) {
- _data = _data[0] || {}
+ _data = data[_config.dataName] || {$$empty: true}
+ if (Array.isArray(_data)) {
+ _data = _data[0] || {$$empty: true}
}
_sync = false
} else if (_sync && initdata) {
- _data = initdata || {}
- if (_data && Array.isArray(_data)) {
- _data = _data[0] || {}
+ _data = initdata || {$$empty: true}
+ if (Array.isArray(_data)) {
+ _data = _data[0] || {$$empty: true}
}
_sync = false
}
}
- if (_data) {
- _data.$$BID = BID || ''
- _data.$$BData = BData || ''
+ _data.$$BID = BID || ''
+ _data.$$BData = BData || ''
+ if (_config.setting.primaryKey) {
+ _data.$$uuid = _data[_config.setting.primaryKey] || ''
}
_config.columns.forEach(item => {
+ if (item.type !== 'number') return
_cols.set(item.field, item)
})
@@ -83,21 +86,21 @@
}
_width += card.setting.width
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
})
})
let offset = 0
- if (_config.wrap.cardFloat && _config.wrap.cardFloat !== 'left' && _config.subcards[0] && _width < 24) {
+ if (_config.wrap.cardFloat && _config.wrap.cardFloat !== 'left' && _width < 24) {
offset = 24 - _width
if (_config.wrap.cardFloat === 'center') {
offset = Math.floor(offset / 2)
@@ -105,13 +108,17 @@
_config.subcards[0].offset = offset
}
- if (_config.subcards[0] && (_config.wrap.selected === 'always' || _config.wrap.selected === 'init')) {
- setTimeout(() => {
- this.checkTopLine()
- }, 200)
- }
+ let selected = _config.wrap.selected || 'false'
+
+ _config.wrap.selStyle = _config.wrap.selStyle || 'active'
+ _config.wrap.priKeyType = _config.wrap.priKeyType || 'static'
+ _config.wrap.scale = _config.wrap.scale === 'true' ? 'scale' : ''
+ _config.wrap.layout = (_config.wrap.layout || 'grid') + '-layout'
+
+ _config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${_config.wrap.scale || ''}`
this.setState({
+ selected,
sync: _sync,
data: _data,
BID: BID || '',
@@ -119,8 +126,14 @@
config: _config,
arr_field: _config.columns.map(col => col.field).join(','),
}, () => {
- if (_config.wrap.datatype !== 'static' && _config.setting && _config.setting.sync !== 'true' && _config.setting.onload === 'true') {
- this.loadData()
+ if (_config.wrap.datatype !== 'static' && _config.setting.sync !== 'true' && _config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, _config.setting.delay || 0)
+ } else if ((!_sync || _config.wrap.priKeyType === 'static') && selected !== 'false') {
+ setTimeout(() => {
+ this.checkTopLine()
+ }, 200)
}
})
}
@@ -150,23 +163,28 @@
* @description 鍥捐〃鏁版嵁鏇存柊锛屽埛鏂板唴瀹�
*/
UNSAFE_componentWillReceiveProps (nextProps) {
- const { sync, config, BID, BData } = this.state
+ const { sync, config, BID, BData, selected } = this.state
if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
let _data = { $$empty: true }
if (nextProps.data && nextProps.data[config.dataName]) {
_data = nextProps.data[config.dataName]
- if (_data && Array.isArray(_data)) {
- _data = _data[0]
+ if (Array.isArray(_data)) {
+ _data = _data[0] || {$$empty: true}
}
}
- if (_data) {
- _data.$$BID = BID || ''
- _data.$$BData = BData || ''
- }
+ _data.$$BID = BID || ''
+ _data.$$BData = BData || ''
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
- this.setState({sync: false, data: _data})
+ this.setState({sync: false, data: _data}, () => {
+ if (config.wrap.priKeyType !== 'static' && selected !== 'false') {
+ setTimeout(() => {
+ this.checkTopLine()
+ }, 200)
+ }
+ })
} else if ( config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
this.loadData()
@@ -175,13 +193,21 @@
}
checkTopLine = () => {
- const { config, data } = this.state
+ const { config, data, selected } = this.state
this.setState({
- activeKey: 0
+ activeKey: 0,
+ selected: selected === 'init' ? 'false' : selected
})
- MKEmitter.emit('resetSelectLine', config.uuid, (config.subcards[0].setting.primaryId || ''), data)
+ let primaryId = config.subcards[0].setting.primaryId || ''
+ if (config.wrap.priKeyType === 'dynamic') {
+ primaryId = data.$$uuid || ''
+ } else if (config.wrap.priKeyType === 'joint') {
+ primaryId = (data.$$uuid || '') + ',' + primaryId
+ }
+
+ MKEmitter.emit('resetSelectLine', config.uuid, primaryId, data)
}
handleTimer = () => {
@@ -245,16 +271,23 @@
if (config.uuid !== menuId) return
- this.loadData() // 鏁版嵁鍒锋柊
+ let supModule = config.setting.supModule
- if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
- MKEmitter.emit('reloadData', btn.syncComponentId) // 鍚岀骇鏍囩鍒锋柊
+ btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
+
+ if (!btn.syncComponentId || btn.syncComponentId !== supModule) {
+ if (position === 'mainline' || position === 'popclose') { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+ if (supModule && BID) {
+ MKEmitter.emit('reloadData', supModule, BID)
+ } else {
+ this.loadData()
+ }
+ } else {
+ this.loadData()
+ }
}
- 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'))
+ if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -262,7 +295,8 @@
resetParentParam = (MenuID, id, data) => {
const { config } = this.state
- if (!config.setting || !config.setting.supModule || config.setting.supModule !== MenuID) return
+ if (!config.setting.supModule || config.setting.supModule !== MenuID) return
+
if (id !== this.state.BID || id !== '') {
this.setState({ BID: id, BData: data }, () => {
this.loadData()
@@ -280,7 +314,7 @@
async loadData (hastimer) {
const { mainSearch, menuType } = this.props
- const { config, arr_field, BID, BData } = this.state
+ const { config, arr_field, BID, BData, selected } = this.state
if (config.wrap.datatype === 'static') {
this.setState({
@@ -322,10 +356,15 @@
_data.$$BID = BID || ''
_data.$$BData = BData
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
this.setState({
data: _data,
loading: false
+ }, () => {
+ if (config.wrap.priKeyType !== 'static' && selected !== 'false') {
+ this.checkTopLine()
+ }
})
if (config.timer && config.clearField) {
@@ -356,11 +395,20 @@
activeKey: index
})
- MKEmitter.emit('resetSelectLine', config.uuid, (item.setting.primaryId || ''), data)
+ let primaryId = item.setting.primaryId || ''
+ if (config.wrap.priKeyType === 'dynamic') {
+ primaryId = data.$$uuid || ''
+ } else if (config.wrap.priKeyType === 'joint') {
+ primaryId = (data.$$uuid || '') + ',' + primaryId
+ }
+
+ MKEmitter.emit('resetSelectLine', config.uuid, primaryId, data)
}
render() {
const { config, loading, data, activeKey } = this.state
+
+ if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null
return (
<div className="custom-prop-card-box" style={config.style}>
@@ -371,12 +419,19 @@
</div> : null
}
<NormalHeader config={config}/>
- <Row className={`card-row-list ${config.wrap.cardType || ''} ${config.wrap.scale || ''}`}>
- {config.subcards.map((item, index) => (
- <Col className={(activeKey === index ? 'active' : '') + (item.setting.click ? ' pointer' : '')} key={index} span={item.setting.width || 6} offset={item.offset || 0} onClick={() => {this.changeCard(index, item)}}>
- <CardItem card={item} cards={config} data={data}/>
- </Col>
- ))}
+ <Row className={`card-row-list data-zoom ${config.wrap.wrapClass} ${config.wrap.layout}`}>
+ {config.subcards.map((item, index) => {
+ let className = item.setting.click ? 'mk-card pointer ' : 'mk-card '
+ if (activeKey === index) {
+ className += 'active'
+ }
+
+ return (
+ <Col className={className} key={index} span={item.setting.width || 6} offset={item.offset || 0} onClick={() => {this.changeCard(index, item)}}>
+ <CardItem card={item} cards={config} data={data}/>
+ </Col>
+ )
+ })}
</Row>
</div>
)
--
Gitblit v1.8.0