async #12897

package-lock.json

@@ -1199,9 +1199,9 @@
       "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
     },
     "acorn-globals": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz",
-      "integrity": "sha512-vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
+      "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
       "requires": {
         "acorn": "^6.0.1",
         "acorn-walk": "^6.0.1"
@@ -2723,9 +2723,9 @@
       }
     },
     "documentation": {
-      "version": "12.1.1",
-      "resolved": "https://registry.npmjs.org/documentation/-/documentation-12.1.1.tgz",
-      "integrity": "sha512-OmvNJ6gddKy9K8lx+eA9w+dTxs//vetBnzhaGrTnXbKkE1qgAP0DXaEE8pva2ptSDw3Wa6oDm3C7fKgXdobjPQ==",
+      "version": "12.1.2",
+      "resolved": "https://registry.npmjs.org/documentation/-/documentation-12.1.2.tgz",
+      "integrity": "sha512-k0orsM458oU4m2P7yaXuLwM/0TPC1y0AWeiM5qLIT39oGjUgHLY+VOlb9x2cty5LyENxLQl4rtQzTMWKJ6l5Ng==",
       "requires": {
         "@babel/core": "^7.1.2",
         "@babel/generator": "^7.1.3",
@@ -3016,17 +3016,17 @@
       }
     },
     "echarts": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/echarts/-/echarts-4.2.1.tgz",
-      "integrity": "sha512-pw4xScRPsLegD/cqEcoXRKeA2SD4+s+Kyo0Na166NamOWhzNl2yI5RZ2rE97tBlAopNmhyMeBVpAeD5qb+ee1A==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-4.3.0.tgz",
+      "integrity": "sha512-tX2dAyhI9D78eVrlKhqJGdrM7Ku599HHvPxT2Pu6tgb/dBP8tYmkWjn8r1Ea9oABQxAKXr0p2/tG1OzKdzULbw==",
       "requires": {
-        "zrender": "4.0.7"
+        "zrender": "4.1.0"
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.253",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.253.tgz",
-      "integrity": "sha512-LAwFRWViiiCSxQ2Lj3mnyEP8atkpAoHSPUnkFoy4mNabbnPHxtfseWvPCGGhewjHQI+ky/V4LdlTyyI0d3YPXA=="
+      "version": "1.3.260",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.260.tgz",
+      "integrity": "sha512-wGt+OivF1C1MPwaSv3LJ96ebNbLAWlx3HndivDDWqwIVSQxmhL17Y/YmwUdEMtS/bPyommELt47Dct0/VZNQBQ=="
     },
     "emoji-regex": {
       "version": "6.1.1",
@@ -3052,12 +3052,11 @@
       }
     },
     "error": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/error/-/error-7.0.2.tgz",
-      "integrity": "sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI=",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/error/-/error-7.2.0.tgz",
+      "integrity": "sha512-M6t3j3Vt3uDicrViMP5fLq2AeADNrCVFD8Oj4Qt2MHsX0mPYG7D5XdnEfSdRpaHQzjAJ19wu+I1mw9rQYMTAPg==",
       "requires": {
-        "string-template": "~0.2.1",
-        "xtend": "~4.0.0"
+        "string-template": "~0.2.1"
       }
     },
     "error-ex": {
@@ -5094,9 +5093,9 @@
       "dev": true
     },
     "katex": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/katex/-/katex-0.10.2.tgz",
-      "integrity": "sha512-cQOmyIRoMloCoSIOZ1+gEwsksdJZ1EW4SWm3QzxSza/QsnZr6D4U1V9S4q+B/OLm2OQ8TCBecQ8MaIfnScI7cw==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.11.0.tgz",
+      "integrity": "sha512-RQsU3HSMjLW9AdPpi2zaBwM123goCbUcUbBJfmjcAdA982RgtEUNMmrf+3y8anGjgJLantcNLa/VSK73xztQBg==",
       "requires": {
         "commander": "^2.19.0"
       }
@@ -5774,9 +5773,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.29",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.29.tgz",
-      "integrity": "sha512-R5bDhzh6I+tpi/9i2hrrvGJ3yKPYzlVOORDkXhnZuwi5D3q1I5w4vYy24PJXTcLk9Q0kws9TO77T75bcK8/ysQ==",
+      "version": "1.1.32",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.32.tgz",
+      "integrity": "sha512-VhVknkitq8dqtWoluagsGPn3dxTvN9fwgR59fV3D7sLBHe0JfDramsMI8n8mY//ccq/Kkrf8ZRHRpsyVZ3qw1A==",
       "requires": {
         "semver": "^5.3.0"
       },
@@ -6651,9 +6650,9 @@
       "integrity": "sha512-hwdV/GQY5F8ReLZWO+W1SRoN5YfpOKY6852+tBFcma72DKBIcHjPRIlIvQN35bCOljuAfP2G2iB0FC/w236mUw=="
     },
     "regexpu-core": {
-      "version": "4.5.5",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.5.tgz",
-      "integrity": "sha512-FpI67+ky9J+cDizQUJlIlNZFKual/lUkFr1AG6zOCpwZ9cLrg8UUVakyUQJD7fCDIe9Z2nwTQJNPyonatNmDFQ==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
+      "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
       "requires": {
         "regenerate": "^1.4.0",
         "regenerate-unicode-properties": "^8.1.0",
@@ -7540,9 +7539,9 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "terser": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.0.tgz",
-      "integrity": "sha512-w5CzrvQOwYAH54aG22IrUJI4yX1w62XQmMdEOM6H4w0ii6rc3HJ89fmcOGN5mRwBWfUgaqO7RJTp4aoY/uE+qQ==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.1.tgz",
+      "integrity": "sha512-pnzH6dnFEsR2aa2SJaKb1uSCl3QmIsJ8dEkj0Fky+2AwMMcC9doMqLOQIH6wVTEKaVfKVvLSk5qxPBEZT9mywg==",
       "requires": {
         "commander": "^2.20.0",
         "source-map": "~0.6.1",
@@ -7766,9 +7765,9 @@
       }
     },
     "try-catch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/try-catch/-/try-catch-2.0.0.tgz",
-      "integrity": "sha512-RPXpVjsbtWgymwGq5F/OWDFsjEzdvzwHFaMjWWW6f/p6+uk/N7YSKJHQfIfGqITfj8qH4cBqCLMnhKZBaKk7Kg=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/try-catch/-/try-catch-2.0.1.tgz",
+      "integrity": "sha512-LsOrmObN/2WdM+y2xG+t16vhYrQsnV8wftXIcIOWZhQcBJvKGYuamJGwnU98A7Jxs2oZNkJztXlphEOoA0DWqg=="
     },
     "try-to-catch": {
       "version": "1.1.1",
@@ -8098,15 +8097,15 @@
       "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM="
     },
     "vditor": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/vditor/-/vditor-1.8.5.tgz",
-      "integrity": "sha512-y8plxxtPo43PUsesu7IyB0bXZchfZlu0mNMBJTuAIg+KMyEzqmTM48+NWpl15Mq9Dk5cI3DwE8mzq5HQ/GCa7Q==",
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/vditor/-/vditor-1.8.6.tgz",
+      "integrity": "sha512-/jEr5xB98Q0IbDYNM9+LjYY8jtlE6zBUE5/ccEivPnqF66X2zAJQC8Sta8m0/bHgqeRFynjFnYt9eJ5pXUEQzg==",
       "requires": {
         "abcjs": "^5.8.0",
         "diff-match-patch": "^1.0.4",
         "echarts": "^4.2.1",
         "highlight.js": "^9.15.9",
-        "katex": "^0.10.2",
+        "katex": "^0.11.0",
         "mermaid": "^8.2.3",
         "turndown": "^5.0.3"
       }
@@ -8473,9 +8472,9 @@
       }
     },
     "zrender": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.0.7.tgz",
-      "integrity": "sha512-TNloHe0ums6zxbHfnaCryM61J4IWDajZwNq6dHk9vfWhhysO/OeFvvR0drBs/nbXha2YxSzfQj2FiCd6RVBe+Q=="
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.1.0.tgz",
+      "integrity": "sha512-PkWDpBSRIZAKyBBSkizWCP5/bIL5s/+W+FM/AwkivN4m4QCVH04PS0nJmBB/E6CnUNQv9ZPfIV4tthg1qEP1gg=="
     }
   }
 }

package.json

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

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.8.5/dist/index.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/vditor@1.8.6/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

@@ -157,18 +157,20 @@ var Util = {
    * @returns {undefined}
    */
   parseMarkdown: function () {
-    var text = $('.vditor-reset').text()
-    if ($('.vditor-reset pre > code').length === 0 &&
-      !(text.split('$').length > 2 ||
-        (text.split('\\(').length > 1 && text.split('\\)').length > 1))) {
-      return
-    }
 
-    Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.8.5/dist/method.min.js',
+    if(!Vditor) {
+      Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.8.6/dist/method.min.js',
         'vditorPreviewScript')
+    }
 
     Vditor.codeRender(document.body, Label.langLabel)
-    Vditor.mathRender(document.body, Label.langLabel)
+    if (Label.markedAvailable) {
+      // TODO: 渲染引擎修改为 lute 后需修改为  Vditor.mathRenderByLute(document.body)
+      Vditor.mathRender(document.body)
+    } else {
+      Vditor.mathRender(document.body)
+    }
+
     Vditor.abcRender()
     Vditor.chartRender()
     Vditor.mediaRender(document.body)

src/main/webapp/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@1.8.5/dist/index.min.js',
+        'https://cdn.jsdelivr.net/npm/vditor@1.8.6/dist/index.min.js',
         'vditorScript')
       var toolbar = [
         'emoji',
@@ -131,6 +131,8 @@ $.extend(Page.prototype, {
         'both',
         'preview',
         'format',
+        '|',
+        'devtools',
         'fullscreen',
         'info',
         'help',

skins @ f4db24d5

-Subproject commit 5c864e88197b2ed78770ea9bb1983ccd33e09c9b
+Subproject commit f4db24d52a9e3db08d911f90c512a4b1b1ae99a4