From 74f991b8c5c0e51ceccf4a0efb8cac0925dd6168 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期二, 18 一月 2022 11:20:23 +0800
Subject: [PATCH] !414 优化任务队列满时任务拒绝策略 Merge pull request !414 from root/master
---
ruoyi-ui/src/components/Editor/index.vue | 74 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 1 deletions(-)
diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index ba2ea73..6bb5a18 100644
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -1,5 +1,20 @@
<template>
+ <div>
+ <el-upload
+ :action="uploadUrl"
+ :before-upload="handleBeforeUpload"
+ :on-success="handleUploadSuccess"
+ :on-error="handleUploadError"
+ name="file"
+ :show-file-list="false"
+ :headers="headers"
+ style="display: none"
+ ref="upload"
+ v-if="this.type == 'url'"
+ >
+ </el-upload>
<div class="editor" ref="editor" :style="styles"></div>
+ </div>
</template>
<script>
@@ -7,6 +22,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",
@@ -30,10 +46,24 @@
readOnly: {
type: Boolean,
default: false,
+ },
+ // 上传文件大小限制(MB)
+ fileSize: {
+ type: Number,
+ default: 5,
+ },
+ /* 类型(base64格式、url格式) */
+ type: {
+ type: String,
+ default: "url",
}
},
data() {
return {
+ uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+ headers: {
+ Authorization: "Bearer " + getToken()
+ },
Quill: null,
currentValue: "",
options: {
@@ -95,6 +125,18 @@
init() {
const editor = this.$refs.editor;
this.Quill = new Quill(editor, this.options);
+ // 如果设置了上传地址则自定义图片上传事件
+ 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.pasteHTML(this.currentValue);
this.Quill.on("text-change", (delta, oldDelta, source) => {
const html = this.$refs.editor.children[0].innerHTML;
@@ -114,13 +156,43 @@
this.$emit("on-editor-change", eventName, ...args);
});
},
+ // 上传前校检格式和大小
+ handleBeforeUpload(file) {
+ // 校检文件大小
+ if (this.fileSize) {
+ const isLt = file.size / 1024 / 1024 < this.fileSize;
+ if (!isLt) {
+ this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
+ return false;
+ }
+ }
+ return true;
+ },
+ 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