From 10d5d95a52341a176d81d75186feafb4c0a58fa8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 02 六月 2023 11:50:50 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/prop-card/index.jsx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/card/prop-card/index.jsx b/src/menu/components/card/prop-card/index.jsx
index 586b01b..12c8c19 100644
--- a/src/menu/components/card/prop-card/index.jsx
+++ b/src/menu/components/card/prop-card/index.jsx
@@ -423,7 +423,7 @@
} trigger="hover">
<ToolOutlined />
</Popover>
- <div className={(card.wrap.layout || 'grid') + '-layout float-' + (card.wrap.cardFloat || 'left') + ' select-' + card.wrap.selStyle}>
+ <div className={`${card.wrap.layout || 'grid'}-layout float-${card.wrap.cardFloat || 'left'} select-${card.wrap.selStyle || ''}`}>
{card.subcards.map(subcard => (<CardComponent key={subcard.uuid} cards={card} card={subcard} move={this.move} updateElement={this.updateCard} deleteElement={this.deleteCard}/>))}
</div>
{card.wrap.display === 'hidden' ? <HeatMapOutlined className="prop-hidden"/> : null}
--
Gitblit v1.8.0