From 25d9edd5c9546d7f2e693e90bc5c580bdc13dbe7 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期二, 13 七月 2021 10:26:10 +0800
Subject: [PATCH] !259 图片上传 - 多图时无法删除相应图片修复 Merge pull request !259 from 严俊东/N/A
---
ruoyi-ui/src/components/Editor/index.vue | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index cc343cc..2c906c5 100644
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -3,14 +3,13 @@
<el-upload
:action="uploadUrl"
:on-success="handleUploadSuccess"
- :before-upload="handleBeforeUpload"
:on-error="handleUploadError"
name="file"
:show-file-list="false"
:headers="headers"
- style="display: none;"
- ref='upload'
- v-if='this.uploadUrl'
+ style="display: none"
+ ref="upload"
+ v-if="this.type == 'url'"
>
</el-upload>
<div class="editor" ref="editor" :style="styles"></div>
@@ -22,6 +21,7 @@
import "quill/dist/quill.core.css";
import "quill/dist/quill.snow.css";
import "quill/dist/quill.bubble.css";
+import { getToken } from "@/utils/auth";
export default {
name: "Editor",
@@ -46,14 +46,18 @@
type: Boolean,
default: false,
},
- /* 上传地址 */
- uploadUrl: {
+ /* 类型（base64格式、url格式） */
+ type: {
type: String,
- default: '',
+ default: "url",
}
},
data() {
return {
+ uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+ headers: {
+ Authorization: "Bearer " + getToken()
+ },
Quill: null,
currentValue: "",
options: {
@@ -115,23 +119,23 @@
init() {
const editor = this.$refs.editor;
this.Quill = new Quill(editor, this.options);
- // 如果设置了上传地址则自定义图片和视频的上传事件
- if (this.uploadUrl) {
- let toolbar = this.Quill.getModule('toolbar');
- toolbar.addHandler('image', (value) => {
- this.uploadType = 'image';
+ // 如果设置了上传地址则自定义图片上传事件
+ if (this.type == 'url') {
+ let toolbar = this.Quill.getModule("toolbar");
+ toolbar.addHandler("image", (value) => {
+ this.uploadType = "image";
if (value) {
this.$refs.upload.$children[0].$refs.input.click();
} else {
- this.quill.format('image', false);
+ this.quill.format("image", false);
}
});
- toolbar.addHandler('video', (value) => {
- this.uploadType = 'video';
+ toolbar.addHandler("video", (value) => {
+ this.uploadType = "video";
if (value) {
this.$refs.upload.$children[0].$refs.input.click();
} else {
- this.quill.format('video', false);
+ this.quill.format("video", false);
}
});
}
@@ -154,13 +158,31 @@
this.$emit("on-editor-change", eventName, ...args);
});
},
+ handleUploadSuccess(res, file) {
+ // 获取富文本组件实例
+ let quill = this.Quill;
+ // 如果上传成功
+ if (res.code == 200) {
+ // 获取光标所在位置
+ let length = quill.getSelection().index;
+ // 插入图片 res.url为服务器返回的图片地址
+ quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
+ // 调整光标到最后
+ quill.setSelection(length + 1);
+ } else {
+ this.$message.error("图片插入失败");
+ }
+ },
+ handleUploadError() {
+ this.$message.error("图片插入失败");
+ },
},
};
</script>
<style>
.editor, .ql-toolbar {
- white-space: pre-wrap!important;
+ white-space: pre-wrap !important;
line-height: normal !important;
}
.quill-img {
--
Gitblit v1.9.2