@hufe921/canvas-editor 0.9.55 → 0.9.56

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [0.9.56](https://github.com/Hufe921/canvas-editor/compare/v0.9.55...v0.9.56) (2023-11-14)
+
+
+### Bug Fixes
+
+* compute table row and col info boundary error #324 ([455b397](https://github.com/Hufe921/canvas-editor/commit/455b397fbc5de18ffe5a22bc9f9f68e23f9874eb)), closes [#324](https://github.com/Hufe921/canvas-editor/issues/324)
+* get and set control property in table #323 ([17cd6cc](https://github.com/Hufe921/canvas-editor/commit/17cd6ccd09e7c368e2ef98c0be2b8de526e8a4c3)), closes [#323](https://github.com/Hufe921/canvas-editor/issues/323)
+
+
+
 ## [0.9.55](https://github.com/Hufe921/canvas-editor/compare/v0.9.54...v0.9.55) (2023-11-10)
 
 

package/dist/canvas-editor.es.js

@@ -23,7 +23,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 var index = "";
-const version = "0.9.55";
+const version = "0.9.56";
 var MaxHeightRatio;
 (function(MaxHeightRatio2) {
   MaxHeightRatio2["HALF"] = "half";
@@ -7923,6 +7923,7 @@ class TableParticle {
     this.options = draw.getOptions();
   }
   getTrListGroupByCol(payload) {
+    var _a;
     const trList = deepClone(payload);
     for (let t = 0; t < payload.length; t++) {
       const tr = trList[t];
@@ -7932,7 +7933,7 @@ class TableParticle {
         const curRowIndex = rowIndex + rowspan - 1;
         if (curRowIndex !== d) {
           const changeTd = tr.tdList.splice(d, 1)[0];
-          trList[curRowIndex].tdList.splice(colIndex, 0, changeTd);
+          (_a = trList[curRowIndex]) == null ? void 0 : _a.tdList.splice(colIndex, 0, changeTd);
         }
       }
     }
@@ -8084,6 +8085,33 @@ class TableParticle {
       }
     }
   }
+  getTableWidth(element) {
+    return element.colgroup.reduce((pre, cur) => pre + cur.width, 0);
+  }
+  getTableHeight(element) {
+    const trList = element.trList;
+    if (!(trList == null ? void 0 : trList.length))
+      return 0;
+    return this.getTdListByColIndex(trList, 0).reduce((pre, cur) => pre + cur.height, 0);
+  }
+  getRowCountByColIndex(trList, colIndex) {
+    return this.getTdListByColIndex(trList, colIndex).reduce((pre, cur) => pre + cur.rowspan, 0);
+  }
+  getTdListByColIndex(trList, colIndex) {
+    const data2 = [];
+    for (let r = 0; r < trList.length; r++) {
+      const tdList = trList[r].tdList;
+      for (let d = 0; d < tdList.length; d++) {
+        const td = tdList[d];
+        const min = td.colIndex;
+        const max = min + td.colspan - 1;
+        if (colIndex >= min && colIndex <= max) {
+          data2.push(td);
+        }
+      }
+    }
+    return data2;
+  }
   computeRowColInfo(element) {
     const { colgroup, trList } = element;
     if (!colgroup || !trList)
@@ -8096,42 +8124,27 @@ class TableParticle {
       let rowMinHeight = 0;
       for (let d = 0; d < tr.tdList.length; d++) {
         const td = tr.tdList[d];
-        let offsetXIndex = 0;
+        let colIndex = 0;
         if (trList.length > 1 && t !== 0) {
-          for (let pT = 0; pT < t; pT++) {
-            const pTr = trList[pT];
-            for (let pD = 0; pD < pTr.tdList.length; pD++) {
-              const pTd = pTr.tdList[pD];
-              const pTdX = pTd.x;
-              const pTdY = pTd.y;
-              const pTdWidth = pTd.width;
-              const pTdHeight = pTd.height;
-              if (pTdX < x)
-                continue;
-              if (pTdX > x)
-                break;
-              if (pTdX === x && pTdY + pTdHeight > y) {
-                const nextPTd = pTr.tdList[pD + 1];
-                if (nextPTd && pTd.colIndex + pTd.colspan !== nextPTd.colIndex) {
-                  x = nextPTd.x;
-                  offsetXIndex = nextPTd.colIndex;
-                } else {
-                  x += pTdWidth;
-                  offsetXIndex += pTd.colspan;
-                }
+          const preTd = tr.tdList[d - 1];
+          const start = preTd ? preTd.colIndex + preTd.colspan : d;
+          for (let c = start; c < colgroup.length; c++) {
+            const rowCount = this.getRowCountByColIndex(trList.slice(0, t), c);
+            if (rowCount === t) {
+              colIndex = c;
+              let preColWidth = 0;
+              for (let preC = 0; preC < c; preC++) {
+                preColWidth += colgroup[preC].width;
               }
+              x = preColWidth;
+              break;
             }
           }
-        }
-        let colIndex = 0;
-        const preTd = tr.tdList[d - 1];
-        if (preTd) {
-          colIndex = preTd.colIndex + offsetXIndex + 1;
-          if (preTd.colspan > 1) {
-            colIndex += preTd.colspan - 1;
-          }
         } else {
-          colIndex += offsetXIndex;
+          const preTd = tr.tdList[d - 1];
+          if (preTd) {
+            colIndex = preTd.colIndex + preTd.colspan;
+          }
         }
         let width = 0;
         for (let col = 0; col < td.colspan; col++) {
@@ -8139,7 +8152,8 @@ class TableParticle {
         }
         let height = 0;
         for (let row = 0; row < td.rowspan; row++) {
-          height += trList[row + t].height;
+          const curTr = trList[row + t] || trList[t];
+          height += curTr.height;
         }
         if (rowMinHeight === 0 || rowMinHeight > height) {
           rowMinHeight = height;
@@ -8427,7 +8441,8 @@ class TableTool {
       var _a;
       let isChangeSize = false;
       if (order === TableOrder.ROW) {
-        const tr = element.trList[index2];
+        const trList = element.trList;
+        const tr = trList[index2] || trList[index2 - 1];
         const { defaultTrMinHeight } = this.options;
         if (dy < 0 && tr.height + dy < defaultTrMinHeight) {
           dy = defaultTrMinHeight - tr.height;
@@ -9432,49 +9447,62 @@ class Control {
     return this.activeControl.cut();
   }
   getValueByConceptId(payload) {
-    var _a;
     const { conceptId } = payload;
+    const result = [];
+    const getValue = (elementList2) => {
+      var _a;
+      let i = 0;
+      while (i < elementList2.length) {
+        const element = elementList2[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];
+              getValue(td.value);
+            }
+          }
+        }
+        if (((_a = element == null ? void 0 : element.control) == null ? void 0 : _a.conceptId) !== conceptId)
+          continue;
+        const { type, code, valueSets } = element.control;
+        let j = i;
+        let textControlValue = "";
+        while (j < elementList2.length) {
+          const nextElement = elementList2[j];
+          if (nextElement.controlId !== element.controlId)
+            break;
+          if (type === ControlType.TEXT && nextElement.controlComponent === ControlComponent.VALUE) {
+            textControlValue += nextElement.value;
+          }
+          j++;
+        }
+        if (type === ControlType.TEXT) {
+          result.push(__spreadProps(__spreadValues({}, element.control), {
+            value: textControlValue || null,
+            innerText: textControlValue || null
+          }));
+        } else if (type === ControlType.SELECT || type === ControlType.CHECKBOX) {
+          const innerText = code == null ? void 0 : code.split(",").map((selectCode) => {
+            var _a2;
+            return (_a2 = valueSets == null ? void 0 : valueSets.find((valueSet) => valueSet.code === selectCode)) == null ? void 0 : _a2.value;
+          }).filter(Boolean).join("");
+          result.push(__spreadProps(__spreadValues({}, element.control), {
+            value: code || null,
+            innerText: innerText || null
+          }));
+        }
+        i = j;
+      }
+    };
     const elementList = [
       ...this.draw.getHeaderElementList(),
       ...this.draw.getOriginalMainElementList(),
       ...this.draw.getFooterElementList()
     ];
-    const result = [];
-    let i = 0;
-    while (i < elementList.length) {
-      const element = elementList[i];
-      i++;
-      if (((_a = element == null ? void 0 : element.control) == null ? void 0 : _a.conceptId) !== conceptId)
-        continue;
-      const { type, code, valueSets } = element.control;
-      let j = i;
-      let textControlValue = "";
-      while (j < elementList.length) {
-        const nextElement = elementList[j];
-        if (nextElement.controlId !== element.controlId)
-          break;
-        if (type === ControlType.TEXT && nextElement.controlComponent === ControlComponent.VALUE) {
-          textControlValue += nextElement.value;
-        }
-        j++;
-      }
-      if (type === ControlType.TEXT) {
-        result.push(__spreadProps(__spreadValues({}, element.control), {
-          value: textControlValue || null,
-          innerText: textControlValue || null
-        }));
-      } else if (type === ControlType.SELECT || type === ControlType.CHECKBOX) {
-        const innerText = code == null ? void 0 : code.split(",").map((selectCode) => {
-          var _a2;
-          return (_a2 = valueSets == null ? void 0 : valueSets.find((valueSet) => valueSet.code === selectCode)) == null ? void 0 : _a2.value;
-        }).filter(Boolean).join("");
-        result.push(__spreadProps(__spreadValues({}, element.control), {
-          value: code || null,
-          innerText: innerText || null
-        }));
-      }
-      i = j;
-    }
+    getValue(elementList);
     return result;
   }
   setValueByConceptId(payload) {
@@ -9574,21 +9602,26 @@ class Control {
     }
   }
   setExtensionByConceptId(payload) {
-    var _a;
     const isReadonly = this.draw.isReadonly();
     if (isReadonly)
       return;
     const { conceptId, extension } = payload;
-    const data2 = [
-      this.draw.getHeaderElementList(),
-      this.draw.getOriginalMainElementList(),
-      this.draw.getFooterElementList()
-    ];
-    for (const elementList of data2) {
+    const setExtension = (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];
+              setExtension(td.value);
+            }
+          }
+        }
         if (((_a = element == null ? void 0 : element.control) == null ? void 0 : _a.conceptId) !== conceptId)
           continue;
         element.control.extension = extension;
@@ -9601,6 +9634,14 @@ class Control {
         }
         i = newEndIndex;
       }
+    };
+    const data2 = [
+      this.draw.getHeaderElementList(),
+      this.draw.getOriginalMainElementList(),
+      this.draw.getFooterElementList()
+    ];
+    for (const elementList of data2) {
+      setExtension(elementList);
     }
   }
 }
@@ -12356,7 +12397,7 @@ class Draw {
             let curTdRealHeight = 0;
             let i2 = 0;
             while (i2 < td.rowspan) {
-              const curTr = trList[i2 + t];
+              const curTr = trList[i2 + t] || trList[t];
               curTdMinHeight += curTr.minHeight;
               curTdRealHeight += curTr.height;
               i2++;
@@ -12389,8 +12430,8 @@ class Draw {
           }
         }
         this.tableParticle.computeRowColInfo(element);
-        const tableHeight = trList.reduce((pre, cur) => pre + cur.height, 0);
-        const tableWidth = element.colgroup.reduce((pre, cur) => pre + cur.width, 0);
+        const tableHeight = this.tableParticle.getTableHeight(element);
+        const tableWidth = this.tableParticle.getTableWidth(element);
         element.width = tableWidth;
         element.height = tableHeight;
         const elementWidth = tableWidth * scale;