From e35df6d1d25bc08e962d6f65996868a48d95215a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 9 Oct 2023 10:34:58 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=AF=8C?=
 =?UTF-8?q?=E6=96=87=E6=9C=ACEditor=E7=BB=84=E4=BB=B6=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui-vue3/src/components/Editor/index.vue | 23 +++++++++++++------
 ruoyi-ui/src/components/Editor/index.vue      | 14 +++++++----
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/ruoyi-ui-vue3/src/components/Editor/index.vue b/ruoyi-ui-vue3/src/components/Editor/index.vue
index c27635c3e..bf48cf163 100644
--- a/ruoyi-ui-vue3/src/components/Editor/index.vue
+++ b/ruoyi-ui-vue3/src/components/Editor/index.vue
@@ -9,14 +9,13 @@
         name="file"
         :show-file-list="false"
         :headers="headers"
-        style="display: none"
         ref="uploadRef"
         v-if="type == 'url'"
     >
     </el-upload>
     <div class="editor">
       <quill-editor
-          ref="myQuillEditor"
+          ref="quillEditorRef"
           v-model:content="content"
           contentType="html"
           @textChange="(e) => $emit('update:modelValue', content)"
@@ -68,7 +67,7 @@ const { proxy } = getCurrentInstance();
 // 上传的图片服务器地址
 const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/system/oss/upload");
 const headers = ref({ Authorization: "Bearer " + getToken() });
-const myQuillEditor = ref();
+const quillEditorRef = ref();
 
 const options = ref({
   theme: "snow",
@@ -101,7 +100,7 @@ const options = ref({
       },
     }
   },
-  placeholder: '请输入内容',
+  placeholder: "请输入内容",
   readOnly: props.readOnly,
 });
 
@@ -114,7 +113,7 @@ const styles = computed(() => {
     style.height = `${props.height}px`;
   }
   return style;
-})
+});
 
 const content = ref("");
 watch(() => props.modelValue, (v) => {
@@ -125,10 +124,10 @@ watch(() => props.modelValue, (v) => {
 
 // 图片上传成功返回图片地址
 function handleUploadSuccess(res, file) {
-  // 获取富文本实例
-  let quill = toRaw(myQuillEditor.value).getQuill();
   // 如果上传成功
   if (res.code == 200) {
+    // 获取富文本实例
+    let quill = toRaw(myQuillEditor.value).getQuill();
     // 获取光标位置
     let length = quill.selection.savedRange.index;
     // 插入图片，res为服务器返回的图片链接地址
@@ -144,6 +143,13 @@ function handleUploadSuccess(res, file) {
 
 // 图片上传前拦截
 function handleBeforeUpload(file) {
+  const type = ["image/jpeg", "image/jpg", "image/png", "image/svg"];
+  const isJPG = type.includes(file.type);
+  //检验文件格式
+  if (!isJPG) {
+    proxy.$modal.msgError(`图片格式错误!`);
+    return false;
+  }
   // 校检文件大小
   if (props.fileSize) {
     const isLt = file.size / 1024 / 1024 < props.fileSize;
@@ -164,6 +170,9 @@ function handleUploadError(err) {
 </script>
 
 <style>
+.editor-img-uploader {
+  display: none;
+}
 .editor, .ql-toolbar {
   white-space: pre-wrap !important;
   line-height: normal !important;
diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index 1f2e15ec2..d9ba27a33 100644
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -47,7 +47,7 @@ export default {
       type: Boolean,
       default: false,
     },
-    // 上传文件大小限制(MB)
+    /* 上传文件大小限制(MB) */
     fileSize: {
       type: Number,
       default: 5,
@@ -129,7 +129,6 @@ export default {
       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 {
@@ -158,6 +157,13 @@ export default {
     },
     // 上传前校检格式和大小
     handleBeforeUpload(file) {
+      const type = ["image/jpeg", "image/jpg", "image/png", "image/svg"];
+      const isJPG = type.includes(file.type);
+      // 检验文件格式
+      if (!isJPG) {
+        this.$message.error(`图片格式错误!`);
+        return false;
+      }
       // 校检文件大小
       if (this.fileSize) {
         const isLt = file.size / 1024 / 1024 < this.fileSize;
@@ -169,10 +175,10 @@ export default {
       return true;
     },
     handleUploadSuccess(res, file) {
-      // 获取富文本组件实例
-      let quill = this.Quill;
       // 如果上传成功
       if (res.code == 200) {
+        // 获取富文本组件实例
+        let quill = this.Quill;
         // 获取光标所在位置
         let length = quill.getSelection().index;
         // 插入图片  res.url为服务器返回的图片地址