diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue index d63a48d1..8e616794 100644 --- a/ruoyi-ui/src/components/Editor/index.vue +++ b/ruoyi-ui/src/components/Editor/index.vue @@ -9,7 +9,7 @@ :headers="headers" style="display: none" ref="upload" - v-if="this.uploadUrl" + v-if="this.type == 'url'" >
@@ -46,14 +46,15 @@ export default { type: Boolean, default: false, }, - /* 上传地址 */ - uploadUrl: { + /* 类型(base64格式、url格式) */ + type: { type: String, default: "", } }, data() { return { + uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 headers: { Authorization: "Bearer " + getToken() }, @@ -119,7 +120,7 @@ export default { const editor = this.$refs.editor; this.Quill = new Quill(editor, this.options); // 如果设置了上传地址则自定义图片上传事件 - if (this.uploadUrl) { + if (this.type == 'url') { let toolbar = this.Quill.getModule("toolbar"); toolbar.addHandler("image", (value) => { this.uploadType = "image"; @@ -165,7 +166,7 @@ export default { // 获取光标所在位置 let length = quill.getSelection().index; // 插入图片 res.url为服务器返回的图片地址 - quill.insertEmbed(length, "image", res.url); + quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName); // 调整光标到最后 quill.setSelection(length + 1); } else {