@hailin-zheng/editor-core 2.1.11 → 2.1.13

package/index-cjs.js

@@ -2237,7 +2237,7 @@ class DataEleBaseProps extends INotifyPropertyChanged {
     required;
     printable;
     secretBrowse;
-    editable;
+    editable = true;
     deleteable;
     minLength;
     underline;
@@ -4900,7 +4900,7 @@ class TextGroupRenderObject extends LeafRenderObject {
         const arr = [];
         let text = '';
         this.textMeasures.reduce((prev, curr) => {
-            if (curr.char !== ' ') {
+            if (curr.char !== ' ' && curr.char !== '\n' && curr.char !== '\r') {
                 arr.push(prev);
                 text += curr.char;
             }
@@ -5241,7 +5241,7 @@ class SelectionRange {
         }
         else if (control instanceof BranchElement) {
             if (offset > control.length) {
-                throw new Error('超索引');
+                offset = control.length - 1;
             }
             if (offset === control.length) {
                 const child = control.getChild(offset - 1);
@@ -10023,6 +10023,103 @@ class RadioBoxRenderObject extends LeafRenderObject {
     }
 }
 
+/**
+ * 强制分页符号
+ */
+class PageBreakElement extends LeafElement {
+    textProps;
+    constructor() {
+        super('page-br');
+        this.textProps = new TextProps();
+        this.textProps.fontSize = 14;
+        this.textProps.fontName = '宋体';
+        this.textProps.color = '#1890ff';
+    }
+    createRenderObject() {
+        const symbol = new PageBreakRenderObject(this);
+        symbol.rect.height = 14;
+        symbol.rect.width = 7;
+        return symbol;
+    }
+    serialize() {
+        return {
+            type: 'page-br',
+            props: {}
+        };
+    }
+    clone() {
+        const clone = new PageBreakElement();
+        //clone.renderCtx = this.renderCtx;
+        return clone;
+    }
+}
+class PageBreakRenderObject extends LeafRenderObject {
+    render(e) {
+        const { render, position } = e;
+        if (render.drawMode === 'print') {
+            return;
+        }
+        render.contentContext.drawText('↩', this.element.textProps, position.x, position.y, 20, this.rect.height);
+    }
+    clone() {
+        const render = new PageBreakRenderObject(this.element);
+        render.rect = ElementUtil.cloneRect(this.rect);
+        return render;
+    }
+}
+class PageBreakFactory extends ElementFactory {
+    match(type) {
+        return type === 'page-br';
+    }
+    createElement(data) {
+        return new PageBreakElement();
+    }
+}
+
+class TabElement extends LeafElement {
+    constructor() {
+        super('tab');
+    }
+    createRenderObject() {
+        const symbol = new TabRenderObject(this);
+        symbol.rect.height = 14;
+        symbol.rect.width = 28;
+        return symbol;
+    }
+    serialize() {
+        return {
+            type: 'tab',
+            props: {}
+        };
+    }
+    clone() {
+        return new TabElement();
+    }
+}
+class TabRenderObject extends LeafRenderObject {
+    render(e) {
+        const { render, position } = e;
+        if (render.drawMode === 'print') {
+            return;
+        }
+        //render.contentContext.fillRect(position.x,position.y,this.rect.width,this.rect.height,'red');
+    }
+    clone() {
+        const render = new TabRenderObject(this.element);
+        render.rect = ElementUtil.cloneRect(this.rect);
+        return render;
+    }
+}
+class TabFactory extends ElementFactory {
+    match(type) {
+        return type === 'tab';
+    }
+    createElement(data) {
+        const ele = new TabElement();
+        return ele;
+    }
+}
+
 class ColumnPatchUtil {
     static getPatchPacks(cols, splitCols) {
         const oldLinePointMap = this.getLinePointMap(cols);
@@ -13974,50 +14071,6 @@ class DynamicContextParser {
     }
 }
 
-class TabElement extends LeafElement {
-    constructor() {
-        super('tab');
-    }
-    createRenderObject() {
-        const symbol = new TabRenderObject(this);
-        symbol.rect.height = 14;
-        symbol.rect.width = 28;
-        return symbol;
-    }
-    serialize() {
-        return {
-            type: 'tab',
-            props: {}
-        };
-    }
-    clone() {
-        return new TabElement();
-    }
-}
-class TabRenderObject extends LeafRenderObject {
-    render(e) {
-        const { render, position } = e;
-        if (render.drawMode === 'print') {
-            return;
-        }
-        //render.contentContext.fillRect(position.x,position.y,this.rect.width,this.rect.height,'red');
-    }
-    clone() {
-        const render = new TabRenderObject(this.element);
-        render.rect = ElementUtil.cloneRect(this.rect);
-        return render;
-    }
-}
-class TabFactory extends ElementFactory {
-    match(type) {
-        return type === 'tab';
-    }
-    createElement(data) {
-        const ele = new TabElement();
-        return ele;
-    }
-}
-
 class ParagraphMeasure {
     options;
     renderCtx;
@@ -16369,59 +16422,6 @@ class DocumentPaint {
     }
 }
 
-/**
- * 强制分页符号
- */
-class PageBreakElement extends LeafElement {
-    textProps;
-    constructor() {
-        super('page-br');
-        this.textProps = new TextProps();
-        this.textProps.fontSize = 14;
-        this.textProps.fontName = '宋体';
-        this.textProps.color = '#1890ff';
-    }
-    createRenderObject() {
-        const symbol = new PageBreakRenderObject(this);
-        symbol.rect.height = 14;
-        symbol.rect.width = 7;
-        return symbol;
-    }
-    serialize() {
-        return {
-            type: 'page-br',
-            props: {}
-        };
-    }
-    clone() {
-        const clone = new PageBreakElement();
-        //clone.renderCtx = this.renderCtx;
-        return clone;
-    }
-}
-class PageBreakRenderObject extends LeafRenderObject {
-    render(e) {
-        const { render, position } = e;
-        if (render.drawMode === 'print') {
-            return;
-        }
-        render.contentContext.drawText('↩', this.element.textProps, position.x, position.y, 20, this.rect.height);
-    }
-    clone() {
-        const render = new PageBreakRenderObject(this.element);
-        render.rect = ElementUtil.cloneRect(this.rect);
-        return render;
-    }
-}
-class PageBreakFactory extends ElementFactory {
-    match(type) {
-        return type === 'page-br';
-    }
-    createElement(data) {
-        return new PageBreakElement();
-    }
-}
-
 const fontSize = 12;
 const verPadding = 2;
 /**
@@ -16635,6 +16635,9 @@ class ElementReader {
         //this.viewOptions.viewSettings.width = this.viewOptions.docPageSettings.width + 10;
     }
     readElement(data) {
+        if (typeof data === 'string') {
+            data = JSON.parse(data);
+        }
         const type = data.type;
         for (const factory of this.factories) {
             if (factory.match(type)) {
@@ -19164,7 +19167,7 @@ class DocumentChange {
                     const dataEle = control.parent;
                     //空数据元，并且当前光标处于数据元开始位置
                     if (this.canDeleteInlineGroup(dataEle)) {
-                        this.setCurosrForDeleteAction(dataEle);
+                        this.setCursorForDeleteAction(dataEle);
                         dataEle.remove();
                         return;
                     }
@@ -19256,7 +19259,7 @@ class DocumentChange {
                     //空数据元，并且当前光标处于数据元开始位置
                     if (control.isPrefix) {
                         if (this.canDeleteInlineGroup(dataEle)) {
-                            this.setCurosrForDeleteAction(dataEle);
+                            this.setCursorForDeleteAction(dataEle);
                             dataEle.remove();
                         }
                         else {
@@ -19994,23 +19997,42 @@ class DocumentChange {
             console.log('当前单元格列数不足以粘贴');
             return;
         }
-        if (pasteTb.length > 1) {
-            console.log('当前单元格只能粘贴一行');
-            return;
-        }
-        const pasteRow = pasteTb.getChild(0);
-        for (let i = 0; i < pasteRow.length; i++) {
-            const pasteCell = pasteRow.getChild(i);
-            const targetCell = targetRow.getChild(colIndex + i);
-            targetCell.clearItems();
-            ElementUtil.getChildrenElements(pasteCell).forEach(item => {
-                targetCell.addChild(item.clone(true), -1);
-            });
+        // if (pasteTb.length > 1) {
+        //     console.log('当前单元格只能粘贴一行');
+        //     return;
+        // }
+        const range = new SelectionRange();
+        if (pasteTb.length > targetTb.length - targetRow.getIndex()) {
+            const addRows = pasteTb.length - (targetTb.length - targetRow.getIndex());
+            for (let i = 0; i < addRows; i++) {
+                targetTb.addChild(TableRowElement.createRow(targetTb.props.cols.length));
+            }
+        }
+        for (let j = 0; j < pasteTb.length; j++) {
+            const pasteRow = pasteTb.getChild(j);
+            for (let i = 0; i < pasteRow.length; i++) {
+                const pasteCell = pasteRow.getChild(i);
+                const targetCell = targetTb.getChild(targetRow.getIndex() + j).getChild(colIndex + i);
+                if (targetCell) {
+                    //选区开始位置
+                    if (j === 0 && i === 0) {
+                        range.setStart(targetCell, 0);
+                        range.setEnd(targetCell, -1);
+                    }
+                    else {
+                        range.setEnd(targetCell, -1);
+                    }
+                    targetCell.clearItems();
+                    ElementUtil.getChildrenElements(pasteCell).forEach(item => {
+                        targetCell.addChild(item.clone(true), -1);
+                    });
+                }
+            }
         }
         //设置选区
-        const range = new SelectionRange();
-        range.setStart(targetRow.getChild(colIndex), 0);
-        range.setEnd(targetRow.getChild(colIndex + pasteRow.length - 1), -1);
+        // const range = new SelectionRange();
+        // range.setStart(targetRow.getChild(colIndex), 0);
+        // range.setEnd(targetRow.getChild(colIndex + pasteRow.length - 1), -1);
         this.selectionState.addRange(range);
     }
     insertSoftBr() {
@@ -20150,12 +20172,12 @@ class DocumentChange {
      */
     removeEmptyText(text) {
         //const nextLeafElementInPara = ElementUtil.getRecursionNextSiblingElement(text, true, true); getComputedStyle
-        this.setCurosrForDeleteAction(text);
+        this.setCursorForDeleteAction(text);
         const parent = text.parent;
         text.remove();
         this.removeEmtpyInlineBlock(parent);
     }
-    setCurosrForDeleteAction(control) {
+    setCursorForDeleteAction(control) {
         const cursorInfo = this.getCursorElementByDeleteAction(control);
         if (cursorInfo) {
             this.selectionState.resetRange(cursorInfo.ele, cursorInfo.offset);
@@ -20167,10 +20189,19 @@ class DocumentChange {
     getCursorElementByDeleteAction(control) {
         if (this.viewOptions.docMode === exports.DocMode.FormEdit) {
             if (control.parent instanceof DataElementInlineGroup) {
-                return {
-                    ele: control.parent.startDecorate,
-                    offset: 1
-                };
+                const prevLeafElementInPara = ElementUtil.getRecursionPrevSiblingElement(control, true, true, this.viewOptions);
+                if (prevLeafElementInPara && ElementUtil.getParent(prevLeafElementInPara, item => item instanceof DataElementInlineGroup)) {
+                    return {
+                        ele: prevLeafElementInPara,
+                        offset: ElementUtil.getElementEndOffset(prevLeafElementInPara)
+                    };
+                }
+                else {
+                    return {
+                        ele: control.parent.startDecorate,
+                        offset: 1
+                    };
+                }
             }
         }
         const prevLeafElementInPara = ElementUtil.getRecursionPrevSiblingElement(control, false, true, this.viewOptions);
@@ -20337,7 +20368,7 @@ function createPrintTemplate({ width, height, orient }) {
       white-space: pre;
       }
       @page {
-          size: ${width}px ${height - 1}px ${orient};
+          size: ${orient};
           margin: 0;
       }
       div {
@@ -27958,6 +27989,20 @@ class DocEditor {
             }
         });
     }
+    /**
+     * 将元素序列化为字符串,和serialize方法不同的是，该方法区别在于对留痕信息的处理
+     * @param ele
+     */
+    serializeString(ele) {
+        return ElementSerialize.serializeString(ele);
+    }
+    /**
+     * 将元素序列化为JSON对象,可进一步操作该对象序列化为JSON对象
+     * @param ele
+     */
+    serialize(ele) {
+        return ElementSerialize.serialize(ele, this.viewOptions);
+    }
     /**
      * 获取选区文本属性
      * @returns
@@ -28239,6 +28284,10 @@ class DocEditor {
      * @param ele
      */
     insertNewElement(ele) {
+        if (ele instanceof TableElement) {
+            this.documentChange.insertTable(ele);
+            return;
+        }
         const { startControl, startOffset } = this.selectionState;
         this.insertElement(startControl, startOffset, [ele]);
     }
@@ -28753,7 +28802,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.1.11";
+        return "2.1.13";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -29075,6 +29124,9 @@ exports.OnceSubject = OnceSubject;
 exports.PSymbolElement = PSymbolElement;
 exports.PSymbolRenderObject = PSymbolRenderObject;
 exports.PaddingProps = PaddingProps;
+exports.PageBreakElement = PageBreakElement;
+exports.PageBreakFactory = PageBreakFactory;
+exports.PageBreakRenderObject = PageBreakRenderObject;
 exports.PageOptions = PageOptions;
 exports.PaintContent = PaintContent;
 exports.ParagraphElement = ParagraphElement;
@@ -29102,6 +29154,9 @@ exports.SelectionState = SelectionState;
 exports.Subject = Subject$1;
 exports.SubjectSubscription = SubjectSubscription$1;
 exports.Subscription = Subscription$1;
+exports.TabElement = TabElement;
+exports.TabFactory = TabFactory;
+exports.TabRenderObject = TabRenderObject;
 exports.TableCellElement = TableCellElement;
 exports.TableCellFactory = TableCellFactory;
 exports.TableCellProps = TableCellProps;