From 891e8aaad3b2ce6980fd44d1cf49192dca1c3c66 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 十一月 2022 14:30:30 +0800
Subject: [PATCH] 2022-11-23
---
src/tabviews/custom/components/share/tabtransfer/index.jsx | 93 ++++++++++++++++++++++++++--------------------
1 files changed, 53 insertions(+), 40 deletions(-)
diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx
index 9d7b3ff..75ee5c2 100644
--- a/src/tabviews/custom/components/share/tabtransfer/index.jsx
+++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx
@@ -37,6 +37,7 @@
const TimeLine = asyncComponent(() => import('@/tabviews/custom/components/timeline/normal-timeline'))
const CustomChart = asyncComponent(() => import('@/tabviews/custom/components/chart/custom-chart'))
const MkBaseTable = asyncComponent(() => import('@/tabviews/custom/components/table/base-table'))
+const AntvG6 = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-G6'))
class TabTransfer extends Component {
static propTpyes = {
@@ -168,27 +169,51 @@
if (!config || !config.components || config.components.length === 0) return (<Empty description={false} />)
return config.components.map(item => {
- if (item.type === 'bar' || item.type === 'line') {
+ let style = null
+
+ if (item.style && item.style.clear === 'left') {
+ style = {clear: 'left'}
+ }
+
+ if (item.type === 'card' && item.subtype === 'datacard') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
+ <DataCard config={item} data={data} mainSearch={mainSearch}/>
+ </Col>
+ )
+ } else if (item.type === 'card' && item.subtype === 'propcard') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <PropCard config={item} data={data} mainSearch={mainSearch}/>
+ </Col>
+ )
+ } else if (item.type === 'table' && item.subtype === 'normaltable') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <NormalTable config={item} data={data} mainSearch={mainSearch}/>
+ </Col>
+ )
+ } else if (item.type === 'bar' || item.type === 'line') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
<AntvBarAndLine data={data} config={item} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'pie') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<AntvPie data={data} config={item} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'dashboard') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<AntvDashboard config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'scatter') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<AntvScatter config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
@@ -199,124 +224,112 @@
BID = BData.$BID || ''
}
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<MainSearch config={item} BID={BID} refreshdata={this.resetSearch} />
</Col>
)
} else if (item.type === 'tabs') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<AntvTabs config={item} mainSearch={mainSearch}/>
- </Col>
- )
- } else if (item.type === 'card' && item.subtype === 'datacard') {
- return (
- <Col span={item.width} key={item.uuid}>
- <DataCard config={item} data={data} mainSearch={mainSearch}/>
- </Col>
- )
- } else if (item.type === 'card' && item.subtype === 'propcard') {
- return (
- <Col span={item.width} key={item.uuid}>
- <PropCard config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'carousel' && item.subtype === 'datacard') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<CarouselDataCard config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'carousel' && item.subtype === 'propcard') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<CarouselPropCard config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'card' && item.subtype === 'tablecard') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<TableCard config={item} data={data} mainSearch={mainSearch}/>
- </Col>
- )
- } else if (item.type === 'table' && item.subtype === 'normaltable') {
- return (
- <Col span={item.width} key={item.uuid}>
- <NormalTable config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'table' && item.subtype === 'basetable') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<MkBaseTable config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'table' && item.subtype === 'editable') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<EditTable config={item} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'group' && item.subtype === 'normalgroup') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<NormalGroup config={item} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'form' && item.subtype === 'simpleform') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<SimpleForm config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'form' && item.subtype === 'stepform') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<StepForm config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'form' && item.subtype === 'tabform') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<TabForm config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'tree') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<NormalTree config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'editor') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<BraftEditor config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'code') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<SandBox config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'balcony') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<Balcony config={item} data={data}/>
</Col>
)
} else if (item.type === 'timeline') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<TimeLine config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'chart') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<CustomChart config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
+ } else if (item.type === 'antvG6') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvG6 config={item} data={data} mainSearch={mainSearch}/>
+ </Col>
+ )
} else {
return null
}
--
Gitblit v1.8.0