@hufe921/canvas-editor 0.9.82 → 0.9.83

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [0.9.83](https://github.com/Hufe921/canvas-editor/compare/v0.9.82...v0.9.83) (2024-06-21)
+
+
+### Bug Fixes
+
+* executeSetControlProperties api invalid in table #653 ([fdcf639](https://github.com/Hufe921/canvas-editor/commit/fdcf6397e1ce62ef1ed18a526a0642c3f120df3b)), closes [#653](https://github.com/Hufe921/canvas-editor/issues/653)
+
+
+### Features
+
+* add clear format attributes ([e21533a](https://github.com/Hufe921/canvas-editor/commit/e21533a3d1cfeecde562aaa6c52ee306e5063a01))
+* add conceptId attribute to table td #654 ([959a062](https://github.com/Hufe921/canvas-editor/commit/959a062f830042b78af498e2d6cbc4e5f82fa3d4)), closes [#654](https://github.com/Hufe921/canvas-editor/issues/654)
+* add mouse event listener #603 ([a2978bd](https://github.com/Hufe921/canvas-editor/commit/a2978bd1f507e9417b995bbb0b7ff756dbe5d2c4)), closes [#603](https://github.com/Hufe921/canvas-editor/issues/603)
+* copy table structure and data #516 ([76c20a6](https://github.com/Hufe921/canvas-editor/commit/76c20a6b44914396ae7dd69a7c97db1b179937c2)), closes [#516](https://github.com/Hufe921/canvas-editor/issues/516)
+
+
+
 ## [0.9.82](https://github.com/Hufe921/canvas-editor/compare/v0.9.81...v0.9.82) (2024-06-14)
 
 

package/dist/canvas-editor.es.js

@@ -23,7 +23,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 var index = "";
-const version = "0.9.82";
+const version = "0.9.83";
 var MaxHeightRatio;
 (function(MaxHeightRatio2) {
   MaxHeightRatio2["HALF"] = "half";
@@ -471,6 +471,7 @@ const EDITOR_ELEMENT_ZIP_ATTR = [
   "externalId"
 ];
 const TABLE_TD_ZIP_ATTR = [
+  "conceptId",
   "verticalAlign",
   "backgroundColor",
   "borderTypes",
@@ -5189,9 +5190,10 @@ class CursorAgent {
     this.canvasEvent.keydown(evt);
   }
   _input(evt) {
-    if (!evt.data)
+    const data2 = evt.data;
+    if (!data2)
       return;
-    this.canvasEvent.input(evt.data);
+    this.canvasEvent.input(data2);
   }
   _paste(evt) {
     const isReadonly = this.draw.isReadonly();
@@ -6978,7 +6980,45 @@ function copy(host) {
     return;
   }
   const rangeManager = draw.getRange();
-  const copyElementList = rangeManager.getIsCollapsed() ? rangeManager.getRangeRowElementList() : rangeManager.getSelectionElementList();
+  let copyElementList = null;
+  const range = rangeManager.getRange();
+  if (range.isCrossRowCol) {
+    const tableElement = rangeManager.getRangeTableElement();
+    if (!tableElement)
+      return;
+    const rowCol = draw.getTableParticle().getRangeRowCol();
+    if (!rowCol)
+      return;
+    const copyTableElement = {
+      type: ElementType.TABLE,
+      value: "",
+      colgroup: [],
+      trList: []
+    };
+    const firstRow = rowCol[0];
+    const colStartIndex = firstRow[0].colIndex;
+    const lastCol = firstRow[firstRow.length - 1];
+    const colEndIndex = lastCol.colIndex + lastCol.colspan - 1;
+    for (let c = colStartIndex; c <= colEndIndex; c++) {
+      copyTableElement.colgroup.push(tableElement.colgroup[c]);
+    }
+    for (let r = 0; r < rowCol.length; r++) {
+      const row = rowCol[r];
+      const tr = tableElement.trList[row[0].rowIndex];
+      const coptTr = {
+        tdList: [],
+        height: tr.height,
+        minHeight: tr.minHeight
+      };
+      for (let c = 0; c < row.length; c++) {
+        coptTr.tdList.push(row[c]);
+      }
+      copyTableElement.trList.push(coptTr);
+    }
+    copyElementList = zipElementList([copyTableElement]);
+  } else {
+    copyElementList = rangeManager.getIsCollapsed() ? rangeManager.getRangeRowElementList() : rangeManager.getSelectionElementList();
+  }
   if (!(copyElementList == null ? void 0 : copyElementList.length))
     return;
   writeElementList(copyElementList, draw.getOptions());
@@ -7824,6 +7864,7 @@ class Position {
                 x,
                 y,
                 td,
+                pageNo: curPageNo,
                 tablePosition: positionList[j],
                 isTable: true,
                 elementList: td.value,
@@ -7884,6 +7925,7 @@ class Position {
           }
         }
         return {
+          isDirectHit: true,
           hitLineStartIndex: hitLineStartIndex2,
           index: curPositionIndex2,
           isControl: !!element.controlId
@@ -8287,6 +8329,13 @@ class RangeManager {
     var _a;
     return ((_a = this.getRangeParagraphInfo()) == null ? void 0 : _a.elementList) || null;
   }
+  getRangeTableElement() {
+    const positionContext = this.position.getPositionContext();
+    if (!positionContext.isTable)
+      return null;
+    const originalElementList = this.draw.getOriginalElementList();
+    return originalElementList[positionContext.index];
+  }
   getIsSelectAll() {
     const elementList = this.draw.getElementList();
     const { startIndex, endIndex } = this.range;
@@ -12251,23 +12300,27 @@ class Control {
     }
   }
   setPropertiesByConceptId(payload) {
-    var _a;
     const isReadonly = this.draw.isReadonly();
     if (isReadonly)
       return;
     const { conceptId, properties } = payload;
     let isExistUpdate = false;
-    const pageComponentData = {
-      header: this.draw.getHeaderElementList(),
-      main: this.draw.getOriginalMainElementList(),
-      footer: this.draw.getFooterElementList()
-    };
-    for (const key in pageComponentData) {
-      const elementList = pageComponentData[key];
+    function setProperties(elementList) {
+      var _a;
       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];
+              setProperties(td.value);
+            }
+          }
+        }
         if (((_a = element == null ? void 0 : element.control) == null ? void 0 : _a.conceptId) !== conceptId)
           continue;
         isExistUpdate = true;
@@ -12284,6 +12337,15 @@ class Control {
         i = newEndIndex;
       }
     }
+    const pageComponentData = {
+      header: this.draw.getHeaderElementList(),
+      main: this.draw.getOriginalMainElementList(),
+      footer: this.draw.getFooterElementList()
+    };
+    for (const key in pageComponentData) {
+      const elementList = pageComponentData[key];
+      setProperties(elementList);
+    }
     if (!isExistUpdate)
       return;
     for (const key in pageComponentData) {
@@ -14372,6 +14434,34 @@ class Group {
     this.clearFillInfo();
   }
 }
+class MouseObserver {
+  constructor(draw) {
+    __publicField(this, "draw");
+    __publicField(this, "eventBus");
+    __publicField(this, "pageContainer");
+    this.draw = draw;
+    this.eventBus = this.draw.getEventBus();
+    this.pageContainer = this.draw.getPageContainer();
+    this.pageContainer.addEventListener("mousemove", this._mousemove.bind(this));
+    this.pageContainer.addEventListener("mouseenter", this._mouseenter.bind(this));
+    this.pageContainer.addEventListener("mouseleave", this._mouseleave.bind(this));
+  }
+  _mousemove(evt) {
+    if (!this.eventBus.isSubscribe("mousemove"))
+      return;
+    this.eventBus.emit("mousemove", evt);
+  }
+  _mouseenter(evt) {
+    if (!this.eventBus.isSubscribe("mouseenter"))
+      return;
+    this.eventBus.emit("mouseenter", evt);
+  }
+  _mouseleave(evt) {
+    if (!this.eventBus.isSubscribe("mouseleave"))
+      return;
+    this.eventBus.emit("mouseleave", evt);
+  }
+}
 class Draw {
   constructor(rootContainer, options, data2, listener, eventBus, override) {
     __publicField(this, "container");
@@ -14490,6 +14580,7 @@ class Draw {
     this.scrollObserver = new ScrollObserver(this);
     this.selectionObserver = new SelectionObserver(this);
     this.imageObserver = new ImageObserver();
+    new MouseObserver(this);
     this.canvasEvent = new CanvasEvent(this);
     this.cursor = new Cursor(this, this.canvasEvent);
     this.canvasEvent.register();
@@ -16237,6 +16328,7 @@ class Command {
     __publicField(this, "getControlList");
     __publicField(this, "getContainer");
     __publicField(this, "getTitleValue");
+    __publicField(this, "getPositionContextByEvent");
     this.executeMode = adapt.mode.bind(adapt);
     this.executeCut = adapt.cut.bind(adapt);
     this.executeCopy = adapt.copy.bind(adapt);
@@ -16343,6 +16435,7 @@ class Command {
     this.getGroupIds = adapt.getGroupIds.bind(adapt);
     this.getContainer = adapt.getContainer.bind(adapt);
     this.getTitleValue = adapt.getTitleValue.bind(adapt);
+    this.getPositionContextByEvent = adapt.getPositionContextByEvent.bind(adapt);
     this.executeSetControlValue = adapt.setControlValue.bind(adapt);
     this.executeSetControlExtension = adapt.setControlExtension.bind(adapt);
     this.executeSetControlProperties = adapt.setControlProperties.bind(adapt);
@@ -16576,6 +16669,7 @@ class CommandAdapt {
     __publicField(this, "workerManager");
     __publicField(this, "searchManager");
     __publicField(this, "i18n");
+    __publicField(this, "zone");
     this.draw = draw;
     this.range = draw.getRange();
     this.position = draw.getPosition();
@@ -16587,6 +16681,7 @@ class CommandAdapt {
     this.workerManager = draw.getWorkerManager();
     this.searchManager = draw.getSearch();
     this.i18n = draw.getI18n();
+    this.zone = draw.getZone();
   }
   mode(payload) {
     this.draw.setMode(payload);
@@ -16740,13 +16835,9 @@ class CommandAdapt {
     if (!changeElementList.length)
       return;
     changeElementList.forEach((el) => {
-      delete el.size;
-      delete el.font;
-      delete el.color;
-      delete el.bold;
-      delete el.italic;
-      delete el.underline;
-      delete el.strikeout;
+      EDITOR_ELEMENT_STYLE_ATTR.forEach((attr) => {
+        delete el[attr];
+      });
     });
     this.draw.render(renderOption);
   }
@@ -18840,6 +18931,50 @@ class CommandAdapt {
     }
     return result;
   }
+  getPositionContextByEvent(evt) {
+    var _a, _b, _c;
+    const pageIndex = (_a = evt.target) == null ? void 0 : _a.dataset.index;
+    if (!pageIndex)
+      return null;
+    const pageNo = Number(pageIndex);
+    const positionContext = this.position.getPositionByXY({
+      x: evt.offsetX,
+      y: evt.offsetY,
+      pageNo
+    });
+    const { isDirectHit, isTable, index: index2, trIndex, tdIndex, tdValueIndex, zone: zone2 } = positionContext;
+    if (!isDirectHit || zone2 && zone2 !== this.zone.getZone())
+      return null;
+    let element = null;
+    const elementList = this.draw.getOriginalElementList();
+    let position = null;
+    const positionList = this.position.getOriginalPositionList();
+    if (isTable) {
+      const td = (_b = elementList[index2].trList) == null ? void 0 : _b[trIndex].tdList[tdIndex];
+      element = (td == null ? void 0 : td.value[tdValueIndex]) || null;
+      position = ((_c = td == null ? void 0 : td.positionList) == null ? void 0 : _c[tdValueIndex]) || null;
+    } else {
+      element = elementList[index2] || null;
+      position = positionList[index2] || null;
+    }
+    let rangeRect = null;
+    if (position) {
+      const { pageNo: pageNo2, coordinate: { leftTop, rightTop }, lineHeight } = position;
+      const height = this.draw.getOriginalHeight();
+      const pageGap = this.draw.getOriginalPageGap();
+      rangeRect = {
+        x: leftTop[0],
+        y: leftTop[1] + pageNo2 * (height + pageGap),
+        width: rightTop[0] - leftTop[0],
+        height: lineHeight
+      };
+    }
+    return {
+      pageNo,
+      element,
+      rangeRect
+    };
+  }
   insertTitle(payload) {
     var _a;
     const isReadonly = this.draw.isReadonly();