Merge branches '3.6.8-dev' and 'master' of https://github.com/88250/solo into 3.6.8-dev

package-lock.json

@@ -5256,9 +5256,9 @@
       "dev": true
     },
     "vditor": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/vditor/-/vditor-2.0.6.tgz",
-      "integrity": "sha512-R3FYFq9GhojcXdkiUhdIXcX2WyNoSr+R9YQoOvXKPSW0dBIzSDvofq/o/5uxini2AIxsWyBgsAJZlvvVxogm1w==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/vditor/-/vditor-2.0.7.tgz",
+      "integrity": "sha512-VwgBJZSlq2yxEz+3M3RHFB6aV7S4DLguVoZBGUNj/VicYp7lM5wOv0OdMefXiVOeLS8pB4heGha8x7TvXdepNA==",
       "requires": {
         "diff-match-patch": "^1.0.4"
       }

package.json

@@ -37,6 +37,6 @@
     "gulp-terser": "^1.2.0"
   },
   "dependencies": {
-    "vditor": "^2.0.6"
+    "vditor": "^2.0.7"
   }
 }

src/main/resources/admin/admin-index.ftl

@@ -165,7 +165,7 @@
             </div>
         </div>
         <script src="${staticServePath}/js/lib/compress/admin-lib.min.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/vditor@2.0.6/dist/index.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/vditor@2.0.7/dist/index.min.js"></script>
         <script src="${staticServePath}/js/common${miniPostfix}.js"></script>
         <#if "" == miniPostfix>
         <script src="${staticServePath}/js/admin/admin.js"></script>

src/main/resources/js/common.js

@@ -168,7 +168,7 @@ var Util = {
 
     if (typeof Vditor === 'undefined') {
       Util.addScript(
-        'https://cdn.jsdelivr.net/npm/vditor@2.0.6/dist/method.min.js',
+        'https://cdn.jsdelivr.net/npm/vditor@2.0.7/dist/method.min.js',
         'vditorPreviewScript')
     }
 

src/main/resources/js/page.js

@@ -103,7 +103,7 @@ $.extend(Page.prototype, {
     if (!$('#soloEditorComment').hasClass('vditor')) {
       var that = this
       Util.addScript(
-        'https://cdn.jsdelivr.net/npm/vditor@2.0.6/dist/index.min.js',
+        'https://cdn.jsdelivr.net/npm/vditor@2.0.7/dist/index.min.js',
         'vditorScript')
       var toolbar = [
         'emoji',