From 43d76e599091dc6b79b51f89c79514b50e33ea35 Mon Sep 17 00:00:00 2001
From: fuzui <73400@163.com>
Date: 星期四, 16 十二月 2021 02:18:48 +0800
Subject: [PATCH] fix: cron组件中周回显bug
---
ruoyi-ui/src/components/Editor/index.vue | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index d63a48d..6bb5a18 100644
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -2,6 +2,7 @@
<div>
<el-upload
:action="uploadUrl"
+ :before-upload="handleBeforeUpload"
:on-success="handleUploadSuccess"
:on-error="handleUploadError"
name="file"
@@ -9,7 +10,7 @@
:headers="headers"
style="display: none"
ref="upload"
- v-if="this.uploadUrl"
+ v-if="this.type == 'url'"
>
</el-upload>
<div class="editor" ref="editor" :style="styles"></div>
@@ -46,14 +47,20 @@
type: Boolean,
default: false,
},
- /* 涓婁紶鍦板潃 */
- uploadUrl: {
+ // 涓婁紶鏂囦欢澶у皬闄愬埗(MB)
+ fileSize: {
+ type: Number,
+ default: 5,
+ },
+ /* 绫诲瀷锛坆ase64鏍煎紡銆乽rl鏍煎紡锛� */
+ type: {
type: String,
- default: "",
+ default: "url",
}
},
data() {
return {
+ uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 涓婁紶鐨勫浘鐗囨湇鍔″櫒鍦板潃
headers: {
Authorization: "Bearer " + getToken()
},
@@ -119,7 +126,7 @@
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";
@@ -127,14 +134,6 @@
this.$refs.upload.$children[0].$refs.input.click();
} else {
this.quill.format("image", false);
- }
- });
- toolbar.addHandler("video", (value) => {
- this.uploadType = "video";
- if (value) {
- this.$refs.upload.$children[0].$refs.input.click();
- } else {
- this.quill.format("video", false);
}
});
}
@@ -157,6 +156,18 @@
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;
@@ -165,7 +176,7 @@
// 鑾峰彇鍏夋爣鎵�鍦ㄤ綅缃�
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 {
--
Gitblit v1.9.3