@hailin-zheng/editor-core 2.0.5 → 2.0.7

package/index.js

@@ -4482,7 +4482,14 @@ class TableRowElement extends BlockContainerElement {
                     setChildrenModifyFlag(ModifyFlag$1.Modify, tb.getChild(j));
                 }
             }
-            cell.modifyFlag = ModifyFlag$1.Modify;
+            else if (cell.props.vMerge === 'restart') {
+                const endRowIndex = TableUtil.getVMergeEndIndex(tb, currRowIndex, i);
+                for (let j = currRowIndex; j <= endRowIndex; j++) {
+                    setChildrenModifyFlag(ModifyFlag$1.Modify, tb.getChild(j));
+                }
+                break;
+            }
+            //cell.modifyFlag = ModifyFlag.Modify;
         }
     }
     createRenderObject() {
@@ -12005,7 +12012,7 @@ class PictureFactory extends ElementFactory {
         picProps.width = props.width;
         picProps.height = props.height;
         picProps.src = props.src;
-        picProps.border = props.border || 'all';
+        picProps.border = props.border;
         picProps.title = props.title;
         pic.props = picProps;
         return pic;
@@ -19223,13 +19230,18 @@ class DocumentChange {
         else if (pasteElement instanceof BlockContainerElement) {
             const children = ElementUtil.getChildrenElements(pasteElement);
             //复制的内容全部为段落,执行黏贴操作
-            if (children.every(item => item instanceof ParagraphElement)) {
-                const targetParagraph = this.splitCurrentParagraph();
-                children.forEach((item, i) => {
-                    targetParagraph.parent.addChild(item, targetParagraph.getIndex());
-                });
-                this.selectionState.resetRange(children[children.length - 1], -1);
-            }
+            // if (children.every(item => item instanceof ParagraphElement)) {
+            //     const targetParagraph = this.splitCurrentParagraph();
+            //     children.forEach((item, i) => {
+            //         targetParagraph.parent.addChild(item, targetParagraph.getIndex());
+            //     });
+            //     this.selectionState.resetRange(children[children.length - 1], -1);
+            // }
+            const targetParagraph = this.splitCurrentParagraph();
+            children.forEach((item, i) => {
+                targetParagraph.parent.addChild(item, targetParagraph.getIndex());
+            });
+            this.selectionState.resetRange(children[children.length - 1], -1);
         }
     }
     insertSoftBr() {
@@ -19547,6 +19559,9 @@ function createPrintTemplate({ width, height, orient }) {
           box-sizing: border-box;
           -moz-box-sizing: border-box;
       }
+      body *{
+        white-space: pre;
+      }
       @page {
           size: ${orient};
           margin: 0;