From f9ba5907ddff56da7c38b1c7d5a9c5ba6aadfa05 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 19 一月 2021 17:10:19 +0800 Subject: [PATCH] 2021-01-19 --- src/views/billprint/index.jsx | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx index 56f813f..bd4f620 100644 --- a/src/views/billprint/index.jsx +++ b/src/views/billprint/index.jsx @@ -21,6 +21,7 @@ const PropCard = asyncComponent(() => import('@/tabviews/custom/components/card/prop-card')) const TableCard = asyncComponent(() => import('@/tabviews/custom/components/card/table-card')) const NormalTable = asyncComponent(() => import('@/tabviews/custom/components/table/normal-table')) +const BraftEditor = asyncComponent(() => import('@/tabviews/custom/components/editor/braft-editor')) class BillPrint extends Component { state = { @@ -153,9 +154,13 @@ if (component.action) component.action = [] if (component.search) component.search = [] component.data = [] // 鍒濆鍖栨暟鎹负绌� + + if ((component.subtype === 'propcard' || component.subtype === 'brafteditor') && component.wrap.datatype === 'static') { + component.format = '' + } if (!component.setting) return component // 涓嶄娇鐢ㄧ郴缁熷嚱鏁版椂 - if (!component.format || (component.subtype === 'propcard' && component.wrap.datatype === 'static')) return component // 娌℃湁鍔ㄦ�佹暟鎹� 鏁版嵁鏍煎紡 array 鎴� object + if (!component.format) return component // 娌℃湁鍔ㄦ�佹暟鎹� 鏁版嵁鏍煎紡 array 鎴� object if (component.setting.interType !== 'system') { // 涓嶄娇鐢ㄧ郴缁熷嚱鏁版椂 component.setting.sync = 'false' return component @@ -350,7 +355,7 @@ let _results = results.filter(Boolean) let comps = components.map(item => { - if (item.subtype === 'propcard' && item.wrap.datatype === 'static') return item + if (!item.format) return item _results.forEach(res => { if (res.componentId === item.uuid && res.data) { @@ -566,6 +571,12 @@ <NormalTable config={item} initdata={item.data} mainSearch={[]} menuType="" /> </Col> ) + } else if (item.type === 'editor') { + return ( + <Col span={item.width} key={item.uuid}> + <BraftEditor config={item} initdata={item.data} mainSearch={[]} menuType="" /> + </Col> + ) } else { return null } -- Gitblit v1.8.0