From d6dfba48678e1107a9e7c6524e1dfa2d3fdff03c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 十月 2021 19:29:21 +0800
Subject: [PATCH] 2021-10-08
---
src/tabviews/custom/components/share/tabtransfer/index.jsx | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx
index bb74ab9..24afb5d 100644
--- a/src/tabviews/custom/components/share/tabtransfer/index.jsx
+++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx
@@ -23,6 +23,7 @@
const AntvScatter = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-scatter'))
const TableCard = asyncComponent(() => import('@/tabviews/custom/components/card/table-card'))
const NormalTable = asyncComponent(() => import('@/tabviews/custom/components/table/normal-table'))
+const EditTable = asyncComponent(() => import('@/tabviews/custom/components/table/edit-table'))
const PropCard = asyncComponent(() => import('@/tabviews/custom/components/card/prop-card'))
const NormalGroup = asyncComponent(() => import('@/tabviews/custom/components/group/normal-group'))
const BraftEditor = asyncComponent(() => import('@/tabviews/custom/components/editor/braft-editor'))
@@ -157,8 +158,10 @@
return config.components.map(item => {
let BID = this.props.BID || ''
+ let BData = ''
if (item.setting && item.setting.supModule) {
BID = bids[item.setting.supModule] || ''
+ BData = bids[item.setting.supModule + '_data'] || ''
}
if (item.type === 'bar' || item.type === 'line') {
@@ -200,37 +203,43 @@
} else if (item.type === 'card' && item.subtype === 'datacard') {
return (
<Col span={item.width} key={item.uuid}>
- <DataCard config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} />
+ <DataCard config={item} data={data} BID={BID} BData={BData} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
} else if (item.type === 'card' && item.subtype === 'propcard') {
return (
<Col span={item.width} key={item.uuid}>
- <PropCard config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} />
+ <PropCard config={item} data={data} BID={BID} BData={BData} 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} />
+ <CarouselDataCard config={item} data={data} BID={BID} BData={BData} 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} />
+ <CarouselPropCard config={item} data={data} BID={BID} BData={BData} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
} else if (item.type === 'table' && item.subtype === 'tablecard') {
return (
<Col span={item.width} key={item.uuid}>
- <TableCard config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} />
+ <TableCard config={item} data={data} BID={BID} BData={BData} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
} else if (item.type === 'table' && item.subtype === 'normaltable') {
return (
<Col span={item.width} key={item.uuid}>
- <NormalTable config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} />
+ <NormalTable config={item} data={data} BID={BID} BData={BData} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
+ } else if (item.type === 'table' && item.subtype === 'editable') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <EditTable config={item} data={data} BID={BID} BData={BData} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
} else if (item.type === 'group' && item.subtype === 'normalgroup') {
--
Gitblit v1.8.0