fix: cherry_markdown error (#908)

* fix: first open document, cherryMarkdown not have theme

* fix: modify prismjs style and improve image clarity

* update cherry-markdown

* optimiztion: cherry-markdown

* feat: cherry-markdown add auto-save and update icon

* fix: the mobile phone displays abnormally and Markdown does not allow conversion

---------

Co-authored-by: zhangsheng.93 <zhangsheng.93@bytedance.com>

.github/workflows/build.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.20.0
 
       - name: Build
         run: |

conf/lang/en-us.ini

@@ -224,6 +224,7 @@ project_label_desc = Allows up to 10 labels, use ";" to separate multiple tags
 cannot_change_own_status = Cannot change own status
 cannot_change_super_status = Cannot change super administrator status
 cannot_change_super_priv = Cannot change super administrator permissions
+editors_not_compatible = two editors are not compatible
 
 [blog]
 author = Author

conf/lang/zh-cn.ini

@@ -224,6 +224,7 @@ project_label_desc = 最多允许添加10个标签，多个标签请用“;”
 cannot_change_own_status = 不能变更自己的状态
 cannot_change_super_status = 不能变更超级管理员的状态
 cannot_change_super_priv = 不能变更超级管理员的权限
+editors_not_compatible = 两种编辑器不兼容
 
 [blog]
 author = 作者

controllers/BookController.go

@@ -173,6 +173,9 @@ func (c *BookController) SaveBook() {
 	book.CommentStatus = commentStatus
 	book.Publisher = publisher
 	//book.Label = tag
+	if book.Editor == EditorMarkdown && editor == EditorCherryMarkdown || book.Editor == EditorCherryMarkdown && editor == EditorMarkdown {
+		c.JsonResult(6006, i18n.Tr(c.Lang, "message.editors_not_compatible"))
+	}
 	book.Editor = editor
 	if editor == EditorCherryMarkdown {
 		book.Theme = "cherry"

static/css/markdown.css

@@ -548,12 +548,13 @@ iframe.cherry-dialog-iframe {
     margin-right: 50px;
 }
 
-.markdown-article-body {
+@media screen and (min-width: 840px) {
+    .markdown-article {
         margin-right: 200px !important;
     }
+}
 
 .markdown-article-head {
-    margin-right: 200px !important;
     width: unset !important;
     padding: unset !important;
     padding-top: 10px !important;
@@ -563,3 +564,9 @@ iframe.cherry-dialog-iframe {
     padding: unset !important;
     width: 100% !important;
 }
+
+@media screen and (max-width: 839px) {
+  .toc {
+    display: none !important;
+  }
+}

utils/html.go

@@ -117,6 +117,8 @@ func SafetyProcessor(html string) string {
 		if selector := docQuery.Find("div.markdown-article").First(); selector.Size() <= 0 {
 			if selector := docQuery.Find("div.markdown-toc").First(); selector.Size() > 0 {
 				docQuery.Find("div.markdown-toc").NextAll().WrapAllHtml("<div class=\"markdown-article\"></div>")
+			} else if selector := docQuery.Find("dir.toc").First(); selector.Size() > 0 {
+				docQuery.Find("dir.toc").NextAll().WrapAllHtml("<div class=\"markdown-article\"></div>")
 			}
 		}