From 4de5be49a7d128118def405c5ce24771526cc188 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 05 一月 2021 21:34:55 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/menu/components/tabs/tabcomponents/card.jsx | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/menu/components/tabs/tabcomponents/card.jsx b/src/menu/components/tabs/tabcomponents/card.jsx
index 79df0f7..978f69a 100644
--- a/src/menu/components/tabs/tabcomponents/card.jsx
+++ b/src/menu/components/tabs/tabcomponents/card.jsx
@@ -12,6 +12,7 @@
const PropCard = asyncComponent(() => import('@/menu/components/card/prop-card'))
const TableCard = asyncComponent(() => import('@/menu/components/card/table-card'))
const NormalTable = asyncComponent(() => import('@/menu/components/table/normal-table'))
+const NormalGroup = asyncComponent(() => import('@/menu/components/group/normal-group'))
const Card = ({ id, card, moveCard, findCard, delCard, updateConfig }) => {
const originalIndex = findCard(id).index
@@ -63,6 +64,8 @@
return (<TableCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'table' && card.subtype === 'normaltable') {
return (<NormalTable card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'group' && card.subtype === 'normalgroup') {
+ return (<NormalGroup group={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
}
}
--
Gitblit v1.8.0