@hufe921/canvas-editor 0.9.83 → 0.9.84

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [0.9.84](https://github.com/Hufe921/canvas-editor/compare/v0.9.83...v0.9.84) (2024-06-30)
+
+
+### Bug Fixes
+
+* merge table cell boundary error #661 ([146ac75](https://github.com/Hufe921/canvas-editor/commit/146ac75a002338f13c96900a2849062c29018606)), closes [#661](https://github.com/Hufe921/canvas-editor/issues/661)
+* set default style for control using executeSetControlProperties #658 ([7b5079c](https://github.com/Hufe921/canvas-editor/commit/7b5079c9b638730f7ea609239b3cb91b915d4650)), closes [#658](https://github.com/Hufe921/canvas-editor/issues/658)
+
+
+### Features
+
+* optimization of table operations in form mode #662 ([b740637](https://github.com/Hufe921/canvas-editor/commit/b74063741f413d5bf6f90c748761f64141405ca7)), closes [#662](https://github.com/Hufe921/canvas-editor/issues/662)
+* override method with default interception behavior #663 ([9a4b4f9](https://github.com/Hufe921/canvas-editor/commit/9a4b4f9a4a70a344740212507e250d9bdea5dd32)), closes [#663](https://github.com/Hufe921/canvas-editor/issues/663)
+
+
+
 ## [0.9.83](https://github.com/Hufe921/canvas-editor/compare/v0.9.82...v0.9.83) (2024-06-21)
 
 

package/dist/canvas-editor.es.js

@@ -23,7 +23,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 var index = "";
-const version = "0.9.83";
+const version = "0.9.84";
 var MaxHeightRatio;
 (function(MaxHeightRatio2) {
   MaxHeightRatio2["HALF"] = "half";
@@ -364,6 +364,10 @@ function isObjectEqual(obj1, obj2) {
   }
   return !obj1Keys.some((key) => obj2[key] !== obj1[key]);
 }
+function isPromiseFunction(fn) {
+  var _a;
+  return ((_a = fn == null ? void 0 : fn.constructor) == null ? void 0 : _a.name) === "AsyncFunction";
+}
 const CURSOR_AGENT_OFFSET_HEIGHT = 12;
 const defaultCursorOption = {
   width: 1,
@@ -5056,7 +5060,7 @@ function pasteImage(host, file) {
     };
   };
 }
-function pasteByEvent(host, evt) {
+async function pasteByEvent(host, evt) {
   const draw = host.getDraw();
   const isReadonly = draw.isReadonly();
   if (isReadonly)
@@ -5066,8 +5070,9 @@ function pasteByEvent(host, evt) {
     return;
   const { paste } = draw.getOverride();
   if (paste) {
-    paste(evt);
-    return;
+    const overrideResult = isPromiseFunction(paste) ? await paste(evt) : paste(evt);
+    if ((overrideResult == null ? void 0 : overrideResult.preventDefault) !== false)
+      return;
   }
   if (!getIsClipboardContainFile(clipboardData)) {
     const clipboardText = clipboardData.getData("text");
@@ -5118,8 +5123,9 @@ async function pasteByApi(host, options) {
     return;
   const { paste } = draw.getOverride();
   if (paste) {
-    paste();
-    return;
+    const overrideResult = isPromiseFunction(paste) ? await paste() : paste();
+    if ((overrideResult == null ? void 0 : overrideResult.preventDefault) !== false)
+      return;
   }
   const clipboardText = await navigator.clipboard.readText();
   const editorClipboardData = getClipboardData();
@@ -5353,6 +5359,51 @@ class Cursor {
     }
   }
 }
+var EditorComponent;
+(function(EditorComponent2) {
+  EditorComponent2["COMPONENT"] = "component";
+  EditorComponent2["MENU"] = "menu";
+  EditorComponent2["MAIN"] = "main";
+  EditorComponent2["FOOTER"] = "footer";
+  EditorComponent2["CONTEXTMENU"] = "contextmenu";
+  EditorComponent2["POPUP"] = "popup";
+  EditorComponent2["CATALOG"] = "catalog";
+  EditorComponent2["COMMENT"] = "comment";
+})(EditorComponent || (EditorComponent = {}));
+var EditorContext;
+(function(EditorContext2) {
+  EditorContext2["PAGE"] = "page";
+  EditorContext2["TABLE"] = "table";
+})(EditorContext || (EditorContext = {}));
+var EditorMode;
+(function(EditorMode2) {
+  EditorMode2["EDIT"] = "edit";
+  EditorMode2["CLEAN"] = "clean";
+  EditorMode2["READONLY"] = "readonly";
+  EditorMode2["FORM"] = "form";
+  EditorMode2["PRINT"] = "print";
+})(EditorMode || (EditorMode = {}));
+var EditorZone;
+(function(EditorZone2) {
+  EditorZone2["HEADER"] = "header";
+  EditorZone2["MAIN"] = "main";
+  EditorZone2["FOOTER"] = "footer";
+})(EditorZone || (EditorZone = {}));
+var PageMode;
+(function(PageMode2) {
+  PageMode2["PAGING"] = "paging";
+  PageMode2["CONTINUITY"] = "continuity";
+})(PageMode || (PageMode = {}));
+var PaperDirection;
+(function(PaperDirection2) {
+  PaperDirection2["VERTICAL"] = "vertical";
+  PaperDirection2["HORIZONTAL"] = "horizontal";
+})(PaperDirection || (PaperDirection = {}));
+var WordBreak;
+(function(WordBreak2) {
+  WordBreak2["BREAK_ALL"] = "break-all";
+  WordBreak2["BREAK_WORD"] = "break-word";
+})(WordBreak || (WordBreak = {}));
 var MouseEventButton;
 (function(MouseEventButton2) {
   MouseEventButton2[MouseEventButton2["LEFT"] = 0] = "LEFT";
@@ -5690,10 +5741,14 @@ function mousedown(evt, host) {
   const previewer = draw.getPreviewer();
   previewer.clearResizer();
   if (isDirectHitImage) {
-    previewer.drawResizer(curElement, positionList[curIndex], curElement.type === ElementType.LATEX ? {
-      mime: "svg",
-      srcKey: "laTexSVG"
-    } : {});
+    const previewerDrawOption = {
+      dragDisable: isReadonly || !curElement.controlId && draw.getMode() === EditorMode.FORM
+    };
+    if (curElement.type === ElementType.LATEX) {
+      previewerDrawOption.mime = "svg";
+      previewerDrawOption.srcKey = "laTexSVG";
+    }
+    previewer.drawResizer(curElement, positionList[curIndex], previewerDrawOption);
     draw.getCursor().drawCursor({
       isShow: false
     });
@@ -5704,7 +5759,7 @@ function mousedown(evt, host) {
   }
   const tableTool = draw.getTableTool();
   tableTool.dispose();
-  if (isTable && !isReadonly) {
+  if (isTable && !isReadonly && draw.getMode() !== EditorMode.FORM) {
     tableTool.render();
   }
   const hyperlinkParticle = draw.getHyperlinkParticle();
@@ -5991,51 +6046,6 @@ function mousemove(evt, host) {
     isCompute: false
   });
 }
-var EditorComponent;
-(function(EditorComponent2) {
-  EditorComponent2["COMPONENT"] = "component";
-  EditorComponent2["MENU"] = "menu";
-  EditorComponent2["MAIN"] = "main";
-  EditorComponent2["FOOTER"] = "footer";
-  EditorComponent2["CONTEXTMENU"] = "contextmenu";
-  EditorComponent2["POPUP"] = "popup";
-  EditorComponent2["CATALOG"] = "catalog";
-  EditorComponent2["COMMENT"] = "comment";
-})(EditorComponent || (EditorComponent = {}));
-var EditorContext;
-(function(EditorContext2) {
-  EditorContext2["PAGE"] = "page";
-  EditorContext2["TABLE"] = "table";
-})(EditorContext || (EditorContext = {}));
-var EditorMode;
-(function(EditorMode2) {
-  EditorMode2["EDIT"] = "edit";
-  EditorMode2["CLEAN"] = "clean";
-  EditorMode2["READONLY"] = "readonly";
-  EditorMode2["FORM"] = "form";
-  EditorMode2["PRINT"] = "print";
-})(EditorMode || (EditorMode = {}));
-var EditorZone;
-(function(EditorZone2) {
-  EditorZone2["HEADER"] = "header";
-  EditorZone2["MAIN"] = "main";
-  EditorZone2["FOOTER"] = "footer";
-})(EditorZone || (EditorZone = {}));
-var PageMode;
-(function(PageMode2) {
-  PageMode2["PAGING"] = "paging";
-  PageMode2["CONTINUITY"] = "continuity";
-})(PageMode || (PageMode = {}));
-var PaperDirection;
-(function(PaperDirection2) {
-  PaperDirection2["VERTICAL"] = "vertical";
-  PaperDirection2["HORIZONTAL"] = "horizontal";
-})(PaperDirection || (PaperDirection = {}));
-var WordBreak;
-(function(WordBreak2) {
-  WordBreak2["BREAK_ALL"] = "break-all";
-  WordBreak2["BREAK_WORD"] = "break-word";
-})(WordBreak || (WordBreak = {}));
 function backspace(evt, host) {
   const draw = host.getDraw();
   if (draw.isReadonly())
@@ -6972,12 +6982,13 @@ function cut(host) {
   rangeManager.setRange(curIndex, curIndex);
   draw.render({ curIndex });
 }
-function copy(host) {
+async function copy(host) {
   const draw = host.getDraw();
   const { copy: copy2 } = draw.getOverride();
   if (copy2) {
-    copy2();
-    return;
+    const overrideResult = isPromiseFunction(copy2) ? await copy2() : copy2();
+    if ((overrideResult == null ? void 0 : overrideResult.preventDefault) !== false)
+      return;
   }
   const rangeManager = draw.getRange();
   let copyElementList = null;
@@ -7023,13 +7034,14 @@ function copy(host) {
     return;
   writeElementList(copyElementList, draw.getOptions());
 }
-function drop(evt, host) {
+async function drop(evt, host) {
   var _a, _b;
   const draw = host.getDraw();
   const { drop: drop2 } = draw.getOverride();
   if (drop2) {
-    drop2(evt);
-    return;
+    const overrideResult = isPromiseFunction(drop2) ? await drop2(evt) : drop2(evt);
+    if ((overrideResult == null ? void 0 : overrideResult.preventDefault) !== false)
+      return;
   }
   evt.preventDefault();
   const data2 = (_a = evt.dataTransfer) == null ? void 0 : _a.getData("text");
@@ -9768,6 +9780,8 @@ class TableParticle {
         td.height = height;
         td.rowIndex = t;
         td.colIndex = colIndex;
+        td.trIndex = t;
+        td.tdIndex = d;
         preX += width;
         if (isLastRowTd && !isLastTd) {
           preX = 0;
@@ -12327,6 +12341,12 @@ class Control {
         element.control = __spreadProps(__spreadValues(__spreadValues({}, element.control), properties), {
           value: element.control.value
         });
+        CONTROL_STYLE_ATTR.forEach((key) => {
+          const controlStyleProperty = properties[key];
+          if (controlStyleProperty) {
+            Reflect.set(element, key, controlStyleProperty);
+          }
+        });
         let newEndIndex = i;
         while (newEndIndex < elementList.length) {
           const nextElement = elementList[newEndIndex];
@@ -12937,7 +12957,7 @@ class Previewer {
     document.addEventListener("mousemove", mousemoveFn);
     document.addEventListener("mouseup", () => {
       var _a;
-      if (this.curElement) {
+      if (this.curElement && !this.previewerDrawOption.dragDisable) {
         this.curElement.width = this.width;
         this.curElement.height = this.height;
         this.draw.render({
@@ -12955,7 +12975,7 @@ class Previewer {
     evt.preventDefault();
   }
   _mousemove(evt) {
-    if (!this.curElement)
+    if (!this.curElement || this.previewerDrawOption.dragDisable)
       return;
     const { scale } = this.options;
     let dx = 0;
@@ -14630,6 +14650,7 @@ class Draw {
       this.setEditorData(this.printModeData);
       this.printModeData = null;
     }
+    this.clearSideEffect();
     this.range.clearRange();
     this.mode = payload;
     this.render({
@@ -17775,7 +17796,11 @@ class CommandAdapt {
         d++;
       }
     }
-    const curIndex = startTd.value.length - 1;
+    this.position.setPositionContext(__spreadProps(__spreadValues({}, positionContext), {
+      trIndex: anchorTd.trIndex,
+      tdIndex: anchorTd.tdIndex
+    }));
+    const curIndex = anchorTd.value.length - 1;
     this.range.setRange(curIndex, curIndex);
     this.draw.render();
     this.tableTool.render();
@@ -19098,7 +19123,7 @@ const controlMenus = [
     i18nPath: "contextmenu.control.delete",
     when: (payload) => {
       var _a;
-      return !payload.isReadonly && !payload.editorHasSelection && !!((_a = payload.startElement) == null ? void 0 : _a.controlId);
+      return !payload.isReadonly && !payload.editorHasSelection && !!((_a = payload.startElement) == null ? void 0 : _a.controlId) && payload.options.mode !== EditorMode.FORM;
     },
     callback: (command) => {
       command.executeRemoveControl();
@@ -19295,7 +19320,7 @@ const tableMenus = [
     i18nPath: "contextmenu.table.border",
     icon: "border-all",
     when: (payload) => {
-      return !payload.isReadonly && payload.isInTable;
+      return !payload.isReadonly && payload.isInTable && payload.options.mode !== EditorMode.FORM;
     },
     childMenus: [
       {
@@ -19394,7 +19419,7 @@ const tableMenus = [
     i18nPath: "contextmenu.table.verticalAlign",
     icon: "vertical-align",
     when: (payload) => {
-      return !payload.isReadonly && payload.isInTable;
+      return !payload.isReadonly && payload.isInTable && payload.options.mode !== EditorMode.FORM;
     },
     childMenus: [
       {
@@ -19431,7 +19456,7 @@ const tableMenus = [
     i18nPath: "contextmenu.table.insertRowCol",
     icon: "insert-row-col",
     when: (payload) => {
-      return !payload.isReadonly && payload.isInTable;
+      return !payload.isReadonly && payload.isInTable && payload.options.mode !== EditorMode.FORM;
     },
     childMenus: [
       {
@@ -19477,7 +19502,7 @@ const tableMenus = [
     i18nPath: "contextmenu.table.deleteRowCol",
     icon: "delete-row-col",
     when: (payload) => {
-      return !payload.isReadonly && payload.isInTable;
+      return !payload.isReadonly && payload.isInTable && payload.options.mode !== EditorMode.FORM;
     },
     childMenus: [
       {
@@ -19514,7 +19539,7 @@ const tableMenus = [
     i18nPath: "contextmenu.table.mergeCell",
     icon: "merge-cell",
     when: (payload) => {
-      return !payload.isReadonly && payload.isCrossRowCol;
+      return !payload.isReadonly && payload.isCrossRowCol && payload.options.mode !== EditorMode.FORM;
     },
     callback: (command) => {
       command.executeMergeTableCell();
@@ -19525,7 +19550,7 @@ const tableMenus = [
     i18nPath: "contextmenu.table.mergeCancelCell",
     icon: "merge-cancel-cell",
     when: (payload) => {
-      return !payload.isReadonly && payload.isInTable;
+      return !payload.isReadonly && payload.isInTable && payload.options.mode !== EditorMode.FORM;
     },
     callback: (command) => {
       command.executeCancelMergeTableCell();
@@ -19647,7 +19672,8 @@ class ContextMenu {
       isInTable: isTable,
       trIndex: trIndex != null ? trIndex : null,
       tdIndex: tdIndex != null ? tdIndex : null,
-      tableElement
+      tableElement,
+      options: this.options
     };
   }
   _createContextMenuContainer() {