Merge branch 'dev' of http://124.70.149.18:10880/lianghj/queenshow into dev

src/hooks/initAuthDef.ts

@@ -7,7 +7,7 @@ export function initAuthDef() {
       httpConfig: {
         baseURL: Dict_Apis.auth,
       },
-      key: "queentreesku3d",
+      key: "queenshow",
       loginPath: "/login",
       loginJumpPath: "/",
       logoutJumpPath: "/login",
@@ -15,6 +15,9 @@ export function initAuthDef() {
       needCompanyLogin: false,
       needRegister: true,
       needResetPwd: true,
+      regInfo: {
+        key: "queenshow"
+      }
     },
   });
   auth.actions.initUser();

src/modules/editor/components/CompUI/basicUI/Text/component.tsx

@@ -1,6 +1,6 @@
 import { useEditor } from "@/modules/editor";
 import { Alignment } from "@ckeditor/ckeditor5-alignment";
-import { Bold, Italic } from "@ckeditor/ckeditor5-basic-styles";
+import { Bold, Italic,Underline,Strikethrough } from "@ckeditor/ckeditor5-basic-styles";
 import { InlineEditor } from "@ckeditor/ckeditor5-editor-inline";
 import { Essentials } from "@ckeditor/ckeditor5-essentials";
 import { FontColor, FontFamily, FontSize } from "@ckeditor/ckeditor5-font";
@@ -44,6 +44,8 @@ function GetConfig() {
       Bold,
       Italic,
       Link,
+      Underline,
+      Strikethrough,
       Paragraph,
       FontColor,
       FontSize,
@@ -73,6 +75,8 @@ function GetConfig() {
         "lineHeight",
         "bold",
         "italic",
+        "underline",
+        "strikethrough",       
         "|",
         "alignment",
         // "|",