From a99caad99c3c19e85edd03f2fe425a0630033ac5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 20 十一月 2024 16:09:11 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/editor/braft-editor/index.jsx | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/menu/components/editor/braft-editor/index.jsx b/src/menu/components/editor/braft-editor/index.jsx
index ba699ef..553f4b0 100644
--- a/src/menu/components/editor/braft-editor/index.jsx
+++ b/src/menu/components/editor/braft-editor/index.jsx
@@ -149,6 +149,9 @@
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')
+ }
res.tbStyle = res.tbStyle.join(' ')
}
--
Gitblit v1.8.0