Merge branch 'feature-rebuild' of github.com:doocs/md into feature-rebuild

src/view/CodemirrorEditor.vue

@@ -184,8 +184,14 @@ export default {
         },
         // 图片上传结束
         uploaded(response) {
-            if (response) {
-                if (response.success) {
+            if (!response || !response.success) {
+                this.$message({
+                    showClose: true,
+                    message: '上传图片未知异常',
+                    type: 'error'
+                });
+                return;
+            }
             // 上传成功，获取光标
             const cursor = this.editor.getCursor();
             const imageUrl = response.data;
@@ -198,21 +204,6 @@ export default {
                 type: 'success'
             });
             this.onEditorRefresh();
-                } else {
-                    // 上传失败
-                    this.$message({
-                        showClose: true,
-                        message: response.message,
-                        type: 'error'
-                    });
-                }
-            } else {
-                this.$message({
-                    showClose: true,
-                    message: '上传图片未知异常',
-                    type: 'error'
-                });
-            }
         },
         // 左右滚动
         leftAndRightScroll() {
@@ -274,13 +265,7 @@ export default {
             const offsetWidth = this.$el.offsetWidth;
             const maxLeft = offsetWidth - menuMinWidth;
             const left = e.clientX - offsetLeft;
-
-            if (left > maxLeft) {
-                this.mouseLeft = maxLeft;
-            } else {
-                this.mouseLeft = left;
-            }
-
+            this.mouseLeft = Math.min(maxLeft, left);
             this.mouseTop = e.clientY + 10;
             this.rightClickMenuVisible = true;
         },