From 2292d1826e69e21c8a411c217faef635fe57d458 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 一月 2021 10:48:49 +0800
Subject: [PATCH] Merge branch 'bms' of ssh://39.106.218.81:29418/~jinfei/pc-plat into bms
---
src/tabviews/custom/components/share/tabtransfer/index.jsx | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx
index ed82365..7e584ff 100644
--- a/src/tabviews/custom/components/share/tabtransfer/index.jsx
+++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx
@@ -20,6 +20,7 @@
const DataCard = asyncComponent(() => import('@/tabviews/custom/components/card/data-card'))
const TableCard = asyncComponent(() => import('@/tabviews/custom/components/card/table-card'))
const PropCard = asyncComponent(() => import('@/tabviews/custom/components/card/prop-card'))
+const NormalGroup = asyncComponent(() => import('@/tabviews/custom/components/group/normal-group'))
class TabTransfer extends Component {
static propTpyes = {
@@ -54,7 +55,7 @@
let params = []
config.components.forEach(item => {
- if (item.type === 'tabs') return
+ if (item.type === 'tabs' || item.type === 'group') return
if (!item.setting || item.setting.interType !== 'system') return
if (!item.format || (item.subtype === 'propcard' && item.wrap.datatype === 'static')) return
@@ -297,6 +298,12 @@
<TableCard config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
+ } else if (item.type === 'group' && item.subtype === 'normalgroup') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <NormalGroup config={item} bids={bids} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
} else {
return null
}
--
Gitblit v1.8.0