@haluo/biz 1.0.4 → 1.0.6

package/dist/haluo-biz.js

@@ -767,7 +767,7 @@ function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
         ]),
         _: 1
       }),
-      !$data.showToolsArticle ? (openBlock(), createBlock(_component_el_tooltip, {
+      $data.showToolsArticle ? (openBlock(), createBlock(_component_el_tooltip, {
         key: 0,
         class: "item",
         effect: "dark",
@@ -805,7 +805,7 @@ function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ])) : createCommentVNode("", true);
 }
-const ToolBar = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$4], ["__scopeId", "data-v-3c4bc6f8"]]);
+const ToolBar = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$4], ["__scopeId", "data-v-aad1f7ce"]]);
 var script$2 = defineComponent({
   name: "CircleCloseFilled"
 });
@@ -1242,8 +1242,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
               key: 1,
               "infinite-scroll-immediate": false,
               class: "insert-article_list",
-              "infinite-scroll-disabled": unref(disable),
-              "infinite-scroll-distance": 10
+              "infinite-scroll-disabled": unref(disable)
             }, [
               (openBlock(true), createElementBlock(Fragment, null, renderList(data.data, (item, index) => {
                 return openBlock(), createElementBlock("div", {
@@ -2021,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.classList.includes("halo") || child.tagName === "svg")) {
                 const parent = child.parentNode;
                 parent.removeChild(child);
               }
@@ -2238,6 +2237,7 @@ const _sfc_main = {
       });
     },
     imgUploadHandler(type, imgSrc) {
+      const me = this;
       if (type && imgSrc) {
         if (type === "uploadAgainImages") {
           this.updateImage(imgSrc, this.currentImg);
@@ -2249,7 +2249,7 @@ const _sfc_main = {
               src: imgSrc,
               img: imgSrc,
               selected: false,
-              seamlessFlag: this.replaceSeamless,
+              seamlessFlag: me.replaceSeamless,
               type: "2"
             }, this.range);
           } else {
@@ -2316,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";
@@ -2324,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];
     },
@@ -2425,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"
@@ -2452,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"
         });
@@ -2467,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);
@@ -2551,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

@@ -771,7 +771,7 @@
           ]),
           _: 1
         }),
-        !$data.showToolsArticle ? (vue.openBlock(), vue.createBlock(_component_el_tooltip, {
+        $data.showToolsArticle ? (vue.openBlock(), vue.createBlock(_component_el_tooltip, {
           key: 0,
           class: "item",
           effect: "dark",
@@ -809,7 +809,7 @@
       ])
     ])) : vue.createCommentVNode("", true);
   }
-  const ToolBar = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$4], ["__scopeId", "data-v-3c4bc6f8"]]);
+  const ToolBar = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$4], ["__scopeId", "data-v-aad1f7ce"]]);
   var script$2 = vue.defineComponent({
     name: "CircleCloseFilled"
   });
@@ -1246,8 +1246,7 @@
                 key: 1,
                 "infinite-scroll-immediate": false,
                 class: "insert-article_list",
-                "infinite-scroll-disabled": vue.unref(disable),
-                "infinite-scroll-distance": 10
+                "infinite-scroll-disabled": vue.unref(disable)
               }, [
                 (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(data.data, (item, index) => {
                   return vue.openBlock(), vue.createElementBlock("div", {
@@ -2025,7 +2024,7 @@
                 return;
               }
               children.forEach((child) => {
-                if (child.nodeType === 1 && !child.className.includes("halo")) {
+                if (child.nodeType === 1 && (child.tagName !== "svg" && !child.classList.includes("halo") || child.tagName === "svg")) {
                   const parent = child.parentNode;
                   parent.removeChild(child);
                 }
@@ -2242,6 +2241,7 @@
         });
       },
       imgUploadHandler(type, imgSrc) {
+        const me = this;
         if (type && imgSrc) {
           if (type === "uploadAgainImages") {
             this.updateImage(imgSrc, this.currentImg);
@@ -2253,7 +2253,7 @@
                 src: imgSrc,
                 img: imgSrc,
                 selected: false,
-                seamlessFlag: this.replaceSeamless,
+                seamlessFlag: me.replaceSeamless,
                 type: "2"
               }, this.range);
             } else {
@@ -2320,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";
@@ -2328,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];
       },
@@ -2429,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"
@@ -2456,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"
           });
@@ -2471,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);
@@ -2555,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/dist/style.css

@@ -1,24 +1,24 @@
-.m12[data-v-3c4bc6f8] {
+.m12[data-v-aad1f7ce] {
   margin: 0 12px;
 }
-.ml16[data-v-3c4bc6f8] {
+.ml16[data-v-aad1f7ce] {
   margin-left: 16px;
 }
-.mr12[data-v-3c4bc6f8] {
+.mr12[data-v-aad1f7ce] {
   margin-right: 12px;
 }
-.ml12[data-v-3c4bc6f8] {
+.ml12[data-v-aad1f7ce] {
   margin-left: 12px;
 }
-.mr18[data-v-3c4bc6f8] {
+.mr18[data-v-aad1f7ce] {
   margin-right: 18px;
 }
-.tools[data-v-3c4bc6f8] {
+.tools[data-v-aad1f7ce] {
   z-index: 2;
   position: relative;
   background: #FAFAFA;
 }
-.tools .tools-content[data-v-3c4bc6f8] {
+.tools .tools-content[data-v-aad1f7ce] {
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
@@ -26,13 +26,13 @@
       -ms-flex-align: center;
           align-items: center;
 }
-.tools img[data-v-3c4bc6f8] {
+.tools img[data-v-aad1f7ce] {
   cursor: pointer;
 }
-.tools .box[data-v-3c4bc6f8] {
+.tools .box[data-v-aad1f7ce] {
   position: relative;
 }
-.tools .box .box-mask[data-v-3c4bc6f8] {
+.tools .box .box-mask[data-v-aad1f7ce] {
   width: 40px;
   height: 40px;
   background: black;
@@ -41,7 +41,7 @@
   position: absolute;
   pointer-events: none;
 }
-.tools .tools-title[data-v-3c4bc6f8] {
+.tools .tools-title[data-v-aad1f7ce] {
   color: #333333;
   font-size: 18px;
   display: -webkit-box;
@@ -52,25 +52,25 @@
           align-items: center;
   cursor: pointer;
 }
-.tools .disable[data-v-3c4bc6f8] {
+.tools .disable[data-v-aad1f7ce] {
   cursor: not-allowed;
   -webkit-filter: blur(0.6px);
           filter: blur(0.6px);
 }
-.tools .disable img[data-v-3c4bc6f8] {
+.tools .disable img[data-v-aad1f7ce] {
   cursor: not-allowed;
 }
-.tools .wrap[data-v-3c4bc6f8] {
+.tools .wrap[data-v-aad1f7ce] {
   position: relative;
 }
-.tools[data-v-3c4bc6f8] .m-colorPicker {
+.tools[data-v-aad1f7ce] .m-colorPicker {
   position: absolute;
   width: 100%;
   left: 0;
   z-index: -1;
   height: 100%;
 }
-.tools[data-v-3c4bc6f8] .m-colorPicker .colorBtn {
+.tools[data-v-aad1f7ce] .m-colorPicker .colorBtn {
   width: 100%;
   height: 100%;
   opacity: 0;

package/package.json

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