@hailin-zheng/editor-core 2.0.29 → 2.0.31

package/index.js

@@ -2373,7 +2373,7 @@ class DataEleCheckProps extends DataEleBaseProps {
         if (this.falseChar !== falseChar) {
             props.falseChar = this.falseChar;
         }
-        if (this.border) {
+        if (!this.border) {
             props.border = this.border;
         }
         if (this.trueStateColor !== '#f00000') {
@@ -4912,6 +4912,9 @@ class DocumentSelection {
      * @private
      */
     updateSelectionState() {
+        if (this.selectionState.startControl && !this.selectionState.startControl.parent) {
+            this.selectionState.clear();
+        }
         if (!this.selectionState.rangeDirty) {
             return false;
         }
@@ -5029,6 +5032,7 @@ class SelectionState {
         this.clear();
     }
     clear() {
+        this.startHitInfo = null;
         this.rangeDirty = true;
         this.range = null;
         this.startOffset = -1;
@@ -8579,6 +8583,10 @@ class DataElementDate extends DataElementInlineGroup {
         return super.cloneSelf(data, DataElementDate);
     }
     setValue(val) {
+        if (val === null) {
+            this.clearInnerItems();
+            return;
+        }
         const format = this.props.format ?? 'YYYY-MM-DD';
         const date = moment(val, format);
         if (!date.isValid()) {
@@ -8941,6 +8949,10 @@ class DataElementList extends DataElementInlineGroup {
         return super.cloneSelf(data, DataElementList);
     }
     setValue(vals) {
+        if (vals === null) {
+            this.clearInnerItems();
+            return;
+        }
         if (!Array.isArray(vals)) {
             vals = [vals];
         }
@@ -12383,14 +12395,14 @@ class ElementUtil {
             }
         };
     }
-    static getMousePos(e) {
+    static getMousePos(e, scale = 1) {
         const svgContainer = e.currentTarget;
         const parentRect = svgContainer.getBoundingClientRect();
         const localX = e.clientX - parentRect.x; //+ this.viewOptions.pageOffset.x;
         const localY = e.clientY - parentRect.y; //+ this.viewOptions.pageOffset.y;
         return {
-            x: localX,
-            y: localY
+            x: localX / scale,
+            y: localY / scale
         };
     }
     static createClipPath(id, width, height, x = 0, y = 0) {
@@ -16129,8 +16141,8 @@ class DocumentPaint {
     getDocumentContainerHeight() {
         if (this.docPages.length > 0) {
             return {
-                width: this.docContainer.rect.width * this.viewOptions.scale,
-                height: this.docContainer.rect.height * this.viewOptions.scale
+                width: this.docContainer.rect.width,
+                height: this.docContainer.rect.height
             };
         }
         else {
@@ -16886,21 +16898,22 @@ class DocumentEvent {
         this.bindEvent();
     }
     getEventListener() {
+        const scale = this.viewOptions.scale;
         return {
             mousedown: (evt) => {
-                this.mousedown(evt, ElementUtil.getMousePos(evt));
+                this.mousedown(evt, ElementUtil.getMousePos(evt, scale));
             },
             mouseup: (evt) => {
-                this.mouseup(evt, ElementUtil.getMousePos(evt));
+                this.mouseup(evt, ElementUtil.getMousePos(evt, scale));
             },
             click: (evt) => {
                 this.mouseClickHandle(evt);
             },
             mousemove: (evt) => {
-                this.mousemove(evt, ElementUtil.getMousePos(evt));
+                this.mousemove(evt, ElementUtil.getMousePos(evt, scale));
             },
             dblclick: (evt) => {
-                this.mouseDblClickHandle(evt, ElementUtil.getMousePos(evt));
+                this.mouseDblClickHandle(evt, ElementUtil.getMousePos(evt, scale));
             },
             contextmenu: (evt) => {
                 this.contextMenu.next(evt);
@@ -27056,7 +27069,15 @@ class DocEditor {
                                 }
                             },
                             children: [
-                                docContentVNode, inputVNode, dropContainer
+                                {
+                                    sel: 'div.scale-container', data: {
+                                        style: {
+                                            transform: 'scale(' + this.viewOptions.scale + ')',
+                                            transformOrigin: 'left top'
+                                        }
+                                    },
+                                    children: [docContentVNode, inputVNode, dropContainer]
+                                }
                             ]
                         }, ruleFunc.refreshRuleSvg().render()
                     ]
@@ -27218,7 +27239,7 @@ class DocEditor {
     }
     getCursorRect() {
         try {
-            if (!this.documentEvent.startHitInfo) {
+            if (!this.selectionState.startHitInfo) {
                 return { x: 0, y: 0, width: 0, height: 0 };
             }
             const { startControl, startOffset } = this.selectionState;
@@ -27421,6 +27442,11 @@ class DocEditor {
         this.updateRenderCtx();
         this.flushToSchedule();
         this.documentPaint.layoutPages();
+        const sub = this.afterNodePatch.subscribe(() => {
+            sub.unsubscribe();
+            const scrollDOM = this.svgContainer.querySelector('.scroll-container');
+            scrollDOM.scrollLeft = (scrollDOM.scrollWidth - scrollDOM.getBoundingClientRect().width) / 2;
+        });
         return scale;
     }
     updateRenderCtx() {