From 2b46797c3a5868f7f26329da5834c13aae07ad69 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 03 四月 2023 11:59:34 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/billprint/index.jsx | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index b616463..70a2505 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -26,6 +26,7 @@
const NormalTable = asyncComponent(() => import('@/tabviews/custom/components/table/normal-table'))
const SandBox = asyncComponent(() => import('@/tabviews/custom/components/code/sand-box'))
const TimeLine = asyncComponent(() => import('@/tabviews/custom/components/timeline/normal-timeline'))
+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 DebugTable = asyncComponent(() => import('@/tabviews/debugtable'))
@@ -60,7 +61,6 @@
let param = JSON.parse(window.decodeURIComponent(window.atob(params.param)))
sessionStorage.setItem('dataM', param.dataM || '')
- sessionStorage.setItem('localDataM', param.dataM || '')
this.setState({
BID: param.id || '',
tempId: param.tempId,
@@ -455,13 +455,23 @@
}
reload = () => {
+ const { tempId } = this.state
+
this.setState({
loadingview: true,
pages: null,
data: '',
config: null
}, () => {
- this.getMenuParam()
+ Api.deleteMenuStorage(tempId)
+ setTimeout(() => {
+ this.getMenuParam()
+ }, 50)
+ // Api.getAppVersion(tempId).then(() => {
+ // this.getMenuParam()
+ // }, () => {
+ // this.getMenuParam()
+ // })
})
}
@@ -874,6 +884,12 @@
<TimeLine config={item} initdata={item.data} mainSearch={[]}/>
</Col>
)
+ } else if (item.type === 'editor') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <BraftEditor config={item} initdata={item.data} mainSearch={[]}/>
+ </Col>
+ )
} else if (item.type === 'antvG6') {
return (
<Col span={item.width} style={style} key={item.uuid}>
--
Gitblit v1.8.0