From ee9de799dd7aec1773a593957eff7639768d6995 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 20 三月 2023 09:57:17 +0800
Subject: [PATCH] 2023-03-20
---
src/views/billprint/index.jsx | 7 +++++++
src/views/menudesign/index.jsx | 2 +-
src/menu/modulesource/option.jsx | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/menu/modulesource/option.jsx b/src/menu/modulesource/option.jsx
index 696b3a5..e914933 100644
--- a/src/menu/modulesource/option.jsx
+++ b/src/menu/modulesource/option.jsx
@@ -66,7 +66,7 @@
{ type: 'menu', url: indent, component: 'antvG6', subtype: 'indentTree', title: '缂╄繘鏂囦欢鏍�', width: 24 },
{ type: 'menu', url: kapmap, component: 'antvG6', subtype: 'kapmap', title: '鐭ヨ瘑鍥捐氨鏍�', width: 24 },
{ type: 'menu', url: chart, component: 'chart', subtype: 'custom', title: '鑷畾涔夊浘琛�', width: 24, forbid: ['billPrint'] },
- { type: 'menu', url: Editor, component: 'editor', subtype: 'brafteditor', title: '瀵屾枃鏈�', width: 24, forbid: ['billPrint'] },
+ { type: 'menu', url: Editor, component: 'editor', subtype: 'brafteditor', title: '瀵屾枃鏈�', width: 24 },
{ type: 'menu', url: SandBox, component: 'code', subtype: 'sandbox', title: '鑷畾涔�', width: 24 },
{ type: 'menu', url: group, component: 'group', subtype: 'normalgroup', title: '鍒嗙粍', width: 24, forbid: ['billPrint'] },
{ type: 'menu', url: Iframe, component: 'iframe', subtype: 'iframe', title: 'iframe', width: 24, forbid: ['billPrint'] },
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index b616463..1ebe237 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'))
@@ -874,6 +875,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}>
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index ce3e6e5..3645483 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -1051,7 +1051,7 @@
carousel: '杞挱',
tree: '鏍戝舰鍒楄〃',
chart: '鑷畾涔夊浘琛�',
- editor: '瀵屾枃鏈�',
+ // editor: '瀵屾枃鏈�',
group: '鍒嗙粍',
iframe: 'iframe'
}
--
Gitblit v1.8.0