From 4b5b5a0f13adceaa4a759580b5dc4ac3179f884d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 10 三月 2021 18:26:29 +0800 Subject: [PATCH] 2021-03-10 --- src/tabviews/custom/index.jsx | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx index 1cf5080..d3f6298 100644 --- a/src/tabviews/custom/index.jsx +++ b/src/tabviews/custom/index.jsx @@ -23,6 +23,8 @@ const AntvTabs = asyncComponent(() => import('./components/tabs/antv-tabs')) const DataCard = asyncComponent(() => import('./components/card/data-card')) const PropCard = asyncComponent(() => import('./components/card/prop-card')) +const CarouselDataCard = asyncComponent(() => import('./components/carousel/data-card')) +const CarouselPropCard = asyncComponent(() => import('./components/carousel/prop-card')) const TableCard = asyncComponent(() => import('./components/card/table-card')) const MainSearch = asyncComponent(() => import('@/tabviews/zshare/topSearch')) const NormalTable = asyncComponent(() => import('./components/table/normal-table')) @@ -547,7 +549,7 @@ return cell.eleType !== 'button' || isHS || permAction[cell.uuid] }) }) - } else if (item.type === 'table' && item.subtype === 'tablecard') { + } else if ((item.type === 'table' && item.subtype === 'tablecard') || item.type === 'carousel') { item.subcards.forEach(card => { let _hasheight = card.style.height && card.style.height !== 'auto' card.elements = card.elements.filter(cell => { @@ -995,6 +997,18 @@ <PropCard config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} /> </Col> ) + } else if (item.type === 'carousel' && item.subtype === 'datacard') { + return ( + <Col span={item.width} key={item.uuid}> + <CarouselDataCard config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} /> + </Col> + ) + } else if (item.type === 'carousel' && item.subtype === 'propcard') { + return ( + <Col span={item.width} key={item.uuid}> + <CarouselPropCard config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} /> + </Col> + ) } else if (item.type === 'table' && item.subtype === 'tablecard') { return ( <Col span={item.width} key={item.uuid}> -- Gitblit v1.8.0