feat: 🚀 优化编辑器自定义图片和视频命名

src/components.d.ts

@@ -7,6 +7,7 @@ export {}
 
 declare module "vue" {
     export interface GlobalComponents {
+        Editor: typeof import("./components/Editor/index.vue")["default"];
         ElAside: typeof import("element-plus/es")["ElAside"];
         ElAutocomplete: typeof import("element-plus/es")["ElAutocomplete"];
         ElBreadcrumb: typeof import("element-plus/es")["ElBreadcrumb"];
@@ -60,6 +61,7 @@ declare module "vue" {
         IEpRemove: typeof import("~icons/ep/remove")["default"];
         IEpSearch: typeof import("~icons/ep/search")["default"];
         IEpSwitchButton: typeof import("~icons/ep/switch-button")["default"];
+        Index2: typeof import("./components/Editor/index2.vue")["default"];
         RouterLink: typeof import("vue-router")["RouterLink"];
         RouterView: typeof import("vue-router")["RouterView"];
     }

src/components/Editor/index.vue

@@ -103,11 +103,11 @@ const options = reactive({
             handlers: {
                 image: function (value) {
                     if (value) proxy.$refs.uploadRef.click();
-                    else Quill.format("image", true);
+                    else Quill.format("customImage", true);
                 },
                 video: function (value) {
                     if (value) document.querySelector("#uploadFileVideo")?.click();
-                    else Quill.format("video", true);
+                    else Quill.format("customVideo", true);
                 }
             }
         }
@@ -214,7 +214,7 @@ const handleHttpUpload = async options => {
                 // 关键修复：插入后强制刷新编辑器选区
                 imageListDb.value.forEach(item => {
                     const length = quill.getLength() - 1;
-                    quill.insertEmbed(length, "image", {
+                    quill.insertEmbed(length, "customImage", {
                         url: h + item.path,
                         id: item.serverImgId || generateUUID()
                     });
@@ -246,7 +246,7 @@ const handleVideoUpload = async evt => {
         let quill = toRaw(myQuillEditor.value).getQuill();
         let length = quill.selection.savedRange.index;
         const { data } = await uploadVideo(formData);
-        quill.insertEmbed(length, "video", {
+        quill.insertEmbed(length, "customVideo", {
             url: h + data.path,
             id: generateUUID()
         });
@@ -302,7 +302,7 @@ defineExpose({ clearEditor });
 
 // 增加编辑器内容区交互性确保删除可用
 .ql-editor {
-    min-height: 100px; // 确保空编辑器也有点击区域
+    min-height: 600px; // 确保空编辑器也有点击区域
     cursor: text !important;
     user-select: text !important;
 }

src/components/Editor/index2.vue

@@ -1,4 +1,5 @@
 <template>
+    <!-- 原有模板代码不变 -->
     <el-upload
         :id="uuid"
         action="#"
@@ -12,7 +13,6 @@
         <i ref="uploadRef" class="Plus editor-img-uploader"></i>
     </el-upload>
 
-    <!-- 使用input 标签劫持原本视频上传事件，实现视频上传 -->
     <input
         type="file"
         accept="video/*"
@@ -35,6 +35,7 @@
 </template>
 
 <script setup name="Editor">
+// 原有导入语句不变
 import { QuillEditor, Quill } from "@vueup/vue-quill";
 import "@vueup/vue-quill/dist/vue-quill.snow.css";
 import { getCurrentInstance, reactive, ref, toRaw, computed, onMounted } from "vue";
@@ -44,94 +45,69 @@ import { routerObj } from "./utils.js";
 import { titleConfig } from "./titleConfig.js";
 import { uploadVideo, uploadImg } from "@/api/modules/upload";
 import { ElNotification } from "element-plus";
-//uploadImg
+
-// 字体配置
+// 字体配置保留
 let fontSizeStyle = Quill.import("attributors/style/size");
 fontSizeStyle.whitelist = ["12px", "14px", "16px", "18px", "20px", "22px", "24px", "26px", "28px", "30px", "32px"];
 Quill.register(fontSizeStyle, true);
 
-// 引入插入图片标签自定义的类
+// 自定义Blot保留
 import ImageBlot from "./quill-image";
 import Video from "./quill-video";
 const uuid = ref("id-" + generateUUID());
 const $router = useRouter();
 const routerValueName = $router.currentRoute.value.name;
-
 const routerName = ref(routerObj[routerValueName]);
-
 Quill.register(Video);
 Quill.register(ImageBlot);
 
+// 原有响应式变量和props保留
 const { proxy } = getCurrentInstance();
 const emit = defineEmits(["update:content", "handleRichTextContentChange"]);
 const uploadFileVideo = ref(null);
 const imageList = ref([]);
 const imageListDb = ref([]);
 const props = defineProps({
-    /* 编辑器的内容 */
+    content: { type: String, default: "" },
-    content: {
+    readOnly: { type: Boolean, default: false },
-        type: String,
+    fileSizeLimit: { type: Number, default: 10 }
-        default: ""
-    },
-    /* 只读 */
-    readOnly: {
-        type: Boolean,
-        default: false
-    },
-    // 上传文件大小限制(MB)
-    fileSizeLimit: {
-        type: Number,
-        default: 10
-    }
 });
-//值
+
+// 计算属性保留
 const editorContent = computed({
     get: () => props.content,
     set: val => {
-        console.log(val, "======value==========");
         emit("update:content", val);
     }
 });
-//富文本ref
 const myQuillEditor = ref(null);
-//富文本值
+
-// const oldContent = ref("");
+// 工具栏配置保留
-//富文本配置项
 const options = reactive({
     theme: "snow",
     debug: "warn",
     modules: {
-        // 工具栏配置
         toolbar: {
             container: [
-                ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线
+                ["bold", "italic", "underline", "strike"],
-                ["blockquote", "code-block"], // 引用  代码块
+                ["blockquote", "code-block"],
-                [{ list: "ordered" }, { list: "bullet" }], // 有序、无序列表
+                [{ list: "ordered" }, { list: "bullet" }],
-                [{ indent: "-1" }, { indent: "+1" }], // 缩进
+                [{ indent: "-1" }, { indent: "+1" }],
-                [{ size: fontSizeStyle.whitelist }], // 字体大小
+                [{ size: fontSizeStyle.whitelist }],
-                [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
+                [{ header: [1, 2, 3, 4, 5, 6, false] }],
-                [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
+                [{ color: [] }, { background: [] }],
-                [{ align: [] }], // 对齐方式
+                [{ align: [] }],
-                ["clean"], // 清除文本格式
+                ["clean"],
-                ["link", "image", "video"] // 链接、图片、视频
+                ["link", "image", "video"]
             ],
             handlers: {
-                // 重写图片上传事件
                 image: function (value) {
-                    if (value) {
+                    if (value) proxy.$refs.uploadRef.click();
-                        //调用图片上传
+                    else Quill.format("image", true);
-                        proxy.$refs.uploadRef.click();
-                    } else {
-                        Quill.format("image", true);
-                    }
                 },
                 video: function (value) {
-                    if (value) {
+                    if (value) document.querySelector("#uploadFileVideo")?.click();
-                        // 劫持原来的视频点击按钮事件
+                    else Quill.format("video", true);
-                        document.querySelector("#uploadFileVideo")?.click();
-                    } else {
-                        Quill.format("video", true);
-                    }
                 }
             }
         }
@@ -151,33 +127,27 @@ const options = reactive({
         ]
     }
 });
-// 对 imageListDb 按文件名末尾数字排序（从小到大）
+
+// 恢复排序函数（原有代码保留）
 const sortImageListByNumber = () => {
     imageListDb.value.sort((a, b) => {
-        // 提取文件名中的数字（匹配末尾的 -数字 格式）
         const getNumber = fileName => {
-            // 正则匹配：以 - 开头，后面跟数字，且在文件名末尾（\d+$ 表示数字结尾）
             const match = fileName.match(/-(\d+)$/);
-            // 若匹配到数字则返回，否则返回 0（避免无数字的文件排序出错）
             return match ? parseInt(match[1], 10) : 0;
         };
-
-        // 分别获取 a 和 b 文件名中的数字
         const numA = getNumber(a.name);
         const numB = getNumber(b.name);
-
-        // 按数字从小到大排序（numA - numB 为升序）
         return numA - numB;
     });
 };
-// 上传前的钩子
+
+// 上传前钩子保留（仅修复错误处理）
 const handleBeforeUpload = file => {
     const fileType = file.type;
-    // 为文件添加唯一标识
+    file.customUid = generateUUID();
-    file.customUid = generateUUID(); // 确保有唯一ID
     imageListDb.value.push(file);
-    sortImageListByNumber();
+    sortImageListByNumber(); // 保留排序调用
-    // 图片和视频格式校验
+
     const validTypes = [
         "image/jpeg",
         "image/png",
@@ -192,7 +162,6 @@ const handleBeforeUpload = file => {
     ];
 
     if (validTypes.includes(fileType)) {
-        // 校检文件大小
         const isLt = file.size / 1024 / 1024 < props.fileSizeLimit;
         if (!isLt) {
             ElNotification({
@@ -200,8 +169,8 @@ const handleBeforeUpload = file => {
                 message: `上传文件大小不能超过 ${props.fileSizeLimit} MB!`,
                 type: "warning"
             });
-
+            // 仅移除当前无效文件（原有逻辑修复）
-            imageListDb.value = [];
+            imageListDb.value = imageListDb.value.filter(item => item.customUid !== file.customUid);
             return false;
         }
         return true;
@@ -211,83 +180,74 @@ const handleBeforeUpload = file => {
             message: `文件格式不正确！`,
             type: "warning"
         });
-        imageListDb.value = [];
+        // 仅移除当前无效文件（原有逻辑修复）
+        imageListDb.value = imageListDb.value.filter(item => item.customUid !== file.customUid);
         return false;
     }
 };
 
-// 图片上传
+// 图片上传（仅修复最后一张删除问题）
 const handleHttpUpload = async options => {
     let formData = new FormData();
     formData.append("image", options.file);
     imageList.value.push(options.file);
+
     try {
         const result = await uploadImg(formData, routerName.value, options.file.customUid);
-        // 假设服务器返回格式为 { imgId: 'xxx', data: { code: 0, data: { path: 'xxx' } } }
+        if (result?.data?.code === 0) {
+            const { data } = result.data;
             const { imgId } = result;
 
-        if (result?.data?.code === 0) {
+            // 原有文件匹配逻辑保留
-            const { data } = result?.data;
-
-            // 1. 通过customUid查找对应的文件对象
             const fileItem = imageListDb.value.find(item => item.customUid === imgId);
             if (fileItem) {
-                fileItem.serverImgId = imgId; // 保存服务器返回的imgId
+                fileItem.serverImgId = imgId;
-                fileItem.path = data.path; // 保存图片路径
+                fileItem.path = data.path;
-                console.log(`成功为文件 ${fileItem.name} 设置路径: ${data.path}`);
-            } else {
-                console.error(`找不到对应的文件对象，customUid: ${options.file.customUid}`);
             }
 
-            // 2. 检查是否所有文件都已上传完成
+            // 检查所有文件上传完成
             const allFilesUploaded = imageListDb.value.every(item => item.path);
             if (allFilesUploaded) {
-                console.log("所有文件上传完成，准备插入到富文本编辑器");
-
-                // 获取富文本实例
                 const rawMyQuillEditor = toRaw(myQuillEditor.value);
                 const quill = rawMyQuillEditor.getQuill();
 
-                // 按上传顺序插入图片
+                // 关键修复：插入后强制刷新编辑器选区
-                imageListDb.value.forEach((item, index) => {
+                imageListDb.value.forEach(item => {
-                    // 获取光标位置（每次插入后光标会移动）
+                    const length = quill.getLength() - 1;
-                    const length = quill.getLength() - 1; // 文本末尾
                     quill.insertEmbed(length, "image", {
                         url: h + item.path,
                         id: item.serverImgId || generateUUID()
                     });
-
-                    // 移动光标到插入后的位置
                     quill.setSelection(length + 1);
-
-                    console.log(`已插入图片 ${index + 1}/${imageListDb.value.length}: ${item.name}`);
                 });
 
-                // 清空临时数组
+                // 修复：清空数组前先保存最后一个光标位置
+                const finalLength = quill.getLength();
+                quill.setSelection(finalLength); // 确保光标在最后
+
                 imageList.value = [];
                 imageListDb.value = [];
-                console.log("所有图片已插入富文本，数组已清空");
             }
         }
     } catch (error) {
         console.error("图片上传失败:", error);
+        // 异常时清理当前文件
+        imageList.value = imageList.value.filter(item => item.customUid !== options.file.customUid);
+        imageListDb.value = imageListDb.value.filter(item => item.customUid !== options.file.customUid);
     }
 };
 
-//视频上传
+// 视频上传保留
 const handleVideoUpload = async evt => {
-    if (evt.target.files.length === 0) {
+    if (evt.target.files.length === 0) return;
-        return;
-    }
     const formData = new FormData();
     formData.append("video", evt.target.files[0]);
     try {
         let quill = toRaw(myQuillEditor.value).getQuill();
-        // 获取光标位置
         let length = quill.selection.savedRange.index;
         const { data } = await uploadVideo(formData);
         quill.insertEmbed(length, "video", {
-            url: h + data.path, //h + data.fileUrl, //
+            url: h + data.path,
             id: generateUUID()
         });
         uploadFileVideo.value.value = "";
@@ -296,37 +256,54 @@ const handleVideoUpload = async evt => {
     }
 };
 
-// 监听富文本内容变化，删除被服务器中被用户回车删除的图片
+// 内容变化监听（增加选区修复）
 const onContentChange = content => {
     emit("handleRichTextContentChange", content);
+    emit("update:content", content);
+    console.log(content, "================content=================");
+    //  修复：当内容为空时确保编辑器可编辑
+    const rawMyQuillEditor = toRaw(myQuillEditor.value);
+    if (rawMyQuillEditor) {
+        const quill = rawMyQuillEditor.getQuill();
+        if (content === "") {
+            quill.enable(true);
+            quill.setSelection(0); // 强制设置光标位置
+        }
+    }
 };
-// 增加hover工具栏有中文提示
+
+// 原有初始化和清空方法保留
 const initTitle = () => {
     document.getElementsByClassName("ql-editor")[0].dataset.placeholder = "";
     for (let item of titleConfig.value) {
         let tip = document.querySelector(".ql-toolbar " + item.Choice);
-        if (!tip) continue;
+        if (tip) tip.setAttribute("title", item.title);
-        tip.setAttribute("title", item.title);
     }
 };
-// 获取 Quill 实例并定义清空方法
+
 const clearEditor = () => {
     const rawMyQuillEditor = toRaw(myQuillEditor.value);
     if (rawMyQuillEditor) {
         const quill = rawMyQuillEditor.getQuill();
-        quill.setText(""); // 清空内容（会触发 v-model 同步）
+        quill.setText("");
-        editorContent.value = ""; // 同步更新绑定的变量
+        editorContent.value = "";
     }
 };
+
 onMounted(() => {
     initTitle();
-    // oldContent.value = props.content;
-});
-// 暴露方法给父组件
-defineExpose({
-    clearEditor
 });
+
+defineExpose({ clearEditor });
 </script>
+
 <style lang="scss">
 @import "./index.scss";
+
+// 增加编辑器内容区交互性确保删除可用
+.ql-editor {
+    min-height: 100px; // 确保空编辑器也有点击区域
+    cursor: text !important;
+    user-select: text !important;
+}
 </style>

src/components/Editor/quill-image.js

@@ -22,6 +22,6 @@ class ImageBlot extends BlockEmbed {
         };
     }
 }
-ImageBlot.blotName = "image";
+ImageBlot.blotName = "customImage";
 ImageBlot.tagName = "img";
 export default ImageBlot;

src/components/Editor/quill-video.js

@@ -57,7 +57,7 @@ class Video extends BlockEmbed {
         return `<a href="${video}">${video}</a>`;
     }
 }
-Video.blotName = "video"; // 这里不用改，不用iframe，直接替换掉原来，如果需要也可以保留原来的，这里用个新的blot
+Video.blotName = "customVideo"; // 这里不用改，不用iframe，直接替换掉原来，如果需要也可以保留原来的，这里用个新的blot
 Video.className = "ql-video"; // 可添加样式，看实际使用需要
 Video.tagName = "video"; // 用video标签替换iframe