Merge remote-tracking branch 'origin/dev' into dev

package-lock.json

@@ -1298,6 +1298,12 @@
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
+    "acorn": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+      "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
+      "dev": true
+    },
     "aggregate-error": {
       "version": "3.0.1",
       "resolved": "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.0.1.tgz",
@@ -3133,8 +3139,8 @@
     },
     "diff-match-patch": {
       "version": "1.0.4",
-      "resolved": "https://registry.npm.taobao.org/diff-match-patch/download/diff-match-patch-1.0.4.tgz",
-      "integrity": "sha1-asS1UjdGN2HE2vDcYD64aRJHRLE="
+      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.4.tgz",
+      "integrity": "sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg=="
     },
     "diffie-hellman": {
       "version": "5.0.3",
@@ -5315,9 +5321,9 @@
       }
     },
     "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.2.tgz",
-      "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
     "last-call-webpack-plugin": {
@@ -5602,9 +5608,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "dev": true
     },
     "minipass": {
@@ -8666,9 +8672,9 @@
       }
     },
     "vditor": {
-      "version": "2.2.19",
-      "resolved": "https://registry.npm.taobao.org/vditor/download/vditor-2.2.19.tgz",
-      "integrity": "sha1-4zEGN33HjuwOFUGbe2EVPstJX/8=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/vditor/-/vditor-3.0.0.tgz",
+      "integrity": "sha512-BymtwIZySlNtTYtKORYpf8S3TM0u0R5aPg5Z8EB5UysZhcsz25f4Vji6cr90qu0LUzCvTI+7c67tSmxjqTZktg==",
       "requires": {
         "diff-match-patch": "^1.0.4"
       }
@@ -8738,12 +8744,6 @@
         "webpack-sources": "^1.4.1"
       },
       "dependencies": {
-        "acorn": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
-          "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
-          "dev": true
-        },
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -8907,6 +8907,14 @@
             "regex-not": "^1.0.0",
             "snapdragon": "^0.8.1",
             "to-regex": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+              "dev": true
+            }
           }
         },
         "p-locate": {

package.json

@@ -49,6 +49,6 @@
     "nprogress": "^0.2.0",
     "uvstat": "^1.0.7",
     "vcmt": "^1.1.2",
-    "vditor": "^2.2.19"
+    "vditor": "^3.0.0"
   }
 }

src/main/resources/js/admin/editor.js

@@ -110,7 +110,7 @@ $.extend(SoloEditor.prototype, {
         'list',
         'check',
         'upload',
-        'wysiwyg',
+        'edit-mode',
         'preview',
         'fullscreen',
         'help',

src/main/resources/js/common.js

@@ -305,7 +305,7 @@ window.Util = {
   loadVditor: function (cb) {
     $.ajax({
       method: 'GET',
-      url: 'https://cdn.jsdelivr.net/npm/vditor@2.2.19/dist/index.min.js',
+      url: 'https://cdn.jsdelivr.net/npm/vditor@3.0.0/dist/index.min.js',
       dataType: 'script',
       cache: true,
       success: () => {

src/main/resources/js/page.js

@@ -160,7 +160,7 @@ $.extend(Page.prototype, {
         'undo',
         'redo',
         '|',
-        'wysiwyg',
+        'edit-mode',
         'both',
         'preview',
         'format',
@@ -178,7 +178,7 @@ $.extend(Page.prototype, {
           'link',
           'list',
           'check',
-          'wysiwyg',
+          'edit-mode',
           'preview',
           'fullscreen',
           'help',

src/main/resources/skins/metro-hot/article-list.ftl

@@ -56,7 +56,7 @@
                     ${article.articleTitle}
                 </a>
             </h2>
-            <div class="vditor-reset">
+            <div class="vditor-reset vditor-reset--dark">
                 ${article.articleAbstractText}
             </div>
             <div data-ico="&#x003b;" title="${tagLabel}" class="article-tags">

src/main/resources/skins/metro-hot/article.ftl

@@ -74,7 +74,7 @@
             </div>
             <div class="fn-clear">
                 <div class="main">
-                    <div class="vditor-reset">
+                    <div class="vditor-reset vditor-reset--dark">
                         ${article.articleContent}
                         <#if "" != article.articleSign.signHTML?trim>
                         ${article.articleSign.signHTML}

src/main/resources/skins/metro-hot/common-comment.ftl

@@ -43,6 +43,6 @@
             ${comment.commentDate2?string("yy-MM-dd HH:mm")}
             </div>
         </div>
-        <div class="vditor-reset">${comment.commentContent}</div>
+        <div class="vditor-reset vditor-reset--dark">${comment.commentContent}</div>
     </div>
-</div>
\ No newline at end of file
+</div>

src/main/resources/skins/metro-hot/css/base.scss

@@ -27,10 +27,6 @@
 @import "../../../scss/function";
 @import "vditor/src/assets/scss/index";
 
-.vditor-reset pre > code {
-  background-color: rgba(255, 255, 255, 0.04);
-}
-
 .user__site {
   svg {
     height: 14px;
@@ -748,7 +744,6 @@ textarea {
 }
 
 .vditor-reset {
-  background-color: #323232;
   margin-bottom: 30px;
   overflow: hidden;
   padding: 10px;

src/main/resources/skins/metro-hot/macro-side.ftl

@@ -52,7 +52,7 @@
             </#if>
 
             <#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
-                <div class="vditor-reset" style="margin-top: 20px">
+                <div class="vditor-reset vditor-reset--dark" style="margin-top: 20px">
                     <#include "../../common-template/toc.ftl"/>
                 </div>
             </#if>