From 07c005cf28acf74e3afde82122e4c53e1000d70c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 六月 2023 12:06:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/menushell/card.jsx | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/menu/menushell/card.jsx b/src/menu/menushell/card.jsx
index 802a6c9..5cdd3e2 100644
--- a/src/menu/menushell/card.jsx
+++ b/src/menu/menushell/card.jsx
@@ -11,6 +11,7 @@
const AntvScatter = asyncComponent(() => import('@/menu/components/chart/antv-scatter'))
const AntvTabs = asyncComponent(() => import('@/menu/components/tabs/antv-tabs'))
const DataCard = asyncComponent(() => import('@/menu/components/card/data-card'))
+const DoubleDataCard = asyncComponent(() => import('@/menu/components/card/double-data-card'))
const PropCard = asyncComponent(() => import('@/menu/components/card/prop-card'))
const Balcony = asyncComponent(() => import('@/menu/components/card/balcony'))
const NormalTree = asyncComponent(() => import('@/menu/components/tree/antd-tree'))
@@ -28,8 +29,12 @@
const CustomChart = asyncComponent(() => import('@/menu/components/chart/chart-custom'))
const Timeline = asyncComponent(() => import('@/menu/components/timeline/normal-timeline'))
const Voucher = asyncComponent(() => import('@/menu/components/module/voucher'))
+const Account = asyncComponent(() => import('@/menu/components/module/account'))
+const Iframe = asyncComponent(() => import('@/menu/components/iframe'))
+const AntvG6 = asyncComponent(() => import('@/menu/components/chart/antv-G6'))
+const AntvX6 = asyncComponent(() => import('@/menu/components/chart/antv-X6'))
-const Card = ({ id, card, moveCard, findCard, delCard, updateConfig }) => {
+const Card = ({ id, card, moveCard, findCard, delCard, unGroup, updateConfig }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: 'menu', id, originalIndex },
@@ -75,6 +80,8 @@
return (<AntvBar card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'search') {
return (<MainSearch card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'card' && card.subtype === 'dualdatacard') {
+ return (<DoubleDataCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'pie') {
return (<AntvPie card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'dashboard') {
@@ -102,7 +109,7 @@
} else if (card.type === 'table' && card.subtype === 'editable') {
return (<EditTable card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'group' && card.subtype === 'normalgroup') {
- return (<NormalGroup group={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ return (<NormalGroup group={card} updateConfig={updateConfig} unGroup={unGroup} deletecomponent={delCard}/>)
} else if (card.type === 'editor') {
return (<BraftEditor card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'code') {
@@ -113,10 +120,27 @@
return (<Timeline card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'chart') {
return (<CustomChart card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'iframe') {
+ return (<Iframe card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'antvG6') {
+ return (<AntvG6 card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'antvX6') {
+ return (<AntvX6 card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'module' && card.subtype === 'voucher') {
return (<Voucher card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'module' && card.subtype === 'account') {
+ return (<Account card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
}
}
+
+ if (card.type === 'antvX6') { // 娴嬭瘯
+ return (
+ <div className={'ant-col mk-component-card ant-col-' + (card.width || 24)} style={style}>
+ <AntvX6 card={card} updateConfig={updateConfig} deletecomponent={delCard}/>
+ </div>
+ )
+ }
+
return (
<div className={'ant-col mk-component-card ant-col-' + (card.width || 24)} ref={node => drag(drop(node))} style={style}>
{getCardComponent()}
--
Gitblit v1.8.0