From a94b0a4d15b26ecf8fe99f0a1c3e60d60b97766d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 15 八月 2023 14:22:03 +0800
Subject: [PATCH] 2023-08-15
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index f87cb87..493a682 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -543,7 +543,6 @@
}
if (/\\n|\n/.test(val)) {
- val = val + val
val = val.replace(/(\\n|\n)$/, '')
if (val) {
@@ -775,7 +774,7 @@
let func = new Function('data', card.formula)
val = func(_data)
} catch (e) {
- if (window.debugger) {
+ if (window.GLOB.debugger === true) {
console.warn(e)
}
val = ''
@@ -795,7 +794,7 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
- if (window.debugger) {
+ if (window.GLOB.debugger === true) {
console.info(_val)
console.warn(e)
}
@@ -821,7 +820,7 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
- if (window.debugger) {
+ if (window.GLOB.debugger === true) {
console.info(_val)
console.warn(e)
}
@@ -946,6 +945,9 @@
if (data.$$type === 'extendCard') {
_data = data.$$selectedData || []
+ if (card.Ot === 'notRequired' && _data.length === 0) {
+ _data = [data]
+ }
} else if (card.$sync) {
_data = this.props.syncData || []
} else if (data.$$empty) {
--
Gitblit v1.8.0