@hailin-zheng/editor-core 2.0.10 → 2.0.12

package/index.js

@@ -4403,6 +4403,27 @@ class TableCellRenderObject extends InlineMuiltBlockLineRenderObject {
                 }]);
         }
     }
+    /**
+     * 绘制对角线
+     * @private
+     */
+    renderDiagonalHTML(event, diagonal, children) {
+        if (!diagonal) {
+            return;
+        }
+        if (diagonal === 'all') {
+            this.renderDiagonalHTML(event, 'main', children);
+            this.renderDiagonalHTML(event, 'sub', children);
+            return;
+        }
+        if (diagonal && this.rect.width && this.rect.height) {
+            let diagonalStartX = diagonal === 'main' ? 0 : this.rect.width;
+            let diagonalStartY = 0;
+            let diagonalEndX = diagonal === 'main' ? this.rect.width : 0;
+            let diagonalEndY = this.rect.height;
+            children.push(ElementUtil.createLine(diagonalStartX, diagonalStartY, diagonalEndX, diagonalEndY, '#000', 1));
+        }
+    }
     clone() {
         const cloneRender = new TableCellRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
@@ -4419,27 +4440,16 @@ class TableCellRenderObject extends InlineMuiltBlockLineRenderObject {
         const clipId = `CP_${counter}`;
         t.children = [...CommonUtil.toArray(event.getChildNodes(this)), ElementUtil.createClipPath(clipId, this.rect.width, this.rect.height)];
         if (this.element.props.backgroundColor) {
-            //t.data.attrs.fill = this.element.props.backgroundColor;
             t.children.splice(0, 0, this.createBgRect());
         }
         t.data.attrs['clip-path'] = `url(#${clipId})`;
+        this.renderDiagonalHTML(event, this.element.props.diagonal, t.children);
         t.isCompleted = true;
         return t;
     }
     createBgRect() {
         if (this.element.props.backgroundColor) {
-            return {
-                sel: 'rect',
-                data: {
-                    ns: 'http://www.w3.org/2000/svg',
-                    attrs: {
-                        fill: this.element.props.backgroundColor,
-                        stroke: 'none',
-                        width: this.rect.width,
-                        height: this.rect.height,
-                    }
-                }
-            };
+            return ElementUtil.getFillSvgRect(0, 0, this.rect.width, this.rect.height, this.element.props.backgroundColor);
         }
         return null;
     }
@@ -8578,6 +8588,26 @@ class ElementUtil {
             }
         };
     }
+    static createLine(x1, y1, x2, y2, stroke, width) {
+        return {
+            sel: 'line',
+            data: {
+                ns: "http://www.w3.org/2000/svg",
+                attrs: {
+                    x1,
+                    y1,
+                    x2,
+                    y2,
+                    stroke,
+                    'stroke-width': width,
+                    fill: 'none'
+                }
+            }
+        };
+    }
+    static getRectPath(x, y, width, height) {
+        return `M${x} ${y} L${x + width} ${y} L${x + width} ${y + height} L${x} ${y + height} Z`;
+    }
     static getFillSvgPath(pathPoints, fill, width) {
         const d = typeof pathPoints === 'string' ? pathPoints : pathPoints.map((p, i) => (i === 0 ? 'M' : 'L') + `${p.x} ${p.y}`).join(' ');
         return {
@@ -11571,7 +11601,17 @@ class DocumentBodyPartRenderObject extends MuiltBlockLineRenderObject {
     exportHTML(event) {
         const t = super.exportHTML(event);
         if (this.element.isFocused) {
-            t.children = [ElementUtil.getFillSvgRect(0, 0, this.rect.width, this.rect.height, event.options.selectPrintAreaBgColor)];
+            // const bgRect=ElementUtil.getStrokeSvgPath(ElementUtil.getRectPath(0,0,this.rect.width,this.rect.height),'black',1);
+            // bgRect.data.attrs.rx=5;
+            // bgRect.data.attrs.ry=5;
+            // bgRect.data.attrs['stroke-dasharray']='5,5';
+            const bgRect = ElementUtil.getFillSvgRect(event.relativePagePos.x, event.relativePagePos.y, this.rect.width, this.rect.height, '#f0f0f0');
+            bgRect.data.attrs['stroke'] = 'black';
+            bgRect.data.attrs['stroke-width'] = 0.5;
+            bgRect.data.attrs.rx = 5;
+            bgRect.data.attrs.ry = 5;
+            //t.children = [bgRect];
+            event.highlights.push(bgRect);
         }
         return t;
     }
@@ -18091,9 +18131,6 @@ class DocumentChange {
     }
     newInput(data) {
         const { startControl, startOffset, collapsed, enableTrackChanges } = this.selectionState;
-        if (!startControl) {
-            debugger;
-        }
         if (!collapsed) {
             this.onInputBySelectRange(data);
             return;
@@ -18982,9 +19019,13 @@ class DocumentChange {
             }
         }
         else {
+            let insertTarget = targetElement;
+            let insertTargetOffset = targetOffset;
             for (let i = 0; i < destEleArray.length; i++) {
                 lastEle = destEleArray[i];
-                targetElement.parent.addChild(lastEle, targetElement.getIndex() + targetOffset);
+                insertTarget.parent.addChild(lastEle, insertTarget.getIndex() + insertTargetOffset);
+                insertTarget = lastEle;
+                insertTargetOffset = 1;
             }
         }
         return lastEle;
@@ -25670,10 +25711,13 @@ class EditorCalendarVNode {
     }
     render(position, dataValue) {
         if (!this.currentDate && dataValue) {
-            this.currYear.value = moment(dataValue).year();
-            this.currMonth.value = moment(dataValue).month();
-            this.selectedDate.value = moment(dataValue).format('YYYY-MM-DD');
+            const currDataValue = moment(dataValue);
+            this.currYear.value = currDataValue.year();
+            this.currMonth.value = currDataValue.month();
+            this.selectedDate.value = currDataValue.format('YYYY-MM-DD');
             this.currentDate = dataValue;
+            this.currTime.value = currDataValue.format('HH:mm:ss');
+            this.selectedTime.value = this.currTime.value;
         }
         if (!this.currentDate) {
             this.currentDate = moment().format('YYYY-MM-DD');
@@ -26887,7 +26931,7 @@ class DocEditor {
      */
     getCurrentDataElement() {
         const selectionState = this.documentSelection.selectionState;
-        const { startControl, startOffset, collapsed } = selectionState;
+        const { startControl, startOffset, collapsed, ancestorCommonControl } = selectionState;
         if (startControl && collapsed) {
             if (!ElementUtil.verifyHitable(startControl)) {
                 return null;
@@ -26900,6 +26944,10 @@ class DocEditor {
                 return null;
             }
         }
+        else if (!collapsed && ancestorCommonControl) {
+            const dataEle = ElementUtil.getParent(startControl, validateDataEle);
+            return dataEle;
+        }
         return null;
     }
     /**
@@ -27611,6 +27659,9 @@ class DocEditor {
         const editor = this;
         return {
             render() {
+                if (editor.viewOptions.docMode === DocMode.View) {
+                    return null;
+                }
                 const dataEle = editor.getCurrentDataElement();
                 if (dataEle && dataEle instanceof DataElementList && dataEle.props.editable) {
                     const position = editor.getDataElementPosition(dataEle.startDecorate);
@@ -27721,6 +27772,9 @@ class DocEditor {
         });
         return {
             render() {
+                if (editor.viewOptions.docMode === DocMode.View) {
+                    return null;
+                }
                 const dataEle = editor.getCurrentDataElement();
                 if (dataEle && dataEle instanceof DataElementDate && dataEle.props.editable) {
                     const position = editor.getDataElementPosition(dataEle.startDecorate);