From e1023bb3313282b00d6dcdefd5d7e30d7aaa1bfc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 30 十一月 2023 11:13:29 +0800
Subject: [PATCH] update 优化 代码中存在的警告
---
src/components/Editor/index.vue | 120 +++++++++++++++++++++++++++--------------------------------
1 files changed, 55 insertions(+), 65 deletions(-)
diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index b7c18c3..b5299b4 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -1,48 +1,59 @@
+<template>
+ <div>
+ <el-upload
+ :action="upload.url"
+ :before-upload="handleBeforeUpload"
+ :on-success="handleUploadSuccess"
+ :on-error="handleUploadError"
+ class="editor-img-uploader"
+ name="file"
+ :show-file-list="false"
+ :headers="upload.headers"
+ ref="uploadRef"
+ v-if="type === 'url'"
+ >
+ </el-upload>
+ <div class="editor">
+ <quill-editor
+ ref="quillEditorRef"
+ v-model:content="content"
+ contentType="html"
+ @textChange="(e: any) => $emit('update:modelValue', content)"
+ :options="options"
+ :style="styles"
+ />
+ </div>
+ </div>
+</template>
+
<script setup lang="ts">
import { QuillEditor, Quill } from '@vueup/vue-quill';
import '@vueup/vue-quill/dist/vue-quill.snow.css';
-import { getToken } from "@/utils/auth";
-import { ComponentInternalInstance } from "vue";
+import { propTypes } from '@/utils/propTypes';
+import { globalHeaders } from "@/utils/request";
const props = defineProps({
/* 缂栬緫鍣ㄧ殑鍐呭 */
- modelValue: {
- type: String,
- },
+ modelValue: propTypes.string,
/* 楂樺害 */
- height: {
- type: Number,
- default: null,
- },
+ height: propTypes.number.def(400),
/* 鏈�灏忛珮搴� */
- minHeight: {
- type: Number,
- default: null,
- },
+ minHeight: propTypes.number.def(400),
/* 鍙 */
- readOnly: {
- type: Boolean,
- default: false,
- },
+ readOnly: propTypes.bool.def(false),
/* 涓婁紶鏂囦欢澶у皬闄愬埗(MB) */
- fileSize: {
- type: Number,
- default: 5,
- },
+ fileSize: propTypes.number.def(5),
/* 绫诲瀷锛坆ase64鏍煎紡銆乽rl鏍煎紡锛� */
- type: {
- type: String,
- default: "url",
- }
+ type: propTypes.string.def('url')
});
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const upload = reactive<UploadOption>({
- headers: { Authorization: "Bearer " + getToken() },
- url: import.meta.env.VITE_APP_BASE_API + '/system/oss/upload'
+ headers: globalHeaders(),
+ url: import.meta.env.VITE_APP_BASE_API + '/resource/oss/upload'
})
-const myQuillEditor = ref();
+const quillEditorRef = ref();
const options = ref({
theme: "snow",
@@ -54,7 +65,7 @@
container: [
["bold", "italic", "underline", "strike"], // 鍔犵矖 鏂滀綋 涓嬪垝绾� 鍒犻櫎绾�
["blockquote", "code-block"], // 寮曠敤 浠ｇ爜鍧�
- [{ list: "ordered" }, { list: "bullet"} ], // 鏈夊簭銆佹棤搴忓垪琛�
+ [{ list: "ordered" }, { list: "bullet" }], // 鏈夊簭銆佹棤搴忓垪琛�
[{ indent: "-1" }, { indent: "+1" }], // 缂╄繘
[{ size: ["small", false, "large", "huge"] }], // 瀛椾綋澶у皬
[{ header: [1, 2, 3, 4, 5, 6, false] }], // 鏍囬
@@ -75,7 +86,7 @@
},
}
},
- placeholder: '璇疯緭鍏ュ唴瀹�',
+ placeholder: "璇疯緭鍏ュ唴瀹�",
readOnly: props.readOnly,
});
@@ -99,10 +110,10 @@
// 鍥剧墖涓婁紶鎴愬姛杩斿洖鍥剧墖鍦板潃
const handleUploadSuccess = (res: any) => {
- // 鑾峰彇瀵屾枃鏈疄渚�
- let quill = toRaw(myQuillEditor.value).getQuill();
// 濡傛灉涓婁紶鎴愬姛
if (res.code === 200) {
+ // 鑾峰彇瀵屾枃鏈疄渚�
+ let quill = toRaw(quillEditorRef.value).getQuill();
// 鑾峰彇鍏夋爣浣嶇疆
let length = quill.selection.savedRange.index;
// 鎻掑叆鍥剧墖锛宺es涓烘湇鍔″櫒杩斿洖鐨勫浘鐗囬摼鎺ュ湴鍧�
@@ -118,6 +129,13 @@
// 鍥剧墖涓婁紶鍓嶆嫤鎴�
const handleBeforeUpload = (file: any) => {
+ 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;
@@ -137,36 +155,12 @@
}
</script>
-<template>
- <div>
- <el-upload
- :action="upload.url"
- :before-upload="handleBeforeUpload"
- :on-success="handleUploadSuccess"
- :on-error="handleUploadError"
- class="editor-img-uploader"
- name="file"
- :show-file-list="false"
- :headers="upload.headers"
- style="display: none"
- v-if="type === 'url'"
- >
- </el-upload>
- <div class="editor">
- <quill-editor
- ref="myQuillEditor"
- v-model:content="content"
- contentType="html"
- @textChange="(e: any) => $emit('update:modelValue', content)"
- :options="options"
- :style="styles"
- />
- </div>
- </div>
-</template>
-
<style>
-.editor, .ql-toolbar {
+.editor-img-uploader {
+ display: none;
+}
+.editor,
+.ql-toolbar {
white-space: pre-wrap !important;
line-height: normal !important;
}
@@ -181,11 +175,9 @@
content: "淇濆瓨";
padding-right: 0;
}
-
.ql-snow .ql-tooltip[data-mode="video"]::before {
content: "璇疯緭鍏ヨ棰戝湴鍧�:";
}
-
.ql-snow .ql-picker.ql-size .ql-picker-label::before,
.ql-snow .ql-picker.ql-size .ql-picker-item::before {
content: "14px";
@@ -202,7 +194,6 @@
.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="huge"]::before {
content: "32px";
}
-
.ql-snow .ql-picker.ql-header .ql-picker-label::before,
.ql-snow .ql-picker.ql-header .ql-picker-item::before {
content: "鏂囨湰";
@@ -231,7 +222,6 @@
.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
content: "鏍囬6";
}
-
.ql-snow .ql-picker.ql-font .ql-picker-label::before,
.ql-snow .ql-picker.ql-font .ql-picker-item::before {
content: "鏍囧噯瀛椾綋";
--
Gitblit v1.9.3