@hailin-zheng/editor-core 1.0.57 → 1.0.60

package/index.js

@@ -3475,7 +3475,7 @@ class TableCellElement extends BlockContainerElement {
         const cellRender = new TableCellRenderObject(this);
         cellRender.rect.width = cellWidth;
         cellRender.rect.maxWidth = cellWidth;
-        cellRender.padding = new PaddingProps(0, 0, 5, 5);
+        cellRender.padding = new PaddingProps(2, 2, 5, 5);
         cellRender.rect.x = cellOffset;
         return cellRender;
     }
@@ -6657,9 +6657,9 @@ class DocumentSelection {
         if (!this.selectionState.rangeDirty) {
             return false;
         }
-        const range = this.selectionState.range;
         //转换选区
         this.transformRange();
+        const range = this.selectionState.range;
         this.selectionState.clear();
         if (!range) {
             return false;
@@ -12092,7 +12092,7 @@ class DocumentEvent {
         //设置文档页中的相对位置
         evt.pageX = hitPagePos.x;
         evt.pageY = hitPagePos.y;
-        const hitInfo = this.getHitLeafRender(docRender, { x: 0, y: -docRender.rect.y }, {
+        const hitInfo = this.getHitLeafRender(docRender, { x: -docRender.rect.x, y: -docRender.rect.y }, {
             x: evt.pageX,
             y: evt.pageY
         });
@@ -15244,6 +15244,50 @@ class DocumentContext {
             }
         });
     }
+    /**
+     * 查询字符
+     * @param text
+     */
+    searchText(text) {
+        const docTextData = this.getElementTextData(this.ctx);
+        for (let i = 0; i < docTextData.length; i++) {
+            // if (docTextData[i].text.indexOf(text) >= 0) {
+            //     matchData.push(docTextData[i]);
+            // }
+            const matchAll = docTextData[i].text.matchAll(new RegExp(`${text}`, 'g'));
+            for (let regExpMatchArray of matchAll) {
+                console.log(regExpMatchArray);
+            }
+        }
+    }
+    getElementTextData(ele) {
+        const arr = [];
+        if (ele instanceof BranchElement) {
+            let prevText = null;
+            for (let i = 0; i < ele.length; i++) {
+                const child = ele.getChild(i);
+                if (child instanceof TextGroupElement) {
+                    if (prevText) {
+                        const prevData = arr[arr.length - 1];
+                        prevData.eles.push(child);
+                        prevData.text += child.text;
+                    }
+                    else {
+                        arr.push({
+                            text: child.text,
+                            eles: [child]
+                        });
+                    }
+                    prevText = child;
+                }
+                else {
+                    arr.push(...this.getElementTextData(child));
+                    prevText = null;
+                }
+            }
+        }
+        return arr;
+    }
 }
 
 /**
@@ -15835,7 +15879,7 @@ class CanvasTextEditor {
         this.viewOptions = new ViewOptions();
         this.documentSelection = new DocumentSelection();
         this.docCtx = new EditorContext(this.documentSelection.selectionState, this.viewOptions);
-        this.viewOptions.copyRightInfo = '万达信息电子病历编辑器,www.wondersgroup.com';
+        this.viewOptions.copyRightInfo = '电子病历编辑器(XXX版权所有)';
         this.viewOptions.drawCharRectColor = 'green';
         this.viewOptions.showLineRect = true;
         this.viewOptions.docSpace = 20;
@@ -16354,6 +16398,9 @@ class CanvasTextEditor {
             return null;
         }
         const para = ElementUtil.getParentByType(selectionState.startControl, ParagraphElement);
+        if (!para) {
+            return null;
+        }
         return para.props;
     }
     setTextFormat(newProps) {
@@ -16580,6 +16627,14 @@ class CanvasTextEditor {
         }
         return this.documentChange.insertElement(targetElement, targetOffset, destEleArray);
     }
+    /**
+     * 插入新元素
+     * @param ele
+     */
+    insertNewElement(ele) {
+        const { startControl, startOffset } = this.selectionState;
+        this.insertElement(startControl, startOffset, [ele]);
+    }
     showHistory() {
         //console.log(History.ops);
         const newPara = new ParagraphElement();