From 63a40e3da5f24b449122fb8b50c16dcbf69d5907 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 06 三月 2023 09:22:43 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 0f57d37..8d010da 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -826,24 +826,12 @@
)
} else if (card.eleType === 'button') {
let _disabled = data.$disabled
- if (card.control === 'hidden') {
- let s = data[card.controlField] !== undefined ? data[card.controlField] + '' : ''
- if (s === card.controlVal || (card.controlVal && card.controlVal.split(',').includes(s))) {
- return null
- }
- } else if (card.control === 'disabled') {
- let s = data[card.controlField] !== undefined ? data[card.controlField] + '' : ''
- if (s === card.controlVal || (card.controlVal && card.controlVal.split(',').includes(s))) {
- _disabled = true
- }
- }
-
let _data = [data]
if (data.$$type === 'extendCard') {
_data = data.$$selectedData || []
} else if (card.$sync) {
- _data = this.props.syncData
+ _data = this.props.syncData || []
} else if (data.$$empty) {
_data = []
}
--
Gitblit v1.8.0