From 033587e825e9e744ea4b75fa04654e5d172ee0ab Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 26 Jun 2024 16:28:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E5=AE=9A=E6=97=B6=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A-=E5=AF=8C=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/rich-text/TinymceEditor.vue    | 46 +++++++++++++++++--
 de-xpack                                      |  2 +-
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/core/core-frontend/src/components/rich-text/TinymceEditor.vue b/core/core-frontend/src/components/rich-text/TinymceEditor.vue
index e8812d3812..1891640cc5 100644
--- a/core/core-frontend/src/components/rich-text/TinymceEditor.vue
+++ b/core/core-frontend/src/components/rich-text/TinymceEditor.vue
@@ -24,11 +24,13 @@ import 'tinymce/plugins/contextmenu' // contextmenu
 import 'tinymce/plugins/directionality'
 import 'tinymce/plugins/nonbreaking'
 import 'tinymce/plugins/pagebreak'
+import { propTypes } from '@/utils/propTypes'
 const props = defineProps({
-  modelValue: String
+  modelValue: String,
+  inline: propTypes.bool.def(true)
 })
 const myValue = ref()
-const { modelValue } = toRefs(props)
+const { modelValue, inline } = toRefs(props)
 myValue.value = modelValue
 watch(
   () => props.modelValue,
@@ -69,10 +71,9 @@ const init = ref({
   menubar: false,
   placeholder: '',
   outer_placeholder: '双击输入文字',
-  inline: true,
-  branding: false
+  inline: inline.value,
+  branding: true
 })
-
 tinymce.init({})
 </script>
 
@@ -102,4 +103,39 @@ tinymce.init({})
     border: none !important;
   }
 }
+
+.tox {
+  border-radius: 4px !important;
+  border-bottom: 1px solid #ccc !important;
+  z-index: 1000;
+}
+.tox-tbtn {
+  height: auto !important;
+}
+.tox-collection__item-label {
+  p {
+    color: #1a1a1a !important;
+  }
+  h1 {
+    color: #1a1a1a !important;
+  }
+  h2 {
+    color: #1a1a1a !important;
+  }
+  h3 {
+    color: #1a1a1a !important;
+  }
+  h4 {
+    color: #1a1a1a !important;
+  }
+  h5 {
+    color: #1a1a1a !important;
+  }
+  h6 {
+    color: #1a1a1a !important;
+  }
+  pre {
+    color: #1a1a1a !important;
+  }
+}
 </style>
diff --git a/de-xpack b/de-xpack
index d03ecc9d0d..1073e587ab 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit d03ecc9d0d31d2b09caa19afd1e3601b4a4b3f7e
+Subproject commit 1073e587ab844d15df1f631902bd59e308234964