Merge remote-tracking branch 'origin/master'

layouts/default.vue

@@ -185,7 +185,8 @@ p {
 
 /* 设置滚动条的样式 */
 ::-webkit-scrollbar {
-  width: 1px;
+  width: 7px;
+  height: 7px;
 }
 
 /* 滚动槽 */

package.json

@@ -29,7 +29,7 @@
     "save-svg-as-png": "^1.4.17",
     "sockjs-client": "^1.5.0",
     "stompjs": "^2.3.3",
-    "vditor": "^3.8.3",
+    "vditor": "^3.8.4",
     "vue-cropperjs": "^4.2.0",
     "vuejs-avataaars": "^4.0.1"
   },

pages/article/_article_id.vue

@@ -134,6 +134,7 @@ import {mapState} from 'vuex';
 import ShareBox from '~/components/widget/share';
 import PortfoliosWidget from '~/components/widget/portfolios';
 import EditTags from '~/components/widget/tags';
+import 'vditor/dist/css/content-theme/light.css';
 
 export default {
   name: "ArticleDetail",
@@ -382,6 +383,11 @@ export default {
       Vue.VditorPreview.mediaRender(previewElement);
       Vue.VditorPreview.lazyLoadImageRender(previewElement);
       //VditorPreview.outlineRender(previewElement, outLineElement);
+      previewElement.addEventListener("click", (event) => {
+        if (event.target.tagName === "IMG") {
+          Vue.VditorPreview.previewImage(event.target);
+        }
+      });
       window.scrollTo(0, 0);
       _ts.$set(_ts, 'isPerfect', _ts.article.articlePerfect === '1')
     })

pages/draft/_draft_id.vue

@@ -67,6 +67,7 @@
 <script>
   import Vue from 'vue';
   import {mapState} from 'vuex';
+  import 'vditor/dist/css/content-theme/light.css';
 
   export default {
     name: "DraftDetail",
@@ -154,6 +155,11 @@
         Vue.VditorPreview.mediaRender(previewElement);
         Vue.VditorPreview.lazyLoadImageRender(previewElement);
         //VditorPreview.outlineRender(previewElement, outLineElement);
+        previewElement.addEventListener("click", (event) => {
+          if (event.target.tagName === "IMG") {
+            Vue.VditorPreview.previewImage(event.target);
+          }
+        });
         window.scrollTo(0,0);
       })
     }