@hailin-zheng/editor-core 1.0.54 → 1.0.55

package/index.js

@@ -2770,8 +2770,8 @@ class DataElementRenderObject extends InlineGroupRenderObject {
             const titleWidth = render.contentContext.measureText(caption, textProps).width;
             const x = position.x;
             const y = position.y - 20;
-            render.contentContext.fillRect(x, y, titleWidth, 20, 'blue');
-            render.contentContext.drawText(caption, textProps, x, y, titleWidth, 20);
+            render.contentContext.fillRect(x, y, titleWidth + 10, 20, 'blue');
+            render.contentContext.drawText(caption, textProps, x + 5, y, titleWidth, 20);
         }
     }
 }
@@ -6618,8 +6618,8 @@ class DocumentSelection {
         this.selectionState.addRange(startRange);
     }
     /**
-    * 获取选区共同的祖先控件
-    */
+     * 获取选区共同的祖先控件
+     */
     static getAncestorCommonControl(startControl, endControl) {
         const startNestParents = this.getNestParents(startControl.parent);
         const ancestorCommonControl = this.getCommonParenet(endControl.parent, startNestParents);
@@ -6654,10 +6654,11 @@ class DocumentSelection {
      * @private
      */
     updateSelectionState() {
-        if (this.compareSelectionEquals()) {
+        if (!this.selectionState.rangeDirty) {
             return false;
         }
         const range = this.selectionState.range;
+        //转换选区
         this.transformRange();
         if (!range) {
             return false;
@@ -6671,6 +6672,7 @@ class DocumentSelection {
         this.selectionState.endControlIndex = ElementUtil.getControlIndex(range.endControl);
         this.selectionState.ancestorCommonControl = DocumentSelection.getAncestorCommonControl(this.selectionState.startControl, this.selectionState.endControl);
         this.selectionState.enableTrackChanges = this.getEnableTrackChanges(range.startControl);
+        this.selectionState.rangeDirty = false;
         return true;
     }
     /**
@@ -6681,17 +6683,6 @@ class DocumentSelection {
         const body = ElementUtil.getParentByType(ele, DocumentBodyElement);
         return body?.trackChanges || false;
     }
-    compareSelectionEquals() {
-        const range = this.selectionState.range;
-        const snap = this.snapshotSelectionState;
-        if (snap && range) {
-            return range.startControl === snap.startControl
-                && range.startOffset === snap.startOffset
-                && range.endControl === snap.endControl
-                && range.endOffset === snap.endOffset;
-        }
-        return false;
-    }
     /**
      * 转换选区内容
      * 处理结束选区在开始选区之前
@@ -6785,9 +6776,14 @@ class SelectionState {
         this.selectedRange = null;
         this.cursorPos = null;
     }
+    /**
+     * 当前选区是否发生改变
+     */
+    rangeDirty = false;
     addRange(range) {
         //this.clear();
         this.range = range;
+        this.rangeDirty = true;
         this.onChangedEvent.next();
     }
     resetRange(startControl, startOffset) {
@@ -12260,6 +12256,7 @@ class DocumentEvent {
         const newParents = ElementUtil.getParentElements(focusElement);
         const leaveParents = oldParents.filter(item => newParents.every(oldItem => item !== oldItem));
         const enterParents = newParents.filter(item => oldParents.every(oldItem => item !== oldItem));
+        let cancelEvent = false;
         const loopInvokeEvent = (eventName, array) => {
             for (const element of array) {
                 const mouseEvent = new LostCursorEvent(this.docCtx);
@@ -12268,13 +12265,16 @@ class DocumentEvent {
                 mouseEvent.ctx = this.docCtx;
                 element.invokeEvent(eventName, mouseEvent);
                 if (mouseEvent.isCancel) {
+                    cancelEvent = true;
                     break;
                 }
             }
         };
         loopInvokeEvent('LostCursor', leaveParents);
         loopInvokeEvent('GotCursor', enterParents);
-        this.prevCursorItems = newParents;
+        if (!cancelEvent) {
+            this.prevCursorItems = newParents;
+        }
         //dDocumentEvent.invokeEvent('GotCursor', focusElement, getCursorEvent, 'All', this.docCtx);
     }
     /**
@@ -16034,10 +16034,10 @@ class CanvasTextEditor {
      */
     refreshView(rePaint) {
         const ssChanged = this.documentSelection.updateSelectionState();
+        this.setCursor();
         this.selectionOverlays.getSelectionTreeData();
         this.documentPaint.refreshView(rePaint);
         this.setScrollSize();
-        this.setCursor();
         ssChanged && this.selectionChanged.next(this.documentSelection.selectionState);
         this.docRule.refreshRule();
     }