vue-editify 0.1.27 → 0.1.30

package/lib/editify.es.js

@@ -2622,7 +2622,23 @@ const mergeWithParentElement = function(element2) {
 };
 const mergeWithSpaceTextElement = function(element2) {
   if (element2.isText()) {
-    element2.textContent = element2.textContent.replace(/[\uFEFF]+/, "\uFEFF");
+    let val = element2.textContent;
+    let i = 0;
+    while (i < val.length) {
+      const chart = val.charAt(i);
+      if (isSpaceText(chart) && i > 0 && isSpaceText(val.charAt(i - 1))) {
+        if (this.range && this.range.anchor.element.isEqual(element2) && this.range.anchor.offset >= i + 1) {
+          this.range.anchor.offset -= 1;
+        }
+        if (this.range && this.range.focus.element.isEqual(element2) && this.range.focus.offset >= i + 1) {
+          this.range.focus.offset -= 1;
+        }
+        val = string$1.delete(val, i, 1);
+      } else {
+        i++;
+      }
+    }
+    element2.textContent = val;
   }
 };
 const { Mac } = platform.os();
@@ -4496,7 +4512,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.32";
+const version$2 = "1.3.33";
 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 = {
   /**
@@ -19874,6 +19890,14 @@ const preHandle = function(editor, element2, highlight2, languages2) {
           newEl.parent = element2;
         });
         updateRangeInPre(editor, element2, originalTextElements, newElements);
+      } else {
+        const breakElement = new AlexElement("closed", "br", null, null, null);
+        element2.children = [breakElement];
+        breakElement.parent = element2;
+        if (editor.range) {
+          editor.range.anchor.moveToStart(breakElement);
+          editor.range.focus.moveToStart(breakElement);
+        }
       }
     }
   }
@@ -23379,6 +23403,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   props: MenuProps,
   setup(__props, { expose: __expose }) {
     const props = __props;
+    const $editTrans = inject("$editTrans");
     const editify = inject("editify");
     const isSourceView = inject("isSourceView");
     const isFullScreen = inject("isFullScreen");
@@ -23386,7 +23411,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     const editor = inject("editor");
     const dataRangeCaches = inject("dataRangeCaches");
     const showBorder = inject("showBorder");
-    const $editTrans = inject("$editTrans");
+    const pluginResultList = inject("pluginResultList");
     const undoConfig = ref({
       show: props.config.undo.show,
       leftBorder: props.config.undo.leftBorder,
@@ -23659,8 +23684,15 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       return editify.props.disabled || !canUseMenu.value;
     });
     const menuNames = computed(() => {
-      return Object.keys(props.config.sequence).sort((a, b) => {
-        if (props.config.sequence[a] > props.config.sequence[b]) {
+      let pluginSequence = {};
+      pluginResultList.value.forEach((pluginResult) => {
+        if (pluginResult.menu) {
+          pluginSequence[pluginResult.name] = pluginResult.menu.sequence;
+        }
+      });
+      pluginSequence = mergeObject(pluginSequence, props.config.sequence);
+      return Object.keys(pluginSequence).sort((a, b) => {
+        if (pluginSequence[a] > pluginSequence[b]) {
           return 1;
         }
         return -1;
@@ -23688,6 +23720,15 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       }
       return showBorder.value;
     });
+    const menuExtends = computed(() => {
+      let pluginExtends = {};
+      pluginResultList.value.forEach((pluginResult) => {
+        if (pluginResult.menu) {
+          pluginExtends[pluginResult.name] = pluginResult.menu.extend;
+        }
+      });
+      return mergeObject(pluginExtends, props.config.extends);
+    });
     const handleOperate = (name, val) => {
       if (disabled.value) {
         return;
@@ -23909,11 +23950,24 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       const value_isRangeInOrderList = isRangeInList(editor.value, dataRangeCaches.value, true);
       const value_isRangeInUnorderList = isRangeInList(editor.value, dataRangeCaches.value, false);
       const value_isRangeInTask = isRangeInTask(editor.value, dataRangeCaches.value);
+      const value_hasImageInRange = hasImageInRange(editor.value, dataRangeCaches.value);
+      const value_hasVideoInRange = hasVideoInRange(editor.value, dataRangeCaches.value);
       const extraDisabled = (name) => {
+        let pluginDisabled = false;
+        let length = pluginResultList.value.length;
+        for (let i = 0; i < length; i++) {
+          const pluginResult = pluginResultList.value[i];
+          if (pluginResult.menu && typeof pluginResult.menu.extraDisabled == "function") {
+            pluginDisabled = pluginResult.menu.extraDisabled(name);
+            if (pluginDisabled) {
+              break;
+            }
+          }
+        }
         if (typeof props.config.extraDisabled == "function") {
-          return props.config.extraDisabled(name) || false;
+          return props.config.extraDisabled(name) || pluginDisabled || false;
         }
-        return false;
+        return pluginDisabled || false;
       };
       undoConfig.value.disabled = !editor.value.history.get(-1) || extraDisabled("undo");
       redoConfig.value.disabled = !editor.value.history.get(1) || extraDisabled("redo");
@@ -24019,7 +24073,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       videoConfig.value.disabled = value_hasPreInRange || extraDisabled("video");
       tableConfig.value.disabled = value_hasPreInRange || value_hasTableInRange || value_hasQuoteInRange || extraDisabled("table");
       codeBlockConfig.value.active = !!getCurrentParsedomElement(editor.value, dataRangeCaches.value, "pre");
-      codeBlockConfig.value.disabled = value_hasTableInRange || value_hasQuoteInRange || extraDisabled("codeBlock");
+      codeBlockConfig.value.disabled = value_hasTableInRange || value_hasQuoteInRange || value_hasImageInRange || value_hasVideoInRange || extraDisabled("codeBlock");
       sourceViewConfig.value.active = isSourceView.value;
       fullScreenConfig.value.active = isFullScreen.value;
     };
@@ -24614,8 +24668,8 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
               () => h(Icon, { value: "full-screen" })
             );
           }
-          if (common.isObject(props.config.extends)) {
-            const configuration = props.config.extends[itemProps.name];
+          if (common.isObject(menuExtends.value)) {
+            const configuration = menuExtends.value[itemProps.name];
             if (configuration) {
               return h(
                 Button,
@@ -24714,7 +24768,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Menu = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-3a513730"]]);
+const Menu = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-fbf50ae5"]]);
 const EditifyProps = {
   //国际化语言类型
   locale: {
@@ -25068,7 +25122,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const props = __props;
     const emits = __emit;
     const $editTrans = trans(props.locale || "zh_CN");
-    provide("$editTrans", $editTrans);
     const isModelChange = ref(false);
     const isInputChinese = ref(false);
     const rangeUpdateTimer = ref(null);
@@ -25137,12 +25190,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       return pluginResultList2;
     });
     const menuConfig = computed(() => {
-      let menu = {};
-      pluginResultList.value.forEach((pluginResult) => {
-        menu = mergeObject(menu, pluginResult.menu || {});
-      });
-      menu = mergeObject(menu, props.menu || {});
-      return mergeObject(getMenuConfig($editTrans, props.locale), menu);
+      return mergeObject(getMenuConfig($editTrans, props.locale), props.menu || {});
     });
     const internalModify = (val) => {
       isModelChange.value = true;
@@ -25732,6 +25780,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       event.off(window, `resize.editify_${instance.uid}`);
       editor.value.destroy();
     });
+    provide("$editTrans", $editTrans);
     provide("editify", instance);
     provide("isSourceView", isSourceView);
     provide("isFullScreen", isFullScreen);
@@ -25739,6 +25788,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     provide("editor", editor);
     provide("dataRangeCaches", dataRangeCaches);
     provide("showBorder", showBorder);
+    provide("pluginResultList", pluginResultList);
     __expose({
       editor,
       isSourceView,
@@ -25808,7 +25858,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Editify = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-3b2e5bbc"]]);
+const Editify = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-306d3e9a"]]);
 const InsertAttachmentProps = {
   //主题色
   color: {
@@ -26053,62 +26103,86 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   }
 });
 const InsertAttachment = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-f995f4bd"]]);
+const isAttachment = (element2) => {
+  if (element2.isEmpty()) {
+    return false;
+  }
+  return element2.parsedom == "span" && element2.type == "closed" && element2.hasMarks() && element2.marks["data-attachment"];
+};
+const hasAttachmentInRange = (editor, dataRangeCaches) => {
+  if (!editor.range) {
+    return false;
+  }
+  if (editor.range.anchor.isEqual(editor.range.focus)) {
+    return isAttachment(editor.range.anchor.element);
+  }
+  return dataRangeCaches.flatList.some((item) => {
+    return isAttachment(item.element);
+  });
+};
 const attachment = (options) => {
   if (!common.isObject(options)) {
     options = {};
   }
   const plugin = (editifyInstance, color2, editTrans) => {
+    let isDisabled = false;
+    if (editifyInstance.exposed.editor.value) {
+      isDisabled = hasPreInRange(editifyInstance.exposed.editor.value, editifyInstance.exposed.dataRangeCaches.value) || hasLinkInRange(editifyInstance.exposed.editor.value, editifyInstance.exposed.dataRangeCaches.value) || hasQuoteInRange(editifyInstance.exposed.editor.value, editifyInstance.exposed.dataRangeCaches.value);
+    }
     return {
+      name: "attachment",
       //附件菜单项配置
       menu: {
-        sequence: {
-          attachment: options.sequence || 100
+        sequence: options.sequence || 100,
+        extraDisabled: (name) => {
+          if (name == "link" || name == "quote" || name == "codeBlock") {
+            return hasAttachmentInRange(editifyInstance.exposed.editor.value, editifyInstance.exposed.dataRangeCaches.value);
+          }
+          return false;
         },
-        extends: {
-          attachment: {
-            type: "select",
-            title: options.title || editTrans("insertAttachment"),
-            leftBorder: options.leftBorder,
-            rightBorder: options.rightBorder,
-            hideScroll: true,
-            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,
-              accept: options.accept,
-              allowedFileType: options.allowedFileType || [],
-              multiple: !!options.multiple,
-              maxSize: options.maxSize,
-              minSize: options.minSize,
-              customUpload: options.customUpload,
-              handleError: options.handleError,
-              onChange: () => {
-                btnInstance.$refs.layerRef.setPosition();
-              },
-              onInsert: (name, url) => {
-                if (url) {
-                  const marks = {
-                    "data-attachment": url,
-                    "data-attachment-name": name || editTrans("attachmentDefaultName"),
-                    contenteditable: "false"
-                  };
-                  const attachmentElement = new AlexElement("closed", "span", marks, null, null);
-                  const editor = editifyInstance.exposed.editor.value;
-                  editor.insertElement(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();
-                }
-                btnInstance.show = false;
+        extend: {
+          type: "select",
+          title: options.title || editTrans("insertAttachment"),
+          leftBorder: options.leftBorder,
+          rightBorder: options.rightBorder,
+          hideScroll: true,
+          disabled: isDisabled,
+          default: () => h(Icon, { value: "attachment" }),
+          layer: (_name, btnInstance) => h(InsertAttachment, {
+            color: color2,
+            accept: options.accept,
+            allowedFileType: options.allowedFileType || [],
+            multiple: !!options.multiple,
+            maxSize: options.maxSize,
+            minSize: options.minSize,
+            customUpload: options.customUpload,
+            handleError: options.handleError,
+            onChange: () => {
+              btnInstance.$refs.layerRef.setPosition();
+            },
+            onInsert: (name, url) => {
+              if (url) {
+                const marks = {
+                  "data-attachment": url,
+                  "data-attachment-name": name || editTrans("attachmentDefaultName"),
+                  contenteditable: "false"
+                };
+                const attachmentElement = new AlexElement("closed", "span", marks, null, null);
+                const editor = editifyInstance.exposed.editor.value;
+                editor.insertElement(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();
               }
-            })
-          }
+              btnInstance.show = false;
+            }
+          })
         }
       },
       //找到附件元素点击下载
@@ -26168,7 +26242,7 @@ const attachment = (options) => {
 const install = (app) => {
   app.component(Editify.name, Editify);
 };
-const version = "0.1.27";
+const version = "0.1.30";
 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,