From c06e58c80240afd703d289bb1c584e08b9783383 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 13 六月 2025 20:24:25 +0800 Subject: [PATCH] 2025-06-13 --- src/menu/menushell/card.jsx | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/menu/menushell/card.jsx b/src/menu/menushell/card.jsx index 1719f71..47269bf 100644 --- a/src/menu/menushell/card.jsx +++ b/src/menu/menushell/card.jsx @@ -30,9 +30,11 @@ 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 Invoice = asyncComponent(() => import('@/menu/components/module/invoice')) 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 Calendar = asyncComponent(() => import('@/menu/components/calendar')) const Card = ({ id, card, moveCard, findCard, delCard, unGroup, updateConfig }) => { const originalIndex = findCard(id).index @@ -69,6 +71,8 @@ if (card.style && card.style.clear === 'left') { style.clear = 'left' + } else if (card.style && card.style.clear === 'right') { + style.float = 'right' } const getCardComponent = () => { @@ -126,20 +130,16 @@ 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 === 'calendar') { + return (<Calendar 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}/>) + } else if (card.type === 'module' && card.subtype === 'invoice') { + return (<Invoice 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}> -- Gitblit v1.8.0