@hailin-zheng/editor-core 2.0.18 → 2.0.19

package/index.js

@@ -1907,6 +1907,7 @@ class DocumentProps extends INotifyPropertyChanged {
     createUserName;
     createDate;
     scripts;
+    columns = 1;
     clone(dest) {
         const clone = dest ?? new DocumentProps();
         super.cloneAttachedProperty(clone);
@@ -1920,6 +1921,7 @@ class DocumentProps extends INotifyPropertyChanged {
         clone.createUserName = this.createUserName;
         clone.createDate = this.createDate;
         clone.orient = this.orient;
+        clone.columns = this.columns;
         return clone;
     }
     getSerializeProps() {
@@ -1939,6 +1941,9 @@ class DocumentProps extends INotifyPropertyChanged {
         if (this.orient && this.orient !== 'portrait') {
             props['orient'] = this.orient;
         }
+        if (this.columns !== 1) {
+            props.columns = this.columns;
+        }
         return props;
     }
 }
@@ -3468,6 +3473,7 @@ class DocumentFactory extends ElementFactory {
         docProps.createUserName = props.createUserName;
         docProps.createDate = props.createDate;
         docProps.orient = props.orient ?? 'portrait';
+        docProps.columns = props.columns ?? 1;
         return documentElement;
     }
 }
@@ -4199,10 +4205,10 @@ class DocumentHeaderRenderObject extends BlockContainerRenderObject {
     }
     exportHTML(event) {
         //判断页眉是否为输入内容
-        const isHeaderEmpty = ElementUtil.checkEmptyRenderContent(this);
+        ElementUtil.checkEmptyRenderContent(this);
         let headerLine;
         //存在输入内容时，绘制页眉-页体分割线
-        if (!isHeaderEmpty || !this.element.disableClick || event.mode === 'print') {
+        if (event.options.printHeaderFooterLine) {
             headerLine = {
                 sel: 'path',
                 data: {
@@ -5008,6 +5014,7 @@ class SelectionState {
         this.clear();
     }
     clear() {
+        this.rangeDirty = true;
         this.range = null;
         this.startOffset = -1;
         this.endOffset = -1;
@@ -8313,6 +8320,7 @@ class DataElementCheck extends DataElementLeaf {
         }
         //如果当前是单选框并且当前已经被选中，则不作处理
         if (this.props.groupName && !this.props.multiSelect && this.props.checked) {
+            this.props.checked = !this.props.checked;
             return;
         }
         this.props.checked = !this.props.checked;
@@ -14395,17 +14403,22 @@ class DocumentArrange {
         docRender.padding.top = bodyMarginTop;
         docRender.padding.bottom = bodyMarginBottom;
         const bodyLimitRect = this.getDocInnerRect(docRender);
+        const docColumns = doc.props.columns ?? 1;
+        bodyLimitRect.width = bodyLimitRect.width / docColumns;
         const bodyRender = doc.bodyElement.createRenderObject();
         const bodyArray = [];
         let { emptyBody: pageBodyRender, innerRect: bodyInnerLimitRect } = this.createEmptyBodyRender(bodyRender, bodyLimitRect);
         bodyArray.push(pageBodyRender);
+        //文档分栏
         const createBodyHolder = () => {
-            const { emptyBody, innerRect } = this.createEmptyBodyRender(bodyRender, bodyLimitRect);
+            let { emptyBody, innerRect } = this.createEmptyBodyRender(bodyRender, bodyLimitRect);
             pageBodyRender = emptyBody;
             bodyInnerLimitRect = innerRect;
             bodyArray.push(pageBodyRender);
         };
         const appendToBody = (item) => {
+            //处理分栏
+            //item.rect.x = bodyInnerLimitRect.width *currColumn / docColumns;
             item.rect.y = bodyInnerLimitRect.height + item.margin.top;
             pageBodyRender.addChild(item);
             bodyInnerLimitRect.height += item.rect.height + item.margin.top + item.margin.bottom;
@@ -14446,30 +14459,35 @@ class DocumentArrange {
         }
         const docPages = [];
         let pageY = this.options.docSpace;
+        //当前分栏
+        let currColumn = 0;
+        let prevDocRender = null;
         for (let i = 0; i < bodyArray.length; i++) {
             const body = bodyArray[i];
-            const documentRender = doc.createRenderObject();
-            docPages.push(documentRender);
-            documentRender.rect.y = pageY;
+            if (!prevDocRender) {
+                prevDocRender = doc.createRenderObject();
+                prevDocRender.rect.y = pageY;
+                docPages.push(prevDocRender);
+            }
+            const documentRender = prevDocRender;
             const limitRect = documentRender.getInnerRect();
             const cloneHeaderRender = headerRender.clone();
             cloneHeaderRender.rect.x = limitRect.x;
             cloneHeaderRender.rect.y = headerLine;
-            documentRender.addChild(cloneHeaderRender);
-            body.rect.x = limitRect.x;
+            currColumn === 0 && documentRender.addChild(cloneHeaderRender);
+            body.rect.x = limitRect.x + bodyLimitRect.width * currColumn;
             body.rect.y = bodyMarginTop;
-            if (!this.options.fullPageView) {
+            if (!this.options.fullPageView || docColumns > 1) {
                 body.rect.height = bodyInnerLimitRect.maxHeight;
             }
             else {
                 documentRender.rect.height = body.rect.height + body.rect.y + bodyMarginBottom;
             }
             documentRender.addChild(body);
-            pageY += documentRender.rect.height + this.options.docSpace;
             const cloneFooterRender = footerRender.clone();
             cloneFooterRender.rect.x = limitRect.x;
             cloneFooterRender.rect.y = documentRender.rect.height - bodyMarginBottom;
-            documentRender.addChild(cloneFooterRender);
+            currColumn === 0 && documentRender.addChild(cloneFooterRender);
             //审阅模式，添加审阅窗口
             if (this.options.showReviewWindow && commentsRender) {
                 const commentsContainer = this.createRenderObject(commentsRender.element);
@@ -14479,6 +14497,12 @@ class DocumentArrange {
                 commentsContainer.rect.x = documentRender.rect.x + documentRender.rect.width;
                 documentRender.rect.width += this.options.reviewWindowWidth;
             }
+            currColumn++;
+            if (currColumn === docColumns) {
+                currColumn = 0;
+                prevDocRender = null;
+                pageY += documentRender.rect.height + this.options.docSpace;
+            }
         }
         return docPages;
     }