From 48db4d4b22331f32bf6c6a0956a7cd4245ad6fde Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 29 六月 2023 09:30:34 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/billprint/index.jsx | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index de28f47..a7be0ab 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -29,6 +29,7 @@
const BraftEditor = asyncComponent(() => import('@/tabviews/custom/components/editor/braft-editor'))
const Balcony = asyncComponent(() => import('@/tabviews/custom/components/card/balcony'))
const AntvG6 = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-G6'))
+const AntvX6 = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-X6'))
const DebugTable = asyncComponent(() => import('@/tabviews/debugtable'))
class BillPrint extends Component {
@@ -961,6 +962,12 @@
<AntvG6 config={item} initdata={item.data} mainSearch={[]}/>
</Col>
)
+ } else if (item.type === 'antvX6') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvX6 config={item}/>
+ </Col>
+ )
} else {
return null
}
--
Gitblit v1.8.0