完善文章读取和编辑;

public/static/css/common.css

@@ -1,5 +1,3 @@
-
-
 .left-bottom-options {
     position  : fixed;
     left      : 20px;
@@ -44,6 +42,7 @@
     font-size: 16px;
     width    : 20%;
 }
+
 .table-card-item .item-value {
     padding         : 5px;
     margin          : 5px;
@@ -52,6 +51,7 @@
     white-space     : normal;
     word-break      : break-all;
 }
+
 .layui-form-radio {
     white-space: nowrap;
 }
@@ -115,3 +115,9 @@
         height: 100%;
     }
 }
+
+
+.w-e-text-container ul li {
+    list-style: inherit;
+}
+

public/static/css/index.articles.css

@@ -176,6 +176,8 @@
   margin-top: 15px;
 }
 
+
+
 @media screen and (max-width: 768px) {
   .nav-left-list {
     text-align: left;
@@ -210,3 +212,76 @@
 a.post-item:visited{
   color: #bbb;
 }
+
+
+.ul-content p{
+    margin: 15px 0;
+}
+
+.ul-content p,
+.ul-content li,
+.ul-content td,
+.ul-content th,
+.ul-content blockquote {
+    white-space: pre-wrap;
+    line-height: 1.5;
+    /* 显示空格 */
+}
+
+
+.ul-content h2{
+    margin:20px 0
+}
+
+/* 表格 */
+.ul-content table {
+    border-collapse: collapse;
+}
+
+.ul-content table th,
+.ul-content table td {
+    border    : 1px solid #ccc;
+    min-width : 50px;
+    height    : 20px;
+    text-align: left;
+}
+
+.ul-content table th {
+    background-color: #f1f1f1;
+    text-align      : center
+}
+
+
+
+/* 引用 */
+.ul-content blockquote {
+    display         : block;
+    border-left     : 8px solid #d0e5f2;
+    padding         : 10px 10px;
+    margin          : 10px 0;
+    background-color: #f1f1f1;
+}
+
+/* 列表 */
+.ul-content ul,
+.ul-content ol {
+    margin: 10px 0 10px 20px;
+}
+
+.ul-content ul li{
+    list-style: inherit;
+}
+
+/* 分割线 */
+.ul-content hr {
+    display         : block;
+    width           : 90%;
+    margin          : 20px auto;
+    border          : 0;
+    height          : 1px;
+    background-color: #ccc;
+}
+
+.ul-content img {
+    max-width: 100%;
+}

public/static/lib/prismjs/prism.css

@@ -0,0 +1,3 @@
+/* PrismJS 1.27.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+bash+git+javadoclike+jq+jsdoc+js-extras+json+json5+markdown+markup-templating+php+phpdoc+php-extras+plsql+sqf+sql+typescript+uri&plugins=normalize-whitespace */
+code[class*=language-],pre[class*=language-]{color:#000;background:0 0;text-shadow:0 1px #fff;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;-o-tab-size:4;tab-size:4;-webkit-hyphens:none;-moz-hyphens:none;-ms-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection,pre[class*=language-]::-moz-selection{text-shadow:none;background:#b3d4fc}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection,pre[class*=language-]::selection{text-shadow:none;background:#b3d4fc}@media print{code[class*=language-],pre[class*=language-]{text-shadow:none}}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#f5f2f0}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#708090}.token.punctuation{color:#999}.token.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#905}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#690}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url{color:#9a6e3a;background:hsla(0,0%,100%,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.class-name,.token.function{color:#dd4a68}.token.important,.token.regex,.token.variable{color:#e90}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}

view/admin/post/edit_content.html

@@ -97,7 +97,7 @@
                     <div id="content-state" style="height: 30px;line-height: 30px;padding-left: 15px;border-top: 1px solid #e8e8e8;color: #666;">
                         内容变动自动提交
                     </div>
-                    <div id="content-data" style="display: none;">{:urlencode($post->content_html)}</div>
+                    <div id="content-data" style="display: none;">{:rawurldecode($post->content_html)}</div>
                 </div>
             </div>
         </div>
@@ -153,7 +153,6 @@
             }
         }
         editorConfig.onChange = (editor) => {
-            console.log('content', editor)
             contentSaveLock = false;
 
             $('#content-state').text('等待自动提交')

view/index/post/read.html

@@ -7,9 +7,8 @@
   <title>{$post.title}</title>
   <meta name="description" content="{$post.desc|default=$post.title}" />
   {include file='common/_require'/}
-  <link rel="stylesheet" href="/static/lib/quill/quill.snow.css">
+  <link rel="stylesheet" href="/static/lib/prismjs/prism.css">
-  <link rel="stylesheet" href="/static/lib/highlight/styles/vs.css">
+  <script src="/static/lib/prismjs/prism.js"></script>
-  <script src="/static/lib/highlight/highlight.pack.js"></script>
   <script src="/static/lib/clipboard/clipboard.js"></script>
   <style>
     .ql-editor {
@@ -124,8 +123,10 @@
             </script>
             {/if}
             {/if}
-            <div class="ql-snow">
+            <div class="">
-              <article class="ql-editor">{$post->content_html|raw}</article>
+                <div class="ul-content ">
+                  {$post->content_html|raw}
+                </div>
             </div>
             <div class="copyright">
               {:get_system_config('post_copyright')}