@hufe921/canvas-editor 0.9.80 → 0.9.81

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+## [0.9.81](https://github.com/Hufe921/canvas-editor/compare/v0.9.80...v0.9.81) (2024-06-07)
+
+
+### Bug Fixes
+
+* disable zone tip in continuous page mode #638 ([bf322df](https://github.com/Hufe921/canvas-editor/commit/bf322dfea334ee242a452c44fdb613a1937d963b)), closes [#638](https://github.com/Hufe921/canvas-editor/issues/638)
+* some shortcut keys with shift are invalid #629 ([aca9d34](https://github.com/Hufe921/canvas-editor/commit/aca9d34a46004f2da207f7127f69430e4e59ab25)), closes [#629](https://github.com/Hufe921/canvas-editor/issues/629)
+
+
+### Documentation
+
+* update start.md ([55bbe22](https://github.com/Hufe921/canvas-editor/commit/55bbe22578320319d9ab38b26ebbe8687b21f1c1))
+
+
+### Features
+
+* add executeLocationControl api #592 ([53701fc](https://github.com/Hufe921/canvas-editor/commit/53701fc46c347595722801e8bca40647cda74bcb)), closes [#592](https://github.com/Hufe921/canvas-editor/issues/592)
+* add maximum page number option #617 ([afce688](https://github.com/Hufe921/canvas-editor/commit/afce6882493c198595a0575640dd313c8cbdb14f)), closes [#617](https://github.com/Hufe921/canvas-editor/issues/617)
+* add options to the getValue api ([65acd58](https://github.com/Hufe921/canvas-editor/commit/65acd580d6813bd15b8ee079b16ae8d5f9e77767))
+* add selection info to rangeContext ([2df03ed](https://github.com/Hufe921/canvas-editor/commit/2df03ed3867cf8edf5fb656c017986af6725780c))
+* set title style through executeSetHtml api #626 ([ac795b0](https://github.com/Hufe921/canvas-editor/commit/ac795b0bc45f99e92a5292a676414e1d7347cb7e)), closes [#626](https://github.com/Hufe921/canvas-editor/issues/626)
+
+
+### Tests
+
+* update watermark test case ([c75482a](https://github.com/Hufe921/canvas-editor/commit/c75482a4f6f18da010963500e790780a63c061c4))
+
+
+
 ## [0.9.80](https://github.com/Hufe921/canvas-editor/compare/v0.9.79...v0.9.80) (2024-05-31)
 
 

package/dist/canvas-editor.es.js

@@ -23,7 +23,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 var index = "";
-const version = "0.9.80";
+const version = "0.9.81";
 var MaxHeightRatio;
 (function(MaxHeightRatio2) {
   MaxHeightRatio2["HALF"] = "half";
@@ -4081,12 +4081,17 @@ function isSameElementExceptValue(source, target) {
   }
   return true;
 }
-function pickElementAttr(payload) {
+function pickElementAttr(payload, option = {}) {
+  const { extraPickAttrs } = option;
+  const zipAttrs = EDITOR_ELEMENT_ZIP_ATTR;
+  if (extraPickAttrs) {
+    zipAttrs.push(...extraPickAttrs);
+  }
   const element = {
     value: payload.value === ZERO ? `
 ` : payload.value
   };
-  EDITOR_ELEMENT_ZIP_ATTR.forEach((attr) => {
+  zipAttrs.forEach((attr) => {
     const value = payload[attr];
     if (value !== void 0) {
       element[attr] = value;
@@ -4094,7 +4099,8 @@ function pickElementAttr(payload) {
   });
   return element;
 }
-function zipElementList(payload) {
+function zipElementList(payload, options = {}) {
+  const { extraPickAttrs } = options;
   const elementList = deepClone(payload);
   const zipElementListData = [];
   let e = 0;
@@ -4126,7 +4132,7 @@ function zipElementList(payload) {
           valueList.push(titleE);
           e++;
         }
-        titleElement.valueList = zipElementList(valueList);
+        titleElement.valueList = zipElementList(valueList, options);
         element = titleElement;
       }
     } else if (element.listId && element.listType) {
@@ -4153,7 +4159,7 @@ function zipElementList(payload) {
           valueList.push(listE);
           e++;
         }
-        listElement.valueList = zipElementList(valueList);
+        listElement.valueList = zipElementList(valueList, options);
         element = listElement;
       }
     } else if (element.type === ElementType.TABLE) {
@@ -4182,7 +4188,7 @@ function zipElementList(payload) {
             const zipTd = {
               colspan: td.colspan,
               rowspan: td.rowspan,
-              value: zipElementList(td.value)
+              value: zipElementList(td.value, options)
             };
             TABLE_TD_ZIP_ATTR.forEach((attr) => {
               const value = td[attr];
@@ -4214,7 +4220,7 @@ function zipElementList(payload) {
           valueList.push(hyperlinkE);
           e++;
         }
-        hyperlinkElement.valueList = zipElementList(valueList);
+        hyperlinkElement.valueList = zipElementList(valueList, options);
         element = hyperlinkElement;
       }
     } else if (element.type === ElementType.DATE) {
@@ -4237,7 +4243,7 @@ function zipElementList(payload) {
           valueList.push(dateE);
           e++;
         }
-        dateElement.valueList = zipElementList(valueList);
+        dateElement.valueList = zipElementList(valueList, options);
         element = dateElement;
       }
     } else if (element.controlId) {
@@ -4248,7 +4254,8 @@ function zipElementList(payload) {
         const controlElement = __spreadProps(__spreadValues({}, pickObject(element, EDITOR_ROW_ATTR)), {
           type: ElementType.CONTROL,
           value: "",
-          control
+          control,
+          controlId
         });
         const valueList = [];
         while (e < elementList.length) {
@@ -4264,16 +4271,16 @@ function zipElementList(payload) {
           }
           e++;
         }
-        controlElement.control.value = zipElementList(valueList);
-        element = controlElement;
+        controlElement.control.value = zipElementList(valueList, options);
+        element = pickElementAttr(controlElement, { extraPickAttrs });
       }
     }
-    const pickElement = pickElementAttr(element);
+    const pickElement = pickElementAttr(element, { extraPickAttrs });
     if (!element.type || element.type === ElementType.TEXT || element.type === ElementType.SUBSCRIPT || element.type === ElementType.SUPERSCRIPT) {
       while (e < elementList.length) {
         const nextElement = elementList[e + 1];
         e++;
-        if (nextElement && isSameElementExceptValue(pickElement, pickElementAttr(nextElement))) {
+        if (nextElement && isSameElementExceptValue(pickElement, pickElementAttr(nextElement, { extraPickAttrs }))) {
           const nextValue = nextElement.value === ZERO ? "\n" : nextElement.value;
           pickElement.value += nextValue;
         } else {
@@ -4692,7 +4699,7 @@ function getElementListByHTML(htmlText, options) {
           }
         } else if (/H[1-6]/.test(node.nodeName)) {
           const hElement = node;
-          const valueList = getElementListByHTML(hElement.innerHTML, options);
+          const valueList = getElementListByHTML(replaceHTMLElementTag(hElement, "div").outerHTML, options);
           elementList.push({
             value: "",
             type: ElementType.TITLE,
@@ -4900,6 +4907,15 @@ function getSlimCloneElementList(elementList) {
 function getIsBlockElement(element) {
   return !!(element == null ? void 0 : element.type) && (BLOCK_ELEMENT_TYPE.includes(element.type) || element.imgDisplay === ImageDisplay.INLINE);
 }
+function replaceHTMLElementTag(oldDom, tagName) {
+  const newDom = document.createElement(tagName);
+  for (let i = 0; i < oldDom.attributes.length; i++) {
+    const attr = oldDom.attributes[i];
+    newDom.setAttribute(attr.name, attr.value);
+  }
+  newDom.innerHTML = oldDom.innerHTML;
+  return newDom;
+}
 function setClipboardData(data2) {
   localStorage.setItem(EDITOR_CLIPBOARD, JSON.stringify({
     text: data2.text,
@@ -9200,7 +9216,8 @@ const defaultPageNumberOption = {
   numberType: NumberType.ARABIC,
   disabled: false,
   startPageNo: 1,
-  fromPageNo: 0
+  fromPageNo: 0,
+  maxPageNo: null
 };
 class PageNumber {
   constructor(draw) {
@@ -12277,7 +12294,9 @@ class Control {
     for (const elementList of data2) {
       getControlElementList(elementList);
     }
-    return zipElementList(controlElementList);
+    return zipElementList(controlElementList, {
+      extraPickAttrs: ["controlId"]
+    });
   }
   recordBorderInfo(x, y, width, height) {
     this.controlBorder.recordBorderInfo(x, y, width, height);
@@ -13548,6 +13567,7 @@ class ImageObserver {
 }
 class ZoneTip {
   constructor(draw, zone2) {
+    __publicField(this, "draw");
     __publicField(this, "zone");
     __publicField(this, "i18n");
     __publicField(this, "container");
@@ -13556,6 +13576,7 @@ class ZoneTip {
     __publicField(this, "tipContainer");
     __publicField(this, "tipContent");
     __publicField(this, "currentMoveZone");
+    this.draw = draw;
     this.zone = zone2;
     this.i18n = draw.getI18n();
     this.container = draw.getContainer();
@@ -13579,7 +13600,7 @@ class ZoneTip {
   }
   _watchMouseMoveZoneChange(watchZones) {
     this.pageContainer.addEventListener("mousemove", throttle((evt) => {
-      if (this.isDisableMouseMove)
+      if (this.isDisableMouseMove || !this.draw.getIsPagingMode())
         return;
       if (!evt.offsetY)
         return;
@@ -15048,7 +15069,6 @@ class Draw {
     });
   }
   getValue(options = {}) {
-    const { width, height, margins, watermark } = this.options;
     const { pageNo } = options;
     let mainElementList = this.elementList;
     if (Number.isInteger(pageNo) && pageNo >= 0 && pageNo < this.pageRowList.length) {
@@ -15061,11 +15081,8 @@ class Draw {
     };
     return {
       version,
-      width,
-      height,
-      margins,
-      watermark: watermark.data ? watermark : void 0,
-      data: data2
+      data: data2,
+      options: deepClone(this.options)
     };
   }
   setValue(payload) {
@@ -15558,7 +15575,7 @@ class Draw {
   _computePageList() {
     var _a;
     const pageRowList = [[]];
-    const { pageMode } = this.options;
+    const { pageMode, pageNumber: { maxPageNo } } = this.options;
     const height = this.getHeight();
     const marginHeight = this.getMainOuterHeight();
     let pageHeight = marginHeight;
@@ -15582,6 +15599,10 @@ class Draw {
       for (let i = 0; i < this.rowList.length; i++) {
         const row = this.rowList[i];
         if (row.height + pageHeight > height || ((_a = this.rowList[i - 1]) == null ? void 0 : _a.isPageBreak)) {
+          if (Number.isInteger(maxPageNo) && pageNo >= maxPageNo) {
+            this.elementList = this.elementList.slice(0, row.startIndex);
+            break;
+          }
           pageHeight = marginHeight + row.height;
           pageRowList.push([row]);
           pageNo++;
@@ -16157,6 +16178,7 @@ class Command {
     __publicField(this, "executeSetControlExtension");
     __publicField(this, "executeSetControlProperties");
     __publicField(this, "executeSetControlHighlight");
+    __publicField(this, "executeLocationControl");
     __publicField(this, "executeUpdateOptions");
     __publicField(this, "executeInsertTitle");
     __publicField(this, "getCatalog");
@@ -16291,6 +16313,7 @@ class Command {
     this.executeSetControlHighlight = adapt.setControlHighlight.bind(adapt);
     this.getControlValue = adapt.getControlValue.bind(adapt);
     this.getControlList = adapt.getControlList.bind(adapt);
+    this.executeLocationControl = adapt.locationControl.bind(adapt);
   }
 }
 const defaultWatermarkOption = {
@@ -18308,6 +18331,8 @@ class CommandAdapt {
     if (!~startIndex && !~endIndex)
       return null;
     const isCollapsed = startIndex === endIndex;
+    const selectionText = this.range.toString();
+    const selectionElementList = zipElementList(this.range.getSelectionElementList() || []);
     const elementList = this.draw.getElementList();
     const startElement = pickElementAttr(elementList[isCollapsed ? startIndex : startIndex + 1]);
     const endElement = pickElementAttr(elementList[endIndex]);
@@ -18375,7 +18400,9 @@ class CommandAdapt {
       isTable,
       trIndex: trIndex != null ? trIndex : null,
       tdIndex: tdIndex != null ? tdIndex : null,
-      tableElement
+      tableElement,
+      selectionText,
+      selectionElementList
     });
   }
   getRangeRow() {
@@ -18605,6 +18632,80 @@ class CommandAdapt {
   getControlList() {
     return this.draw.getControl().getList();
   }
+  locationControl(controlId) {
+    function location(elementList, zone2) {
+      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];
+              const locationContext = location(td.value, zone2);
+              if (locationContext) {
+                return __spreadProps(__spreadValues({}, locationContext), {
+                  positionContext: {
+                    isTable: true,
+                    index: i - 1,
+                    trIndex: r,
+                    tdIndex: d,
+                    tdId: element.tdId,
+                    trId: element.trId,
+                    tableId: element.tableId
+                  }
+                });
+              }
+            }
+          }
+        }
+        if ((element == null ? void 0 : element.controlId) !== controlId)
+          continue;
+        const curIndex = i - 1;
+        return {
+          zone: zone2,
+          range: {
+            startIndex: curIndex,
+            endIndex: curIndex
+          },
+          positionContext: {
+            isTable: false
+          }
+        };
+      }
+      return null;
+    }
+    const data2 = [
+      {
+        zone: EditorZone.HEADER,
+        elementList: this.draw.getHeaderElementList()
+      },
+      {
+        zone: EditorZone.MAIN,
+        elementList: this.draw.getOriginalMainElementList()
+      },
+      {
+        zone: EditorZone.FOOTER,
+        elementList: this.draw.getFooterElementList()
+      }
+    ];
+    for (const context of data2) {
+      const locationContext = location(context.elementList, context.zone);
+      if (locationContext) {
+        this.setZone(locationContext.zone);
+        this.position.setPositionContext(locationContext.positionContext);
+        this.range.replaceRange(locationContext.range);
+        this.draw.render({
+          curIndex: locationContext.range.startIndex,
+          isCompute: false,
+          isSubmitHistory: false
+        });
+        break;
+      }
+    }
+  }
   getContainer() {
     return this.draw.getContainer();
   }
@@ -19483,7 +19584,7 @@ class ContextMenu {
 }
 const richtextKeys = [
   {
-    key: KeyMap.X_UPPERCASE,
+    key: KeyMap.X,
     ctrl: true,
     shift: true,
     callback: (command) => {
@@ -19700,7 +19801,7 @@ class Shortcut {
     var _a;
     for (let s = 0; s < shortCutList.length; s++) {
       const shortCut = shortCutList[s];
-      if ((shortCut.mod ? isMod(evt) === !!shortCut.mod : evt.ctrlKey === !!shortCut.ctrl && evt.metaKey === !!shortCut.meta) && evt.shiftKey === !!shortCut.shift && evt.altKey === !!shortCut.alt && evt.key === shortCut.key) {
+      if ((shortCut.mod ? isMod(evt) === !!shortCut.mod : evt.ctrlKey === !!shortCut.ctrl && evt.metaKey === !!shortCut.meta) && evt.shiftKey === !!shortCut.shift && evt.altKey === !!shortCut.alt && evt.key.toLowerCase() === shortCut.key.toLowerCase()) {
         if (!shortCut.disable) {
           (_a = shortCut == null ? void 0 : shortCut.callback) == null ? void 0 : _a.call(shortCut, this.command);
           evt.preventDefault();