@hailin-zheng/editor-core 2.2.15 → 2.2.17

package/index.js

@@ -3846,17 +3846,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)) {
@@ -4452,7 +4453,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;
     }
@@ -4474,12 +4475,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() {
@@ -8698,7 +8707,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;
     }
@@ -8719,12 +8728,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);
@@ -8770,13 +8793,15 @@ class DataElementGroupElement extends InlineGroupInputElement {
             val += '';
         }
         if (val) {
-            const items = val.split('<br/>');
+            const items = val.split('\n');
             if (items.length) {
                 items.forEach((item, index) => {
-                    const valueText = new TextGroupElement();
-                    this.props.valueTextProps.clone(valueText.props);
-                    valueText.text = item + '';
-                    this.addChild(valueText, this.length - 1);
+                    if (item) {
+                        const valueText = new TextGroupElement();
+                        this.props.valueTextProps.clone(valueText.props);
+                        valueText.text = item + '';
+                        this.addChild(valueText, this.length - 1);
+                    }
                     if (index < items.length - 1) {
                         const brElement = new BreakElement();
                         this.addChild(brElement, this.length - 1);
@@ -9172,13 +9197,15 @@ class DataElementText extends DataElementInlineGroup {
             val += '';
         }
         if (val) {
-            const items = val.split('<br/>');
+            const items = val.split('\n');
             if (items.length) {
                 items.forEach((item, index) => {
-                    const valueText = new TextGroupElement();
-                    this.props.valueTextProps.clone(valueText.props);
-                    valueText.text = item + '';
-                    this.addChild(valueText, this.length - 1);
+                    if (item) {
+                        const valueText = new TextGroupElement();
+                        this.props.valueTextProps.clone(valueText.props);
+                        valueText.text = item + '';
+                        this.addChild(valueText, this.length - 1);
+                    }
                     if (index < items.length - 1) {
                         const brElement = new BreakElement();
                         this.addChild(brElement, this.length - 1);
@@ -10855,9 +10882,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;
     }
     /**
      * 选中的文本
@@ -10865,18 +10905,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 '';
@@ -16793,7 +16834,7 @@ class DocumentEvent {
                     this.moveCursorToRightHandle(nextEle, ElementUtil.fixedOffset(nextEle, -1));
                     return;
                 }
-                this.selectionState.resetRange(nextEle, 1);
+                this.selectionState.resetRange(nextEle, 0);
                 return;
             }
         }
@@ -17991,6 +18032,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);
@@ -18012,6 +18056,9 @@ class DocumentChange {
      */
     insertLayoutContainer(ele) {
         const breakPara = this.splitCurrentParagraph();
+        if (!breakPara) {
+            return;
+        }
         breakPara.parent.addChild(ele, breakPara.getIndex());
         this.selectionState.resetRange(ele, 0);
     }
@@ -18021,6 +18068,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;
         //如果选中的是段落第一个元素
@@ -18441,67 +18493,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 === 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);
+        }
     }
     /**
      * 复制单元格向另一个单元格粘贴
@@ -18597,6 +18635,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();
@@ -18608,6 +18649,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
@@ -21653,8 +21708,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('');
     }
     /**
      * 执行编辑器内部复制事件
@@ -22285,7 +22345,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.15";
+        return "2.2.17";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -22599,6 +22659,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);
+    }
 }
 
 /**