@hailin-zheng/editor-core 2.0.26 → 2.0.28

package/index.js

@@ -3361,7 +3361,9 @@ class DocumentRenderObject extends BlockContainerRenderObject {
             sel: 'g#page-num',
             data: {
                 ns: 'http://www.w3.org/2000/svg',
-                attrs: {}
+                attrs: {
+                    xmlns: 'http://www.w3.org/2000/svg'
+                }
             },
             children: []
         };
@@ -3394,7 +3396,7 @@ class DocumentRenderObject extends BlockContainerRenderObject {
                 ns: "http://www.w3.org/2000/svg",
                 attrs: {
                     id: "selection",
-                }
+                },
             },
             children: []
         };
@@ -3419,7 +3421,7 @@ class DocumentRenderObject extends BlockContainerRenderObject {
                     height: this.rect.height,
                     viewBox: `0 0 ${this.rect.width} ${this.rect.height}`,
                     overflow: "hidden"
-                }
+                },
             },
             children: [
                 pageCorner, highlight, ...CommonUtil.toArray(event.getChildNodes(this)), pageNum, selection
@@ -4762,15 +4764,19 @@ class TextGroupRenderObject extends LeafRenderObject {
         else if (props.vertAlign === 'superscript') ;
         const fontSize = (props.vertAlign ? props.fontSize * 3 / 5 : props.fontSize);
         const arr = [];
+        let text = '';
         this.textMeasures.reduce((prev, curr) => {
-            arr.push(prev);
+            if (curr.char !== ' ') {
+                arr.push(prev);
+                text += curr.char;
+            }
             return curr.actualSize + prev;
         }, this.rect.x);
         const x = arr.join(' ');
         const y = this.rect.y + vertHeight; //this.textMeasures.map(item => this.rect.y + vertHeight).join(' ');
-        const text = this.textMeasures.map(item => {
-            return item.char;
-        }).join('');
+        // const text = this.textMeasures.map(item => {
+        //     return item.char
+        // }).join('');
         const t = {
             sel: 'text',
             text: text,
@@ -13332,6 +13338,7 @@ class EditorContext {
                 this._document.destroy();
             }
             this.clearPrevDocCb = null;
+            this.selectionState.startHitInfo = null;
         };
     }
     clear() {
@@ -19961,16 +19968,14 @@ function createPrintTemplate({ width, height, orient }) {
           box-sizing: border-box;
           -moz-box-sizing: border-box;
       }
-      body *{
-        white-space: pre;
-      }
       @page {
           size: ${orient};
           margin: 0;
+          padding: 0;
       }
       div {
           width: ${width}mm;
-          min-height: ${height}mm;
+          height: ${height}mm;
           font-size: 0;
       }
       @media print {
@@ -19978,6 +19983,7 @@ function createPrintTemplate({ width, height, orient }) {
           body {
               width: ${width}mm;
               height: ${height}mm;
+              margin: 0;
           }
           div {
               width: initial;
@@ -27166,22 +27172,26 @@ class DocEditor {
      */
     setCursor() {
         this.selectionState;
-        if (!this.canSetCursor() || !this.documentEvent.startHitInfo) {
+        if (!this.canSetCursor() || !this.selectionState.startHitInfo) {
             this.selectionState.editable = false;
             this.docCtx.selectionState.cursorPos = null;
-            this.hiddenInput(false);
+            const cursorRect = this.getCursorRect();
+            this.hiddenInput(false, cursorRect);
             return false;
         }
         const cursorRect = this.getCursorRect();
         this.docCtx.cursorRect = ElementUtil.cloneRect(cursorRect);
         this.selectionState.cursorPos = cursorRect;
-        const abPos = this.transToAbsolutePos(ElementUtil.cloneRect(cursorRect));
+        const abPos = ElementUtil.cloneRect(cursorRect);
         this.setCursorPosition(abPos);
         //this.documentEvent.invokeCursor(startControl);
         return true;
     }
     getCursorRect() {
         try {
+            if (!this.documentEvent.startHitInfo) {
+                return { x: 0, y: 0, width: 0, height: 0 };
+            }
             const { startControl, startOffset } = this.selectionState;
             const { startRegion, hitDocIndex } = this.documentEvent.startHitInfo;
             const cursorPos = DocumentCursor.getElementCursorPos(startControl, startOffset, startRegion, hitDocIndex);
@@ -27198,14 +27208,16 @@ class DocEditor {
      */
     setCursorVisibility(visibility) {
         if (visibility) {
+            this.editInput.style.removeProperty('display');
             this.editInput.focus();
         }
     }
-    hiddenInput(reset = true) {
+    hiddenInput(reset = true, pos = null) {
         //this.input.style.display = 'none';
-        this.editInput.style.left = '-2px';
-        this.editInput.style.top = '-2px';
+        this.editInput.style.left = pos ? pos.x + 'px' : '-2px';
+        this.editInput.style.top = pos ? pos.y + 'px' : '-2px';
         this.editInput.readOnly = true;
+        this.editInput.style.display = 'none';
         !reset && this.editInput.focus();
     }
     /**
@@ -27220,22 +27232,6 @@ class DocEditor {
         this.setCursorVisibility(true);
         //this.setCursorInputStatus();
     }
-    /**
-     * 将相对坐标位置转换为绝对坐标位
-     * 由于缩放，导致绝对位置=相对位置*scale
-     * @param pos
-     */
-    transToAbsolutePos(pos) {
-        const { scale } = this.viewOptions;
-        this.documentPaint.docContainer.rect.x;
-        this.documentPaint.docContainer.rect.y;
-        pos.x = pos.x * scale;
-        pos.y = pos.y * scale;
-        if ('height' in pos) {
-            pos.height = pos.height * scale;
-        }
-        return pos;
-    }
     /**
      * 判断是否光标可以设置接受编辑
      * @returns