@hufe921/canvas-editor 0.9.66 → 0.9.68

package/CHANGELOG.md

@@ -1,3 +1,45 @@
+## [0.9.68](https://github.com/Hufe921/canvas-editor/compare/v0.9.67...v0.9.68) (2024-03-10)
+
+
+### Bug Fixes
+
+* dragging element boundary error ([a2d8dd5](https://github.com/Hufe921/canvas-editor/commit/a2d8dd55b36a09b42fae377e06bf667dced3857e))
+* hyperlink word count statistics #449 ([180bd08](https://github.com/Hufe921/canvas-editor/commit/180bd088397159e32dc70da4eefd507721ced432)), closes [#449](https://github.com/Hufe921/canvas-editor/issues/449)
+
+
+### Features
+
+* set print layout format when printing #448 ([c6534f7](https://github.com/Hufe921/canvas-editor/commit/c6534f766d8640cbea4e441541065d25e0dd8b82)), closes [#448](https://github.com/Hufe921/canvas-editor/issues/448)
+
+
+### Performance Improvements
+
+* history stack memory ([5044c31](https://github.com/Hufe921/canvas-editor/commit/5044c319211322c0ab2a2db461b029f34b292939))
+
+
+
+## [0.9.67](https://github.com/Hufe921/canvas-editor/compare/v0.9.66...v0.9.67) (2024-03-01)
+
+
+### Bug Fixes
+
+* dragging image boundary error within the control ([52590f6](https://github.com/Hufe921/canvas-editor/commit/52590f6d92746e30aaf92efe85b0486ddd3cb467))
+* text control clear value range context error #439 (#443) ([c299290](https://github.com/Hufe921/canvas-editor/commit/c2992909b6c7ff94d6685007d09fa9611b5e6d8d)), closes [#439](https://github.com/Hufe921/canvas-editor/issues/439) [#443](https://github.com/Hufe921/canvas-editor/issues/443)
+
+
+### Chores
+
+* add underline decoration type demo ([aa12296](https://github.com/Hufe921/canvas-editor/commit/aa12296ef67aa66e46d6615e91833199746c8bae))
+* update FUNDING.yml ([dc2804c](https://github.com/Hufe921/canvas-editor/commit/dc2804c492b1d5d745ec58276e4ff8bc1ed825b3))
+
+
+### Features
+
+* add text decoration property ([f1570f2](https://github.com/Hufe921/canvas-editor/commit/f1570f2180086c1d4f9bf92e06edf5baecbd436c))
+* add textDecoration property to the rangeStyleChange event ([a7fa847](https://github.com/Hufe921/canvas-editor/commit/a7fa847b198010cc5c7b8af9c860a04fe1c4250d))
+
+
+
 ## [0.9.66](https://github.com/Hufe921/canvas-editor/compare/v0.9.65...v0.9.66) (2024-02-24)
 
 

package/dist/canvas-editor.es.js

@@ -23,7 +23,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 var index = "";
-const version = "0.9.66";
+const version = "0.9.68";
 var MaxHeightRatio;
 (function(MaxHeightRatio2) {
   MaxHeightRatio2["HALF"] = "half";
@@ -119,6 +119,22 @@ function throttle(func, delay) {
     }
   };
 }
+function deepCloneOmitKeys(obj, omitKeys) {
+  if (!obj || typeof obj !== "object") {
+    return obj;
+  }
+  let newObj = {};
+  if (Array.isArray(obj)) {
+    newObj = obj.map((item) => deepCloneOmitKeys(item, omitKeys));
+  } else {
+    Object.keys(obj).forEach((key) => {
+      if (omitKeys.includes(key))
+        return;
+      return newObj[key] = deepCloneOmitKeys(obj[key], omitKeys);
+    });
+  }
+  return newObj;
+}
 function deepClone(obj) {
   if (!obj || typeof obj !== "object") {
     return obj;
@@ -325,6 +341,16 @@ function isArrayEqual(arr1, arr2) {
   }
   return !arr1.some((item) => !arr2.includes(item));
 }
+function isObjectEqual(obj1, obj2) {
+  if (!isObject(obj1) || !isObject(obj2))
+    return false;
+  const obj1Keys = Object.keys(obj1);
+  const obj2Keys = Object.keys(obj2);
+  if (obj1Keys.length !== obj2Keys.length) {
+    return false;
+  }
+  return !obj1Keys.some((key) => obj2[key] !== obj1[key]);
+}
 const CURSOR_AGENT_OFFSET_HEIGHT = 12;
 const defaultCursorOption = {
   width: 1,
@@ -369,7 +395,8 @@ const EDITOR_ELEMENT_STYLE_ATTR = [
   "size",
   "italic",
   "underline",
-  "strikeout"
+  "strikeout",
+  "textDecoration"
 ];
 const EDITOR_ROW_ATTR = ["rowFlex", "rowMargin"];
 const EDITOR_ELEMENT_COPY_ATTR = [
@@ -389,7 +416,8 @@ const EDITOR_ELEMENT_COPY_ATTR = [
   "dateFormat",
   "groupIds",
   "rowFlex",
-  "rowMargin"
+  "rowMargin",
+  "textDecoration"
 ];
 const EDITOR_ELEMENT_ZIP_ATTR = [
   "type",
@@ -422,7 +450,8 @@ const EDITOR_ELEMENT_ZIP_ATTR = [
   "groupIds",
   "conceptId",
   "imgDisplay",
-  "imgFloatPosition"
+  "imgFloatPosition",
+  "textDecoration"
 ];
 const TABLE_TD_ZIP_ATTR = [
   "verticalAlign",
@@ -441,6 +470,11 @@ const LIST_CONTEXT_ATTR = [
   "listType",
   "listStyle"
 ];
+const CONTROL_CONTEXT_ATTR = [
+  "control",
+  "controlId",
+  "controlComponent"
+];
 const EDITOR_ELEMENT_CONTEXT_ATTR = [
   ...TABLE_CONTEXT_ATTR,
   ...TITLE_CONTEXT_ATTR,
@@ -4613,6 +4647,12 @@ ${listIndex + 1}.${buildText(listElementList)}${isLast ? `
   }
   return buildText(zipElementList(elementList));
 }
+function getSlimCloneElementList(elementList) {
+  return deepCloneOmitKeys(elementList, [
+    "metrics",
+    "style"
+  ]);
+}
 function setClipboardData(data2) {
   localStorage.setItem(EDITOR_CLIPBOARD, JSON.stringify({
     text: data2.text,
@@ -5232,6 +5272,7 @@ function setRangeCache(host) {
   host.cacheRange = deepClone(rangeManager.getRange());
   host.cacheElementList = draw.getElementList();
   host.cachePositionList = position.getPositionList();
+  host.cachePositionContext = position.getPositionContext();
 }
 function mousedown(evt, host) {
   var _a;
@@ -5369,13 +5410,14 @@ function moveImgPosition(element, evt, host) {
   draw.getImageParticle().destroyFloatImage();
 }
 function mouseup(evt, host) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   if (host.isAllowDrop) {
     const draw = host.getDraw();
     if (draw.isReadonly())
       return;
     const position = draw.getPosition();
     const positionList = position.getPositionList();
+    const positionContext = position.getPositionContext();
     const rangeManager = draw.getRange();
     const cacheRange = host.cacheRange;
     const cacheElementList = host.cacheElementList;
@@ -5384,7 +5426,7 @@ function mouseup(evt, host) {
     const isCacheRangeCollapsed = cacheRange.startIndex === cacheRange.endIndex;
     const cacheStartIndex = isCacheRangeCollapsed ? cacheRange.startIndex - 1 : cacheRange.startIndex;
     const cacheEndIndex = cacheRange.endIndex;
-    if (range.startIndex >= cacheStartIndex && range.endIndex <= cacheEndIndex) {
+    if (range.startIndex >= cacheStartIndex && range.endIndex <= cacheEndIndex && ((_a = host.cachePositionContext) == null ? void 0 : _a.tdId) === positionContext.tdId) {
       draw.clearSideEffect();
       let isSubmitHistory = false;
       if (isCacheRangeCollapsed) {
@@ -5413,7 +5455,7 @@ function mouseup(evt, host) {
     if (isContainControl) {
       const cacheStartElement2 = cacheElementList[cacheStartIndex + 1];
       const cacheEndElement2 = cacheElementList[cacheEndIndex];
-      const isAllowDragControl = (!cacheStartElement2.controlId || cacheStartElement2.controlComponent === ControlComponent.PREFIX) && (!cacheEndElement2.controlId || cacheEndElement2.controlComponent === ControlComponent.POSTFIX) || cacheStartElement2.controlId === cacheEndElement2.controlId && cacheStartElement2.controlComponent === ControlComponent.PREFIX && cacheEndElement2.controlComponent === ControlComponent.POSTFIX || ((_a = cacheStartElement2.control) == null ? void 0 : _a.type) === ControlType.TEXT && cacheStartElement2.controlComponent === ControlComponent.VALUE && ((_b = cacheEndElement2.control) == null ? void 0 : _b.type) === ControlType.TEXT && cacheEndElement2.controlComponent === ControlComponent.VALUE;
+      const isAllowDragControl = (!cacheStartElement2.controlId || cacheStartElement2.controlComponent === ControlComponent.PREFIX) && (!cacheEndElement2.controlId || cacheEndElement2.controlComponent === ControlComponent.POSTFIX) || cacheStartElement2.controlId === cacheEndElement2.controlId && cacheStartElement2.controlComponent === ControlComponent.PREFIX && cacheEndElement2.controlComponent === ControlComponent.POSTFIX || ((_b = cacheStartElement2.control) == null ? void 0 : _b.type) === ControlType.TEXT && cacheStartElement2.controlComponent === ControlComponent.VALUE && ((_c = cacheEndElement2.control) == null ? void 0 : _c.type) === ControlType.TEXT && cacheEndElement2.controlComponent === ControlComponent.VALUE;
       if (!isAllowDragControl) {
         draw.render({
           curIndex: range.startIndex,
@@ -5426,8 +5468,7 @@ function mouseup(evt, host) {
     const editorOptions = draw.getOptions();
     const elementList = draw.getElementList();
     const replaceElementList = dragElementList.map((el) => {
-      var _a2;
-      if (!el.type || el.type === ElementType.TEXT || ((_a2 = el.control) == null ? void 0 : _a2.type) === ControlType.TEXT) {
+      if (!el.type || el.type === ElementType.TEXT) {
         const newElement = {
           value: el.value
         };
@@ -5439,7 +5480,7 @@ function mouseup(evt, host) {
         });
         return newElement;
       } else {
-        const newElement = deepClone(el);
+        const newElement = omitObject(deepClone(el), CONTROL_CONTEXT_ATTR);
         formatElementList([newElement], {
           isHandleFirstElement: false,
           editorOptions
@@ -5448,6 +5489,8 @@ function mouseup(evt, host) {
       }
     });
     formatElementContext(elementList, replaceElementList, range.startIndex);
+    const cacheStartElement = cacheElementList[cacheStartIndex];
+    const cacheStartPosition = cachePositionList[cacheStartIndex];
     const cacheRangeStartId = createDragId(cacheElementList[cacheStartIndex]);
     const cacheRangeEndId = createDragId(cacheElementList[cacheEndIndex]);
     const replaceLength = replaceElementList.length;
@@ -5477,15 +5520,12 @@ function mouseup(evt, host) {
         startIndex: cacheRangeStartIndex,
         endIndex: cacheRangeEndIndex
       }));
-      (_c = control.getActiveControl()) == null ? void 0 : _c.cut();
+      (_d = control.getActiveControl()) == null ? void 0 : _d.cut();
     } else {
       draw.spliceElementList(cacheElementList, cacheRangeStartIndex + 1, cacheRangeEndIndex - cacheRangeStartIndex);
     }
     const startElement = elementList[range.startIndex];
-    const cacheStartElement = cacheElementList[cacheStartIndex];
     const startPosition = positionList[range.startIndex];
-    const cacheStartPosition = cachePositionList[cacheStartIndex];
-    const positionContext = position.getPositionContext();
     let positionContextIndex = positionContext.index;
     if (positionContextIndex) {
       if (startElement.tableId && !cacheStartElement.tableId) {
@@ -6378,6 +6418,7 @@ class CanvasEvent {
     __publicField(this, "cacheRange");
     __publicField(this, "cacheElementList");
     __publicField(this, "cachePositionList");
+    __publicField(this, "cachePositionContext");
     __publicField(this, "mouseDownStartPosition");
     __publicField(this, "draw");
     __publicField(this, "pageContainer");
@@ -6397,6 +6438,7 @@ class CanvasEvent {
     this.cacheRange = null;
     this.cacheElementList = null;
     this.cachePositionList = null;
+    this.cachePositionContext = null;
     this.mouseDownStartPosition = null;
   }
   getDraw() {
@@ -7443,6 +7485,7 @@ class RangeManager {
     const level = curElement.level || null;
     const listType = curElement.listType || null;
     const listStyle = curElement.listStyle || null;
+    const textDecoration = underline ? curElement.textDecoration || null : null;
     const painter = !!this.draw.getPainterStyle();
     const undo = this.historyManager.isCanUndo();
     const redo = this.historyManager.isCanRedo();
@@ -7466,7 +7509,8 @@ class RangeManager {
       level,
       listType,
       listStyle,
-      groupIds
+      groupIds,
+      textDecoration
     };
     if (rangeStyleChangeListener) {
       rangeStyleChangeListener(rangeStyle);
@@ -7505,7 +7549,8 @@ class RangeManager {
       level: null,
       listType: null,
       listStyle: null,
-      groupIds: null
+      groupIds: null,
+      textDecoration: null
     };
     if (rangeStyleChangeListener) {
       rangeStyleChangeListener(rangeStyle);
@@ -7681,10 +7726,12 @@ class AbstractRichText {
   constructor() {
     __publicField(this, "fillRect");
     __publicField(this, "fillColor");
+    __publicField(this, "fillDecorationStyle");
     this.fillRect = this.clearFillInfo();
   }
   clearFillInfo() {
     this.fillColor = void 0;
+    this.fillDecorationStyle = void 0;
     this.fillRect = {
       x: 0,
       y: 0,
@@ -7693,12 +7740,12 @@ class AbstractRichText {
     };
     return this.fillRect;
   }
-  recordFillInfo(ctx, x, y, width, height, color) {
+  recordFillInfo(ctx, x, y, width, height, color, decorationStyle) {
     const isFirstRecord = !this.fillRect.width;
-    if (!isFirstRecord && this.fillColor !== color) {
+    if (!isFirstRecord && (this.fillColor !== color || this.fillDecorationStyle !== decorationStyle)) {
       this.render(ctx);
       this.clearFillInfo();
-      this.recordFillInfo(ctx, x, y, width, height, color);
+      this.recordFillInfo(ctx, x, y, width, height, color, decorationStyle);
       return;
     }
     if (isFirstRecord) {
@@ -7710,6 +7757,7 @@ class AbstractRichText {
     }
     this.fillRect.width += width;
     this.fillColor = color;
+    this.fillDecorationStyle = decorationStyle;
   }
 }
 class Highlight extends AbstractRichText {
@@ -8041,24 +8089,92 @@ class Strikeout extends AbstractRichText {
     this.clearFillInfo();
   }
 }
+var TextDecorationStyle;
+(function(TextDecorationStyle2) {
+  TextDecorationStyle2["SOLID"] = "solid";
+  TextDecorationStyle2["DOUBLE"] = "double";
+  TextDecorationStyle2["DASHED"] = "dashed";
+  TextDecorationStyle2["DOTTED"] = "dotted";
+  TextDecorationStyle2["WAVY"] = "wavy";
+})(TextDecorationStyle || (TextDecorationStyle = {}));
+var DashType;
+(function(DashType2) {
+  DashType2["SOLID"] = "solid";
+  DashType2["DASHED"] = "dashed";
+  DashType2["DOTTED"] = "dotted";
+})(DashType || (DashType = {}));
 class Underline extends AbstractRichText {
   constructor(draw) {
     super();
     __publicField(this, "options");
     this.options = draw.getOptions();
   }
+  _drawLine(ctx, startX, startY, width, dashType) {
+    const endX = startX + width;
+    ctx.beginPath();
+    switch (dashType) {
+      case DashType.DASHED:
+        ctx.setLineDash([3, 1]);
+        break;
+      case DashType.DOTTED:
+        ctx.setLineDash([1, 1]);
+        break;
+    }
+    ctx.moveTo(startX, startY);
+    ctx.lineTo(endX, startY);
+    ctx.stroke();
+  }
+  _drawDouble(ctx, startX, startY, width) {
+    const SPACING = 3;
+    const endX = startX + width;
+    const endY = startY + SPACING * this.options.scale;
+    ctx.beginPath();
+    ctx.moveTo(startX, startY);
+    ctx.lineTo(endX, startY);
+    ctx.stroke();
+    ctx.beginPath();
+    ctx.moveTo(startX, endY);
+    ctx.lineTo(endX, endY);
+    ctx.stroke();
+  }
+  _drawWave(ctx, startX, startY, width) {
+    const { scale } = this.options;
+    const AMPLITUDE = 1.2 * scale;
+    const FREQUENCY = 1 / scale;
+    const adjustY = startY + 2 * AMPLITUDE;
+    ctx.beginPath();
+    for (let x = 0; x < width; x++) {
+      const y = AMPLITUDE * Math.sin(FREQUENCY * x);
+      ctx.lineTo(startX + x, adjustY + y);
+    }
+    ctx.stroke();
+  }
   render(ctx) {
     if (!this.fillRect.width)
       return;
-    const { underlineColor } = this.options;
+    const { underlineColor, scale } = this.options;
     const { x, y, width } = this.fillRect;
     ctx.save();
     ctx.strokeStyle = this.fillColor || underlineColor;
+    ctx.lineWidth = scale;
     const adjustY = Math.floor(y + 2 * ctx.lineWidth) + 0.5;
-    ctx.beginPath();
-    ctx.moveTo(x, adjustY);
-    ctx.lineTo(x + width, adjustY);
-    ctx.stroke();
+    switch (this.fillDecorationStyle) {
+      case TextDecorationStyle.WAVY:
+        this._drawWave(ctx, x, adjustY, width);
+        break;
+      case TextDecorationStyle.DOUBLE:
+        this._drawDouble(ctx, x, adjustY, width);
+        break;
+      case TextDecorationStyle.DASHED:
+        this._drawLine(ctx, x, adjustY, width, DashType.DASHED);
+        break;
+      case TextDecorationStyle.DOTTED:
+        this._drawLine(ctx, x, adjustY, width, DashType.DOTTED);
+        break;
+      default:
+        this._drawLine(ctx, x, adjustY, width);
+        break;
+    }
     ctx.restore();
     this.clearFillInfo();
   }
@@ -9613,9 +9729,9 @@ class TextControl {
   getElement() {
     return this.element;
   }
-  getValue() {
-    const elementList = this.control.getElementList();
-    const { startIndex } = this.control.getRange();
+  getValue(context = {}) {
+    const elementList = context.elementList || this.control.getElementList();
+    const { startIndex } = context.range || this.control.getRange();
     const startElement = elementList[startIndex];
     const data2 = [];
     let preIndex = startIndex;
@@ -9676,7 +9792,7 @@ class TextControl {
     const range = context.range || this.control.getRange();
     const { startIndex, endIndex } = range;
     this.control.getDraw().spliceElementList(elementList, startIndex + 1, endIndex - startIndex);
-    const value = this.getValue();
+    const value = this.getValue(context);
     if (!value.length) {
       this.control.addPlaceholder(startIndex);
     }
@@ -10434,7 +10550,7 @@ class CheckboxParticle {
     ctx.restore();
   }
 }
-const encodedJs$2 = "KCgpPT57KGZ1bmN0aW9uKCl7InVzZSBzdHJpY3QiO3ZhciBmOyhmdW5jdGlvbih0KXt0LlRFWFQ9InRleHQiLHQuVEFCTEU9InRhYmxlIix0LkhZUEVSTElOSz0iaHlwZXJsaW5rIix0LkNPTlRST0w9ImNvbnRyb2wifSkoZnx8KGY9e30pKTt2YXIgcDsoZnVuY3Rpb24odCl7dC5WQUxVRT0idmFsdWUifSkocHx8KHA9e30pKTtjb25zdCBoPSJcdTIwMEIiLGc9YApgO2Z1bmN0aW9uIGEodCl7bGV0IGw9IiIsbj0wO2Zvcig7bjx0Lmxlbmd0aDspe2NvbnN0IG89dFtuXTtpZihvLnR5cGU9PT1mLlRBQkxFKXtpZihvLnRyTGlzdClmb3IobGV0IHI9MDtyPG8udHJMaXN0Lmxlbmd0aDtyKyspe2NvbnN0IHM9by50ckxpc3Rbcl07Zm9yKGxldCBlPTA7ZTxzLnRkTGlzdC5sZW5ndGg7ZSsrKXtjb25zdCBpPXMudGRMaXN0W2VdO2wrPWEoaS52YWx1ZSl9fX1lbHNlIGlmKG8udHlwZT09PWYuSFlQRVJMSU5LKXtjb25zdCByPW8uaHlwZXJsaW5rSWQscz1bXTtmb3IoO248dC5sZW5ndGg7KXtjb25zdCBlPXRbbl07aWYociE9PWUuaHlwZXJsaW5rSWQpe24tLTticmVha31kZWxldGUgZS50eXBlLHMucHVzaChlKSxuKyt9bCs9YShzKX1lbHNlIGlmKG8uY29udHJvbElkKXtjb25zdCByPW8uY29udHJvbElkLHM9W107Zm9yKDtuPHQubGVuZ3RoOyl7Y29uc3QgZT10W25dO2lmKHIhPT1lLmNvbnRyb2xJZCl7bi0tO2JyZWFrfWUuY29udHJvbENvbXBvbmVudD09PXAuVkFMVUUmJihkZWxldGUgZS5jb250cm9sSWQscy5wdXNoKGUpKSxuKyt9bCs9YShzKX0oIW8udHlwZXx8by50eXBlPT09Zi5URVhUKSYmKGwrPW8udmFsdWUpLG4rK31yZXR1cm4gbH1mdW5jdGlvbiBkKHQpe2NvbnN0IGw9W10sbj0vWzAtOV0vLG89L1tBLVphLXpdLyxyPS9ccy87bGV0IHM9ITEsZT0hMSxpPSIiO2Z1bmN0aW9uIHUoKXtpJiYobC5wdXNoKGkpLGk9IiIpfWZvcihjb25zdCBjIG9mIHQpby50ZXN0KGMpPyhzfHx1KCksaSs9YyxzPSEwLGU9ITEpOm4udGVzdChjKT8oZXx8dSgpLGkrPWMscz0hMSxlPSEwKToodSgpLHM9ITEsZT0hMSxyLnRlc3QoYyl8fGwucHVzaChjKSk7cmV0dXJuIHUoKSxsfW9ubWVzc2FnZT10PT57Y29uc3QgbD10LmRhdGEsbz1hKGwpLnJlcGxhY2UobmV3IFJlZ0V4cChgXiR7aH1gKSwiIikucmVwbGFjZShuZXcgUmVnRXhwKGgsImciKSxnKSxyPWQobyk7cG9zdE1lc3NhZ2Uoci5sZW5ndGgpfX0pKCk7fSkoKTsK";
+const encodedJs$2 = "KCgpPT57KGZ1bmN0aW9uKCl7InVzZSBzdHJpY3QiO3ZhciBmOyhmdW5jdGlvbih0KXt0LlRFWFQ9InRleHQiLHQuVEFCTEU9InRhYmxlIix0LkhZUEVSTElOSz0iaHlwZXJsaW5rIix0LkNPTlRST0w9ImNvbnRyb2wifSkoZnx8KGY9e30pKTt2YXIgcDsoZnVuY3Rpb24odCl7dC5WQUxVRT0idmFsdWUifSkocHx8KHA9e30pKTtjb25zdCBoPSJcdTIwMEIiLGc9YApgO2Z1bmN0aW9uIGEodCl7bGV0IGw9IiIsbj0wO2Zvcig7bjx0Lmxlbmd0aDspe2NvbnN0IG89dFtuXTtpZihvLnR5cGU9PT1mLlRBQkxFKXtpZihvLnRyTGlzdClmb3IobGV0IHI9MDtyPG8udHJMaXN0Lmxlbmd0aDtyKyspe2NvbnN0IHM9by50ckxpc3Rbcl07Zm9yKGxldCBlPTA7ZTxzLnRkTGlzdC5sZW5ndGg7ZSsrKXtjb25zdCBpPXMudGRMaXN0W2VdO2wrPWEoaS52YWx1ZSl9fX1lbHNlIGlmKG8udHlwZT09PWYuSFlQRVJMSU5LKXtjb25zdCByPW8uaHlwZXJsaW5rSWQscz1bXTtmb3IoO248dC5sZW5ndGg7KXtjb25zdCBlPXRbbl07aWYociE9PWUuaHlwZXJsaW5rSWQpe24tLTticmVha31kZWxldGUgZS50eXBlLHMucHVzaChlKSxuKyt9bCs9YShzKX1lbHNlIGlmKG8uY29udHJvbElkKXtjb25zdCByPW8uY29udHJvbElkLHM9W107Zm9yKDtuPHQubGVuZ3RoOyl7Y29uc3QgZT10W25dO2lmKHIhPT1lLmNvbnRyb2xJZCl7bi0tO2JyZWFrfWUuY29udHJvbENvbXBvbmVudD09PXAuVkFMVUUmJihkZWxldGUgZS5jb250cm9sSWQscy5wdXNoKGUpKSxuKyt9bCs9YShzKX1lbHNlKCFvLnR5cGV8fG8udHlwZT09PWYuVEVYVCkmJihsKz1vLnZhbHVlKTtuKyt9cmV0dXJuIGx9ZnVuY3Rpb24gZCh0KXtjb25zdCBsPVtdLG49L1swLTldLyxvPS9bQS1aYS16XS8scj0vXHMvO2xldCBzPSExLGU9ITEsaT0iIjtmdW5jdGlvbiB1KCl7aSYmKGwucHVzaChpKSxpPSIiKX1mb3IoY29uc3QgYyBvZiB0KW8udGVzdChjKT8oc3x8dSgpLGkrPWMscz0hMCxlPSExKTpuLnRlc3QoYyk/KGV8fHUoKSxpKz1jLHM9ITEsZT0hMCk6KHUoKSxzPSExLGU9ITEsci50ZXN0KGMpfHxsLnB1c2goYykpO3JldHVybiB1KCksbH1vbm1lc3NhZ2U9dD0+e2NvbnN0IGw9dC5kYXRhLG89YShsKS5yZXBsYWNlKG5ldyBSZWdFeHAoYF4ke2h9YCksIiIpLnJlcGxhY2UobmV3IFJlZ0V4cChoLCJnIiksZykscj1kKG8pO3Bvc3RNZXNzYWdlKHIubGVuZ3RoKX19KSgpO30pKCk7Cg==";
 const blob$2 = typeof window !== "undefined" && window.Blob && new Blob([atob(encodedJs$2)], { type: "text/javascript;charset=utf-8" });
 function WorkerWrapper$2() {
   const objURL = blob$2 && (window.URL || window.webkitURL).createObjectURL(blob$2);
@@ -13682,7 +13798,7 @@ class Draw {
     this.textParticle.complete();
   }
   drawRow(ctx, payload) {
-    var _a, _b;
+    var _a, _b, _c;
     const { rowList, pageNo, elementList, positionList, startIndex, zone: zone2 } = payload;
     const isPrintMode = this.mode === EditorMode.PRINT;
     const { scale, tdPadding, defaultBasicRowMarginHeight, defaultRowMargin, group: group2 } = this.options;
@@ -13776,8 +13892,8 @@ class Draw {
             offsetY2 = this.superscriptParticle.getOffsetY(element);
           }
           const color = element.controlComponent === ControlComponent.PLACEHOLDER ? void 0 : element.color;
-          this.underline.recordFillInfo(ctx, x - offsetX, y + curRow.height - rowMargin + offsetY2, metrics.width + offsetX, 0, color);
-        } else if ((preElement == null ? void 0 : preElement.underline) || ((_b = preElement == null ? void 0 : preElement.control) == null ? void 0 : _b.underline)) {
+          this.underline.recordFillInfo(ctx, x - offsetX, y + curRow.height - rowMargin + offsetY2, metrics.width + offsetX, 0, color, (_b = element.textDecoration) == null ? void 0 : _b.style);
+        } else if ((preElement == null ? void 0 : preElement.underline) || ((_c = preElement == null ? void 0 : preElement.control) == null ? void 0 : _c.underline)) {
           this.underline.render(ctx);
         }
         if (element.strikeout) {
@@ -14020,23 +14136,22 @@ class Draw {
       this.cursor.drawCursor();
     }
     if (isSubmitHistory) {
-      const self = this;
-      const oldElementList = deepClone(this.elementList);
-      const oldHeaderElementList = deepClone(this.header.getElementList());
-      const oldFooterElementList = deepClone(this.footer.getElementList());
-      const { startIndex, endIndex } = this.range.getRange();
+      const oldElementList = getSlimCloneElementList(this.elementList);
+      const oldHeaderElementList = getSlimCloneElementList(this.header.getElementList());
+      const oldFooterElementList = getSlimCloneElementList(this.footer.getElementList());
+      const oldRange = deepClone(this.range.getRange());
       const pageNo = this.pageNo;
       const oldPositionContext = deepClone(positionContext);
       const zone2 = this.zone.getZone();
-      this.historyManager.execute(function() {
-        self.zone.setZone(zone2);
-        self.setPageNo(pageNo);
-        self.position.setPositionContext(deepClone(oldPositionContext));
-        self.header.setElementList(deepClone(oldHeaderElementList));
-        self.footer.setElementList(deepClone(oldFooterElementList));
-        self.elementList = deepClone(oldElementList);
-        self.range.setRange(startIndex, endIndex);
-        self.render({
+      this.historyManager.execute(() => {
+        this.zone.setZone(zone2);
+        this.setPageNo(pageNo);
+        this.position.setPositionContext(deepClone(oldPositionContext));
+        this.header.setElementList(deepClone(oldHeaderElementList));
+        this.footer.setElementList(deepClone(oldFooterElementList));
+        this.elementList = deepClone(oldElementList);
+        this.range.replaceRange(deepClone(oldRange));
+        this.render({
           curIndex,
           isSubmitHistory: false,
           isSourceHistory: true
@@ -14310,7 +14425,8 @@ var VerticalAlign;
   VerticalAlign2["MIDDLE"] = "middle";
   VerticalAlign2["BOTTOM"] = "bottom";
 })(VerticalAlign || (VerticalAlign = {}));
-function printImageBase64(base64List, width, height) {
+function printImageBase64(base64List, options) {
+  const { width, height, direction = PaperDirection.VERTICAL } = options;
   const iframe = document.createElement("iframe");
   iframe.style.visibility = "hidden";
   iframe.style.position = "absolute";
@@ -14332,7 +14448,15 @@ function printImageBase64(base64List, width, height) {
     container.append(image);
   });
   const style = document.createElement("style");
-  const stylesheet = `*{margin:0;padding:0;}@page{margin:0;}`;
+  const stylesheet = `
+  * {
+    margin: 0;
+    padding: 0;
+  }
+  @page {
+    margin: 0;
+    size: ${direction === PaperDirection.HORIZONTAL ? `landscape` : `portrait`};
+  }`;
   style.append(document.createTextNode(stylesheet));
   setTimeout(() => {
     doc.write(`${style.outerHTML}${container.innerHTML}`);
@@ -14706,15 +14830,20 @@ class CommandAdapt {
       }
     }
   }
-  underline() {
+  underline(textDecoration) {
     const isDisabled = this.draw.isReadonly() || this.control.isDisabledControl();
     if (isDisabled)
       return;
     const selection = this.range.getSelectionElementList();
     if (selection == null ? void 0 : selection.length) {
-      const noUnderlineIndex = selection.findIndex((s) => !s.underline);
+      const isSetUnderline = selection.some((s) => !s.underline || !textDecoration && s.textDecoration || textDecoration && !s.textDecoration || textDecoration && s.textDecoration && !isObjectEqual(s.textDecoration, textDecoration));
       selection.forEach((el) => {
-        el.underline = !!~noUnderlineIndex;
+        el.underline = isSetUnderline;
+        if (isSetUnderline && textDecoration) {
+          el.textDecoration = textDecoration;
+        } else {
+          delete el.textDecoration;
+        }
       });
       this.draw.render({
         isSetCursor: false,
@@ -16016,7 +16145,7 @@ class CommandAdapt {
     });
   }
   async print() {
-    const { scale, printPixelRatio } = this.options;
+    const { scale, printPixelRatio, paperDirection } = this.options;
     if (scale !== 1) {
       this.draw.setPageScale(1);
     }
@@ -16026,7 +16155,11 @@ class CommandAdapt {
       pixelRatio: printPixelRatio,
       mode: EditorMode.PRINT
     });
-    printImageBase64(base64List, width, height);
+    printImageBase64(base64List, {
+      width,
+      height,
+      direction: paperDirection
+    });
     if (scale !== 1) {
       this.draw.setPageScale(scale);
     }
@@ -17626,5 +17759,5 @@ class Editor {
     this.use = plugin.use.bind(plugin);
   }
 }
-export { BackgroundRepeat, BackgroundSize, BlockType, Command, ControlIndentation, ControlType, EDITOR_COMPONENT, Editor, EditorComponent, EditorMode, EditorZone, ElementType, INTERNAL_CONTEXT_MENU_KEY, ImageDisplay, KeyMap, LETTER_CLASS, ListStyle, ListType, MaxHeightRatio, NumberType, PageMode, PaperDirection, RowFlex, TableBorder, TdBorder, TdSlash, TitleLevel, VerticalAlign, WordBreak, Editor as default, splitText };
+export { BackgroundRepeat, BackgroundSize, BlockType, Command, ControlIndentation, ControlType, EDITOR_COMPONENT, Editor, EditorComponent, EditorMode, EditorZone, ElementType, INTERNAL_CONTEXT_MENU_KEY, ImageDisplay, KeyMap, LETTER_CLASS, ListStyle, ListType, MaxHeightRatio, NumberType, PageMode, PaperDirection, RowFlex, TableBorder, TdBorder, TdSlash, TextDecorationStyle, TitleLevel, VerticalAlign, WordBreak, Editor as default, splitText };
 //# sourceMappingURL=canvas-editor.es.js.map