From 1ed039c656453814a2357671fa81bdb4ad0306fb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 07 七月 2023 09:25:37 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/popview/index.jsx | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index ca59201..7c45f53 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -40,6 +40,7 @@
const TimeLine = asyncComponent(() => import('../components/timeline/normal-timeline'))
const Voucher = asyncComponent(() => import('../components/module/voucher'))
const Iframe = asyncComponent(() => import('../components/iframe'))
+const Calendar = asyncComponent(() => import('../components/calendar'))
const AntvG6 = asyncComponent(() => import('../components/chart/antv-G6'))
const AntvX6 = asyncComponent(() => import('../components/chart/antv-X6'))
@@ -1055,6 +1056,12 @@
<NormalTree config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
+ } else if (item.type === 'calendar') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <Calendar config={item} mainSearch={mainSearch}/>
+ </Col>
+ )
} else if (item.type === 'code') {
return (
<Col span={item.width} style={style} key={item.uuid}>
--
Gitblit v1.8.0