From b6cbfb08b51e87e6eac995be8e7751815715e6a1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 三月 2022 15:36:21 +0800
Subject: [PATCH] 2022-03-29
---
src/tabviews/custom/components/group/normal-group/index.jsx | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/custom/components/group/normal-group/index.jsx b/src/tabviews/custom/components/group/normal-group/index.jsx
index 9fde7b5..f6ac9cd 100644
--- a/src/tabviews/custom/components/group/normal-group/index.jsx
+++ b/src/tabviews/custom/components/group/normal-group/index.jsx
@@ -21,6 +21,7 @@
const DataCard = asyncComponent(() => import('@/tabviews/custom/components/card/data-card'))
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 BraftEditor = asyncComponent(() => import('@/tabviews/custom/components/editor/braft-editor'))
const SandBox = asyncComponent(() => import('@/tabviews/custom/components/code/sand-box'))
@@ -30,6 +31,7 @@
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 CustomChart = asyncComponent(() => import('@/tabviews/custom/components/chart/custom-chart'))
class TabTransfer extends Component {
static propTpyes = {
@@ -76,7 +78,7 @@
item.setting.sync = 'false'
item.setting.onload = 'false'
} else {
- params.push(getStructDefaultParam(item, searchlist))
+ params.push(getStructDefaultParam(item, searchlist, params.length === 0))
}
} else {
item.setting.sync = 'false'
@@ -135,8 +137,10 @@
return config.components.map(item => {
let _bid = BID || ''
+ let BData = ''
if (item.setting && item.setting.supModule) {
_bid = bids ? bids[item.setting.supModule] || '' : ''
+ BData = bids ? bids[item.setting.supModule + '_data'] || '' : ''
}
if (item.type === 'bar' || item.type === 'line') {
@@ -178,37 +182,43 @@
} 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 === '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 === '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 === 'tree') {
@@ -235,6 +245,12 @@
<Balcony config={item} data={data} BID={_bid} menuType={menuType} />
</Col>
)
+ } else if (item.type === 'chart') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <CustomChart config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
} else {
return null
}
@@ -250,6 +266,7 @@
let pageSize = ['A4', 'A3', 'A5'].includes(config.setting.pageSize) ? config.setting.pageSize : 'A4'
let pageLayout = config.setting.pageLayout !== 'horizontal' ? 'vertical' : 'horizontal'
+ let hides = config.setting.hide || []
let pageParam = {
A4: {
@@ -285,7 +302,7 @@
doc.write(`<LINK rel="stylesheet" type="text/css" href="${linkList[i].href}">`)
}
}
- doc.write(`<style>body{width: ${width}px!important;}*{border-style: solid;border-width: 0;}.print-button, .top-search{display: none!important;}</style>`)
+ doc.write(`<style>body{width: ${width}px!important;} *{border-style: solid;border-width: 0;} .print-button{display: none!important;} ${hides.includes('search') ? '.top-search{display: none!important;}' : ''} ${hides.includes('button') ? '.ant-btn{opacity: 0!important;}' : ''}</style>`)
for (let i = 0;i < styleList.length;i++) {
doc.write('<style>' + styleList[i].innerHTML + '</style>')
}
--
Gitblit v1.8.0