fix #12796

package-lock.json

@@ -1423,6 +1423,14 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "echarts": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-4.2.1.tgz",
+      "integrity": "sha512-pw4xScRPsLegD/cqEcoXRKeA2SD4+s+Kyo0Na166NamOWhzNl2yI5RZ2rE97tBlAopNmhyMeBVpAeD5qb+ee1A==",
+      "requires": {
+        "zrender": "4.0.7"
+      }
+    },
     "end-of-stream": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
@@ -2837,9 +2845,9 @@
       "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
     },
     "highlight.js": {
-      "version": "9.15.6",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.6.tgz",
-      "integrity": "sha512-zozTAWM1D6sozHo8kqhfYgsac+B+q0PmsjXeyDrYIHHcBN0zTVT66+s2GW1GZv7DbyaROdLXKdabwS/WqPyIdQ=="
+      "version": "9.15.8",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.8.tgz",
+      "integrity": "sha512-RrapkKQWwE+wKdF73VsOa2RQdIoO3mxwJ4P8mhbI6KYJUraUHRKM5w5zQQKXNk0xNL4UVRdulV9SBJcmzJNzVA=="
     },
     "homedir-polyfill": {
       "version": "1.0.3",
@@ -3281,9 +3289,9 @@
       "dev": true
     },
     "katex": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/katex/-/katex-0.10.1.tgz",
-      "integrity": "sha512-iZXZ2L8pEP7HXBLAaeWkdLxnoRQ8Fdks8IuIVt01tYb+D8e0em5JYgfe6J48wXsuEr512IRCN5Kvwb9FjZH6kg==",
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.10.2.tgz",
+      "integrity": "sha512-cQOmyIRoMloCoSIOZ1+gEwsksdJZ1EW4SWm3QzxSza/QsnZr6D4U1V9S4q+B/OLm2OQ8TCBecQ8MaIfnScI7cw==",
       "requires": {
         "commander": "^2.19.0"
       }
@@ -5477,12 +5485,13 @@
       "dev": true
     },
     "vditor": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/vditor/-/vditor-1.3.5.tgz",
-      "integrity": "sha512-fzDtXRtXG2fNUuTlzqS6qfP0F+GhwQ9nsQK47Ymh6NcIh5PEgfBUdGXLB4AQR6jwrrJHhb8/xuSs/5n6URa46Q==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/vditor/-/vditor-1.5.2.tgz",
+      "integrity": "sha512-NOmvjkg6NgEZUKTQB4lqlZoZTJcJ9tDoj+7odtcWO2fpi1RpRmrBnJjhDbuJy5mstM8KBXD9k17gSrlDT+UbeA==",
       "requires": {
+        "echarts": "^4.2.1",
         "highlight.js": "^9.15.6",
-        "katex": "^0.10.1",
+        "katex": "^0.10.2",
         "markdown-it": "^8.4.2",
         "mermaid": "^8.0.0",
         "turndown": "^5.0.3",
@@ -5711,6 +5720,11 @@
           "dev": true
         }
       }
+    },
+    "zrender": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.0.7.tgz",
+      "integrity": "sha512-TNloHe0ums6zxbHfnaCryM61J4IWDajZwNq6dHk9vfWhhysO/OeFvvR0drBs/nbXha2YxSzfQj2FiCd6RVBe+Q=="
     }
   }
 }

package.json

@@ -36,6 +36,6 @@
     "gulp-uglify": "^3.0.2"
   },
   "dependencies": {
-    "vditor": "^1.3.5"
+    "vditor": "^1.5.2"
   }
 }

src/main/webapp/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@1.3.5/dist/index.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/vditor@1.5.2/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/webapp/js/common.js

@@ -147,7 +147,7 @@ var Util = {
     if ($('.vditor-reset pre > code').length === 0) {
       return
     }
-    Util.addStyle('https://cdn.jsdelivr.net/npm/vditor@1.3.5/dist/js/highlight.js@9.15.6/styles/' +
+    Util.addStyle('https://cdn.jsdelivr.net/npm/vditor@1.5.2/dist/js/highlight.js@9.15.8/styles/' +
       Label.hljsStyle + '.css', 'vditorHljsStyle')
 
     var initHljs = function () {
@@ -158,7 +158,7 @@ var Util = {
     if (!Label.markedAvailable) {
       if (typeof hljs === 'undefined') {
         $.ajax({
-          url: 'https://cdn.jsdelivr.net/npm/vditor@1.3.5/dist/js/highlight.js@9.15.6/highlight.pack.js',
+          url: 'https://cdn.jsdelivr.net/npm/vditor@1.5.2/dist/js/highlight.js@9.15.8/highlight.pack.js',
           dataType: 'script',
           cache: true,
           success: function () {
@@ -182,7 +182,7 @@ var Util = {
       return
     }
 
-    Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.3.5/dist/index.min.js',
+    Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.5.2/dist/index.min.js',
       'vditorScript')
 
     Vditor.mermaidRender(document.body)

src/main/webapp/js/page.js

@@ -102,7 +102,7 @@ $.extend(Page.prototype, {
 
     if (!$('#soloEditorComment').hasClass('vditor')) {
       var that = this
-      Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.3.5/dist/index.min.js', 'vditorScript')
+      Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.5.2/dist/index.min.js', 'vditorScript')
       window.vditor = new Vditor('soloEditorComment', {
         placeholder: that.tips.commentContentCannotEmptyLabel,
         height: 180,

skins @ d582ffd2

-Subproject commit 7332ca1d7e2e39d76a7eaffbc6bf6c4c710fb06b
+Subproject commit d582ffd29aee34909a457a158c9f6f461456763c