vue-editify 0.0.50 → 0.0.51

package/lib/editify.es.js

@@ -1938,8 +1938,13 @@ const getNewFlatData = function(arr) {
       newArr.unshift(arr[i]);
     }
   }
-  for (let i = 0; i < newArr.length; i++) {
+  let newLength = newArr.length;
+  let handledElementKeys = [];
+  for (let i = 0; i < newLength; i++) {
     const element2 = newArr[i].element;
+    if (handledElementKeys.includes(element2.key)) {
+      continue;
+    }
     if (!element2.offset && element2.parent) {
       const selfIn = newArr.some((item) => {
         return item.element.isEqual(element2.parent);
@@ -1954,7 +1959,9 @@ const getNewFlatData = function(arr) {
           element: element2.parent,
           offset: false
         });
-        i++;
+        newLength += 1;
+        handledElementKeys.push(element2.key);
+        i--;
       }
     }
   }
@@ -3477,7 +3484,7 @@ class AlexEditor {
   /**
    * 根据光标进行剪切操作
    */
-  async cut() {
+  async cut(useCache = false) {
     if (!this.useClipboard) {
       return;
     }
@@ -3487,7 +3494,7 @@ class AlexEditor {
     if (!this.allowCut) {
       return;
     }
-    const result = await this.copy(true);
+    const result = await this.copy(useCache, true);
     if (result) {
       if (!this.disabled) {
         this.delete(true);
@@ -3500,7 +3507,7 @@ class AlexEditor {
    * 根据光标执行复制操作
    * isCut表示是否在执行剪切操作，默认为false，这个参数仅在内部使用
    */
-  async copy(isCut = false) {
+  async copy(useCache = false, isCut = false) {
     if (!this.useClipboard) {
       return;
     }
@@ -3510,7 +3517,7 @@ class AlexEditor {
     if (!this.allowCopy) {
       return;
     }
-    let result = this.getElementsByRange().includes;
+    let result = this.getElementsByRange(useCache).includes;
     if (result.length == 0) {
       return;
     }
@@ -4196,35 +4203,35 @@ class AlexEditor {
     if (this.disabled) {
       return;
     }
-    if (!this.range) {
-      const selection2 = window.getSelection();
-      selection2.removeAllRanges();
-      return;
+    if (this.range) {
+      const handler = (point) => {
+        let node = null;
+        let offset = null;
+        if (point.element.isText()) {
+          node = point.element.elm.childNodes[0];
+          offset = point.offset;
+        } else {
+          node = point.element.parent.elm;
+          const index = point.element.parent.children.findIndex((item) => {
+            return point.element.isEqual(item);
+          });
+          offset = point.offset + index;
+        }
+        return { node, offset };
+      };
+      this.__innerSelectionChange = true;
+      const anchorResult = handler(this.range.anchor);
+      const focusResult = handler(this.range.focus);
+      const selection = window.getSelection();
+      selection.removeAllRanges();
+      const range = document.createRange();
+      range.setStart(anchorResult.node, anchorResult.offset);
+      range.setEnd(focusResult.node, focusResult.offset);
+      selection.addRange(range);
+    } else {
+      const selection = window.getSelection();
+      selection.removeAllRanges();
     }
-    const handler = (point) => {
-      let node = null;
-      let offset = null;
-      if (point.element.isText()) {
-        node = point.element.elm.childNodes[0];
-        offset = point.offset;
-      } else {
-        node = point.element.parent.elm;
-        const index = point.element.parent.children.findIndex((item) => {
-          return point.element.isEqual(item);
-        });
-        offset = point.offset + index;
-      }
-      return { node, offset };
-    };
-    this.__innerSelectionChange = true;
-    const anchorResult = handler(this.range.anchor);
-    const focusResult = handler(this.range.focus);
-    const selection = window.getSelection();
-    selection.removeAllRanges();
-    const range = document.createRange();
-    range.setStart(anchorResult.node, anchorResult.offset);
-    range.setEnd(focusResult.node, focusResult.offset);
-    selection.addRange(range);
     setTimeout(() => {
       setRangeInVisible.apply(this);
       this.__innerSelectionChange = false;
@@ -20043,7 +20050,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 const InsertTable = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-227ede65"]]);
-const Menu_vue_vue_type_style_index_0_scoped_c952b6ed_lang = "";
+const Menu_vue_vue_type_style_index_0_scoped_ad482303_lang = "";
 const _sfc_main$1 = {
   name: "Menu",
   props: {
@@ -21066,6 +21073,9 @@ const _sfc_main$1 = {
       if (this.disabled) {
         return;
       }
+      if (!this.$parent.editor.range) {
+        return;
+      }
       if (name == "undo") {
         this.$parent.undo();
       } else if (name == "redo") {
@@ -21165,6 +21175,9 @@ const _sfc_main$1 = {
       if (this.disabled) {
         return;
       }
+      if (!this.$parent.editor.range) {
+        return;
+      }
       const result = this.$parent.editor.getElementsByRange(useCache).includes;
       const hasPreStyle = this.$parent.hasPreStyle(true);
       const hasTable = this.$parent.hasTable(true);
@@ -21306,8 +21319,8 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
     }), 256))
   ], 14, _hoisted_1$1);
 }
-const Menu = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-c952b6ed"]]);
-const Editify_vue_vue_type_style_index_0_scoped_ede8b39b_lang = "";
+const Menu = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-ad482303"]]);
+const Editify_vue_vue_type_style_index_0_scoped_80d8535a_lang = "";
 const _sfc_main = {
   name: "editify",
   props: { ...editorProps },
@@ -21420,6 +21433,7 @@ const _sfc_main = {
       this.editor.formatElementStack();
       this.editor.domRender();
       this.editor.rangeRender();
+      this.$refs.content.blur();
     },
     //代码视图切换
     isSourceView(newValue) {
@@ -21850,6 +21864,10 @@ const _sfc_main = {
       if (this.disabled) {
         return;
       }
+      this.canUseMenu = !!this.editor.range;
+      if (!this.editor.range) {
+        return;
+      }
       if (this.updateTimer) {
         clearTimeout(this.updateTimer);
       }
@@ -23013,7 +23031,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ], 2)) : createCommentVNode("", true)
   ], 2);
 }
-const Editify = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-ede8b39b"]]);
+const Editify = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-80d8535a"]]);
 const iconfont = "";
 const en_US = {
   textWrapUp: "Up feed",
@@ -23196,7 +23214,7 @@ const i18n = (locale) => {
     return translations[locale][key];
   };
 };
-const version = "0.0.50";
+const version = "0.0.51";
 const install = (app, props) => {
   const locale = (props ? props.locale : "zh_CN") || "zh_CN";
   app.provide("$editTrans", i18n(locale));