From 5e871a4164869bac7927ea6884dbadd650b1cadf Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 25 五月 2023 11:25:28 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index c728475..27033aa 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -76,10 +76,8 @@
elements: PropTypes.array, // 鍏冪礌闆�
}
- state = {}
-
shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState)) || !is(fromJS(this.props), fromJS(nextProps))
+ return !is(fromJS(this.props), fromJS(nextProps))
}
/**
@@ -133,12 +131,7 @@
}
window.open(_url)
return
- } else if (card.linkType === 'qywx') {
- notification.warning({
- top: 92,
- message: 'PC涓嶆敮鎸佹墦寮�浼佷笟寰俊锛�',
- duration: 5
- })
+ } else if (card.linkType === 'qywx' || card.linkType === 'linkmenu') {
return
}
@@ -757,6 +750,10 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
+ if (window.debugger) {
+ console.info(_val)
+ console.warn(e)
+ }
_val = 0
}
}
@@ -779,6 +776,10 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
+ if (window.debugger) {
+ console.info(_val)
+ console.warn(e)
+ }
_val = ''
}
}
@@ -789,6 +790,11 @@
if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
+
+ if (card.round && typeof(val) === 'number') {
+ val = Math.round(val * card.round) / card.round
+ val = val.toFixed(card.decimal)
+ }
if (val !== '') {
if (val && typeof(val) === 'string') {
--
Gitblit v1.8.0