From 306eb5f035302baef95995437e2dc735110b6536 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 23 二月 2023 17:38:37 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/prop-card/index.jsx | 24 +++---------------------
1 files changed, 3 insertions(+), 21 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..375b7bf 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'
@@ -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