From dca2092018a052adad9431cbdbc5c7e760c61f88 Mon Sep 17 00:00:00 2001
From: namezlx <1879558202@qq.com>
Date: Fri, 27 Oct 2023 10:34:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A8=E6=83=85=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Issues/index.scss                    | 15 +++++++++++++++
 src/modules/tpm/challengesnew/tpm-md-editor.js |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/forge/Issues/index.scss b/src/forge/Issues/index.scss
index 1283e3a8e..a6c8c531e 100644
--- a/src/forge/Issues/index.scss
+++ b/src/forge/Issues/index.scss
@@ -851,4 +851,19 @@
       }
     }
   }
+}
+
+.editormd-emoji-dialog {
+  .editormd-dialog-mask {
+    display: none !important;
+  }
+  .editormd-tab-box {
+    .editormd-grid-table {
+      .editormd-grid-table-row {
+        .selected {
+          background-color: #708cff;
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/modules/tpm/challengesnew/tpm-md-editor.js b/src/modules/tpm/challengesnew/tpm-md-editor.js
index 0f36bda75..dee53eff4 100644
--- a/src/modules/tpm/challengesnew/tpm-md-editor.js
+++ b/src/modules/tpm/challengesnew/tpm-md-editor.js
@@ -9,8 +9,8 @@ import 'codemirror/lib/codemirror.css';
 import './css/newquestion.css';
 const $ = window.$
 
-const mdIcons = ["bold", "italic", "del", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "image", "table", '|', "line-break", "watch", "clear","fullscreen"];
-const mdIconsHasLatex = ["bold", "italic", "del", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "inline-latex", "latex", '|', "image", "table", '|', "line-break", "watch", "clear","fullscreen"];
+const mdIcons = ["bold", "italic", "del", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "image", "table", '|', "line-break", "watch", "clear", "emoji","fullscreen"];
+const mdIconsHasLatex = ["bold", "italic", "del", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "inline-latex", "latex", '|', "image", "table", '|', "line-break", "watch", "clear", "emoji","fullscreen"];
 
 const NULL_CH = '▁';
 
@@ -339,7 +339,7 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
       syncScrolling: "single",
       tex: true,
       tocm: true,
-      emoji: !!emoji,
+      emoji: true,
       taskList: true,
       codeFold: true,
       searchReplace: true,

From d8acbfc4d5bac1abed660119b7f28589196bab23 Mon Sep 17 00:00:00 2001
From: namezlx <1879558202@qq.com>
Date: Fri, 27 Oct 2023 10:40:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=92=A4=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Issues/index.scss                    | 15 ---------------
 src/modules/tpm/challengesnew/tpm-md-editor.js |  6 +++---
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/forge/Issues/index.scss b/src/forge/Issues/index.scss
index a6c8c531e..1283e3a8e 100644
--- a/src/forge/Issues/index.scss
+++ b/src/forge/Issues/index.scss
@@ -851,19 +851,4 @@
       }
     }
   }
-}
-
-.editormd-emoji-dialog {
-  .editormd-dialog-mask {
-    display: none !important;
-  }
-  .editormd-tab-box {
-    .editormd-grid-table {
-      .editormd-grid-table-row {
-        .selected {
-          background-color: #708cff;
-        }
-      }
-    }
-  }
 }
\ No newline at end of file
diff --git a/src/modules/tpm/challengesnew/tpm-md-editor.js b/src/modules/tpm/challengesnew/tpm-md-editor.js
index dee53eff4..e4cc4a53d 100644
--- a/src/modules/tpm/challengesnew/tpm-md-editor.js
+++ b/src/modules/tpm/challengesnew/tpm-md-editor.js
@@ -9,8 +9,8 @@ import 'codemirror/lib/codemirror.css';
 import './css/newquestion.css';
 const $ = window.$
 
-const mdIcons = ["bold", "italic", "del", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "image", "table", '|', "line-break", "watch", "clear", "emoji","fullscreen"];
-const mdIconsHasLatex = ["bold", "italic", "del", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "inline-latex", "latex", '|', "image", "table", '|', "line-break", "watch", "clear", "emoji","fullscreen"];
+const mdIcons = ["bold", "italic", "del", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "image", "table", '|', "line-break", "watch", "clear", "fullscreen"];
+const mdIconsHasLatex = ["bold", "italic", "del", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "inline-latex", "latex", '|', "image", "table", '|', "line-break", "watch", "clear", "fullscreen"];
 
 const NULL_CH = '▁';
 
@@ -339,7 +339,7 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
       syncScrolling: "single",
       tex: true,
       tocm: true,
-      emoji: true,
+      emoji: !!emoji,
       taskList: true,
       codeFold: true,
       searchReplace: true,