@hailin-zheng/editor-core 2.2.16 → 2.2.18

package/index-cjs.js

@@ -1749,18 +1749,26 @@ class ViewOptions {
     dataEleEmptyBgColor = '';
     //数据元鼠标悬浮颜色
     dataEleMouseEnterBgColor = '#d9d9d9';
+    dataEleMouseEnterDecoratorMode = 'background';
     //数据元只读背景颜色
     dataEleReadOnlyBgColor = '#d9d9d9';
     //数据元焦点背景颜色
     dataEleFocusedBgColor = '#d9d9d9';
+    dataEleFocusedDecoratorMode = 'background';
     //数据元正常背景颜色
     dataEleNormalBgColor = '#fafafa';
+    //数据元外部框线颜色
+    dataEleOutlineColor = '#0050b3';
+    //数据组外部框线颜色
+    dataGroupOutlineColor = '#0050b3';
     //数据元错误背景颜色
     dataEleErrorBgColor = '#ff4d4f';
     //数据组修饰符号颜色
     dataGroupDecoratorNormalColor = '#0050b3';
     dataGroupDecoratorMouseEnterColor = '#0050b3';
+    dataGroupMouseEnterDecoratorMode = 'outline';
     dataGroupDecoratorFocusedColor = '#0050b3';
+    dataGroupFocusedDecoratorMode = 'outline';
     //数据组正常背景颜色
     dataGroupNormalBgColor = '#fafafa';
     //数据元没有输入值时背景颜色
@@ -1781,8 +1789,6 @@ class ViewOptions {
     trackDelColor = '#000';
     showLineRect;
     showCharRect;
-    //数据元交互修饰模式
-    dataEleDecoratorMode = 'outline';
     showTabChar;
     showSpaceChar;
     showLineBreak;
@@ -3759,7 +3765,7 @@ class DocumentRenderObject extends BlockContainerRenderObject {
                 },
             },
             children: [
-                pageCorner, highlight, ...CommonUtil.toArray(event.getChildNodes(this)), pageNum, selection, copyright
+                pageCorner, highlight, selection, ...CommonUtil.toArray(event.getChildNodes(this)), pageNum, copyright
             ]
         };
     }
@@ -3875,17 +3881,18 @@ class InlineGroupInputElement extends InlineGroupElement {
     endDecorate;
     constructor(type) {
         super(type);
-        //行内块不允许换行
-        this.addEvent('ElementKeyDown', (evt) => {
-            const { selectionState, sourceEvent, source } = evt;
-            const { startControl, startOffset } = selectionState;
-            if (IsInSideInlineGroupInputElement(startControl, startOffset)) {
-                if (sourceEvent.shiftKey && sourceEvent.keyCode === 13) ;
-                else if (!sourceEvent.shiftKey && sourceEvent.keyCode === 13) {
-                    evt.isCancel = true;
-                }
-            }
-        }, true);
+        // //行内块不允许换行
+        // this.addEvent<KeyboradElementEvent>('ElementKeyDown', (evt) => {
+        //     const { selectionState, sourceEvent, source } = evt;
+        //     const { startControl, startOffset } = selectionState;
+        //     if (IsInSideInlineGroupInputElement(startControl as LeafElement, startOffset)) {
+        //         if (sourceEvent.shiftKey && sourceEvent.keyCode === 13) {
+        //             //this.removeNullText();
+        //         } else if (!sourceEvent.shiftKey && sourceEvent.keyCode === 13) {
+        //             evt.isCancel = true;
+        //         }
+        //     }
+        // }, true);
         this.addEvent('GotCursor', (evt) => {
             const { startControl, startOffset } = evt.selectionState;
             if (IsInSideInlineGroupInputElement(startControl, startOffset)) {
@@ -4085,7 +4092,11 @@ class DataElementInlineGroup extends InlineGroupInputElement {
                     }
                 });
             }
-            this.parserExpress = { compliedCode, func: new Function(`with(this){ ${compliedCode} }`), depItems: depEleMap };
+            this.parserExpress = {
+                compliedCode,
+                func: new Function(`with(this){ ${compliedCode} }`),
+                depItems: depEleMap
+            };
         }
         catch (e) {
             console.error('解析表达式出错,parseEleExpression', this.props.expression);
@@ -4202,6 +4213,7 @@ function exportDataEleDecoratorSVG$1(event, r) {
         return;
     }
     const options = event.options;
+    let mode = 'background';
     let color = options.dataEleNormalBgColor;
     //空数据元填充颜色
     if (r.element.length === 2 && options.dataEleEmptyBgColor) {
@@ -4209,17 +4221,69 @@ function exportDataEleDecoratorSVG$1(event, r) {
     }
     if (r.element.isMouseenter && options.dataEleMouseEnterBgColor) {
         color = options.dataEleMouseEnterBgColor;
+        mode = options.dataEleMouseEnterDecoratorMode;
     }
     if (r.element.isFocused && options.dataEleFocusedBgColor) {
         color = options.dataEleFocusedBgColor;
+        mode = options.dataEleFocusedDecoratorMode;
     }
     if (!color) {
         return;
     }
     //绘制背景
-    const bgX = event.relativePagePos.x;
-    const bgY = event.relativePagePos.y;
-    event.highlights.push(ElementUtil.getFillSvgRect(bgX, bgY, r.rect.width, r.rect.height, color));
+    if (['all', 'background'].includes(mode)) {
+        const bgX = event.relativePagePos.x;
+        const bgY = event.relativePagePos.y;
+        event.highlights.push(ElementUtil.getFillSvgRect(bgX, bgY, r.rect.width, r.rect.height, color));
+    }
+    if (['all', 'outline'].includes(mode)) {
+        color = event.options.dataEleOutlineColor;
+        const verOffset = 0;
+        const renderPosMap = getCurrentParaGroupRenders(r).map(item => ({ pos: getRenderPosToDoc(item), render: item }));
+        if (renderPosMap.length > 1) {
+            const secondGroupRenderPos = renderPosMap[1].pos;
+            if (secondGroupRenderPos.x + renderPosMap[1].render.rect.width > event.relativePagePos.x) {
+                const leftPoints = [];
+                const rightPoints = [];
+                for (let i = 0; i < renderPosMap.length; i++) {
+                    const groupRender = renderPosMap[i].render;
+                    const groupRenderPos = renderPosMap[i].pos;
+                    leftPoints.push({ x: groupRenderPos.x, y: groupRenderPos.y - verOffset });
+                    rightPoints.push({
+                        x: groupRenderPos.x + groupRender.rect.width,
+                        y: groupRenderPos.y - verOffset
+                    });
+                    leftPoints.push({
+                        x: groupRenderPos.x,
+                        y: groupRenderPos.y + groupRender.rect.height + verOffset * 2
+                    });
+                    rightPoints.push({
+                        x: groupRenderPos.x + groupRender.rect.width,
+                        y: groupRenderPos.y + groupRender.rect.height + verOffset * 2
+                    });
+                }
+                const sharpPoints1 = CommonUtil.resharpPoints(rightPoints);
+                const sharpPoints = CommonUtil.resharpPoints([...leftPoints.reverse()]);
+                const path = [...sharpPoints, ...sharpPoints1, sharpPoints[0]].map((item, index) => ((index === 0) ? 'M' : "L") + item.x + " " + item.y).join(" ");
+                event.highlights.push(ElementUtil.createSvgPath({
+                    d: path,
+                    stroke: color,
+                    fill: 'none',
+                    'stroke-width': 1
+                }));
+                return;
+            }
+        }
+        for (let i = 0; i < renderPosMap.length; i++) {
+            const currRen = renderPosMap[i];
+            event.highlights.push(ElementUtil.createSvgPath({
+                d: `M${currRen.pos.x} ${currRen.pos.y} L${currRen.pos.x + currRen.render.rect.width} ${currRen.pos.y} L${currRen.pos.x + currRen.render.rect.width} ${currRen.pos.y + currRen.render.rect.height} L${currRen.pos.x} ${currRen.pos.y + currRen.render.rect.height} Z`,
+                stroke: color,
+                fill: 'none',
+                'stroke-width': 1
+            }));
+        }
+    }
     // const canPaint = r.element.isMouseenter || r.element.isFocused;
     // if (!canPaint) {
     //     return;
@@ -4234,51 +4298,6 @@ function exportDataEleDecoratorSVG$1(event, r) {
     //     event.highlights.push(ElementUtil.getFillSvgRect(bgX, bgY, r.rect.width, r.rect.height, color));
     //     return;
     // } else if (mode === 'outline') {
-    //     const verOffset = 0;
-    //     const renderPosMap = getCurrentParaGroupRenders(r).map(item => ({ pos: getRenderPosToDoc(item), render: item }));
-    //     if (renderPosMap.length > 1) {
-    //         const secondGroupRenderPos = renderPosMap[1].pos;
-    //         if (secondGroupRenderPos.x + renderPosMap[1].render.rect.width > event.relativePagePos.x) {
-    //             const leftPoints: Array<Position> = [];
-    //             const rightPoints: Array<Position> = [];
-    //             for (let i = 0; i < renderPosMap.length; i++) {
-    //                 const groupRender = renderPosMap[i].render;
-    //                 const groupRenderPos = renderPosMap[i].pos;
-    //                 leftPoints.push({ x: groupRenderPos.x, y: groupRenderPos.y - verOffset });
-    //                 rightPoints.push({
-    //                     x: groupRenderPos.x + groupRender.rect.width,
-    //                     y: groupRenderPos.y - verOffset
-    //                 });
-    //                 leftPoints.push({
-    //                     x: groupRenderPos.x,
-    //                     y: groupRenderPos.y + groupRender.rect.height + verOffset * 2
-    //                 });
-    //                 rightPoints.push({
-    //                     x: groupRenderPos.x + groupRender.rect.width,
-    //                     y: groupRenderPos.y + groupRender.rect.height + verOffset * 2
-    //                 });
-    //             }
-    //             const sharpPoints1 = CommonUtil.resharpPoints(rightPoints);
-    //             const sharpPoints = CommonUtil.resharpPoints([...leftPoints.reverse()]);
-    //             const path = [...sharpPoints, ...sharpPoints1, sharpPoints[0]].map((item, index) => ((index === 0) ? 'M' : "L") + item.x + " " + item.y).join(" ")
-    //             event.highlights.push(ElementUtil.createSvgPath({
-    //                 d: path,
-    //                 stroke: color,
-    //                 fill: 'none',
-    //                 'stroke-width': 1
-    //             }));
-    //             return;
-    //         }
-    //     }
-    //     for (let i = 0; i < renderPosMap.length; i++) {
-    //         const currRen = renderPosMap[i];
-    //         event.highlights.push(ElementUtil.createSvgPath({
-    //             d: `M${currRen.pos.x} ${currRen.pos.y} L${currRen.pos.x + currRen.render.rect.width} ${currRen.pos.y} L${currRen.pos.x + currRen.render.rect.width} ${currRen.pos.y + currRen.render.rect.height} L${currRen.pos.x} ${currRen.pos.y + currRen.render.rect.height} Z`,
-    //             stroke: '#0050b3',
-    //             fill: 'none',
-    //             'stroke-width': 1
-    //         }));
-    //     }
     // }
 }
 /**
@@ -4385,6 +4404,30 @@ function renderUnderWavyLine(event, r, color) {
     const path = ElementUtil.createSvgPath({ d, fill: 'none', stroke: color });
     event.highlights.push(path);
 }
+/**
+ * 获取渲染元素相对稳当的位置
+ * @param render
+ * @param refPos
+ */
+function getRenderPosToDoc(render, refPos = null) {
+    refPos = refPos ?? { x: 0, y: 0 };
+    if (render instanceof DocumentRenderObject) {
+        return refPos;
+    }
+    const currPos = { x: render.rect.x + refPos.x, y: render.rect.y + refPos.y };
+    return getRenderPosToDoc(render.parent, currPos);
+}
+function getCurrentParaGroupRenders(r) {
+    const renders = [];
+    const currParaRender = ElementUtil.getParentRender(r, ParagraphRenderObject);
+    for (let i = 0; i < r.element.paintRenders.length; i++) {
+        const paraRender = ElementUtil.getParentRender(r.element.paintRenders[i], ParagraphRenderObject);
+        if (paraRender === currParaRender) {
+            renders.push(r.element.paintRenders[i]);
+        }
+    }
+    return renders;
+}
 function renderUnderline(event, render) {
     const { x, y } = event.relativePagePos;
     event.highlights.push({
@@ -4481,7 +4524,7 @@ class PSymbolElement extends LeafElement {
     }
     createRenderObject() {
         const symbol = new PSymbolRenderObject(this);
-        symbol.rect.height = this.defaultHeight;
+        symbol.rect.height = Math.ceil(this.defaultHeight * TEXT_HEIGHT_FACTOR);
         symbol.rect.width = 1;
         return symbol;
     }
@@ -4503,12 +4546,20 @@ class PSymbolRenderObject extends LeafRenderObject {
         if (!event.options.showEnterSymbol || event.mode === 'print') {
             return null;
         }
-        return ElementUtil.createSvgText('↵', { 'dominant-baseline': 'hanging',
-            'font-family': 'Courier',
-            'font-size': this.element.defaultHeight,
+        const font = `14px 宋体`;
+        const actualFontBoundingBoxAscent = event.renderCtx.mainContext.getActualFontBoundingBoxAscent(font);
+        let y = this.rect.y;
+        //基线处理
+        y += actualFontBoundingBoxAscent ?? 0;
+        //行高处理
+        y += (this.rect.height - 14) / 2;
+        return ElementUtil.createSvgText('↵', {
+            'font-family': '宋体',
+            'font-size': 14,
             x: this.rect.x,
-            y: this.rect.y,
-            fill: 'green' });
+            y: y,
+            fill: 'green'
+        });
     }
     //绘制段落符号
     clone() {
@@ -8727,7 +8778,7 @@ class BreakElement extends LeafElement {
     }
     createRenderObject() {
         const symbol = new BreakRenderObject(this);
-        symbol.rect.height = 14;
+        symbol.rect.height = Math.ceil(14 * TEXT_HEIGHT_FACTOR);
         symbol.rect.width = 7;
         return symbol;
     }
@@ -8748,12 +8799,26 @@ class BreakRenderObject extends LeafRenderObject {
         if (!event.options.showEnterSymbol || event.mode === 'print') {
             return null;
         }
-        return ElementUtil.createSvgText('↓', { 'dominant-baseline': 'hanging',
-            'font-family': 'Courier',
-            'font-size': this.rect.height,
-            x: this.rect.x + 4,
-            y: this.rect.y,
-            fill: 'green' });
+        // return ElementUtil.createSvgText( '↓',{ 'dominant-baseline': 'hanging',
+        //     'font-family': 'Courier',
+        //     'font-size': this.rect.height,
+        //     x: this.rect.x + 4,
+        //     y: this.rect.y,
+        //     fill: 'green'});
+        const font = `14px 宋体`;
+        const actualFontBoundingBoxAscent = event.renderCtx.mainContext.getActualFontBoundingBoxAscent(font);
+        let y = 0;
+        //基线处理
+        y += actualFontBoundingBoxAscent ?? 0;
+        //行高处理
+        y += (this.parent.rect.height - 14) / 2;
+        return ElementUtil.createSvgText('↓', {
+            'font-family': '宋体',
+            'font-size': 14,
+            x: this.rect.x,
+            y: y,
+            fill: 'green'
+        });
     }
     clone() {
         const render = new BreakRenderObject(this.element);
@@ -8905,23 +8970,76 @@ function exportDataEleDecoratorSVG(event, r) {
     }
     const options = event.options;
     let color = options.dataGroupNormalBgColor;
+    let mode = 'background';
     //空数据元填充颜色
     if (r.element.length === 2 && options.dataGroupEmptyBgColor) {
         color = options.dataGroupEmptyBgColor;
     }
     if (r.element.isMouseenter && options.dataGroupMouseEnterBgColor) {
         color = options.dataGroupMouseEnterBgColor;
+        mode = options.dataGroupMouseEnterDecoratorMode;
     }
     if (r.element.isFocused && options.dataGroupFocusedBgColor) {
         color = options.dataGroupFocusedBgColor;
+        mode = options.dataGroupFocusedDecoratorMode;
     }
     if (!color) {
         return;
     }
     //绘制背景
-    const bgX = event.relativePagePos.x;
-    const bgY = event.relativePagePos.y;
-    event.highlights.push(ElementUtil.getFillSvgRect(bgX, bgY, r.rect.width, r.rect.height, color));
+    if (['all', 'background'].includes(mode)) {
+        const bgX = event.relativePagePos.x;
+        const bgY = event.relativePagePos.y;
+        event.highlights.push(ElementUtil.getFillSvgRect(bgX, bgY, r.rect.width, r.rect.height, color));
+    }
+    if (['all', 'outline'].includes(mode)) {
+        color = event.options.dataGroupOutlineColor;
+        const verOffset = 0;
+        const renderPosMap = getCurrentParaGroupRenders(r).map(item => ({ pos: getRenderPosToDoc(item), render: item }));
+        if (renderPosMap.length > 1) {
+            const secondGroupRenderPos = renderPosMap[1].pos;
+            if (secondGroupRenderPos.x + renderPosMap[1].render.rect.width > event.relativePagePos.x) {
+                const leftPoints = [];
+                const rightPoints = [];
+                for (let i = 0; i < renderPosMap.length; i++) {
+                    const groupRender = renderPosMap[i].render;
+                    const groupRenderPos = renderPosMap[i].pos;
+                    leftPoints.push({ x: groupRenderPos.x, y: groupRenderPos.y - verOffset });
+                    rightPoints.push({
+                        x: groupRenderPos.x + groupRender.rect.width,
+                        y: groupRenderPos.y - verOffset
+                    });
+                    leftPoints.push({
+                        x: groupRenderPos.x,
+                        y: groupRenderPos.y + groupRender.rect.height + verOffset * 2
+                    });
+                    rightPoints.push({
+                        x: groupRenderPos.x + groupRender.rect.width,
+                        y: groupRenderPos.y + groupRender.rect.height + verOffset * 2
+                    });
+                }
+                const sharpPoints1 = CommonUtil.resharpPoints(rightPoints);
+                const sharpPoints = CommonUtil.resharpPoints([...leftPoints.reverse()]);
+                const path = [...sharpPoints, ...sharpPoints1, sharpPoints[0]].map((item, index) => ((index === 0) ? 'M' : "L") + item.x + " " + item.y).join(" ");
+                event.highlights.push(ElementUtil.createSvgPath({
+                    d: path,
+                    stroke: color,
+                    fill: 'none',
+                    'stroke-width': 1
+                }));
+                return;
+            }
+        }
+        for (let i = 0; i < renderPosMap.length; i++) {
+            const currRen = renderPosMap[i];
+            event.highlights.push(ElementUtil.createSvgPath({
+                d: `M${currRen.pos.x} ${currRen.pos.y} L${currRen.pos.x + currRen.render.rect.width} ${currRen.pos.y} L${currRen.pos.x + currRen.render.rect.width} ${currRen.pos.y + currRen.render.rect.height} L${currRen.pos.x} ${currRen.pos.y + currRen.render.rect.height} Z`,
+                stroke: color,
+                fill: 'none',
+                'stroke-width': 1
+            }));
+        }
+    }
 }
 
 class DataElementImage extends DataElementLeaf {
@@ -10888,9 +11006,22 @@ class ElementSerialize {
             const { startCol, endCol } = tbRegion;
             const cloneTb = ElementUtil.cloneRange(range, false, 'copy');
             cloneTb.props.cols = cloneTb.props.cols.slice(startCol, endCol + 1);
-            return cloneTb;
+            return [cloneTb];
         }
-        return ElementUtil.cloneRange(range, false, 'copy');
+        //元素全选的情况下
+        // if (range.isFullSelected) {
+        //     const ele = ElementUtil.cloneRange(range, false, 'copy');
+        //     return ele ? [ele] : null;
+        // }
+        //元素部分选中的情况下，只获取选中的部分元素
+        const selectedEle = range.selectedChildren.map(item => ElementUtil.cloneRange(item, false, 'copy'));
+        const list = [];
+        selectedEle.forEach(item => {
+            if (item) {
+                list.push(item);
+            }
+        });
+        return list;
     }
     /**
      * 选中的文本
@@ -10898,18 +11029,19 @@ class ElementSerialize {
      * @param viewOptions
      */
     static getSelectedText(ss, viewOptions) {
-        const selectedStruct = this.getSelectedStruct(ss, viewOptions);
-        if (selectedStruct) {
-            return this.serializeString(selectedStruct);
+        const selectedStructs = this.getSelectedStruct(ss, viewOptions);
+        if (selectedStructs) {
+            return selectedStructs.map(item => this.serializeString(item)).join('');
         }
         else {
             return '';
         }
     }
     static getSelectedJSON(ss, viewOptions) {
-        const selectedStruct = this.getSelectedStruct(ss, viewOptions);
-        if (selectedStruct) {
-            return JSON.stringify(this.serialize(selectedStruct, viewOptions));
+        const selectedStructs = this.getSelectedStruct(ss, viewOptions);
+        if (selectedStructs) {
+            //return JSON.stringify(this.serialize(selectedStructs, viewOptions));
+            return JSON.stringify(selectedStructs.map(item => this.serialize(item, viewOptions)).filter(item => item));
         }
         else {
             return '';
@@ -14220,6 +14352,11 @@ class ParagraphMeasure {
             parent: parentLine,
             isCloseToBody: parentLine.isCloseToBody,
             applyNewLine() {
+                //申请新行前，需要将当前内联元素的宽度扩充到可用最大宽度
+                const space = parentLine.limitWidth - parentLine.lineWidth();
+                if (space > 0) {
+                    render.rect.width += space;
+                }
                 parentLine.applyNewLine();
                 render = ele.createRenderObject({ options, renderCtx, execute });
                 parentLine.add(render);
@@ -16826,7 +16963,7 @@ class DocumentEvent {
                     this.moveCursorToRightHandle(nextEle, ElementUtil.fixedOffset(nextEle, -1));
                     return;
                 }
-                this.selectionState.resetRange(nextEle, 1);
+                this.selectionState.resetRange(nextEle, 0);
                 return;
             }
         }
@@ -18024,6 +18161,9 @@ class DocumentChange {
         const { startControl } = this.selectionState;
         const paragraph = ElementUtil.getParentByType(startControl, ParagraphElement);
         const breakPara = this.splitCurrentParagraph();
+        if (!breakPara) {
+            return;
+        }
         //选中的是一个元素
         if (breakPara === paragraph) {
             const clonePara = paragraph.clone(false);
@@ -18045,6 +18185,9 @@ class DocumentChange {
      */
     insertLayoutContainer(ele) {
         const breakPara = this.splitCurrentParagraph();
+        if (!breakPara) {
+            return;
+        }
         breakPara.parent.addChild(ele, breakPara.getIndex());
         this.selectionState.resetRange(ele, 0);
     }
@@ -18054,6 +18197,11 @@ class DocumentChange {
      */
     splitCurrentParagraph() {
         const { startControl, startOffset } = this.selectionState;
+        //内联数据块不能拆分两部分
+        if (!this.allowSplitParagraph()) {
+            console.warn("内联数据块不能拆分!");
+            return null;
+        }
         const paragraph = ElementUtil.getParentByType(startControl, ParagraphElement);
         const paraContainer = paragraph.parent;
         //如果选中的是段落第一个元素
@@ -18474,67 +18622,53 @@ class DocumentChange {
             }
             return;
         }
-        const pasteElement = this.eleReader.readElement(JSON.parse(pasteData.doc));
-        if (!pasteElement) {
-            console.log('粘贴反序列化数据失败', pasteData);
+        let data = JSON.parse(pasteData.doc);
+        const pasteEles = [];
+        data = Array.isArray(data) ? data : [data];
+        data.forEach(item => {
+            const ele = this.eleReader.readElement(item);
+            if (ele) {
+                pasteEles.push(ele);
+            }
+            else {
+                console.log('粘贴反序列化数据失败', item);
+            }
+        });
+        if (!pasteEles.length) {
             return;
         }
         //表单模式:如果复制的是单格式的文本，需要序列化为纯文本处理
         if (this.viewOptions.docMode === exports.DocMode.FormEdit) {
-            const pasteString = ElementSerialize.serializeString(pasteElement, { all: false });
+            const pasteString = pasteEles.map(item => ElementSerialize.serializeString(item, { all: false })).join('');
             if (pasteString) {
                 this.pastePlainText(pasteString);
             }
             return;
         }
-        if (pasteElement instanceof ParagraphElement || pasteElement instanceof InlineGroupElement) {
-            const children = [];
-            if (pasteElement instanceof ParagraphElement) {
-                children.push(...ElementUtil.getChildrenElements(pasteElement));
-            }
-            else if (pasteElement instanceof InlineGroupElement) {
-                //当前粘贴的元素为数据元，并且在数据元内部粘贴
-                if (IsInSideDataElement(startControl, startOffset) && pasteElement instanceof DataElementInlineGroup) {
-                    const pasteChildren = pasteElement.getInnerItems().map(item => item.clone(true));
-                    children.push(...pasteChildren);
-                }
-                else {
-                    children.push(pasteElement);
-                }
-            }
-            if (!children.length) {
-                throw new Error('段落子元素为空');
-            }
-            const lastEle = this.insertElement(startControl, startOffset, children);
-            this.selectionState.resetRange(lastEle, -1);
-            return;
+        //复制的内容为表格，且操作位于单元格内
+        if (pasteEles[0] instanceof TableElement && ElementUtil.getParentByType(startControl, TableCellElement) && pasteEles.length === 1) {
+            this.pasteTableToCell(pasteEles[0]);
         }
-        else if (pasteElement instanceof BlockContainerElement) {
+        //复制的为表格或者段落
+        else if (pasteEles[0] instanceof BlockContainerElement || pasteEles[0] instanceof ParagraphElement) {
             const children = [];
-            if (pasteElement instanceof TableElement) {
-                children.push(pasteElement);
-                if (ElementUtil.getParentByType(startControl, TableCellElement)) {
-                    this.pasteTableToCell(pasteElement);
-                    return;
-                }
-            }
-            else {
-                children.push(...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);
-            // }
+            children.push(...pasteEles);
             const targetParagraph = this.splitCurrentParagraph();
+            if (!targetParagraph) {
+                return;
+            }
             children.forEach((item, i) => {
                 targetParagraph.parent.addChild(item, targetParagraph.getIndex());
             });
             this.selectionState.resetRange(children[children.length - 1], -1);
         }
+        //符合段落内的元素约定
+        else {
+            const children = [];
+            children.push(...pasteEles);
+            const lastEle = this.insertElement(startControl, startOffset, children);
+            this.selectionState.resetRange(lastEle, -1);
+        }
     }
     /**
      * 复制单元格向另一个单元格粘贴
@@ -18630,6 +18764,9 @@ class DocumentChange {
         }
         else {
             const breakPara = this.splitCurrentParagraph();
+            if (!breakPara) {
+                return;
+            }
             for (let i = 0; i < textItems.length; i++) {
                 const newPara = breakPara.clone(false);
                 const inputTextProps = this.getDefaultTextPropsByOptions();
@@ -18641,6 +18778,20 @@ class DocumentChange {
             this.selectionState.resetRange(breakPara, 0);
         }
     }
+    /**
+     * 当前光标位置是否允许分割生成两个段落
+     */
+    allowSplitParagraph(target) {
+        if (!target) {
+            target = this.selectionState;
+        }
+        const { startControl, startOffset } = target;
+        //内联数据块不能拆分两部分
+        if (IsInSideInlineGroupInputElement(startControl, startOffset)) {
+            return false;
+        }
+        return true;
+    }
     /**
      * 向当前光标追加文本
      * @param appendStr
@@ -19701,7 +19852,6 @@ class DocumentSvg {
                     fill: item.color ?? this.viewOptions.selectionColor,
                     'paint-order': 'stroke fill markers',
                     d: `M${item.x} ${item.y} L${item.x + item.width} ${item.y} L${item.x + item.width} ${item.y + item.height} L${item.x} ${item.y + item.height} Z`,
-                    'fill-opacity': '0.5'
                 }
             }
         }));
@@ -21686,8 +21836,13 @@ class DocEditor {
         return ElementSerialize.getSelectedJSON(this.selectionState, this.viewOptions);
     }
     getSelectedText() {
-        const copySerializeStr = ElementSerialize.getSelectedStruct(this.selectionState, this.viewOptions);
-        return ElementSerialize.serializeString(copySerializeStr);
+        const selectedEles = ElementSerialize.getSelectedStruct(this.selectionState, this.viewOptions);
+        if (!selectedEles) {
+            return '';
+        }
+        return selectedEles.map(ele => {
+            return ElementSerialize.serializeString(ele);
+        }).join('');
     }
     /**
      * 执行编辑器内部复制事件
@@ -22318,7 +22473,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.16";
+        return "2.2.18";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -22632,6 +22787,39 @@ class DocEditor {
         }
         return res;
     }
+    /**
+     * 返回当前光标处是否允许截断段落生成新的段落
+     * @returns
+     */
+    allowSplitParagraph() {
+        return this.documentChange.allowSplitParagraph();
+    }
+    /**
+     * 设置元素属性(attribute)
+     * @param ele
+     * @param attr
+     * @param value
+     */
+    setEleAttribute(ele, attr, value) {
+        ElementUtil.setEleAttribute(ele, attr, value);
+    }
+    /**
+     * 获取元素属性(attribute)
+     * @param ele
+     * @param attr
+     * @returns
+     */
+    getEleAttribute(ele, attr) {
+        return ElementUtil.getEleAttribute(ele, attr);
+    }
+    /**
+     * 删除元素属性(attribute)
+     * @param ele
+     * @param attr
+     */
+    removeEleAttribute(ele, attr) {
+        ElementUtil.removeEleAttribute(ele, attr);
+    }
 }
 
 /**
@@ -28277,7 +28465,9 @@ exports.formatEle = formatEle;
 exports.fromEvent = fromEvent;
 exports.generatePatch = generatePatch;
 exports.getCalleeName = getCalleeName;
+exports.getCurrentParaGroupRenders = getCurrentParaGroupRenders;
 exports.getFocusTextSegment = getFocusTextSegment;
+exports.getRenderPosToDoc = getRenderPosToDoc;
 exports.inputText = inputText;
 exports.insertEle = insertEle;
 exports.invokeTypeHandler = invokeTypeHandler;