From eed746580d059ab1bb01fec5a4c117a82c861ff2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 20:56:55 +0800
Subject: [PATCH] 2025-02-06
---
src/menu/components/editor/braft-editor/index.jsx | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/menu/components/editor/braft-editor/index.jsx b/src/menu/components/editor/braft-editor/index.jsx
index ba933e2..67fcb70 100644
--- a/src/menu/components/editor/braft-editor/index.jsx
+++ b/src/menu/components/editor/braft-editor/index.jsx
@@ -38,7 +38,7 @@
let _card = {
uuid: card.uuid,
type: card.type,
- format: 'object', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
+ format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: false, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
width: card.width || 24,
@@ -57,6 +57,7 @@
} else {
let _card = fromJS(card).toJS()
+ _card.format = 'array'
if (_card.wrap.firstTr === 'light') {
_card.wrap.tbStyle = 'th-light'
delete _card.wrap.firstTr
@@ -108,8 +109,9 @@
card.name = card.wrap.name
card.errors = []
+ card.$tables = []
- if (card.wrap.datatype !== 'static') {
+ if (card.wrap.datatype === 'dynamic') {
card.$c_ds = true
card.errors = checkComponent(card)
@@ -147,8 +149,18 @@
const { card } = this.state
if (res.tbStyle) {
+ if (res.tbStyle.includes('no-border') && (res.tbStyle.includes('bold-border') || res.tbStyle.includes('deep-border'))) {
+ res.tbStyle = res.tbStyle.filter(item => item !== 'no-border')
+ }
+
+ if (res.splitLine === 'true') {
+ res.tbStyle.push('deep-split')
+ }
+
res.tbStyle = res.tbStyle.join(' ')
}
+
+ delete res.splitLine
let _card = {...card, wrap: res}
@@ -188,7 +200,7 @@
<NormalHeader hideSearch="true" config={card} updateComponent={this.updateComponent}/>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <NormalForm title="瀵屾枃鏈缃�" width={850} update={this.updateWrap} getForms={this.getWrapForms}>
+ <NormalForm title="瀵屾枃鏈缃�" width={900} update={this.updateWrap} getForms={this.getWrapForms}>
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
<CopyComponent type="editor" card={card}/>
@@ -200,10 +212,7 @@
} trigger="hover">
<ToolOutlined />
</Popover>
- <BraftContent
- value={card.wrap.datatype !== 'static' ? '<p class="empty-content">瀵屾枃鏈�</p>' : card.html}
- encryption="false"
- />
+ <BraftContent value={card.wrap.datatype !== 'static' ? '<p class="empty-content">瀵屾枃鏈�</p>' : card.html}/>
<div className="component-name">
<div className="center">
<div className="title">{card.name}</div>
--
Gitblit v1.8.0