From ce70be666bcd78a7e16e739040488cf7e7256cc2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 31 五月 2021 15:49:43 +0800
Subject: [PATCH] 2021-05-31
---
src/tabviews/custom/components/share/tabtransfer/index.jsx | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx
index 389ca85..49d4377 100644
--- a/src/tabviews/custom/components/share/tabtransfer/index.jsx
+++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx
@@ -26,6 +26,10 @@
const NormalGroup = asyncComponent(() => import('@/tabviews/custom/components/group/normal-group'))
const BraftEditor = asyncComponent(() => import('@/tabviews/custom/components/editor/braft-editor'))
const SandBox = asyncComponent(() => import('@/tabviews/custom/components/code/sand-box'))
+const NormalForm = asyncComponent(() => import('@/tabviews/custom/components/form/normal-form'))
+const NormalTree = asyncComponent(() => import('@/tabviews/custom/components/tree/antd-tree'))
+const CarouselDataCard = asyncComponent(() => import('@/tabviews/custom/components/carousel/data-card'))
+const CarouselPropCard = asyncComponent(() => import('@/tabviews/custom/components/carousel/prop-card'))
class TabTransfer extends Component {
static propTpyes = {
@@ -142,6 +146,13 @@
}
})
}
+
+ _dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
+ _customScript = _customScript.replace(/@select\$|\$select@/ig, '')
+ _dataresource = _dataresource.replace(/\$sum@/ig, '/*')
+ _dataresource = _dataresource.replace(/@sum\$/ig, '*/')
+ _customScript = _customScript.replace(/\$sum@/ig, '/*')
+ _customScript = _customScript.replace(/@sum\$/ig, '*/')
let _search = ''
if (setting.queryType !== 'statistics' && _dataresource) {
@@ -322,6 +333,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}>
@@ -340,6 +363,18 @@
<NormalGroup config={item} bids={bids} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
+ } else if (item.type === 'form') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <NormalForm config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
+ } else if (item.type === 'tree') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <NormalTree config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
} else if (item.type === 'editor') {
return (
<Col span={item.width} key={item.uuid}>
--
Gitblit v1.8.0