@haluo/biz 2.0.7 → 2.0.9

package/dist/haluo-biz.js

@@ -1,5 +1,5 @@
 import { ElTooltip, ElDivider, ElPopover, ElDialog, ElButton, ElRadio, ElInput, ElInfiniteScroll, ElMessage, ElIcon, ElFormItem, ElForm, ElMessageBox } from "element-plus";
-import { resolveComponent, resolveDirective, openBlock, createElementBlock, createElementVNode, createVNode, withCtx, normalizeStyle, createCommentVNode, normalizeClass, toDisplayString, withDirectives, Fragment, renderList, createBlock, defineComponent, inject, computed, unref, isRef, renderSlot, createTextVNode, provide, toRefs, reactive, watch, onMounted, withKeys, ref, h, render, vShow } from "vue";
+import { resolveComponent, resolveDirective, openBlock, createElementBlock, createElementVNode, createVNode, withCtx, normalizeStyle, createCommentVNode, normalizeClass, toDisplayString, withDirectives, Fragment, renderList, createBlock, defineComponent, inject, computed, unref, isRef, renderSlot, createTextVNode, provide, toRefs, reactive, watch, onMounted, withKeys, ref, h, render, vShow, withModifiers } from "vue";
 import { Picture, CircleCloseFilled, Plus } from "@element-plus/icons-vue";
 import util from "@haluo/util";
 import draggable from "vuedraggable";
@@ -164,12 +164,16 @@ const _sfc_main$7 = {
       this.editor.collectArticle();
     },
     back(e) {
-      this.editor.setContent(e);
-      this.backState = this.editor.editor.getUndoOrRedoState();
+      if (this.backState.undo) {
+        this.editor.setContent(e);
+        this.backState = this.editor.editor.getUndoOrRedoState();
+      }
     },
     forward(e) {
-      this.editor.setContent(e);
-      this.backState = this.editor.editor.getUndoOrRedoState();
+      if (this.backState.redo) {
+        this.editor.setContent(e);
+        this.backState = this.editor.editor.getUndoOrRedoState();
+      }
     },
     setTitle(e, type) {
       this.headType = type;
@@ -808,7 +812,7 @@ function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ])) : createCommentVNode("", true);
 }
-const ToolBar = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$3], ["__scopeId", "data-v-bea66306"]]);
+const ToolBar = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$3], ["__scopeId", "data-v-679581a3"]]);
 const __vite_glob_0_0 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAmCAYAAAClI5npAAAA0UlEQVR42uWYwQnDMAxFfckAXkFDmGzgS1foDpnFS3gTb+IFtIDyA4UeBKUtNR8qwTvlkAdyfmSletySmRUwgIIJOijXs9VcLxegwNVDRFYLdHtdCg6wrRKY9l4NUFYIqH1WDeTfCXxXE9w5Ar4tQhBwh7SBjSDg2lJJAj47SAI+OwgC7pDuJAGfHQQBnx0kAZ8dBAF3SOtTgCchybjV2QLKFpihW6BAQn6GA0i4KG4g037H4QaSDiTWUMocyweQcFezBjLrer5TFxR/uaKhL6lOdeUQ8G6X1pQAAAAASUVORK5CYII=";
 const index_vue_vue_type_style_index_0_lang$4 = "";
 const _hoisted_1$6 = { class: "basic-dialog_title" };
@@ -1828,7 +1832,7 @@ const _sfc_main = {
     me.editorDom = document.getElementById("editor-content");
     me.editorDom.addEventListener("blur", this.canSetAlign);
     if (!window.Squire) {
-      import("./squire-raw.7e84068d.js").then(function() {
+      import("./squire-raw.61527b92.js").then(function() {
         me.initSquire();
       });
     } else {
@@ -2375,6 +2379,7 @@ const _sfc_main = {
       this.parseHtml(data, essayPicRelVOList).then((res) => {
         this.editorDom.innerHTML = "";
         this.editor.insertElement(res);
+        this.editor.saveUndoState();
         this.updateData();
       });
     },
@@ -3034,14 +3039,18 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }, null, 36),
     createVNode(_component_el_dialog, {
       modelValue: $data.viewLinkDialog,
-      "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => $data.viewLinkDialog = $event),
+      "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => $data.viewLinkDialog = $event),
       "before-close": $options.handleClose,
       class: "squire-dialog-content",
       "append-to-body": ""
     }, {
       default: withCtx(() => [
         createElementVNode("div", _hoisted_2, [
-          createVNode(_component_el_form, { model: $data.linkForm }, {
+          createVNode(_component_el_form, {
+            model: $data.linkForm,
+            onSubmit: _cache[3] || (_cache[3] = withModifiers(() => {
+            }, ["prevent"]))
+          }, {
             default: withCtx(() => [
               createVNode(_component_el_form_item, {
                 label: "\u6DFB\u52A0\u94FE\u63A5",
@@ -3074,7 +3083,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ]),
         createElementVNode("div", _hoisted_3, [
           createVNode(_component_el_button, {
-            onClick: _cache[3] || (_cache[3] = ($event) => $data.viewLinkDialog = false)
+            onClick: _cache[4] || (_cache[4] = ($event) => $data.viewLinkDialog = false)
           }, {
             default: withCtx(() => [
               _hoisted_4
@@ -3097,28 +3106,28 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     createVNode(_component_InsertArticle, {
       article: $data.article,
       visible: $data.visibleArticle,
-      "onUpdate:visible": _cache[5] || (_cache[5] = ($event) => $data.visibleArticle = $event),
+      "onUpdate:visible": _cache[6] || (_cache[6] = ($event) => $data.visibleArticle = $event),
       getList: $props.getArticleList,
       onDelete: $options.handleImgDelete,
       onChange: $options.selectArticle
     }, null, 8, ["article", "visible", "getList", "onDelete", "onChange"]),
     createVNode(_component_ImgUpload, {
       "img-list": $data.imgList,
-      "onUpdate:img-list": _cache[6] || (_cache[6] = ($event) => $data.imgList = $event),
+      "onUpdate:img-list": _cache[7] || (_cache[7] = ($event) => $data.imgList = $event),
       visible: $data.visibleImg,
-      "onUpdate:visible": _cache[7] || (_cache[7] = ($event) => $data.visibleImg = $event),
+      "onUpdate:visible": _cache[8] || (_cache[8] = ($event) => $data.visibleImg = $event),
       onSubmit: $options.submitImg
     }, null, 8, ["img-list", "visible", "onSubmit"]),
     createVNode(_component_VideoUpload, {
       visible: $data.visibleVideo,
-      "onUpdate:visible": _cache[8] || (_cache[8] = ($event) => $data.visibleVideo = $event),
+      "onUpdate:visible": _cache[9] || (_cache[9] = ($event) => $data.visibleVideo = $event),
       "file-selected": $options.uploadVideo
     }, null, 8, ["visible", "file-selected"]),
     createVNode(_component_CollectArticle, {
       "link-content": $data.linkContent,
-      "onUpdate:link-content": _cache[9] || (_cache[9] = ($event) => $data.linkContent = $event),
+      "onUpdate:link-content": _cache[10] || (_cache[10] = ($event) => $data.linkContent = $event),
       visible: $data.visibleCollectArticle,
-      "onUpdate:visible": _cache[10] || (_cache[10] = ($event) => $data.visibleCollectArticle = $event),
+      "onUpdate:visible": _cache[11] || (_cache[11] = ($event) => $data.visibleCollectArticle = $event),
       onSubmit: $options.confirmLink
     }, null, 8, ["link-content", "visible", "onSubmit"]),
     createElementVNode("input", {
@@ -3127,14 +3136,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       multiple: "",
       class: "upload-again-input hide",
       accept: "image/*",
-      onChange: _cache[11] || (_cache[11] = (...args) => $options.againImg && $options.againImg(...args))
+      onChange: _cache[12] || (_cache[12] = (...args) => $options.againImg && $options.againImg(...args))
     }, null, 32),
     createElementVNode("input", {
       type: "file",
       name: "file",
       class: "replace-input hide",
       accept: "image/*",
-      onChange: _cache[12] || (_cache[12] = (...args) => $options.replaceImg && $options.replaceImg(...args))
+      onChange: _cache[13] || (_cache[13] = (...args) => $options.replaceImg && $options.replaceImg(...args))
     }, null, 32)
   ]);
 }

package/dist/haluo-biz.umd.cjs

@@ -166,12 +166,16 @@
         this.editor.collectArticle();
       },
       back(e) {
-        this.editor.setContent(e);
-        this.backState = this.editor.editor.getUndoOrRedoState();
+        if (this.backState.undo) {
+          this.editor.setContent(e);
+          this.backState = this.editor.editor.getUndoOrRedoState();
+        }
       },
       forward(e) {
-        this.editor.setContent(e);
-        this.backState = this.editor.editor.getUndoOrRedoState();
+        if (this.backState.redo) {
+          this.editor.setContent(e);
+          this.backState = this.editor.editor.getUndoOrRedoState();
+        }
       },
       setTitle(e, type) {
         this.headType = type;
@@ -810,7 +814,7 @@
       ])
     ])) : vue.createCommentVNode("", true);
   }
-  const ToolBar = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$3], ["__scopeId", "data-v-bea66306"]]);
+  const ToolBar = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$3], ["__scopeId", "data-v-679581a3"]]);
   const __vite_glob_0_0 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAmCAYAAAClI5npAAAA0UlEQVR42uWYwQnDMAxFfckAXkFDmGzgS1foDpnFS3gTb+IFtIDyA4UeBKUtNR8qwTvlkAdyfmSletySmRUwgIIJOijXs9VcLxegwNVDRFYLdHtdCg6wrRKY9l4NUFYIqH1WDeTfCXxXE9w5Ar4tQhBwh7SBjSDg2lJJAj47SAI+OwgC7pDuJAGfHQQBnx0kAZ8dBAF3SOtTgCchybjV2QLKFpihW6BAQn6GA0i4KG4g037H4QaSDiTWUMocyweQcFezBjLrer5TFxR/uaKhL6lOdeUQ8G6X1pQAAAAASUVORK5CYII=";
   const index_vue_vue_type_style_index_0_lang$4 = "";
   const _hoisted_1$6 = { class: "basic-dialog_title" };
@@ -2377,6 +2381,7 @@
         this.parseHtml(data, essayPicRelVOList).then((res) => {
           this.editorDom.innerHTML = "";
           this.editor.insertElement(res);
+          this.editor.saveUndoState();
           this.updateData();
         });
       },
@@ -3036,14 +3041,18 @@
       }, null, 36),
       vue.createVNode(_component_el_dialog, {
         modelValue: $data.viewLinkDialog,
-        "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => $data.viewLinkDialog = $event),
+        "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => $data.viewLinkDialog = $event),
         "before-close": $options.handleClose,
         class: "squire-dialog-content",
         "append-to-body": ""
       }, {
         default: vue.withCtx(() => [
           vue.createElementVNode("div", _hoisted_2, [
-            vue.createVNode(_component_el_form, { model: $data.linkForm }, {
+            vue.createVNode(_component_el_form, {
+              model: $data.linkForm,
+              onSubmit: _cache[3] || (_cache[3] = vue.withModifiers(() => {
+              }, ["prevent"]))
+            }, {
               default: vue.withCtx(() => [
                 vue.createVNode(_component_el_form_item, {
                   label: "\u6DFB\u52A0\u94FE\u63A5",
@@ -3076,7 +3085,7 @@
           ]),
           vue.createElementVNode("div", _hoisted_3, [
             vue.createVNode(_component_el_button, {
-              onClick: _cache[3] || (_cache[3] = ($event) => $data.viewLinkDialog = false)
+              onClick: _cache[4] || (_cache[4] = ($event) => $data.viewLinkDialog = false)
             }, {
               default: vue.withCtx(() => [
                 _hoisted_4
@@ -3099,28 +3108,28 @@
       vue.createVNode(_component_InsertArticle, {
         article: $data.article,
         visible: $data.visibleArticle,
-        "onUpdate:visible": _cache[5] || (_cache[5] = ($event) => $data.visibleArticle = $event),
+        "onUpdate:visible": _cache[6] || (_cache[6] = ($event) => $data.visibleArticle = $event),
         getList: $props.getArticleList,
         onDelete: $options.handleImgDelete,
         onChange: $options.selectArticle
       }, null, 8, ["article", "visible", "getList", "onDelete", "onChange"]),
       vue.createVNode(_component_ImgUpload, {
         "img-list": $data.imgList,
-        "onUpdate:img-list": _cache[6] || (_cache[6] = ($event) => $data.imgList = $event),
+        "onUpdate:img-list": _cache[7] || (_cache[7] = ($event) => $data.imgList = $event),
         visible: $data.visibleImg,
-        "onUpdate:visible": _cache[7] || (_cache[7] = ($event) => $data.visibleImg = $event),
+        "onUpdate:visible": _cache[8] || (_cache[8] = ($event) => $data.visibleImg = $event),
         onSubmit: $options.submitImg
       }, null, 8, ["img-list", "visible", "onSubmit"]),
       vue.createVNode(_component_VideoUpload, {
         visible: $data.visibleVideo,
-        "onUpdate:visible": _cache[8] || (_cache[8] = ($event) => $data.visibleVideo = $event),
+        "onUpdate:visible": _cache[9] || (_cache[9] = ($event) => $data.visibleVideo = $event),
         "file-selected": $options.uploadVideo
       }, null, 8, ["visible", "file-selected"]),
       vue.createVNode(_component_CollectArticle, {
         "link-content": $data.linkContent,
-        "onUpdate:link-content": _cache[9] || (_cache[9] = ($event) => $data.linkContent = $event),
+        "onUpdate:link-content": _cache[10] || (_cache[10] = ($event) => $data.linkContent = $event),
         visible: $data.visibleCollectArticle,
-        "onUpdate:visible": _cache[10] || (_cache[10] = ($event) => $data.visibleCollectArticle = $event),
+        "onUpdate:visible": _cache[11] || (_cache[11] = ($event) => $data.visibleCollectArticle = $event),
         onSubmit: $options.confirmLink
       }, null, 8, ["link-content", "visible", "onSubmit"]),
       vue.createElementVNode("input", {
@@ -3129,14 +3138,14 @@
         multiple: "",
         class: "upload-again-input hide",
         accept: "image/*",
-        onChange: _cache[11] || (_cache[11] = (...args) => $options.againImg && $options.againImg(...args))
+        onChange: _cache[12] || (_cache[12] = (...args) => $options.againImg && $options.againImg(...args))
       }, null, 32),
       vue.createElementVNode("input", {
         type: "file",
         name: "file",
         class: "replace-input hide",
         accept: "image/*",
-        onChange: _cache[12] || (_cache[12] = (...args) => $options.replaceImg && $options.replaceImg(...args))
+        onChange: _cache[13] || (_cache[13] = (...args) => $options.replaceImg && $options.replaceImg(...args))
       }, null, 32)
     ]);
   }
@@ -6373,6 +6382,10 @@
           nodeAfterSplit = this.createDefaultBlock();
           root.appendChild(nodeAfterSplit);
         }
+        const pBlock = el.previousSibling;
+        if (pBlock && isEmptyBlock(pBlock)) {
+          pBlock.remove();
+        }
         range.setStart(nodeAfterSplit, 0);
         range.setEnd(nodeAfterSplit, 0);
         moveRangeBoundariesDownTree(range);

package/dist/{squire-raw.7e84068d.js → squire-raw.61527b92.js}

@@ -3230,6 +3230,10 @@
         nodeAfterSplit = this.createDefaultBlock();
         root.appendChild(nodeAfterSplit);
       }
+      const pBlock = el.previousSibling;
+      if (pBlock && isEmptyBlock(pBlock)) {
+        pBlock.remove();
+      }
       range.setStart(nodeAfterSplit, 0);
       range.setEnd(nodeAfterSplit, 0);
       moveRangeBoundariesDownTree(range);

package/dist/style.css

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

package/package.json

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