From bdfec44c9f3a37dbbe05bf14a252ffec04132a86 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 21:24:28 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/share/tabtransfer/index.jsx | 75 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx
index 1fbd303..1ce33c9 100644
--- a/src/tabviews/custom/components/share/tabtransfer/index.jsx
+++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx
@@ -34,11 +34,11 @@
const CarouselDataCard = asyncComponent(() => import('@/tabviews/custom/components/carousel/data-card'))
const CarouselPropCard = asyncComponent(() => import('@/tabviews/custom/components/carousel/prop-card'))
const Balcony = asyncComponent(() => import('@/tabviews/custom/components/card/balcony'))
+const TimeLine = asyncComponent(() => import('@/tabviews/custom/components/timeline/normal-timeline'))
const CustomChart = asyncComponent(() => import('@/tabviews/custom/components/chart/custom-chart'))
class TabTransfer extends Component {
static propTpyes = {
- bids: PropTypes.any, // 鐖剁骇Id闆�
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 鍏ㄥ眬鎼滅储鏉′欢
}
@@ -122,9 +122,16 @@
* @description 涓昏〃鏁版嵁鍔犺浇
*/
loadmaindata = (params) => {
- let param = getStructuredParams(params, this.props.config, this.props.BID || '')
+ let BID = ''
+ let BData = window.GLOB.CacheData.get(this.props.config.$pageId)
- Api.getLocalConfig(param).then(result => {
+ if (BData) {
+ BID = BData.$BID || ''
+ }
+
+ let param = getStructuredParams(params, this.props.config, BID)
+
+ Api.genericInterface(param).then(result => {
if (result.status) {
delete result.status
delete result.message
@@ -154,44 +161,42 @@
}
getComponents = () => {
- const { bids, config } = this.props
+ const { config } = this.props
const { mainSearch, data } = this.state
if (!config || !config.components || config.components.length === 0) return (<Empty description={false} />)
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') {
return (
<Col span={item.width} key={item.uuid}>
- <AntvBarAndLine data={data} config={item} BID={BID} mainSearch={mainSearch}/>
+ <AntvBarAndLine data={data} config={item} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'pie') {
return (
<Col span={item.width} key={item.uuid}>
- <AntvPie data={data} config={item} BID={BID} mainSearch={mainSearch}/>
+ <AntvPie data={data} config={item} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'dashboard') {
return (
<Col span={item.width} key={item.uuid}>
- <AntvDashboard config={item} data={data} BID={BID} mainSearch={mainSearch}/>
+ <AntvDashboard config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'scatter') {
return (
<Col span={item.width} key={item.uuid}>
- <AntvScatter config={item} data={data} BID={BID} mainSearch={mainSearch}/>
+ <AntvScatter config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'search') {
+ let BID = ''
+ let BData = window.GLOB.CacheData.get(item.$pageId)
+ if (BData) {
+ BID = BData.$BID || ''
+ }
return (
<Col span={item.width} key={item.uuid}>
<MainSearch config={item} BID={BID} refreshdata={this.resetSearch} />
@@ -200,103 +205,109 @@
} else if (item.type === 'tabs') {
return (
<Col span={item.width} key={item.uuid}>
- <AntvTabs config={item} BID={BID} bids={bids} mainSearch={mainSearch}/>
+ <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} BID={BID} BData={BData} mainSearch={mainSearch}/>
+ <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} BID={BID} BData={BData} mainSearch={mainSearch}/>
+ <PropCard config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'carousel' && item.subtype === 'datacard') {
return (
<Col span={item.width} key={item.uuid}>
- <CarouselDataCard config={item} data={data} BID={BID} BData={BData} mainSearch={mainSearch}/>
+ <CarouselDataCard config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'carousel' && item.subtype === 'propcard') {
return (
<Col span={item.width} key={item.uuid}>
- <CarouselPropCard config={item} data={data} BID={BID} BData={BData} mainSearch={mainSearch}/>
+ <CarouselPropCard config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'table' && item.subtype === 'tablecard') {
return (
<Col span={item.width} key={item.uuid}>
- <TableCard config={item} data={data} BID={BID} BData={BData} mainSearch={mainSearch}/>
+ <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} BID={BID} BData={BData} mainSearch={mainSearch}/>
+ <NormalTable config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'table' && item.subtype === 'editable') {
return (
<Col span={item.width} key={item.uuid}>
- <EditTable config={item} BID={BID} BData={BData} mainSearch={mainSearch}/>
+ <EditTable config={item} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'group' && item.subtype === 'normalgroup') {
return (
<Col span={item.width} key={item.uuid}>
- <NormalGroup config={item} BID={BID} bids={bids} mainSearch={mainSearch}/>
+ <NormalGroup config={item} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'form' && item.subtype === 'simpleform') {
return (
<Col span={item.width} key={item.uuid}>
- <SimpleForm config={item} data={data} BID={BID} BData={BData} mainSearch={mainSearch}/>
+ <SimpleForm config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'form' && item.subtype === 'stepform') {
return (
<Col span={item.width} key={item.uuid}>
- <StepForm config={item} data={data} BID={BID} BData={BData} mainSearch={mainSearch}/>
+ <StepForm config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'form' && item.subtype === 'tabform') {
return (
<Col span={item.width} key={item.uuid}>
- <TabForm config={item} data={data} BID={BID} BData={BData} mainSearch={mainSearch}/>
+ <TabForm config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'tree') {
return (
<Col span={item.width} key={item.uuid}>
- <NormalTree config={item} data={data} BID={BID} mainSearch={mainSearch}/>
+ <NormalTree config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'editor') {
return (
<Col span={item.width} key={item.uuid}>
- <BraftEditor config={item} data={data} BID={BID} mainSearch={mainSearch}/>
+ <BraftEditor config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'code') {
return (
<Col span={item.width} key={item.uuid}>
- <SandBox config={item} data={data} BID={BID} mainSearch={mainSearch}/>
+ <SandBox config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'balcony') {
return (
<Col span={item.width} key={item.uuid}>
- <Balcony config={item} data={data} BID={BID}/>
+ <Balcony config={item} data={data}/>
+ </Col>
+ )
+ } else if (item.type === 'timeline') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <TimeLine config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'chart') {
return (
<Col span={item.width} key={item.uuid}>
- <CustomChart config={item} data={data} BID={BID} mainSearch={mainSearch}/>
+ <CustomChart config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else {
--
Gitblit v1.8.0