vue-editify 0.1.33 → 0.1.35

package/examples/App.vue

@@ -6,7 +6,7 @@
 <script setup lang="ts">
 import { h, ref } from 'vue'
 import { AlexElement, MenuConfigType, Editify, attachment, PluginType } from '../src/index'
-const val = ref<string>('<p><br></p>')
+const val = ref<string>('<p><code>444</code></p>')
 const editify = ref<InstanceType<typeof Editify> | null>(null)
 const menuConfig = ref<MenuConfigType>({
 	use: true,

package/lib/editify.es.js

@@ -2680,7 +2680,11 @@ const doPaste = async function(html, text, files) {
         await this.customHtmlPaste.apply(this, [elements, html]);
       } else {
         for (let i = 0; i < elements.length; i++) {
-          this.insertElement(elements[i], false);
+          if (i == 0) {
+            this.insertElement(elements[i]);
+          } else {
+            this.insertElement(elements[i], false);
+          }
         }
         this.emit("pasteHtml", elements, html);
       }
@@ -3927,6 +3931,9 @@ class AlexEditor {
     if (parsedom == "style" || parsedom == "meta" || parsedom == "script" || parsedom == "link") {
       return new AlexElement("text", null, null, null, null);
     }
+    if (parsedom == AlexElement.TEXT_NODE && Array.from(node.childNodes).every((childNode) => childNode.nodeType == 3)) {
+      return new AlexElement("text", null, marks, styles, node.textContent);
+    }
     const block = blockParse.find((item) => item.parsedom == parsedom);
     const inblock = inblockParse.find((item) => item.parsedom == parsedom);
     const inline = inlineParse.find((item) => item.parsedom == parsedom);
@@ -4206,23 +4213,6 @@ class AlexEditor {
         flatList: []
       };
     }
-    if (this.range.anchor.element.isEqual(this.range.focus.element)) {
-      const isCover = this.range.anchor.offset == 0 && this.range.focus.offset == (this.range.anchor.element.isText() ? this.range.anchor.element.textContent.length : 1);
-      return {
-        list: [
-          {
-            element: this.range.anchor.element,
-            offset: isCover ? false : [this.range.anchor.offset, this.range.focus.offset]
-          }
-        ],
-        flatList: [
-          {
-            element: this.range.anchor.element,
-            offset: isCover ? false : [this.range.anchor.offset, this.range.focus.offset]
-          }
-        ]
-      };
-    }
     const getFlatList = () => {
       let flatList = [];
       const anchorInStart = this.range.anchor.offset == 0;
@@ -4238,60 +4228,78 @@ class AlexEditor {
       if (startIndex > 0 || endIndex < elements.length - 1) {
         elements = elements.slice(startIndex, endIndex + 1);
       }
-      const length = elements.length;
-      for (let i = 0; i < length; i++) {
-        if (this.range.anchor.element.isEqual(elements[i])) {
-          if (anchorInStart) {
-            flatList.push({
-              element: this.range.anchor.element,
+      if (this.range.anchor.element.isEqual(this.range.focus.element)) {
+        if (anchorInStart && focusInEnd) {
+          flatList = elements.map((element2) => {
+            return {
+              element: element2,
               offset: false
-            });
-          } else if (this.range.anchor.element.isText() && this.range.anchor.offset < this.range.anchor.element.textContent.length) {
-            flatList.push({
+            };
+          });
+        } else {
+          flatList = [
+            {
               element: this.range.anchor.element,
-              offset: [this.range.anchor.offset, this.range.anchor.element.textContent.length]
-            });
-          }
-        } else if (elements[i].isContains(this.range.anchor.element)) {
-          const isFirst = this.range.anchor.element.isFirst(elements[i]);
-          const hasFocus = elements[i].isContains(this.range.focus.element);
-          const isLast = this.range.focus.element.isLast(elements[i]);
-          if (anchorInStart && isFirst && hasFocus && isLast && focusInEnd) {
-            flatList.push({
-              element: elements[i],
-              offset: false
-            });
-          } else if (anchorInStart && isFirst && !hasFocus) {
-            flatList.push({
-              element: elements[i],
-              offset: false
-            });
-          }
-        } else if (this.range.focus.element.isEqual(elements[i])) {
-          if (focusInEnd) {
-            flatList.push({
-              element: this.range.focus.element,
-              offset: false
-            });
-          } else if (this.range.focus.offset > 0) {
-            flatList.push({
-              element: this.range.focus.element,
-              offset: [0, this.range.focus.offset]
-            });
-          }
-        } else if (elements[i].isContains(this.range.focus.element)) {
-          const isLast = this.range.focus.element.isLast(elements[i]);
-          if (isLast && focusInEnd) {
+              offset: [this.range.anchor.offset, this.range.focus.offset]
+            }
+          ];
+        }
+      } else {
+        const length = elements.length;
+        for (let i = 0; i < length; i++) {
+          if (this.range.anchor.element.isEqual(elements[i])) {
+            if (anchorInStart) {
+              flatList.push({
+                element: this.range.anchor.element,
+                offset: false
+              });
+            } else if (this.range.anchor.element.isText() && this.range.anchor.offset < this.range.anchor.element.textContent.length) {
+              flatList.push({
+                element: this.range.anchor.element,
+                offset: [this.range.anchor.offset, this.range.anchor.element.textContent.length]
+              });
+            }
+          } else if (elements[i].isContains(this.range.anchor.element)) {
+            const isFirst = this.range.anchor.element.isFirst(elements[i]);
+            const hasFocus = elements[i].isContains(this.range.focus.element);
+            const isLast = this.range.focus.element.isLast(elements[i]);
+            if (anchorInStart && isFirst && hasFocus && isLast && focusInEnd) {
+              flatList.push({
+                element: elements[i],
+                offset: false
+              });
+            } else if (anchorInStart && isFirst && !hasFocus) {
+              flatList.push({
+                element: elements[i],
+                offset: false
+              });
+            }
+          } else if (this.range.focus.element.isEqual(elements[i])) {
+            if (focusInEnd) {
+              flatList.push({
+                element: this.range.focus.element,
+                offset: false
+              });
+            } else if (this.range.focus.offset > 0) {
+              flatList.push({
+                element: this.range.focus.element,
+                offset: [0, this.range.focus.offset]
+              });
+            }
+          } else if (elements[i].isContains(this.range.focus.element)) {
+            const isLast = this.range.focus.element.isLast(elements[i]);
+            if (isLast && focusInEnd) {
+              flatList.push({
+                element: elements[i],
+                offset: false
+              });
+            }
+          } else {
             flatList.push({
               element: elements[i],
               offset: false
             });
           }
-        } else {
-          flatList.push({
-            element: elements[i],
-            offset: false
-          });
         }
       }
       return flatList;
@@ -4512,7 +4520,7 @@ class AlexEditor {
     event$1.off(this.$el, "beforeinput.alex_editor compositionstart.alex_editor compositionupdate.alex_editor compositionend.alex_editor keydown.alex_editor cut.alex_editor paste.alex_editor copy.alex_editor dragstart.alex_editor drop.alex_editor focus.alex_editor blur.alex_editor");
   }
 }
-const version$2 = "1.3.33";
+const version$2 = "1.3.35";
 console.log(`%c alex-editor %c v${version$2} `, "padding: 2px 1px; border-radius: 3px 0 0 3px; color: #fff; background: #606060; font-weight: bold;", "padding: 2px 1px; border-radius: 0 3px 3px 0; color: #fff; background: #42c02e; font-weight: bold;");
 const number = {
   /**
@@ -17861,7 +17869,8 @@ const pasteKeepData = {
   //粘贴html时非文本元素保留的样式
   styles: {
     "text-indent": "*",
-    "text-align": "*"
+    "text-align": "*",
+    "line-height": "*"
   }
 };
 const mergeObject = function(o1, o2) {
@@ -23003,16 +23012,16 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
         filterFiles.push(file2);
       }
       if (filterFiles.length) {
-        let images = [];
+        let urls = [];
         if (typeof props.customUpload == "function") {
-          images = await props.customUpload(filterFiles) || [];
+          urls = await props.customUpload(filterFiles) || [];
         } else {
           for (let i = 0; i < filterFiles.length; i++) {
             const url = await file.dataFileToBase64(filterFiles[i]);
-            images.push(url);
+            urls.push(url);
           }
         }
-        emits("insert", images);
+        emits("insert", urls);
       }
       inputEle.value = "";
     };
@@ -23073,7 +23082,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const InsertImage = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-1d6646fd"]]);
+const InsertImage = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-b63a5bff"]]);
 const InsertVideoProps = {
   //主题色
   color: {
@@ -23198,16 +23207,16 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         filterFiles.push(file2);
       }
       if (filterFiles.length) {
-        let videos = [];
+        let urls = [];
         if (typeof props.customUpload == "function") {
-          videos = await props.customUpload(filterFiles) || [];
+          urls = await props.customUpload(filterFiles) || [];
         } else {
           for (let i = 0; i < filterFiles.length; i++) {
             const url = await file.dataFileToBase64(filterFiles[i]);
-            videos.push(url);
+            urls.push(url);
           }
         }
-        emits("insert", videos);
+        emits("insert", urls);
       }
       inputEle.value = "";
     };
@@ -23268,7 +23277,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const InsertVideo = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-46f99390"]]);
+const InsertVideo = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-4383bae9"]]);
 const InsertTableProps = {
   //主题色
   color: {
@@ -25487,28 +25496,34 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       AlexElement.flatElements(elements).forEach((el) => {
         let marks = {};
         let styles = {};
-        if (el.hasMarks()) {
-          for (let key in keepMarks) {
-            if (el.marks.hasOwnProperty(key) && (Array.isArray(keepMarks[key]) && keepMarks[key].includes(el.parsedom) || keepMarks[key] == "*")) {
-              marks[key] = el.marks[key];
+        if (!el.isText()) {
+          if (el.hasMarks()) {
+            for (let key in keepMarks) {
+              if (el.marks.hasOwnProperty(key) && (Array.isArray(keepMarks[key]) && keepMarks[key].includes(el.parsedom) || keepMarks[key] == "*")) {
+                marks[key] = el.marks[key];
+              }
             }
+            el.marks = marks;
           }
-          el.marks = marks;
-        }
-        if (el.hasStyles() && !el.isText()) {
-          for (let key in keepStyles) {
-            if (el.styles.hasOwnProperty(key) && (Array.isArray(keepStyles[key]) && keepStyles[key].includes(el.parsedom) || keepStyles[key] == "*")) {
-              styles[key] = el.styles[key];
+          if (el.hasStyles()) {
+            for (let key in keepStyles) {
+              if (el.styles.hasOwnProperty(key) && (Array.isArray(keepStyles[key]) && keepStyles[key].includes(el.parsedom) || keepStyles[key] == "*")) {
+                styles[key] = el.styles[key];
+              }
             }
+            el.styles = styles;
           }
-          el.styles = styles;
         }
       });
       if (typeof props.customHtmlPaste == "function") {
         await props.customHtmlPaste(elements);
       } else {
         for (let i = 0; i < elements.length; i++) {
-          editor.value.insertElement(elements[i], false);
+          if (i == 0) {
+            editor.value.insertElement(elements[i]);
+          } else {
+            editor.value.insertElement(elements[i], false);
+          }
         }
       }
     };
@@ -25870,7 +25885,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Editify = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-4a3bc815"]]);
+const Editify = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-4c71ae18"]]);
 const InsertAttachmentProps = {
   //主题色
   color: {
@@ -26006,16 +26021,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         filterFiles.push(file2);
       }
       if (filterFiles.length) {
-        let attachments = [];
+        let urls = [];
         if (typeof props.customUpload == "function") {
-          attachments = await props.customUpload(filterFiles) || [];
+          urls = await props.customUpload(filterFiles) || [];
         } else {
           for (let i = 0; i < filterFiles.length; i++) {
             const url = await file.dataFileToBase64(filterFiles[i]);
-            attachments.push(url);
+            urls.push(url);
           }
         }
-        emits("insert", attachmentName.value, attachments);
+        emits("insert", attachmentName.value, urls);
       }
       fileInputRef.value.value = "";
     };
@@ -26112,7 +26127,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const InsertAttachment = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-71f31c71"]]);
+const InsertAttachment = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-52b1e545"]]);
 const isAttachment = (element2) => {
   if (element2.isEmpty()) {
     return false;
@@ -26171,12 +26186,12 @@ const attachment = (options) => {
               btnInstance.$refs.layerRef.setPosition();
             },
             onInsert: (name, urls) => {
-              const filterUrls = urls.filter((url) => {
+              urls = urls.filter((url) => {
                 return !!url;
               });
-              if (filterUrls.length) {
+              if (urls.length) {
                 const editor = editifyInstance.exposed.editor.value;
-                filterUrls.forEach((url) => {
+                urls.forEach((url) => {
                   const marks = {
                     "data-attachment": url,
                     "data-attachment-name": name || editTrans("attachmentDefaultName"),
@@ -26257,7 +26272,7 @@ const attachment = (options) => {
 const install = (app) => {
   app.component(Editify.name, Editify);
 };
-const version = "0.1.33";
+const version = "0.1.35";
 console.log(`%c vue-editify %c v${version} `, "padding: 2px 1px; border-radius: 3px 0 0 3px; color: #fff; background: #606060; font-weight: bold;", "padding: 2px 1px; border-radius: 0 3px 3px 0; color: #fff; background: #42c02e; font-weight: bold;");
 export {
   AlexElement,