vue-editify 0.1.23 → 0.1.25

package/examples/App.vue

@@ -21,7 +21,7 @@ const menuConfig = ref<MenuConfigType>({
 
 const plugins = ref<PluginType[]>([
 	attachment({
-		leftBorder: true
+		multiple: true
 	})
 ])
 </script>

package/lib/editify.es.js

@@ -2466,73 +2466,6 @@ const breakFormat = function(element2) {
     }
   }
 };
-const mergeWithParentElement = function(element2) {
-  const canMerge = (parent, child) => {
-    if (child.isText() && parent.isInline()) {
-      return parent.parsedom == AlexElement.TEXT_NODE;
-    }
-    if (parent.isInline() && child.isInline() || parent.isInblock() && child.isInblock()) {
-      return parent.parsedom == child.parsedom;
-    }
-    return false;
-  };
-  const merge = (parent, child) => {
-    if (child.isText()) {
-      parent.type = "text";
-      parent.parsedom = null;
-      if (child.hasMarks()) {
-        if (parent.hasMarks()) {
-          Object.assign(parent.marks, cloneData$1(child.marks));
-        } else {
-          parent.marks = cloneData$1(child.marks);
-        }
-      }
-      if (child.hasStyles()) {
-        if (parent.hasStyles()) {
-          Object.assign(parent.styles, cloneData$1(child.styles));
-        } else {
-          parent.styles = cloneData$1(child.styles);
-        }
-      }
-      parent.textContent = child.textContent;
-      parent.children = null;
-      if (this.range && child.isContains(this.range.anchor.element)) {
-        this.range.anchor.element = parent;
-      }
-      if (this.range && child.isContains(this.range.focus.element)) {
-        this.range.focus.element = parent;
-      }
-    } else {
-      if (child.hasMarks()) {
-        if (parent.hasMarks()) {
-          Object.assign(parent.marks, cloneData$1(child.marks));
-        } else {
-          parent.marks = cloneData$1(child.marks);
-        }
-      }
-      if (child.hasStyles()) {
-        if (parent.hasStyles()) {
-          Object.assign(parent.styles, cloneData$1(child.styles));
-        } else {
-          parent.styles = cloneData$1(child.styles);
-        }
-      }
-      if (child.hasChildren()) {
-        parent.children = [...child.children];
-        parent.children.forEach((item) => {
-          item.parent = parent;
-        });
-      }
-      mergeElement(parent);
-    }
-  };
-  const mergeElement = (ele) => {
-    if (ele.hasChildren() && ele.children.length == 1 && ele.children[0] && canMerge(ele, ele.children[0])) {
-      merge(ele, ele.children[0]);
-    }
-  };
-  mergeElement(element2);
-};
 const mergeWithBrotherElement = function(element2) {
   const canMerge = (pel, nel) => {
     if (pel.isEmpty() || nel.isEmpty()) {
@@ -2631,6 +2564,78 @@ const mergeWithBrotherElement = function(element2) {
   };
   mergeElement(element2);
 };
+const mergeWithParentElement = function(element2) {
+  const canMerge = (parent, child) => {
+    if (child.isText() && parent.isInline()) {
+      return parent.parsedom == AlexElement.TEXT_NODE;
+    }
+    if (parent.isInline() && child.isInline() || parent.isInblock() && child.isInblock()) {
+      return parent.parsedom == child.parsedom;
+    }
+    return false;
+  };
+  const merge = (parent, child) => {
+    if (child.isText()) {
+      parent.type = "text";
+      parent.parsedom = null;
+      if (child.hasMarks()) {
+        if (parent.hasMarks()) {
+          Object.assign(parent.marks, cloneData$1(child.marks));
+        } else {
+          parent.marks = cloneData$1(child.marks);
+        }
+      }
+      if (child.hasStyles()) {
+        if (parent.hasStyles()) {
+          Object.assign(parent.styles, cloneData$1(child.styles));
+        } else {
+          parent.styles = cloneData$1(child.styles);
+        }
+      }
+      parent.textContent = child.textContent;
+      parent.children = null;
+      if (this.range && child.isContains(this.range.anchor.element)) {
+        this.range.anchor.element = parent;
+      }
+      if (this.range && child.isContains(this.range.focus.element)) {
+        this.range.focus.element = parent;
+      }
+    } else {
+      if (child.hasMarks()) {
+        if (parent.hasMarks()) {
+          Object.assign(parent.marks, cloneData$1(child.marks));
+        } else {
+          parent.marks = cloneData$1(child.marks);
+        }
+      }
+      if (child.hasStyles()) {
+        if (parent.hasStyles()) {
+          Object.assign(parent.styles, cloneData$1(child.styles));
+        } else {
+          parent.styles = cloneData$1(child.styles);
+        }
+      }
+      if (child.hasChildren()) {
+        parent.children = [...child.children];
+        parent.children.forEach((item) => {
+          item.parent = parent;
+        });
+      }
+      mergeElement(parent);
+    }
+  };
+  const mergeElement = (ele) => {
+    if (ele.hasChildren() && ele.children.length == 1 && ele.children[0] && canMerge(ele, ele.children[0])) {
+      merge(ele, ele.children[0]);
+    }
+  };
+  mergeElement(element2);
+};
+const mergeWithSpaceTextElement = function(element2) {
+  if (element2.isText()) {
+    element2.textContent = element2.textContent.replace(/[\uFEFF]+/, "\uFEFF");
+  }
+};
 const { Mac } = platform.os();
 const isUndo = function(e) {
   if (Mac) {
@@ -3818,7 +3823,7 @@ class AlexEditor {
     let renderRules = this.renderRules.filter((fn) => {
       return typeof fn == "function";
     });
-    [handleNotStackBlock, handleInblockWithOther, handleInlineChildrenNotInblock, breakFormat, mergeWithParentElement, mergeWithBrotherElement, mergeWithParentElement, ...renderRules].forEach((fn) => {
+    [handleNotStackBlock, handleInblockWithOther, handleInlineChildrenNotInblock, breakFormat, mergeWithParentElement, mergeWithBrotherElement, mergeWithParentElement, mergeWithSpaceTextElement, ...renderRules].forEach((fn) => {
       format(this.stack, fn, true);
     });
     handleStackEmpty.apply(this);
@@ -26082,6 +26087,7 @@ const attachment = (options) => {
             title: options.title || editTrans("insertAttachment"),
             leftBorder: options.leftBorder,
             rightBorder: options.rightBorder,
+            disabled: editifyInstance.exposed.editor.value ? hasPreInRange(editifyInstance.exposed.editor.value, editifyInstance.exposed.dataRangeCaches.value) : false,
             default: () => h(Icon, { value: "attachment" }),
             layer: (_name, btnInstance) => h(InsertAttachment, {
               color: color2,
@@ -26096,11 +26102,20 @@ const attachment = (options) => {
                 btnInstance.$refs.layerRef.setPosition();
               },
               onInsert: (url) => {
-                const attachmentElement = new AlexElement("closed", "span", { "data-attachment": url, contenteditable: "false" }, null, null);
+                const marks = {
+                  "data-attachment": url,
+                  "data-attachment-name": editTrans("attachmentDownloadName"),
+                  contenteditable: "false"
+                };
+                const attachmentElement = new AlexElement("closed", "span", marks, null, null);
                 const editor = editifyInstance.exposed.editor.value;
                 editor.insertElement(attachmentElement);
-                editor.range.anchor.moveToEnd(attachmentElement);
-                editor.range.focus.moveToEnd(attachmentElement);
+                const beforeText = AlexElement.getSpaceElement();
+                const afterText = AlexElement.getSpaceElement();
+                editor.addElementAfter(afterText, attachmentElement);
+                editor.addElementBefore(beforeText, attachmentElement);
+                editor.range.anchor.moveToStart(afterText);
+                editor.range.focus.moveToStart(afterText);
                 editor.formatElementStack();
                 editor.domRender();
                 editor.rangeRender();
@@ -26135,12 +26150,24 @@ const attachment = (options) => {
       },
       //span元素粘贴保留data-attachment
       pasteKeepMarks: {
-        "data-attachment": ["span"]
+        "data-attachment": ["span"],
+        "data-attachment-name": ["span"]
       },
-      //设置元素的title属性标记
+      //自定义渲染规范
       renderRule: (el) => {
         if (el.type == "closed" && el.hasMarks() && el.marks["data-attachment"]) {
           el.marks["title"] = editTrans("downloadAttachment");
+          const editor = editifyInstance.exposed.editor.value;
+          const previousElement = editor.getPreviousElement(el);
+          const newTextElement = editor.getNextElement(el);
+          if (!previousElement || !previousElement.isSpaceText()) {
+            const spaceText = AlexElement.getSpaceElement();
+            editor.addElementBefore(spaceText, el);
+          }
+          if (!newTextElement || !newTextElement.isSpaceText()) {
+            const spaceText = AlexElement.getSpaceElement();
+            editor.addElementAfter(spaceText, el);
+          }
         }
       }
     };
@@ -26150,7 +26177,7 @@ const attachment = (options) => {
 const install = (app) => {
   app.component(Editify.name, Editify);
 };
-const version = "0.1.23";
+const version = "0.1.25";
 export {
   AlexElement,
   Editify,