@hailin-zheng/editor-core 1.0.53 → 1.0.56

package/index.js

@@ -2741,11 +2741,39 @@ class DataElementRenderObject extends InlineGroupRenderObject {
             }
             if (this.element.props.underline) {
                 const y = position.y + 2 + this.rect.height;
-                render.contentContext.strokeLines([{ x: position.x, y }, { x: position.x + this.rect.width, y }], 1, '#595959');
+                render.contentContext.strokeLines([{ x: position.x, y }, {
+                        x: position.x + this.rect.width,
+                        y
+                    }], 1, '#595959');
             }
             e.nextRender();
+            this.drawCaption(e);
         });
     }
+    /**
+     * 绘制数据元标题
+     * @param e
+     * @private
+     */
+    drawCaption(e) {
+        const { render, position, docCtx: { viewOptions } } = e;
+        //获取到焦点时，绘制数据元标题
+        if (render.drawMode === 'view' && this.element.isFocused && this.element.paintRenders.indexOf(this) === 0) {
+            const { caption } = this.element.props;
+            if (!caption) {
+                return;
+            }
+            const textProps = new TextProps();
+            textProps.fontSize = 16;
+            textProps.fontName = viewOptions.defaultFontName;
+            textProps.color = '#fff';
+            const titleWidth = render.contentContext.measureText(caption, textProps).width;
+            const x = position.x;
+            const y = position.y - 20;
+            render.contentContext.fillRect(x, y, titleWidth + 10, 20, 'blue');
+            render.contentContext.drawText(caption, textProps, x + 5, y, titleWidth, 20);
+        }
+    }
 }
 const validateDataEle = (ele) => {
     return ele instanceof DataElementLeaf || ele instanceof DataElementInlineGroup;
@@ -6590,8 +6618,8 @@ class DocumentSelection {
         this.selectionState.addRange(startRange);
     }
     /**
-    * 获取选区共同的祖先控件
-    */
+     * 获取选区共同的祖先控件
+     */
     static getAncestorCommonControl(startControl, endControl) {
         const startNestParents = this.getNestParents(startControl.parent);
         const ancestorCommonControl = this.getCommonParenet(endControl.parent, startNestParents);
@@ -6620,26 +6648,22 @@ class DocumentSelection {
         }
         return this.getCommonParenet(control?.parent, array);
     }
+    /**
+     * 更新选区对象
+     * return：当前选区是否改变
+     * @private
+     */
     updateSelectionState() {
-        if (this.compareSelectionEquals()) {
+        if (!this.selectionState.rangeDirty) {
             return false;
         }
         const range = this.selectionState.range;
+        //转换选区
         this.transformRange();
+        this.selectionState.clear();
         if (!range) {
             return false;
         }
-        const startControlIndex = ElementUtil.getControlIndex(range.startControl);
-        const endControlIndex = ElementUtil.getControlIndex(range.endControl);
-        if (endControlIndex < startControlIndex) {
-            const clone = range.clone();
-            clone.startControl = range.endControl;
-            clone.startOffset = range.endOffset;
-            clone.endControl = range.startControl;
-            clone.endOffset = range.startOffset;
-            clone.editable = range.editable;
-            this.selectionState.addRange(clone);
-        }
         this.selectionState.editable = range.editable;
         this.selectionState.startControl = range.startControl;
         this.selectionState.startOffset = range.startOffset;
@@ -6649,6 +6673,7 @@ class DocumentSelection {
         this.selectionState.endControlIndex = ElementUtil.getControlIndex(range.endControl);
         this.selectionState.ancestorCommonControl = DocumentSelection.getAncestorCommonControl(this.selectionState.startControl, this.selectionState.endControl);
         this.selectionState.enableTrackChanges = this.getEnableTrackChanges(range.startControl);
+        this.selectionState.rangeDirty = false;
         return true;
     }
     /**
@@ -6659,17 +6684,6 @@ class DocumentSelection {
         const body = ElementUtil.getParentByType(ele, DocumentBodyElement);
         return body?.trackChanges || false;
     }
-    compareSelectionEquals() {
-        const range = this.selectionState.range;
-        const snap = this.snapshotSelectionState;
-        if (snap && range) {
-            return range.startControl === snap.startControl
-                && range.startOffset === snap.startOffset
-                && range.endControl === snap.endControl
-                && range.endOffset === snap.endOffset;
-        }
-        return false;
-    }
     /**
      * 转换选区内容
      * 处理结束选区在开始选区之前
@@ -6763,9 +6777,14 @@ class SelectionState {
         this.selectedRange = null;
         this.cursorPos = null;
     }
+    /**
+     * 当前选区是否发生改变
+     */
+    rangeDirty = false;
     addRange(range) {
         this.clear();
         this.range = range;
+        this.rangeDirty = true;
         this.onChangedEvent.next();
     }
     resetRange(startControl, startOffset) {
@@ -12238,6 +12257,7 @@ class DocumentEvent {
         const newParents = ElementUtil.getParentElements(focusElement);
         const leaveParents = oldParents.filter(item => newParents.every(oldItem => item !== oldItem));
         const enterParents = newParents.filter(item => oldParents.every(oldItem => item !== oldItem));
+        let cancelEvent = false;
         const loopInvokeEvent = (eventName, array) => {
             for (const element of array) {
                 const mouseEvent = new LostCursorEvent(this.docCtx);
@@ -12245,11 +12265,17 @@ class DocumentEvent {
                 mouseEvent.currentElement = element;
                 mouseEvent.ctx = this.docCtx;
                 element.invokeEvent(eventName, mouseEvent);
+                if (mouseEvent.isCancel) {
+                    cancelEvent = true;
+                    break;
+                }
             }
         };
         loopInvokeEvent('LostCursor', leaveParents);
         loopInvokeEvent('GotCursor', enterParents);
-        this.prevCursorItems = newParents;
+        if (!cancelEvent) {
+            this.prevCursorItems = newParents;
+        }
         //dDocumentEvent.invokeEvent('GotCursor', focusElement, getCursorEvent, 'All', this.docCtx);
     }
     /**
@@ -14292,24 +14318,43 @@ class DocumentChange {
      */
     onPaste(evt) {
         evt.preventDefault();
-        let pasteText = evt.clipboardData?.getData('text/plain');
-        const pasteData = evt.clipboardData?.getData('doc/plain');
-        if (!pasteData) {
-            if (pasteText) {
-                this.pastePlainText(pasteText);
+        let pasteText = evt.clipboardData?.getData('text/plain') ?? '';
+        const pasteData = evt.clipboardData?.getData('doc/plain') ?? '';
+        const { collapsed } = this.selectionState;
+        if (!collapsed) {
+            //TODO:如果一个容器内的元素被全部删除，则返回 null
+            // const { cursorEle, cursorOffset } = this.onRangeDelete();
+            // startControl = cursorEle;
+            // startOffset = cursorOffset;
+            this.onRangeDelete();
+            const cb = () => {
+                this.handlePasteContent({ text: pasteText, doc: pasteData }, this.selectionState);
+            };
+            this.docCtx.setPaintedCallback(cb);
+            return;
+        }
+        this.handlePasteContent({ text: pasteText, doc: pasteData }, this.selectionState);
+    }
+    /**
+     * 处理粘贴的内容
+     * @private
+     */
+    handlePasteContent(pasteData, ss) {
+        const { startOffset, startControl, editable } = ss;
+        if (!startControl || !editable) {
+            return;
+        }
+        if (!pasteData.doc) {
+            if (pasteData.text) {
+                this.pastePlainText(pasteData.text);
             }
             return;
         }
-        const pasteElement = this.eleReader.readElement(JSON.parse(pasteData));
+        const pasteElement = this.eleReader.readElement(JSON.parse(pasteData.doc));
         if (!pasteElement) {
             console.log('粘贴反序列化数据失败', pasteData);
             return;
         }
-        this.selectionState;
-        let { startControl, startOffset } = this.selectionState;
-        if (!startControl) {
-            return;
-        }
         //表单模式:如果复制的是单格式的文本，需要序列化为纯文本处理
         if (this.viewOptions.docMode === DocMode.FormEdit) {
             const pasteString = ElementSerialize.serializeString(pasteElement, { all: false });
@@ -14340,7 +14385,6 @@ class DocumentChange {
             this.selectionState.resetRange(lastEle, -1);
             return;
         }
-        console.log('粘贴:' + pasteData);
     }
     insertSoftBr() {
         let { startControl, startOffset } = this.selectionState;