From fe21d23b147ed5cec22b4f76a88840b05495d4ad Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 18 六月 2022 22:33:59 +0800
Subject: [PATCH] 2022-06-18
---
src/tabviews/zshare/normalTable/index.jsx | 28 +++++++++-------------------
1 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 4bf5a88..6b497bd 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -401,40 +401,30 @@
let icon = ''
marks.some(mark => {
- let originVal = record[mark.field] + ''
+ let originVal = record[mark.field]
let contrastVal = ''
if (mark.contrastType === 'static') {
- contrastVal = mark.contrastValue + ''
+ contrastVal = mark.contrastValue
} else {
- contrastVal = record[mark.contrastField] + ''
+ contrastVal = record[mark.contrastField]
}
+
+ if (originVal === undefined || contrastVal === undefined) return false
if (mark.match === '=') {
className = originVal === contrastVal ? mark.color[1] : ''
} else if (mark.match === '!=') {
className = originVal !== contrastVal ? mark.color[1] : ''
} else if (mark.match === 'like') {
+ originVal = originVal + ''
+ contrastVal = contrastVal + ''
className = originVal.indexOf(contrastVal) > -1 ? mark.color[1] : ''
} else if (mark.match === '>') {
- try {
- originVal = parseFloat(originVal)
- contrastVal = parseFloat(contrastVal)
- } catch (e) {
- originVal = NaN
- }
-
- if (!isNaN(originVal) && !isNaN(contrastVal) && originVal > contrastVal) {
+ if (parseFloat(originVal) > parseFloat(contrastVal)) {
className = mark.color[1]
}
} else if (mark.match === '<') {
- try {
- originVal = parseFloat(originVal)
- contrastVal = parseFloat(contrastVal)
- } catch (e) {
- originVal = NaN
- }
-
- if (!isNaN(originVal) && !isNaN(contrastVal) && originVal < contrastVal) {
+ if (parseFloat(originVal) < parseFloat(contrastVal)) {
className = mark.color[1]
}
}
--
Gitblit v1.8.0