@hufe921/canvas-editor 0.9.99 → 0.9.100

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [0.9.100](https://github.com/Hufe921/canvas-editor/compare/v0.9.99...v0.9.100) (2025-01-03)
+
+
+### Bug Fixes
+
+* get or update elements within a table by id #951 ([951de97](https://github.com/Hufe921/canvas-editor/commit/951de9794186cb6225e1f668f1021f6e7f04b1bc)), closes [#951](https://github.com/Hufe921/canvas-editor/issues/951)
+* set default style boundary error #942 ([2fd9d10](https://github.com/Hufe921/canvas-editor/commit/2fd9d10c10705df57fbc67455edb8da05df92d0a)), closes [#942](https://github.com/Hufe921/canvas-editor/issues/942)
+
+
+### Features
+
+* add table tool disabled option #954 ([a6eccc7](https://github.com/Hufe921/canvas-editor/commit/a6eccc7a78569e881d80c745f8a77455b91df0ad)), closes [#954](https://github.com/Hufe921/canvas-editor/issues/954)
+* adjust watermark rendering layer #948 ([0f53552](https://github.com/Hufe921/canvas-editor/commit/0f5355216c1c092ea59ecb737f447c0a0ff11558)), closes [#948](https://github.com/Hufe921/canvas-editor/issues/948)
+* optimize cursor focus in readonly mode #936 ([2e0ac96](https://github.com/Hufe921/canvas-editor/commit/2e0ac966e839a2dc9df911b04d24577c46d930e4)), closes [#936](https://github.com/Hufe921/canvas-editor/issues/936)
+* preserve cell content when merging cells #932 ([167bfa1](https://github.com/Hufe921/canvas-editor/commit/167bfa1e7c44a580f29c06bccd9bf5675e4d166f)), closes [#932](https://github.com/Hufe921/canvas-editor/issues/932)
+
+
+
 ## [0.9.99](https://github.com/Hufe921/canvas-editor/compare/v0.9.98...v0.9.99) (2024-12-20)
 
 

package/dist/canvas-editor.es.js

@@ -23,7 +23,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 var index = "";
-const version = "0.9.99";
+const version = "0.9.100";
 var MaxHeightRatio;
 (function(MaxHeightRatio2) {
   MaxHeightRatio2["HALF"] = "half";
@@ -412,6 +412,9 @@ var MoveDirection;
   MoveDirection2["LEFT"] = "left";
   MoveDirection2["RIGHT"] = "right";
 })(MoveDirection || (MoveDirection = {}));
+const isApple = typeof navigator !== "undefined" && /Mac OS X/.test(navigator.userAgent);
+const isIOS = typeof navigator !== "undefined" && /iPad|iPhone/.test(navigator.userAgent);
+const isMobile = /Mobile|Android|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
 var ElementType;
 (function(ElementType2) {
   ElementType2["TEXT"] = "text";
@@ -5747,6 +5750,8 @@ class Cursor {
     }
   }
   focus() {
+    if (isMobile && this.draw.isReadonly())
+      return;
     const agentCursorDom = this.cursorAgent.getAgentCursorDom();
     if (document.activeElement !== agentCursorDom) {
       agentCursorDom.focus();
@@ -5845,8 +5850,6 @@ var MouseEventButton;
   MouseEventButton2[MouseEventButton2["CENTER"] = 1] = "CENTER";
   MouseEventButton2[MouseEventButton2["RIGHT"] = 2] = "RIGHT";
 })(MouseEventButton || (MouseEventButton = {}));
-const isApple = typeof navigator !== "undefined" && /Mac OS X/.test(navigator.userAgent);
-const isIOS = typeof navigator !== "undefined" && /iPad|iPhone/.test(navigator.userAgent);
 function isMod(evt) {
   return isApple ? evt.metaKey : evt.ctrlKey;
 }
@@ -7391,7 +7394,7 @@ function keydown(evt, host) {
   }
 }
 function input(data2, host) {
-  var _a;
+  var _a, _b;
   const draw = host.getDraw();
   if (draw.isReadonly() || draw.isDisabled())
     return;
@@ -7405,6 +7408,7 @@ function input(data2, host) {
   const rangeManager = draw.getRange();
   if (!rangeManager.getIsCanInput())
     return;
+  const defaultStyle = rangeManager.getDefaultStyle() || ((_b = host.compositionInfo) == null ? void 0 : _b.defaultStyle) || null;
   removeComposingInput(host);
   if (!isComposing) {
     const cursor = draw.getCursor();
@@ -7420,11 +7424,11 @@ function input(data2, host) {
     return;
   const isDesignMode = draw.isDesignMode();
   const inputData = splitText(text).map((value) => {
-    var _a2, _b;
+    var _a2, _b2;
     const newElement = {
       value
     };
-    if (isDesignMode || !((_a2 = copyElement.title) == null ? void 0 : _a2.disabled) && !((_b = copyElement.control) == null ? void 0 : _b.disabled)) {
+    if (isDesignMode || !((_a2 = copyElement.title) == null ? void 0 : _a2.disabled) && !((_b2 = copyElement.control) == null ? void 0 : _b2.disabled)) {
       const nextElement = elementList[endIndex + 1];
       if (!copyElement.type || copyElement.type === TEXT || copyElement.type === HYPERLINK && (nextElement == null ? void 0 : nextElement.type) === HYPERLINK || copyElement.type === DATE && (nextElement == null ? void 0 : nextElement.type) === DATE || copyElement.type === SUBSCRIPT && (nextElement == null ? void 0 : nextElement.type) === SUBSCRIPT || copyElement.type === SUPERSCRIPT && (nextElement == null ? void 0 : nextElement.type) === SUPERSCRIPT) {
         EDITOR_ELEMENT_COPY_ATTR.forEach((attr) => {
@@ -7436,6 +7440,14 @@ function input(data2, host) {
           }
         });
       }
+      if (defaultStyle) {
+        EDITOR_ELEMENT_STYLE_ATTR.forEach((attr) => {
+          const value2 = defaultStyle[attr];
+          if (value2 !== void 0) {
+            newElement[attr] = value2;
+          }
+        });
+      }
       if (isComposing) {
         newElement.underline = true;
       }
@@ -7469,7 +7481,8 @@ function input(data2, host) {
       elementList,
       value: text,
       startIndex: curIndex - inputData.length,
-      endIndex: curIndex
+      endIndex: curIndex,
+      defaultStyle
     };
   }
 }
@@ -10559,10 +10572,12 @@ class TableTool {
     if (!isTable)
       return;
     this.dispose();
-    const { scale } = this.options;
     const elementList = this.draw.getOriginalElementList();
     const positionList = this.position.getOriginalPositionList();
     const element = elementList[index2];
+    if (element.tableToolDisabled && !this.draw.isDesignMode())
+      return;
+    const { scale } = this.options;
     const position = positionList[index2];
     const { colgroup, trList } = element;
     const { coordinate: { leftTop } } = position;
@@ -16233,6 +16248,7 @@ class TableOperate {
     }
     const mergeTdIdList = [];
     const anchorTd = rowCol[0][0];
+    const anchorElement = anchorTd.value[0];
     for (let t = 0; t < rowCol.length; t++) {
       const tr = rowCol[t];
       for (let d = 0; d < tr.length; d++) {
@@ -16240,6 +16256,11 @@ class TableOperate {
         const isAnchorTd = t === 0 && d === 0;
         if (!isAnchorTd) {
           mergeTdIdList.push(td.id);
+          for (let d2 = 0; d2 < td.value.length; d2++) {
+            const tdElement = td.value[d2];
+            cloneProperty(TABLE_CONTEXT_ATTR, anchorElement, tdElement);
+            anchorTd.value.push(tdElement);
+          }
         }
         if (t === 0 && d !== 0) {
           anchorTd.colspan += td.colspan;
@@ -18436,6 +18457,9 @@ class Draw {
     if (!isPrintMode) {
       this.area.render(ctx, pageNo);
     }
+    if (pageMode !== PageMode.CONTINUITY && this.options.watermark.data) {
+      this.waterMark.render(ctx);
+    }
     if (!isPrintMode) {
       this.margin.render(ctx, pageNo);
     }
@@ -18474,9 +18498,6 @@ class Draw {
     if (!isPrintMode && this.search.getSearchKeyword()) {
       this.search.render(ctx, pageNo);
     }
-    if (pageMode !== PageMode.CONTINUITY && this.options.watermark.data) {
-      this.waterMark.render(ctx);
-    }
     if (this.elementList.length <= 1 && !((_b = this.elementList[0]) == null ? void 0 : _b.listId)) {
       this.placeholder.render(ctx);
     }
@@ -20510,35 +20531,51 @@ class CommandAdapt {
     const { id, conceptId } = payload;
     if (!id && !conceptId)
       return;
-    function getElementIndexById(elementList) {
-      for (let e = 0; e < elementList.length; e++) {
-        const element = elementList[e];
-        if (id && element.id === id || conceptId && element.conceptId === conceptId) {
-          return e;
+    const updateElementInfoList = [];
+    function getElementInfoById(elementList) {
+      let i = 0;
+      while (i < elementList.length) {
+        const element = elementList[i];
+        i++;
+        if (element.type === ElementType.TABLE) {
+          const trList = element.trList;
+          for (let r = 0; r < trList.length; r++) {
+            const tr = trList[r];
+            for (let d = 0; d < tr.tdList.length; d++) {
+              const td = tr.tdList[d];
+              getElementInfoById(td.value);
+            }
+          }
+        }
+        if (id && (element.id === id || element.controlId === id) || conceptId && element.conceptId === conceptId) {
+          updateElementInfoList.push({
+            elementList,
+            index: i - 1
+          });
         }
       }
-      return -1;
     }
-    const getElementListFnList = [
-      this.draw.getOriginalMainElementList,
-      this.draw.getHeaderElementList,
-      this.draw.getFooterElementList
+    const data2 = [
+      this.draw.getOriginalMainElementList(),
+      this.draw.getHeaderElementList(),
+      this.draw.getFooterElementList()
     ];
-    for (const getElementList of getElementListFnList) {
-      const elementList = getElementList.call(this.draw);
-      const elementIndex = getElementIndexById(elementList);
-      if (~elementIndex) {
-        elementList[elementIndex] = __spreadValues(__spreadValues({}, elementList[elementIndex]), payload.properties);
-        formatElementList(zipElementList([elementList[elementIndex]]), {
-          isHandleFirstElement: false,
-          editorOptions: this.options
-        });
-        this.draw.render({
-          isSetCursor: false
-        });
-        break;
-      }
+    for (const elementList of data2) {
+      getElementInfoById(elementList);
     }
+    if (!updateElementInfoList.length)
+      return;
+    for (let i = 0; i < updateElementInfoList.length; i++) {
+      const { elementList, index: index2 } = updateElementInfoList[i];
+      elementList[index2] = __spreadValues(__spreadValues({}, elementList[index2]), payload.properties);
+      formatElementList(zipElementList([elementList[index2]]), {
+        isHandleFirstElement: false,
+        editorOptions: this.options
+      });
+    }
+    this.draw.render({
+      isSetCursor: false
+    });
   }
   getElementById(payload) {
     const { id, conceptId } = payload;
@@ -20550,7 +20587,17 @@ class CommandAdapt {
       while (i < elementList.length) {
         const element = elementList[i];
         i++;
-        if (id && element.controlId !== id || conceptId && element.conceptId !== conceptId) {
+        if (element.type === ElementType.TABLE) {
+          const trList = element.trList;
+          for (let r = 0; r < trList.length; r++) {
+            const tr = trList[r];
+            for (let d = 0; d < tr.tdList.length; d++) {
+              const td = tr.tdList[d];
+              getElement(td.value);
+            }
+          }
+        }
+        if (id && element.controlId !== id && element.id !== id || conceptId && element.conceptId !== conceptId) {
           continue;
         }
         result.push(element);