@hailin-zheng/editor-core 2.0.13 → 2.0.15

package/index.js

@@ -4780,45 +4780,23 @@ class TextGroupRenderObject extends LeafRenderObject {
         if (this.element.props.background) {
             const bgX = event.relativePagePos.x;
             const bgY = event.relativePagePos.y;
-            event.highlights.push({
-                sel: 'path',
-                data: {
-                    ns: "http://www.w3.org/2000/svg",
-                    attrs: {
-                        d: `M${bgX} ${bgY} h${width} v${this.rect.height} h-${width}z`,
-                        fill: this.element.props.background,
-                    }
-                }
-            });
+            event.highlights.push(ElementUtil.getFillSvgRect(bgX, bgY, this.rect.width, this.rect.height, this.element.props.background));
         }
         if (this.element.props.underline) {
             const underHeight = this.element.props.fontSize * 1.2;
-            event.highlights.push({
-                sel: 'path',
-                data: {
-                    ns: "http://www.w3.org/2000/svg",
-                    attrs: {
-                        d: `M${event.relativePagePos.x} ${event.relativePagePos.y + underHeight} L${event.relativePagePos.x + this.rect.width} ${event.relativePagePos.y + underHeight}`,
-                        stroke: '#000',
-                        'stroke-width': 1,
-                        fill: 'none'
-                    }
-                }
-            });
+            const path = `M${event.relativePagePos.x} ${event.relativePagePos.y + underHeight} L${event.relativePagePos.x + this.rect.width} ${event.relativePagePos.y + underHeight}`;
+            event.highlights.push(ElementUtil.getStrokeSvgPath(path, '#000', 1));
         }
         if (this.element.props.linethrough) {
-            event.highlights.push({
-                sel: 'path',
-                data: {
-                    ns: "http://www.w3.org/2000/svg",
-                    attrs: {
-                        d: `M${event.relativePagePos.x} ${event.relativePagePos.y + this.rect.height / 2} L${event.relativePagePos.x + this.rect.width} ${event.relativePagePos.y + this.rect.height / 2}`,
-                        stroke: '#000',
-                        'stroke-width': 1,
-                        fill: 'none'
-                    }
-                }
-            });
+            const path = `M${event.relativePagePos.x} ${event.relativePagePos.y + this.rect.height / 2} L${event.relativePagePos.x + this.rect.width} ${event.relativePagePos.y + this.rect.height / 2}`;
+            event.highlights.push(ElementUtil.getStrokeSvgPath(path, '#000', 1));
+        }
+        if (this.element.props.border) {
+            event.highlights.push(ElementUtil.getStrokeSvgPath(ElementUtil.getRectPath(event.relativePagePos.x, event.relativePagePos.y, this.rect.width, this.rect.height), '#000', 1));
+        }
+        if (this.element.props.overline) {
+            const path = `M${event.relativePagePos.x} ${event.relativePagePos.y} L${event.relativePagePos.x + this.rect.width} ${event.relativePagePos.y}`;
+            event.highlights.push(ElementUtil.getStrokeSvgPath(path, '#000', 1));
         }
         return t;
     }
@@ -19799,17 +19777,81 @@ function printNodes(printNodes, options, printEvent = null) {
 
 class DocumentTemplate {
     static createA4Doc() {
+        return DocumentTemplate.createDoc('A4');
+    }
+    static createDoc(name = 'A4') {
         const doc = new DocumentElement();
         doc.props = new DocumentProps();
-        doc.props.width = 210;
-        doc.props.height = 297;
-        doc.props.padding = new PaddingProps(25.4, 25.4, 19.1, 19.1);
+        const paper = DocumentTemplate.getPaper(name);
+        doc.props.width = paper.width;
+        doc.props.height = paper.height;
+        doc.props.padding = new PaddingProps(paper.top, paper.bottom, paper.left, paper.right);
         doc.addChild(new DocumentHeaderElement());
         doc.addChild(new DocumentBodyElement());
         doc.addChild(new DocumentFooterElement());
         return doc;
     }
-}
+    static getPaper(name) {
+        let top = 25.4, bottom = 25.4, left = 19.1, right = 19.1;
+        const paper = PageSize.find(item => item.name.toUpperCase() === name.toUpperCase());
+        if (paper) {
+            if (top + bottom + 30 > paper.height) {
+                top = bottom = 0;
+            }
+            if (left + right + 30 > paper.width) {
+                left = right = 0;
+            }
+            return {
+                width: paper.width,
+                height: paper.height,
+                top, left, right, bottom
+            };
+        }
+        return { width: PageSize[0].width, height: PageSize[0].height, top, left, right, bottom };
+    }
+}
+const PageSize = [
+    { name: 'A4', width: 210, height: 297 },
+    { name: 'A5', width: 148, height: 210 },
+    { name: 'A6', width: 105, height: 148 },
+    { name: 'B5', width: 176, height: 250 },
+    { name: 'B6', width: 125, height: 176 },
+    { name: 'Letter', width: 216, height: 279 },
+    { name: 'Legal', width: 216, height: 356 },
+    { name: 'Executive', width: 184, height: 267 },
+    { name: 'Folio', width: 210, height: 330 },
+    { name: 'Quarto', width: 215, height: 275 },
+    { name: '10x15cm', width: 100, height: 150 },
+    { name: '13x18cm', width: 130, height: 180 },
+    { name: '15x20cm', width: 150, height: 200 },
+    { name: '20x25cm', width: 200, height: 250 },
+    { name: '20x30cm', width: 200, height: 300 },
+    { name: '25x35cm', width: 250, height: 350 },
+    { name: '30x40cm', width: 300, height: 400 },
+    { name: 'A0', width: 841, height: 1189 },
+    { name: 'A1', width: 594, height: 841 },
+    { name: 'A2', width: 420, height: 594 },
+    { name: 'A3', width: 297, height: 420 },
+    { name: 'A7', width: 74, height: 105 },
+    { name: 'A8', width: 52, height: 74 },
+    { name: 'A9', width: 37, height: 52 },
+    { name: 'A10', width: 26, height: 37 },
+    { name: 'B0', width: 1000, height: 1414 },
+    { name: 'B1', width: 707, height: 1000 },
+    { name: 'B2', width: 500, height: 707 },
+    { name: 'B3', width: 353, height: 500 },
+    { name: 'B4', width: 250, height: 353 },
+    { name: 'B7', width: 88, height: 125 },
+    { name: 'B8', width: 62, height: 88 },
+    { name: 'B9', width: 44, height: 62 },
+    { name: 'B10', width: 31, height: 44 },
+    { name: 'C5E', width: 163, height: 229 },
+    { name: 'Comm10E', width: 105, height: 241 },
+    { name: 'DLE', width: 110, height: 220 },
+    { name: 'Folio', width: 210, height: 330 },
+    { name: 'Ledger', width: 432, height: 279 },
+    { name: 'Tabloid', width: 279, height: 432 }
+];
 
 /**
  * 处理文档批注
@@ -26973,7 +27015,7 @@ class DocEditor {
                 return null;
             }
             const dataEle = ElementUtil.getParent(startControl, validateDataEle);
-            if (IsInSideDataElement(startControl, startOffset)) {
+            if (dataEle instanceof DataElementLeaf || IsInSideDataElement(startControl, startOffset)) {
                 return dataEle;
             }
             else {
@@ -26981,8 +27023,7 @@ class DocEditor {
             }
         }
         else if (!collapsed && ancestorCommonControl) {
-            const dataEle = ElementUtil.getParent(startControl, validateDataEle);
-            return dataEle;
+            return ElementUtil.getParent(startControl, validateDataEle);
         }
         return null;
     }
@@ -27123,10 +27164,11 @@ class DocEditor {
     /**
      * 新建文档
      * @param doc
+     * @param name
      */
-    createNewDoc(doc = null) {
+    createNewDoc(doc = null, name = 'A4') {
         //this.docCtx.clear();
-        const newDoc = doc ?? DocumentTemplate.createA4Doc();
+        const newDoc = doc ?? DocumentTemplate.createDoc(name);
         // this.elementReader.setDocument(newDoc);
         // this.refreshDocument('content');
         this.loadDoc(ElementSerialize.serialize(newDoc, this.viewOptions));
@@ -27350,12 +27392,13 @@ class DocEditor {
         this.resetViewer('force');
         this.selectionState.clear();
     }
-    /**
-     * 设置纸张大小,单位为毫米(mm)
-     * @param width
-     * @param height
-     */
     setPaperSize(width, height) {
+        if (typeof width === 'string') {
+            const paperSize = DocumentTemplate.getPaper(width);
+            width = paperSize.width;
+            height = paperSize.height;
+        }
+        height = height;
         const docProps = this.docCtx.document.props;
         docProps.width = width;
         docProps.height = height;