From 34e7681fd12b1c4e4994d3bea1a553870e10bc50 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 11 三月 2023 17:58:54 +0800
Subject: [PATCH] 2023-03-11
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 8f74c29..8d010da 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -475,6 +475,10 @@
icon = card.icon
}
+ if (!icon && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ return null
+ }
+
if (!height) { // 鍏煎
let fontSize = 14
let lineHeight = 1.5
@@ -558,10 +562,6 @@
if (url === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
-
- if (_style.borderRadius) {
- _imagestyle.borderRadius = _style.borderRadius
- }
if (PicRadio[card.lenWidRadio]) {
_imagestyle.paddingTop = PicRadio[card.lenWidRadio]
@@ -569,7 +569,10 @@
_imagestyle.paddingTop = '100%'
}
- _imagestyle.backgroundSize = card.backgroundSize || 'cover'
+ _imagestyle.borderRadius = _style.borderRadius || 0
+ _imagestyle.backgroundSize = _style.backgroundSize || 'cover'
+ _imagestyle.backgroundPosition = _style.backgroundPosition || 'center'
+ _imagestyle.backgroundRepeat = _style.backgroundRepeat || 'no-repeat'
if (card.link) {
_style.cursor = 'pointer'
@@ -823,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