From 9b0754adb7fbe595eef73010992c0ce53ef6571a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 11 十月 2023 17:22:36 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 9208d9a..fed3d09 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -426,6 +426,14 @@
} 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
}
@@ -507,6 +515,14 @@
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 +790,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 +808,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 +832,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 = ''
}
}
@@ -882,6 +892,14 @@
} 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