From 9e0a0749233c15711fd3259afa1f19867d214df7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 22 六月 2020 16:07:35 +0800
Subject: [PATCH] 2020-06-22
---
src/tabviews/zshare/cardcomponent/index.jsx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/zshare/cardcomponent/index.jsx b/src/tabviews/zshare/cardcomponent/index.jsx
index 42963c9..567aaa8 100644
--- a/src/tabviews/zshare/cardcomponent/index.jsx
+++ b/src/tabviews/zshare/cardcomponent/index.jsx
@@ -570,7 +570,7 @@
}
if (plot.subelement.includes('avatar')) {
- card.avatar = { type: plot.avatar.type }
+ card.avatar = { type: plot.avatar.type, display: plot.avatar.display || 'inline' }
if (card.avatar.type === 'icon' && colMap.get(plot.avatar.field)) {
let col = fromJS(colMap.get(plot.avatar.field)).toJS()
let _marks = []
@@ -714,11 +714,11 @@
_cardWidth = Math.floor(_outWidth * plot.cardWidth / 24 - 20)
}
- if (card.avatar.widthType === 'ratio') {
+ if (card.avatar.widthType === 'ratio' && card.avatar.display !== 'block') {
if (card.avatar.width < 90) {
_flex = true
}
- } else if (card.avatar.width < _cardWidth * 0.9) {
+ } else if (card.avatar.width < _cardWidth * 0.9 && card.avatar.display !== 'block') {
_flex = true
}
--
Gitblit v1.8.0