@hailin-zheng/editor-core 1.0.55 → 1.0.58

package/index.js

@@ -6660,6 +6660,7 @@ class DocumentSelection {
         const range = this.selectionState.range;
         //转换选区
         this.transformRange();
+        this.selectionState.clear();
         if (!range) {
             return false;
         }
@@ -6781,7 +6782,7 @@ class SelectionState {
      */
     rangeDirty = false;
     addRange(range) {
-        //this.clear();
+        this.clear();
         this.range = range;
         this.rangeDirty = true;
         this.onChangedEvent.next();
@@ -12091,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
         });
@@ -15243,6 +15244,48 @@ class DocumentContext {
             }
         });
     }
+    /**
+     * 查询字符
+     * @param text
+     */
+    searchText(text) {
+        const docTextData = this.getElementTextData(this.ctx);
+        const matchData = [];
+        for (let i = 0; i < docTextData.length; i++) {
+            if (docTextData[i].text.indexOf(text) >= 0) {
+                matchData.push(docTextData[i]);
+            }
+        }
+        console.log(matchData);
+    }
+    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;
+    }
 }
 
 /**
@@ -16034,17 +16077,17 @@ class CanvasTextEditor {
      */
     refreshView(rePaint) {
         const ssChanged = this.documentSelection.updateSelectionState();
-        this.setCursor();
         this.selectionOverlays.getSelectionTreeData();
         this.documentPaint.refreshView(rePaint);
         this.setScrollSize();
-        ssChanged && this.selectionChanged.next(this.documentSelection.selectionState);
+        this.setCursor();
+        (ssChanged || rePaint) && this.selectionChanged.next(this.documentSelection.selectionState);
         this.docRule.refreshRule();
     }
     hitInfoChanged(hitInfo) {
         this.documentSelection.setSelectionState(hitInfo);
         this.refreshDocument();
-        this.selectionChanged.next(this.documentSelection.selectionState);
+        //this.selectionChanged.next(this.documentSelection.selectionState);
     }
     /**
      * 设置光标