@hailin-zheng/editor-core 2.2.32 → 2.2.33

package/editor.css

@@ -1,5 +1,5 @@
 .svg-container {
-	background: #C0C6CF;
+	background: #c0c6cf;
 	overflow: hidden;
 	flex: 1;
 	height: 100%;
@@ -9,7 +9,7 @@
 .svg-container * {
 	white-space: pre;
 }
-.svg-container svg{
+.svg-container svg {
 	pointer-events: none;
 }
 
@@ -46,7 +46,6 @@
 	}
 }
 
-
 /* 样式化 radio box 的外观 */
 .editor-list-radiobox {
 	width: 16px;
@@ -77,6 +76,7 @@
 	height: 16px;
 	border: 1px solid #000;
 	cursor: pointer;
+	display: inline-block;
 }
 
 /* 选中状态的样式 */
@@ -451,7 +451,6 @@
 /*    transform-origin: center top;*/
 /*}*/
 
-
 .editor-calendar-footer-left {
 	display: flex;
 }
@@ -563,18 +562,18 @@
 	left: 0;
 	top: 0;
 }
-.rule-thumb-container{
+.rule-thumb-container {
 	position: absolute;
 	cursor: pointer;
 }
-.rule-thumb-top{
-	top:0;
+.rule-thumb-top {
+	top: 0;
 }
-.rule-thumb-left{
+.rule-thumb-left {
 	top: calc(100% - 10px);
 }
 
-.rule-wrapper{
+.rule-wrapper {
 	position: absolute;
 	transform-origin: 0px 0px;
 	top: 0;
@@ -636,4 +635,4 @@ button:focus {
 
 .editor-search-box input::placeholder {
 	color: #aaa;
-}
+}

package/index-cjs.js

@@ -260,8 +260,8 @@ const toRawType = (value) => {
  */
 class RenderObject {
     element;
-    margin;
-    padding;
+    // margin!: MarginProps;
+    // padding!: PaddingProps;
     rect = new Rect();
     parent;
     /**
@@ -270,8 +270,8 @@ class RenderObject {
     disableClick;
     constructor(element) {
         this.element = element;
-        this.margin = new MarginProps();
-        this.padding = new PaddingProps();
+        // this.margin = new MarginProps();
+        // this.padding = new PaddingProps();
     }
     destroy() {
         //this.parent = null;
@@ -280,34 +280,34 @@ class RenderObject {
         //this.rect = null;
         //this.element = null;
     }
-    /**
-     * 获取内容区域框体
-     * @param render
-     * @returns
-     */
-    getInnerRect() {
-        const { padding } = this;
-        const rect = new Rect();
-        rect.x = padding.left;
-        rect.y = padding.top;
-        rect.width = this.rect.width - padding.left - padding.right;
-        rect.height = this.rect.height - padding.top - padding.bottom;
-        return rect;
-    }
-    getInnerMaxWidth() {
-        const { padding, margin } = this;
-        return this.rect.width - padding.left - padding.right - margin.left - margin.right;
-    }
-    /**
-     * 根据内框内容高度，更新外框框体高度
-     * @param innerRect
-     */
-    updateRenderHeight(innerRect) {
-        const innerHeight = typeof innerRect === 'number' ? innerRect : innerRect.height;
-        const { padding, margin } = this;
-        //外层容器高度等于内容高度+外边距+内边距
-        this.rect.height = innerHeight + padding.top + padding.bottom;
-    }
+    // /**
+    //  * 获取内容区域框体
+    //  * @param render
+    //  * @returns
+    //  */
+    // getInnerRect(): Rect {
+    //     const { padding } = this;
+    //     const rect = new Rect();
+    //     rect.x = padding.left;
+    //     rect.y = padding.top;
+    //     rect.width = this.rect.width - padding.left - padding.right;
+    //     rect.height = this.rect.height - padding.top - padding.bottom;
+    //     return rect;
+    // }
+    // getInnerMaxWidth(): number {
+    //     const { padding, margin } = this;
+    //     return this.rect.width - padding.left - padding.right - margin.left - margin.right;
+    // }
+    // /**
+    //  * 根据内框内容高度，更新外框框体高度
+    //  * @param innerRect
+    //  */
+    // updateRenderHeight(innerRect: Rect | number): void {
+    //     const innerHeight = typeof innerRect === 'number' ? innerRect : (<Rect>innerRect).height;
+    //     const { padding, margin } = this;
+    //     //外层容器高度等于内容高度+外边距+内边距
+    //     this.rect.height = innerHeight + padding.top + padding.bottom;
+    // }
     getIndex() {
         if (this.parent) {
             return this.parent.getChildIndex(this);
@@ -411,10 +411,45 @@ class BranchRenderObject extends RenderObject {
  * 块级渲染元素
  */
 class BlockContentRenderObject extends BranchRenderObject {
+    margin;
+    padding;
+    constructor(element) {
+        super(element);
+        this.margin = new MarginProps();
+        this.padding = new PaddingProps();
+    }
     setRenderWidth(maxWidth) {
         //this.rect.maxWidth = maxWidth;
         this.rect.width = maxWidth;
     }
+    /**
+     * 获取内容区域框体
+     * @param render
+     * @returns
+     */
+    getInnerRect() {
+        const { padding } = this;
+        const rect = new Rect();
+        rect.x = padding.left;
+        rect.y = padding.top;
+        rect.width = this.rect.width - padding.left - padding.right;
+        rect.height = this.rect.height - padding.top - padding.bottom;
+        return rect;
+    }
+    getInnerMaxWidth() {
+        const { padding, margin } = this;
+        return this.rect.width - padding.left - padding.right - margin.left - margin.right;
+    }
+    /**
+  * 根据内框内容高度，更新外框框体高度
+  * @param innerRect
+  */
+    updateRenderHeight(innerRect) {
+        const innerHeight = typeof innerRect === 'number' ? innerRect : innerRect.height;
+        const { padding, margin } = this;
+        //外层容器高度等于内容高度+外边距+内边距
+        this.rect.height = innerHeight + padding.top + padding.bottom;
+    }
 }
 class InlineGroupRenderObject extends BranchRenderObject {
 }
@@ -422,10 +457,45 @@ class InlineGroupRenderObject extends BranchRenderObject {
  * 包含块级渲染元素的容器元素,例如body、table-cell等
  */
 class BlockContainerRenderObject extends BranchRenderObject {
+    margin;
+    padding;
+    constructor(element) {
+        super(element);
+        this.margin = new MarginProps();
+        this.padding = new PaddingProps();
+    }
     setRenderWidth(maxWidth) {
         //this.rect.maxWidth = maxWidth;
         this.rect.width = maxWidth;
     }
+    /**
+     * 获取内容区域框体
+     * @param render
+     * @returns
+     */
+    getInnerRect() {
+        const { padding } = this;
+        const rect = new Rect();
+        rect.x = padding.left;
+        rect.y = padding.top;
+        rect.width = this.rect.width - padding.left - padding.right;
+        rect.height = this.rect.height - padding.top - padding.bottom;
+        return rect;
+    }
+    getInnerMaxWidth() {
+        const { padding, margin } = this;
+        return this.rect.width - padding.left - padding.right - margin.left - margin.right;
+    }
+    /**
+  * 根据内框内容高度，更新外框框体高度
+  * @param innerRect
+  */
+    updateRenderHeight(innerRect) {
+        const innerHeight = typeof innerRect === 'number' ? innerRect : innerRect.height;
+        const { padding, margin } = this;
+        //外层容器高度等于内容高度+外边距+内边距
+        this.rect.height = innerHeight + padding.top + padding.bottom;
+    }
 }
 /**
  * 多级 ‘BlockLineRectRenderObject’ 包裹元素，例如 p、table
@@ -3110,9 +3180,12 @@ function parser(code, objects) {
                 const identifierName = child['name'];
                 if (identifierName.startsWith('$')) {
                     //获取对象为"CallExpression", "MemberExpression"获取属性，例如$1.value
-                    parent?.type;
-                    `getObject('${identifierName.slice(1)})`;
-                    child['name'] = `getObject('${identifierName.slice(1)}').value`;
+                    const type = parent?.type;
+                    let express = `getObject('${identifierName.slice(1)}')`;
+                    if (type !== 'MemberExpression') {
+                        express += '.value';
+                    }
+                    child['name'] = express;
                     objects?.push(identifierName.slice(1));
                 }
             }
@@ -4368,6 +4441,9 @@ class DataElementRenderObject extends InlineGroupRenderObject {
 const validateDataEle = (ele) => {
     return ele instanceof DataElementLeaf || ele instanceof DataElementInlineGroup;
 };
+const validateInlineDataEle = (ele) => {
+    return ele instanceof DataElementInlineGroup;
+};
 const validateDataEleRenderObj = (renderObj) => {
     if (renderObj.element) {
         return validateDataEle(renderObj.element);
@@ -11047,8 +11123,10 @@ class SVGRenderObject extends ResizeLeafRenderObject {
     exportSVG(event) {
         const props = this.element.props;
         const t = super.exportSVG(event);
-        t.children = [ElementUtil.createSvgEle('svg', { width: this.rect.width,
-                height: this.rect.height }, ElementUtil.createSvgEle('image', {
+        t.children = [ElementUtil.createSvgEle('svg', {
+                width: this.rect.width,
+                height: this.rect.height
+            }, ElementUtil.createSvgEle('image', {
                 "xlink:href": props.value,
                 width: Math.min(this.rect.width, this.rect.height),
                 height: Math.min(this.rect.width, this.rect.height)
@@ -11081,7 +11159,6 @@ class SVGFactory extends ElementFactory {
         picProps.height = props.height;
         picProps.value = props.value;
         picProps.title = props.title;
-        pic.props = picProps;
         return pic;
     }
 }
@@ -11716,12 +11793,18 @@ class ElementUtil {
         innerRect.height = 0;
         for (let i = 0; i < render.length; i++) {
             const line = render.getChild(i);
+            let mt = 0;
+            let mb = 0;
+            if (line instanceof BlockContainerRenderObject || line instanceof BlockContentRenderObject) {
+                mt = line.margin.top;
+                mb = line.margin.bottom;
+            }
             if (resetX) {
                 line.rect.x = innerRect.x;
             }
-            line.rect.y = innerRect.height + innerRect.y + line.margin.top;
+            line.rect.y = innerRect.height + innerRect.y + mt;
             this.setHorizontalAlign(line, innerRect);
-            innerRect.height += line.rect.height + line.margin.top + line.margin.bottom;
+            innerRect.height += line.rect.height + mt + mb;
         }
         render.updateRenderHeight(innerRect);
         return innerRect.height;
@@ -14408,6 +14491,22 @@ class DynamicExecute {
         }
         return res;
     }
+    /**
+     * 获取元素的父表格行元素。
+     *
+     */
+    CtxRow(ele) {
+        // 使用ElementUtil的getParent方法来查找第一个实例化为TableRowElement的父元素
+        return ElementUtil.getParent(ele, (item) => item instanceof TableRowElement);
+    }
+    /**
+    * 获取元素的父表格行元素。
+    *
+    */
+    CtxTable(ele) {
+        // 使用ElementUtil的getParent方法来查找第一个实例化为TableElement的父元素
+        return ElementUtil.getParent(ele, (item) => item instanceof TableElement);
+    }
 }
 
 class ParagraphMeasure {
@@ -16303,6 +16402,7 @@ class DocumentEvent {
     subs = [];
     selectionState;
     viewOptions;
+    prevTrackInfo = false;
     constructor(documentPaint, docCtx, documentInput) {
         this.documentPaint = documentPaint;
         this.docCtx = docCtx;
@@ -16379,6 +16479,7 @@ class DocumentEvent {
     }
     clear() {
         this.selectionState.clear();
+        this.prevCursorItems.length = 0;
         this.startHitInfo = null;
         this.endHitInfo = null;
         this.focusedElement = null;
@@ -16439,7 +16540,6 @@ class DocumentEvent {
         viewEvt.globalX = evt.x / this.viewOptions.scale;
         viewEvt.globalY = evt.y / this.viewOptions.scale;
     }
-    prevTrackInfo = false;
     /**
      * 显示提示信息
      * 显示留痕提示信息等
@@ -17367,13 +17467,25 @@ class DocumentEvent {
         if (this.viewOptions.docMode !== exports.DocMode.FormEdit) {
             return;
         }
-        const currDataEle = this.getCurrentDataElement('free');
-        if (currDataEle) {
-            if (currDataEle instanceof DataElementLeaf) {
-                this.moveCursorToRightHandle(currDataEle, 1);
-            }
-            else {
-                this.moveCursorToRightHandle(currDataEle.endDecorate, 1);
+        const currDataEle = this.getCurrentDataElement();
+        //只处理内联数据元元素
+        if (!currDataEle || !(currDataEle instanceof DataElementInlineGroup)) {
+            return;
+        }
+        const ctx = this.docCtx.defaultCtx.ctx;
+        //获取所有的段落
+        const paras = ctx.treeFilter(item => item instanceof ParagraphElement);
+        //当前段落
+        let currPara = ElementUtil.getParentByType(currDataEle, ParagraphElement);
+        for (let i = paras.indexOf(currPara); i < paras.length; i++) {
+            const currPara = paras[i];
+            let currParaDataEleList = currPara.treeFilter(item => validateInlineDataEle(item));
+            for (let j = currParaDataEleList.indexOf(currDataEle) + 1; j < currParaDataEleList.length; j++) {
+                const nextDataEle = currParaDataEleList[j];
+                if (nextDataEle && ElementUtil.canSetCursor(nextDataEle.startDecorate, 1, true, this.viewOptions)) {
+                    this.selectionState.resetRange(nextDataEle.startDecorate, 1);
+                    return;
+                }
             }
         }
     }
@@ -17529,7 +17641,7 @@ class DocumentEvent {
      * 获取当前光标所在的数据元
      * @returns
      */
-    getCurrentDataElement(mode = 'strict') {
+    getCurrentDataElement() {
         const selectionState = this.selectionState;
         const { startControl, startOffset, collapsed, ancestorCommonControl } = selectionState;
         if (startControl && collapsed) {
@@ -17537,7 +17649,7 @@ class DocumentEvent {
             //     return null;
             // }
             const dataEle = ElementUtil.getParent(startControl, validateDataEle);
-            if (dataEle instanceof DataElementLeaf || (mode === 'free' || IsInSideDataElement(startControl, startOffset))) {
+            if (dataEle instanceof DataElementLeaf || IsInSideDataElement(startControl, startOffset)) {
                 return dataEle;
             }
             else {
@@ -17550,10 +17662,18 @@ class DocumentEvent {
         return null;
     }
     /**
-  * 获取当前光标所在的数据组
-  * @returns
-  */
-    getCurrentDataGroupElement(mode = 'strict') {
+     * 根据元素寻找所在的数据元
+     * @param ele
+     */
+    getParentDataElement(ele) {
+        const dataEle = ElementUtil.getParent(ele, validateDataEle);
+        return dataEle;
+    }
+    /**
+    * 获取当前光标所在的数据组
+    * @returns
+    */
+    getCurrentDataGroupElement() {
         const selectionState = this.selectionState;
         const { startControl, startOffset, collapsed, ancestorCommonControl } = selectionState;
         if (startControl && collapsed) {
@@ -17561,7 +17681,7 @@ class DocumentEvent {
             //     return null;
             // }
             const dataEle = ElementUtil.getParent(startControl, validateDataGroup);
-            if (mode === 'free' || IsInSideDataGroup(startControl, startOffset)) {
+            if (IsInSideDataGroup(startControl, startOffset)) {
                 return dataEle;
             }
             else {
@@ -19282,6 +19402,9 @@ class DocumentChange {
      * @param text
      */
     pastePlainText(text) {
+        if (!text) {
+            return;
+        }
         const textItems = text.split(/\r?\n/);
         const { startControl, startOffset } = this.selectionState;
         if (this.viewOptions.docMode === exports.DocMode.FormEdit || textItems.length === 1 || IsInSideInlineGroupInputElement(startControl, startOffset)) {
@@ -22003,6 +22126,10 @@ class DocEditor {
         }
         this.trackChangeState = prev;
     }
+    /**
+     * 载入文档
+     * @param data json对象、json字符串、DocumentElement对象
+     */
     loadDoc(data) {
         suppressTracking(() => {
             this.noEffectChange(() => {
@@ -22010,6 +22137,8 @@ class DocEditor {
                 this.elementReader.read(data);
                 this.refreshDocument();
                 this.historyMange.clear();
+                this.documentEvent.clear();
+                this.scrollToPosition({ x: 0, y: 0 });
             });
         });
     }
@@ -22228,7 +22357,7 @@ class DocEditor {
         return this.documentEvent.getCurrentDataElement();
     }
     /**
-     * 回去当前光标所在数据组
+     * 获取当前光标所在数据组
      * @returns
      */
     getCurrentDataGroupElement() {
@@ -23166,7 +23295,7 @@ class DocEditor {
         if (parent) {
             const parentRect = parent.getBoundingClientRect();
             const elmRect = elm.getBoundingClientRect();
-            const top = parseInt(elm.style.top);
+            parseInt(elm.style.top);
             // elmRect.width /= scale;
             // elmRect.height /= scale;
             // parentRect.width /= scale;
@@ -23177,21 +23306,7 @@ class DocEditor {
             if (elmRect.left < parentRect.left) {
                 elm.style.left = (position.x - 10) + 'px';
             }
-            if (elmRect.right > parentRect.right) {
-                elm.style.left = (position.x - elmRect.width / scale + 10) + 'px';
-                //elm.style.left = parentRect.width - elmRect.width + 'px';
-            }
-            if (elmRect.top + elmRect.height > parentRect.top + parentRect.height) {
-                const newTop = top - 5 - position.height - elmRect.height;
-                position.y + 5 + position.height;
-                //计算前后的高度的差距,然后判断新的值是否在父元素的范围内，如果不在则使用旧的值
-                // if (newTop > 0 && oldTop - newTop < elmRect.top - parentRect.top) {
-                //     elm.style.top = (position.y - position.height - elmRect.height) + 'px';
-                // }
-                elm.style.top = newTop + 'px';
-                //elm.style.top = (top - (elmRect.top + elmRect.height - (parentRect.top + parentRect.height))) + 'px';
-                //elm.style.top = (position.y - position.height - elmRect.height) + 'px';
-            }
+            return;
         }
     }
     renderCalendar() {
@@ -23299,7 +23414,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.32";
+        return "2.2.33";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -23752,7 +23867,9 @@ class DocumentEvalFunc {
     }
 }
 
-function createPrintTemplate({ width, height, orient }) {
+function createPrintTemplate({ width, height, orient, printDOMStyle }) {
+    //FIX:修复win7宋体加粗不生效的情况
+    const printStyle = printDOMStyle ?? `text[font-weight="bold"][font-family="宋体"] {font-family: STSong;}`;
     return `
     <!DOCTYPE html>
     <html lang="zh">
@@ -23793,10 +23910,7 @@ function createPrintTemplate({ width, height, orient }) {
               width: initial;
               min-height: initial;
           }
-          text[font-weight="bold"][font-family="宋体"] {
-            font-family: STSong, 宋体;
-            -webkit-text-shadow: 0.15pt 0px 0px black, 0.25pt 0px 0px black, 0.35pt 0px 0px black, -0.25pt 0px 0px black, 0px 0.25pt 0px black, 0px -0.25pt 0px black;
-}
+          ${printStyle}
       }
       </style>
     </head>
@@ -23822,8 +23936,7 @@ function printNodes(printNodes, options, printEvent = null) {
         console.warn('无可打印节点');
         return;
     }
-    const printSize = options;
-    const iframeHTML = createPrintTemplate(printSize);
+    const iframeHTML = createPrintTemplate(options);
     printIFrame.contentWindow?.document.write(iframeHTML);
     printIFrame.contentWindow?.document.close();
     for (let i = 0; i < printNodes.length; i++) {
@@ -28813,6 +28926,7 @@ class DocumentPrintOffscreenBase {
     afterRenderEvent = new Subject();
     beforePrint = new Subject();
     afterPrint = new Subject();
+    printDOMStyle;
     constructor() {
         this.viewOptions = new ViewOptions();
         this.viewOptions.copyRightInfo = '';
@@ -28846,6 +28960,7 @@ class DocumentPrintOffscreenBase {
             return;
         }
         const docProps = this.docCtx.viewOptions.docPageSettings.clone();
+        docProps['printDOMStyle'] = this.printDOMStyle;
         printNodes(canvasNodes, docProps, {
             beforePrint: () => this.beforePrint.next(),
             afterPrint: () => this.afterPrint.next()
@@ -28876,6 +28991,7 @@ class DocumentPrintOffscreenBase {
             return;
         }
         const docProps = this.docCtx.viewOptions.docPageSettings.clone();
+        docProps['printDOMStyle'] = this.printDOMStyle;
         // if (docProps.orient === 'landscape') {
         //     svgNodes = svgNodes.map(item => 'data:image/svg+xml;base64,' + CommonUtil.btoa(item)).map(item => `<img src="${item}" width="${docProps.width}px" height="${docProps.height-1}px" style="display: block"/>`);
         // }
@@ -29342,6 +29458,7 @@ exports.updatePartialProps = updatePartialProps;
 exports.validateDataEle = validateDataEle;
 exports.validateDataEleRenderObj = validateDataEleRenderObj;
 exports.validateDataGroup = validateDataGroup;
+exports.validateInlineDataEle = validateInlineDataEle;
 exports.validateInlineInputRenderObj = validateInlineInputRenderObj;
 exports.watchChanged = watchChanged;
 //# sourceMappingURL=index-cjs.js.map