From eb2be90e74adfa06ee251f80c08243d0301ce467 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:49:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
ruoyi-ui/src/components/Editor/index.vue | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index f78dfcc..bc2e7e1 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"
@@ -46,6 +47,11 @@
type: Boolean,
default: false,
},
+ // 涓婁紶鏂囦欢澶у皬闄愬埗(MB)
+ fileSize: {
+ type: Number,
+ default: 5,
+ },
/* 绫诲瀷锛坆ase64鏍煎紡銆乽rl鏍煎紡锛� */
type: {
type: String,
@@ -54,7 +60,7 @@
},
data() {
return {
- uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 涓婁紶鐨勫浘鐗囨湇鍔″櫒鍦板潃
+ uploadUrl: process.env.VUE_APP_BASE_API + "/system/oss/upload", // 涓婁紶鐨勫浘鐗囨湇鍔″櫒鍦板潃
headers: {
Authorization: "Bearer " + getToken()
},
@@ -130,14 +136,6 @@
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);
- // }
- // });
}
this.Quill.pasteHTML(this.currentValue);
this.Quill.on("text-change", (delta, oldDelta, source) => {
@@ -158,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;
--
Gitblit v1.9.3