@hailin-zheng/editor-core 2.0.15 → 2.0.16

package/index.js

@@ -2741,6 +2741,7 @@ class DataDecorateElement extends LeafElement {
                 }
             }
         });
+        this.disableClick = !isPrefix;
         this.isDecorate = true;
     }
     createRenderObject() {
@@ -3358,7 +3359,6 @@ class DocumentRenderObject extends BlockContainerRenderObject {
                     'font-family': '仿宋',
                     'font-size': '14',
                     "fill": this.element.props.color,
-                    'font-style': 'italic',
                     x: 0,
                     y: 0,
                 }
@@ -4249,7 +4249,7 @@ class PSymbolElement extends LeafElement {
     createRenderObject() {
         const symbol = new PSymbolRenderObject(this);
         symbol.rect.height = this.defaultHeight;
-        symbol.rect.width = 7;
+        symbol.rect.width = 1;
         return symbol;
     }
     serialize() {
@@ -4798,6 +4798,10 @@ class TextGroupRenderObject extends LeafRenderObject {
             const path = `M${event.relativePagePos.x} ${event.relativePagePos.y} L${event.relativePagePos.x + this.rect.width} ${event.relativePagePos.y}`;
             event.highlights.push(ElementUtil.getStrokeSvgPath(path, '#000', 1));
         }
+        //处理null-text
+        if (this.element.isDecorate && this.element.disableClick && !this.element.parent) {
+            t.data.attrs['opacity'] = '0.58';
+        }
         return t;
     }
 }
@@ -5069,10 +5073,7 @@ class SelectionRange {
     }
     setInfo(control, offset) {
         if (control instanceof LeafElement) {
-            if (control instanceof TextGroupElement) {
-                offset = offset === -1 ? control.text.length : offset;
-            }
-            offset = offset === -1 ? 1 : offset;
+            offset = ElementUtil.fixedOffset(control, offset);
             return { control, offset };
         }
         else if (control instanceof BranchElement) {
@@ -6271,6 +6272,40 @@ class TableUtil {
             });
         }
     }
+    static getTableData(tb) {
+        //根据实际要提取的行索引进行调整
+        const rowData = [];
+        for (let i = 0; i < tb.length; i++) {
+            const row = tb.getChild(i);
+            const cellData = [];
+            for (let j = 0; j < row.length; j++) {
+                const cell = row.getChild(j);
+                cellData.push(this.getCellData(cell));
+            }
+            rowData.push(cellData);
+        }
+        return rowData;
+    }
+    /**
+     * 获取单元格内的数据元的值
+     * @param target
+     */
+    static getCellData(target) {
+        if (validateDataEle(target)) {
+            const dataEle = target;
+            return { id: dataEle.props.id, value: dataEle.getValue() };
+        }
+        if (target instanceof BranchElement) {
+            for (let i = 0; i < target.length; i++) {
+                const child = target.getChild(i);
+                const val = this.getCellData(child);
+                if (val !== null) {
+                    return val;
+                }
+            }
+        }
+        return null;
+    }
 }
 
 class TableElement extends BlockContainerElement {
@@ -8651,6 +8686,46 @@ class ElementUtil {
             ]
         };
     }
+    /**
+     * 判断是否光标可以设置接受编辑
+     * @returns
+     */
+    static canSetCursor(startControl, startOffset, editable, viewOptions) {
+        if (!startControl || !editable) {
+            return false;
+        }
+        if (viewOptions.docMode === DocMode.Design) {
+            return true;
+        }
+        //浏览模式
+        if (viewOptions.docMode === DocMode.View) {
+            return false;
+        }
+        //表单模式下，如果不在数据元素中，则不显示光标
+        if (viewOptions.docMode === DocMode.FormEdit) {
+            if (!IsInSideDataElement(startControl, startOffset)) {
+                return false;
+            }
+        }
+        if (!ElementUtil.verifyHitable(startControl)) {
+            return false;
+        }
+        //表单模式下，数据元不可编辑
+        if (viewOptions.docMode === DocMode.FormEdit && IsInSideDataElement(startControl, startOffset)) {
+            const dataEle = ElementUtil.getDataElement(startControl);
+            if (dataEle && !dataEle.props.editable) {
+                return false;
+            }
+        }
+        return true;
+    }
+    static fixedOffset(control, offset) {
+        if (control instanceof TextGroupElement) {
+            offset = offset === -1 ? control.text.length : offset;
+        }
+        offset = offset === -1 ? 1 : offset;
+        return offset;
+    }
 }
 
 class RenderContext {
@@ -10824,7 +10899,7 @@ class DataElementCheckRenderObject extends LeafRenderObject {
                     data: {
                         ns: "http://www.w3.org/2000/svg",
                         attrs: {
-                            cx: width / 2,
+                            cx: 2 + width / 2,
                             cy: height / 2,
                             r: width / 3,
                             stroke: 'black',
@@ -10839,7 +10914,7 @@ class DataElementCheckRenderObject extends LeafRenderObject {
                         data: {
                             ns: "http://www.w3.org/2000/svg",
                             attrs: {
-                                cx: width / 2,
+                                cx: 2 + width / 2,
                                 cy: height / 2,
                                 r: width / 5,
                                 stroke: 'black',
@@ -17536,7 +17611,6 @@ class DocumentEvent {
             if (resizeColWidth < minColWidth || cellWidth < minColWidth) {
                 return;
             }
-            console.log(resizeColWidth, cellWidth);
             table.setCellWidth(resizeColIndex, resizeColWidth);
             table.setCellWidth(cellIndex, cellWidth);
             this.edgeRenderInfo.mousedownPos = this.currentPos;
@@ -17710,6 +17784,15 @@ class DocumentEvent {
      */
     moveCursorToLeft() {
         const { startControl, startOffset } = this.selectionState;
+        this.moveCursorToLeftHandle(startControl, startOffset);
+    }
+    /**
+     * 向左移动光标处理函数
+     * @param startControl
+     * @param startOffset
+     * @private
+     */
+    moveCursorToLeftHandle(startControl, startOffset) {
         if (startOffset === 0) {
             const oldRegion = ElementUtil.getElementRegion(startControl);
             const prevEle = ElementUtil.getRecursionPrevSiblingElement(startControl, false, true, this.viewOptions);
@@ -17718,6 +17801,10 @@ class DocumentEvent {
                 if (newRegion !== oldRegion) {
                     return;
                 }
+                if (this.viewOptions.docMode === DocMode.FormEdit && !ElementUtil.canSetCursor(prevEle, ElementUtil.fixedOffset(prevEle, -1), true, this.viewOptions)) {
+                    this.moveCursorToLeftHandle(prevEle, 0);
+                    return;
+                }
                 this.selectionState.resetRange(prevEle, -1);
                 return;
             }
@@ -17727,6 +17814,10 @@ class DocumentEvent {
                 this.selectionState.resetRange(startControl, startOffset - 1);
             }
             else {
+                if (this.viewOptions.docMode === DocMode.FormEdit && !ElementUtil.canSetCursor(startControl, ElementUtil.fixedOffset(startControl, 0), true, this.viewOptions)) {
+                    this.moveCursorToLeftHandle(startControl, 0);
+                    return;
+                }
                 this.selectionState.resetRange(startControl, 0);
             }
         }
@@ -17736,6 +17827,9 @@ class DocumentEvent {
      */
     moveCursorToRight() {
         const { startControl, startOffset } = this.selectionState;
+        this.moveCursorToRightHandle(startControl, startOffset);
+    }
+    moveCursorToRightHandle(startControl, startOffset) {
         if (this.isLeafEleEndOffset(startControl, startOffset)) {
             const oldRegion = ElementUtil.getElementRegion(startControl);
             const nextEle = ElementUtil.getRecursionNextSiblingElement(startControl, false, true, this.viewOptions);
@@ -17744,7 +17838,11 @@ class DocumentEvent {
                 if (oldRegion !== newRegion) {
                     return;
                 }
-                this.selectionState.resetRange(nextEle, 0);
+                if (this.viewOptions.docMode === DocMode.FormEdit && !ElementUtil.canSetCursor(nextEle, ElementUtil.fixedOffset(nextEle, -1), true, this.viewOptions)) {
+                    this.moveCursorToRightHandle(nextEle, ElementUtil.fixedOffset(nextEle, -1));
+                    return;
+                }
+                this.selectionState.resetRange(nextEle, 1);
                 return;
             }
         }
@@ -17753,6 +17851,10 @@ class DocumentEvent {
                 this.selectionState.resetRange(startControl, startOffset + 1);
             }
             else {
+                if (this.viewOptions.docMode === DocMode.FormEdit && !ElementUtil.canSetCursor(startControl, 0, true, this.viewOptions)) {
+                    this.moveCursorToRightHandle(startControl, ElementUtil.fixedOffset(startControl, -1));
+                    return;
+                }
                 this.selectionState.resetRange(startControl, 1);
             }
         }
@@ -26938,33 +27040,7 @@ class DocEditor {
      */
     canSetCursor() {
         const { startControl, startOffset, editable } = this.selectionState;
-        if (!startControl || !editable) {
-            return false;
-        }
-        if (this.viewOptions.docMode === DocMode.Design) {
-            return true;
-        }
-        //浏览模式
-        if (this.viewOptions.docMode === DocMode.View) {
-            return false;
-        }
-        //表单模式下，如果不在数据元素中，则不显示光标
-        if (this.viewOptions.docMode === DocMode.FormEdit) {
-            if (!IsInSideDataElement(startControl, startOffset)) {
-                return false;
-            }
-        }
-        if (!ElementUtil.verifyHitable(startControl)) {
-            return false;
-        }
-        //表单模式下，数据元不可编辑
-        if (this.viewOptions.docMode === DocMode.FormEdit && IsInSideDataElement(startControl, startOffset)) {
-            const dataEle = ElementUtil.getDataElement(startControl);
-            if (dataEle && !dataEle.props.editable) {
-                return false;
-            }
-        }
-        return true;
+        return ElementUtil.canSetCursor(startControl, startOffset, editable, this.viewOptions);
     }
     /**
      * 修改光标
@@ -27608,7 +27684,7 @@ class DocEditor {
         const vNodeFunc = this.renderRoot();
         setActiveEditorContext(null);
         const render = () => {
-            //console.time('patch');
+            console.time('patch');
             setActiveEditorContext(this);
             const vNode = vNodeFunc.render();
             setActiveEditorContext(null);
@@ -27620,7 +27696,7 @@ class DocEditor {
                 this.vNodeDocContent = this.nodePatch(this.svgContainer, vNode);
             }
             this.afterNodePatch.next();
-            //console.timeEnd('patch');
+            console.timeEnd('patch');
         };
         render();
         this.onShouldRender.subscribe(() => {