From 34e7681fd12b1c4e4994d3bea1a553870e10bc50 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 11 三月 2023 17:58:54 +0800
Subject: [PATCH] 2023-03-11
---
src/tabviews/custom/components/card/prop-card/index.jsx | 32 +++++++-------------------------
1 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index 2ad4a02..aac9321 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -36,7 +36,6 @@
UNSAFE_componentWillMount () {
const { data, initdata } = this.props
let _config = fromJS(this.props.config).toJS()
- let _cols = new Map()
let _data = { $$empty: true }
let _sync = false
@@ -85,11 +84,6 @@
_data.$$uuid = _data[_config.setting.primaryKey] || ''
}
- _config.columns.forEach(item => {
- if (item.type !== 'number') return
- _cols.set(item.field, item)
- })
-
_config.subcards.forEach(card => {
if (card.setting.click === 'button' && !card.setting.linkbtn) {
card.elements.forEach(ele => {
@@ -101,18 +95,6 @@
card.setting.click = ''
}
}
- card.elements = card.elements.map(item => {
- 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.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
- item.decimal = _cols.get(item.field).decimal || 0
- }
- return item
- })
})
let selected = _config.wrap.selected || 'false'
@@ -152,7 +134,7 @@
}, 200)
}
- if (_config.wrap.datatype === 'dynamic') {
+ if (_config.wrap.datatype === 'dynamic' && this.loaded) {
this.autoExec()
}
if (!_config.wrap.cardType && _data.$$uuid) {
@@ -270,10 +252,10 @@
autoExec = () => {
const { config, data } = this.state
- if (!config.wrap.autoExec || data.$$empty) return
+ if (!config.wrap.autoExec) return
setTimeout(() => {
- MKEmitter.emit('triggerBtnId', config.wrap.autoExec, [data])
+ MKEmitter.emit('triggerBtnId', config.wrap.autoExec, data.$$empty ? [] : [data])
}, 200)
}
@@ -407,7 +389,7 @@
let _data = {}
this.loaded = true
- if (config.$cache) {
+ if (config.$cache && config.setting.onload !== 'false') {
Api.writeCacheConfig(config.uuid, result.data || '')
}
@@ -499,14 +481,14 @@
<NormalHeader config={config}/>
<Row className={`card-row-list data-zoom ${config.wrap.wrapClass}`}>
{config.subcards.map((item, index) => {
- let className = item.setting.click ? 'mk-card pointer ' : 'mk-card '
+ let className = '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 className={className} key={index} span={item.setting.width || 6} offset={item.offset || 0}>
+ <CardItem card={item} cards={config} data={data} onClick={() => {this.changeCard(index, item)}}/>
</Col>
)
})}
--
Gitblit v1.8.0