From 293318e25f00ee837e9f61778176aaae298b214f Mon Sep 17 00:00:00 2001
From: sysnix <535420543@qq.com>
Date: Mon, 25 Sep 2023 06:02:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/controller/admin/ArticleController.go |  2 ++
 template/admin/article/editor/markdown.html    |  4 +---
 template/admin/article/editor/tinymce.html     |  9 ++++-----
 template/blog/article/article_md.html          | 14 ++++++++++----
 template/blog/article/article_tinyMce.html     |  7 ++++++-
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/internal/controller/admin/ArticleController.go b/internal/controller/admin/ArticleController.go
index 0ffb6ef..886ec43 100644
--- a/internal/controller/admin/ArticleController.go
+++ b/internal/controller/admin/ArticleController.go
@@ -5,6 +5,7 @@ import (
 	"blog/internal/model/admin"
 	"blog/internal/service"
 	"blog/third_party/SessionUtil"
+	"html/template"
 	"log"
 	"net/http"
 
@@ -34,6 +35,7 @@ func (ctrl *ArticleController) GetEditor() {
 		content, _ := service.ContentService.GetContentByDb(id)
 		ctrl.Ctx.ViewData("blogArticle", article)
 		ctrl.Ctx.ViewData("blogContent", content)
+		ctrl.Ctx.ViewData("content", template.HTML(content.Content))
 	}
 	ctrl.Ctx.View("/admin/article/editor/" + contentType + ".html")
 }
diff --git a/template/admin/article/editor/markdown.html b/template/admin/article/editor/markdown.html
index 7c51612..1c26d4f 100644
--- a/template/admin/article/editor/markdown.html
+++ b/template/admin/article/editor/markdown.html
@@ -25,8 +25,6 @@
 <script type="text/x-template" id="app-template">
     <v-app id="inspire">
         #{ render "common/bar-admin.html" . }
-        <!-- <#include "../../common/drawer-admin.ftl"> -->
-
 
         <v-main class="grey lighten-3">
             <v-container style="height: 100%">
@@ -63,7 +61,7 @@
     </v-app>
 </script>
 
-<script type="text/x-template" id="content">#{.blogContent.Content}</script>
+<script type="text/x-template" id="content">#{.content}</script>
 
 <script>
     var markdownEditor;
diff --git a/template/admin/article/editor/tinymce.html b/template/admin/article/editor/tinymce.html
index df41acf..c92cc7f 100644
--- a/template/admin/article/editor/tinymce.html
+++ b/template/admin/article/editor/tinymce.html
@@ -14,6 +14,7 @@
     <script src="/assets/vuetify-v2.6.9/vuetify-v2.6.9.min.js"></script>
     <script src="/assets/tinymce5/js/tinymce/tinymce.min.js"></script>
     <script src="/assets/axios/axios.min.js"></script>
+    <script src="/assets/moment/moment.js"></script>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
 </head>
 
@@ -23,8 +24,6 @@
 <script type="text/x-template" id="app-template">
     <v-app id="inspire">
         #{ render "common/bar-admin.html" . }
-        <!-- <#include "../../common/drawer-admin.ftl"> -->
-
 
         <v-main class="grey lighten-3">
             <v-container style="height: 100%">
@@ -60,7 +59,7 @@
     </v-app>
 </script>
 
-<script type="text/x-template" id="text-template">#{.blogContent}</script>
+<script type="text/x-template" id="text-template">#{.content}</script>
 
 <script>
     var editor;
@@ -131,7 +130,7 @@
                 editor = tinymce.init({
                     selector: '#tinyMceEditor',
                     language: 'zh_CN',
-                    plugins: 'print preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media template code codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autosave bdmap indent2em autoresize formatpainter axupimgs importword kityformula-editor',
+                    plugins: 'print preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media template code codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons bdmap indent2em autoresize formatpainter axupimgs importword kityformula-editor',
                     toolbar: 'undo redo restoredraft | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough link anchor codesample table image media charmap emoticons code preview| alignleft aligncenter alignright alignjustify outdent indent | \
                      styleselect formatselect fontselect fontsizeselect | bullist numlist | blockquote subscript superscript removeformat | \
                      hr pagebreak insertdatetime print | fullscreen | bdmap indent2em lineheight formatpainter axupimgs importword kityformula-editor',
@@ -139,7 +138,7 @@
                     toolbar_sticky: true,
                     height: 800, //编辑器高度
                     min_height: 800,
-                    autosave_ask_before_unload: true,
+                    // autosave_ask_before_unload: true,
                     /*content_css: [ //可设置编辑区内容展示的css，谨慎使用
                         '/assets/reset.css',
                         '/assets/ax.css',
diff --git a/template/blog/article/article_md.html b/template/blog/article/article_md.html
index 5eff294..76588fb 100644
--- a/template/blog/article/article_md.html
+++ b/template/blog/article/article_md.html
@@ -16,6 +16,7 @@
     <script src="/assets/editor-md/lib/prettify.min.js"></script>
     <script src="/assets/editor-md/lib/marked.min.js"></script>
     <script src="/assets/editor-md/editormd.min.js"></script>
+    <script src="/assets/moment/moment.js"></script>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
 </head>
 <body>
@@ -33,10 +34,14 @@
                     </v-col>
 
                     <v-col cols="12" xs="12" sm="12" md="10">
-                        <v-sheet min-height="100%" style="float: left;" width="100%">
-                            <div id="my-content">
-                                <h2>#{.article.Title}</h2>
-                                <v-subheader>#{.article.SubTitle}</v-subheader>
+                        <v-sheet min-height="100%" style="float: left;padding: 15px;" width="100%">
+                            <h2>#{.article.Title}</h2>
+                            #{ if ne .article.SubTitle ""}
+                            <v-subheader>#{.article.SubTitle}</v-subheader>
+                            #{end}
+                            <v-subheader>发布时间: {{ publishTime?moment(parseInt(publishTime)).format('YYYY/MM/DD'):''}}</v-subheader>
+                            <v-divider></v-divider>
+                            <div id="my-content" style="padding-left: 0;padding-right: 0; padding-top:10px">
                                 <textarea id="append-test" style="display:none;">#{.content}</textarea>
                             </div>
                         </v-sheet>
@@ -56,6 +61,7 @@
             group: null,
             drawer: false,
             loading: false,
+            publishTime: '#{.article.PublishTime}'
 
         },
         methods: {},
diff --git a/template/blog/article/article_tinyMce.html b/template/blog/article/article_tinyMce.html
index ab72fb8..0f96a30 100644
--- a/template/blog/article/article_tinyMce.html
+++ b/template/blog/article/article_tinyMce.html
@@ -16,6 +16,7 @@
     <script src="/assets/editor-md/lib/jquery.min.js"></script>
     <script src="/assets/editor-md/editormd.js"></script>
     <script src="/assets/prism/prism.js"></script>
+    <script src="/assets/moment/moment.js"></script>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
 </head>
 
@@ -34,9 +35,12 @@
                     </v-col>
 
                     <v-col cols="12" xs="12" sm="12" md="10">
-                        <v-sheet min-height="100%" style="float: left;padding: 10px;" width="100%" class="article_content">
+                        <v-sheet min-height="100%" style="float: left;padding: 15px;" width="100%">
                             <h2>#{.article.Title}</h2>
+                            #{ if ne .article.SubTitle ""}
                             <v-subheader>#{.article.SubTitle}</v-subheader>
+                            #{end}
+                            <v-subheader>发布时间: {{ publishTime?moment(parseInt(publishTime)).format('YYYY/MM/DD'):''}}</v-subheader>
                             <v-divider></v-divider>
                             #{.content}
                         </v-sheet>
@@ -67,6 +71,7 @@
         template: '#app-template',
         data: {
             drawer: false,
+            publishTime: '#{.article.PublishTime}'
         },
         methods: {},
         vuetify: new Vuetify(),