From 36d523db004f2eb6f6a2bab906893f4929f8412b Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Mon, 4 Mar 2024 18:26:58 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E7=A0=94=E5=8F=91?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=9C=A8=E5=BC=B9=E5=87=BA=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=9C=80=E6=B1=82=E3=80=81=E7=BC=BA=E9=99=B7=E7=AD=89?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E6=97=B6=EF=BC=8C=E6=8F=8F=E8=BF=B0=E6=A1=86?=
 =?UTF-8?q?=E4=B8=8B=E6=BB=91=E4=BA=86=EF=BC=8C=E6=93=8D=E4=BD=9C=E6=A0=8F?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=81=8F=E7=A7=BB=20=20=20-=20[=E5=85=B3?=
 =?UTF-8?q?=E8=81=94]#[1104896110067712]=E7=A0=94=E5=8F=91=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=9C=A8=E5=BC=B9=E5=87=BA=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E3=80=81=E7=BC=BA=E9=99=B7=E7=AD=89=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E6=97=B6=EF=BC=8C=E6=8F=8F=E8=BF=B0=E6=A1=86=E4=B8=8B?=
 =?UTF-8?q?=E6=BB=91=E4=BA=86=EF=BC=8C=E6=93=8D=E4=BD=9C=E6=A0=8F=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=81=8F=E7=A7=BB=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1104896110067?=
 =?UTF-8?q?712?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/css/common.less           |  5 -----
 src/resources/plugins/TsCkeditor/ckeditor.less | 10 ++++++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/resources/assets/css/common.less b/src/resources/assets/css/common.less
index 1c5fdab1..b511ad6a 100644
--- a/src/resources/assets/css/common.less
+++ b/src/resources/assets/css/common.less
@@ -1828,11 +1828,6 @@ span {
   ol li {
     list-style: decimal inside;
   }
-  &.ck-editor__editable {
-    .ck-list-bogus-paragraph {
-      display: inline; // 修复ckeditor升级后，无序有序列表图标和后面的内容换行问题
-    }
-  }
 }
 .combinesearcher-drop {
   max-height: none;
diff --git a/src/resources/plugins/TsCkeditor/ckeditor.less b/src/resources/plugins/TsCkeditor/ckeditor.less
index 0d8b73ab..3b40dfe2 100644
--- a/src/resources/plugins/TsCkeditor/ckeditor.less
+++ b/src/resources/plugins/TsCkeditor/ckeditor.less
@@ -9,12 +9,15 @@
     }
   }
 }
-.ck-content{
-  min-height:130px;
+.ck-content {
+  min-height: 130px;
   // >p{
   //   margin-top: 0;
   // }
 }
+.ck.ck-sticky-panel .ck-sticky-panel__content_sticky {
+  position: static; // ckeditor计算top有问题，导致工具栏位置偏移
+}
 .theme(@op-color, @title-color, @text-color, @icon-color, @dividing-color, @mongolia-color, @background-color, @blockbg-color, @gray-color, @border-color-base, @boxshadow-main, @boxshadow-bolck, @disable-color, @primary-grey, @selected-bg , @placeholder-color, @topo-node, @footer-btn-bg, @shadow, @main-shadow) {
   .ck.ck-reset_all,
   .ck.ck-reset_all * {
@@ -65,7 +68,7 @@
   figure.table table {
     border-color: var(--border-color, @border-color-base) !important;
     border: 1px solid;
-    padding: .5em;
+    padding: 0.5em;
   }
 }
 .ck .ck-tooltip {
@@ -79,4 +82,3 @@ html {
     .theme(@dark-op, @dark-title, @dark-text, @dark-icon, @dark-dividing, @dark-mongolia, @dark-background, @dark-blockbg, @dark-gray, @dark-border, @dark-boxshadow-main, @dark-boxshadow-bolck, @dark-disable, @menu-background, @dark-selectbg, @dark-placeholder, @dark-dividing, @dark-footer-btn-bg, @dark-shadow, @dark-main-shadow);
   }
 }
-
-- 
Gitee