@haluo/biz 1.0.5 → 1.0.7

package/dist/haluo-biz.js

@@ -2020,7 +2020,7 @@ const _sfc_main = {
               return;
             }
             children.forEach((child) => {
-              if (child.nodeType === 1 && !child.className.includes("halo")) {
+              if (child.nodeType === 1 && (child.tagName !== "svg" && !child.className.includes("halo") || child.tagName === "svg")) {
                 const parent = child.parentNode;
                 parent.removeChild(child);
               }
@@ -2237,6 +2237,7 @@ const _sfc_main = {
       });
     },
     imgUploadHandler(type, imgSrc) {
+      const me = this;
       if (type && imgSrc) {
         if (type === "uploadAgainImages") {
           this.updateImage(imgSrc, this.currentImg);
@@ -2248,7 +2249,7 @@ const _sfc_main = {
               src: imgSrc,
               img: imgSrc,
               selected: false,
-              seamlessFlag: this.replaceSeamless,
+              seamlessFlag: me.replaceSeamless,
               type: "2"
             }, this.range);
           } else {
@@ -2315,7 +2316,7 @@ const _sfc_main = {
           return;
         const current = me.findParentByClass(e.target, "halo-img-content");
         const range = document.createRange();
-        range.setEnd(current.previousElementSibling || current, 1);
+        range.setEnd(current.previousElementSibling, 1);
         range.collapse(false);
         me.range = range;
         me.replaceSeamless = data.seamlessFlag || "0";
@@ -2323,6 +2324,30 @@ const _sfc_main = {
         me.removePreviousImg = () => me.removeParentByClass(e.target, "halo-img-content");
         replaceInput.click();
       };
+      delBtn.onclick = function(e) {
+        if (me.disabled)
+          return;
+        const cur = me.findParentByClass(e.target, "halo-img-content");
+        const currentImg = cur.getElementsByClassName("halo-picture-area")[0];
+        const currentData = JSON.parse(currentImg.getAttribute("data"));
+        if (currentData.seamlessFlag === "0") {
+          if (!cur.previousElementSibling)
+            return;
+          try {
+            const imgcont = cur.previousElementSibling.previousElementSibling;
+            const input = imgcont.getElementsByClassName("desc-input-wrap")[0];
+            const pic = imgcont.getElementsByClassName("halo-picture-area")[0];
+            const data2 = JSON.parse(pic.getAttribute("data"));
+            data2.seamlessFlag = "0";
+            pic.setAttribute("data", JSON.stringify(data2));
+            input.style.display = "";
+          } catch (e2) {
+            console.log(e2);
+          }
+        }
+        me.removeParentByClass(e.target, "halo-img-content");
+        me.updateData(true);
+      };
       replaceBtn.innerHTML = "\u66FF\u6362";
       return [replaceBtn, delBtn, descInputWrap];
     },
@@ -2424,6 +2449,7 @@ const _sfc_main = {
       window.Squire.prototype.insertImages = function(src, data = {}, range) {
         var isHaloImage = me.isHaloImage(src);
         var scrollTop = document.documentElement.scrollTop;
+        const isSeameless = data.seamlessFlag === "1";
         var loading = this.createElement("div", {
           "class": "img-loading",
           "contenteditable": "false"
@@ -2451,7 +2477,7 @@ const _sfc_main = {
           "src": src,
           "class": isHaloImage ? "halo-picture-area" : "halo-picture-area no-upload",
           "data": JSON.stringify(data),
-          "style": data.seamlessFlag === "1" ? "margin: 0" : "margin-top: 0",
+          "style": isSeameless ? "margin: 0" : "margin-top: 0",
           "data-content": data.content || "",
           "contenteditable": "false"
         });
@@ -2466,16 +2492,11 @@ const _sfc_main = {
           "class": "halo-img-content",
           "contenteditable": "false"
         }, [...childList]);
-        if (me.imgType === "seamless") {
-          me.countList.push(p);
-          if (me.countList.length === me.imgList.length) {
-            var ct = this.createElement("div", {}, [...me.countList]);
-            this.insertElement(ct, range);
-            this.imgType = "normal";
-          }
-          return;
-        }
         this.insertElement(p, range);
+        if (isSeameless) {
+          me.removeDefault(p, "nextElementSibling");
+          me.removeDefault(p, "previousElementSibling");
+        }
         setTimeout(() => {
           document.documentElement.scrollTop = scrollTop;
         }, 50);
@@ -2550,6 +2571,23 @@ const _sfc_main = {
       };
       me.sticky();
     },
+    removeDefault(next, key) {
+      const me = this;
+      const cur = next[key];
+      if (!cur || cur.innerText !== "\n")
+        return;
+      const blockDefault = cur.classList.contains("halo-paragraph") || false;
+      const isLasterBlock = next.classList.contains("halo-paragraph") || false;
+      if (blockDefault && isLasterBlock) {
+        cur.remove();
+        me.removeDefault(cur, key);
+      } else {
+        if (blockDefault) {
+          cur.style.display = "none";
+          me.removeDefault(cur, key);
+        }
+      }
+    },
     generateDelLinkIcon() {
       const me = this;
       const del = this.editor.createElement("img", {

package/dist/haluo-biz.umd.cjs

@@ -2024,7 +2024,7 @@
                 return;
               }
               children.forEach((child) => {
-                if (child.nodeType === 1 && !child.className.includes("halo")) {
+                if (child.nodeType === 1 && (child.tagName !== "svg" && !child.className.includes("halo") || child.tagName === "svg")) {
                   const parent = child.parentNode;
                   parent.removeChild(child);
                 }
@@ -2241,6 +2241,7 @@
         });
       },
       imgUploadHandler(type, imgSrc) {
+        const me = this;
         if (type && imgSrc) {
           if (type === "uploadAgainImages") {
             this.updateImage(imgSrc, this.currentImg);
@@ -2252,7 +2253,7 @@
                 src: imgSrc,
                 img: imgSrc,
                 selected: false,
-                seamlessFlag: this.replaceSeamless,
+                seamlessFlag: me.replaceSeamless,
                 type: "2"
               }, this.range);
             } else {
@@ -2319,7 +2320,7 @@
             return;
           const current = me.findParentByClass(e.target, "halo-img-content");
           const range = document.createRange();
-          range.setEnd(current.previousElementSibling || current, 1);
+          range.setEnd(current.previousElementSibling, 1);
           range.collapse(false);
           me.range = range;
           me.replaceSeamless = data.seamlessFlag || "0";
@@ -2327,6 +2328,30 @@
           me.removePreviousImg = () => me.removeParentByClass(e.target, "halo-img-content");
           replaceInput.click();
         };
+        delBtn.onclick = function(e) {
+          if (me.disabled)
+            return;
+          const cur = me.findParentByClass(e.target, "halo-img-content");
+          const currentImg = cur.getElementsByClassName("halo-picture-area")[0];
+          const currentData = JSON.parse(currentImg.getAttribute("data"));
+          if (currentData.seamlessFlag === "0") {
+            if (!cur.previousElementSibling)
+              return;
+            try {
+              const imgcont = cur.previousElementSibling.previousElementSibling;
+              const input = imgcont.getElementsByClassName("desc-input-wrap")[0];
+              const pic = imgcont.getElementsByClassName("halo-picture-area")[0];
+              const data2 = JSON.parse(pic.getAttribute("data"));
+              data2.seamlessFlag = "0";
+              pic.setAttribute("data", JSON.stringify(data2));
+              input.style.display = "";
+            } catch (e2) {
+              console.log(e2);
+            }
+          }
+          me.removeParentByClass(e.target, "halo-img-content");
+          me.updateData(true);
+        };
         replaceBtn.innerHTML = "\u66FF\u6362";
         return [replaceBtn, delBtn, descInputWrap];
       },
@@ -2428,6 +2453,7 @@
         window.Squire.prototype.insertImages = function(src, data = {}, range) {
           var isHaloImage = me.isHaloImage(src);
           var scrollTop = document.documentElement.scrollTop;
+          const isSeameless = data.seamlessFlag === "1";
           var loading = this.createElement("div", {
             "class": "img-loading",
             "contenteditable": "false"
@@ -2455,7 +2481,7 @@
             "src": src,
             "class": isHaloImage ? "halo-picture-area" : "halo-picture-area no-upload",
             "data": JSON.stringify(data),
-            "style": data.seamlessFlag === "1" ? "margin: 0" : "margin-top: 0",
+            "style": isSeameless ? "margin: 0" : "margin-top: 0",
             "data-content": data.content || "",
             "contenteditable": "false"
           });
@@ -2470,16 +2496,11 @@
             "class": "halo-img-content",
             "contenteditable": "false"
           }, [...childList]);
-          if (me.imgType === "seamless") {
-            me.countList.push(p);
-            if (me.countList.length === me.imgList.length) {
-              var ct = this.createElement("div", {}, [...me.countList]);
-              this.insertElement(ct, range);
-              this.imgType = "normal";
-            }
-            return;
-          }
           this.insertElement(p, range);
+          if (isSeameless) {
+            me.removeDefault(p, "nextElementSibling");
+            me.removeDefault(p, "previousElementSibling");
+          }
           setTimeout(() => {
             document.documentElement.scrollTop = scrollTop;
           }, 50);
@@ -2554,6 +2575,23 @@
         };
         me.sticky();
       },
+      removeDefault(next, key) {
+        const me = this;
+        const cur = next[key];
+        if (!cur || cur.innerText !== "\n")
+          return;
+        const blockDefault = cur.classList.contains("halo-paragraph") || false;
+        const isLasterBlock = next.classList.contains("halo-paragraph") || false;
+        if (blockDefault && isLasterBlock) {
+          cur.remove();
+          me.removeDefault(cur, key);
+        } else {
+          if (blockDefault) {
+            cur.style.display = "none";
+            me.removeDefault(cur, key);
+          }
+        }
+      },
       generateDelLinkIcon() {
         const me = this;
         const del = this.editor.createElement("img", {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@haluo/biz",
   "description": "rich text",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "type": "module",
   "module": "./dist/haluo-biz.js",
   "main": "./dist/haluo-biz.umd.cjs",