From e07e410cf2fbc64c4e1fa8a080a9aac6a3d0c305 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 23 十月 2023 10:39:50 +0800
Subject: [PATCH] 2023-10-23
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 493a682..5ca4716 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -76,7 +76,7 @@
}
shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.props.data), fromJS(nextProps.data)) || (nextProps.syncData && !is(fromJS(this.props.syncData), fromJS(nextProps.syncData)))
+ return !is(fromJS(this.props.data), fromJS(nextProps.data)) || (nextProps.syncData ? !is(fromJS(this.props.syncData), fromJS(nextProps.syncData)) : false)
}
/**
@@ -278,8 +278,7 @@
_style.lineHeight = card.innerHeight + 'px'
let mark = getMark(card.marks, data, _style)
-
- _style = mark.style
+
className = mark.signType
}
contents.push(
@@ -418,13 +417,19 @@
if (card.marks) {
let mark = getMark(card.marks, data, _style)
- _style = mark.style
-
if (mark.icon) {
if (mark.position === 'front') {
val = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {val}</span>
} else {
val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
+ }
+ } else if (mark.space) {
+ val = <><span style={{float: 'left'}} dangerouslySetInnerHTML={{__html: mark.space}}></span>{val}</>
+ } else if (mark.point) {
+ if (mark.position === 'front') {
+ val = <>{mark.point}{val}</>
+ } else {
+ val = <>{val}{mark.point}</>
}
}
className = mark.signType
@@ -500,13 +505,19 @@
if (card.marks) {
let mark = getMark(card.marks, data, _style)
- _style = mark.style
-
if (mark.icon) {
if (mark.position === 'front') {
val = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {val}</span>
} else {
val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
+ }
+ } else if (mark.space) {
+ val = <><span style={{float: 'left'}} dangerouslySetInnerHTML={{__html: mark.space}}></span>{val}</>
+ } else if (mark.point) {
+ if (mark.position === 'front') {
+ val = <>{mark.point}{val}</>
+ } else {
+ val = <>{val}{mark.point}</>
}
}
className = mark.signType
@@ -774,9 +785,7 @@
let func = new Function('data', card.formula)
val = func(_data)
} catch (e) {
- if (window.GLOB.debugger === true) {
- console.warn(e)
- }
+ console.warn(e)
val = ''
}
} else if (card.$sync) {
@@ -794,10 +803,8 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
- if (window.GLOB.debugger === true) {
- console.info(_val)
- console.warn(e)
- }
+ console.info(_val)
+ console.warn(e)
_val = 0
}
}
@@ -820,10 +827,8 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
- if (window.GLOB.debugger === true) {
- console.info(_val)
- console.warn(e)
- }
+ console.info(_val)
+ console.warn(e)
_val = ''
}
}
@@ -874,14 +879,20 @@
if (card.marks) {
let mark = getMark(card.marks, data, _style)
- _style = mark.style
-
if (mark.icon) {
if (mark.position === 'front') {
val = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {val}</span>
} else {
val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
+ } else if (mark.space) {
+ val = <><span style={{float: 'left'}} dangerouslySetInnerHTML={{__html: mark.space}}></span>{val}</>
+ } else if (mark.point) {
+ if (mark.position === 'front') {
+ val = <>{mark.point}{val}</>
+ } else {
+ val = <>{val}{mark.point}</>
+ }
}
className = mark.signType
}
--
Gitblit v1.8.0