@hailin-zheng/editor-core 2.2.21 → 2.2.23

package/index.js

@@ -12053,81 +12053,87 @@ class ElementUtil {
         }
         return true;
     }
-    /**
-     * 获取一个点到一个矩形最短的距离
-     * @param rect
-     * @param p
-     * @returns
-     */
-    static getDistanceToRect(rect, p) {
-        const lines = [];
-        lines.push({
-            f: {
-                x: rect.x,
-                y: rect.y
-            },
-            s: {
-                x: rect.x + rect.width,
-                y: rect.y
-            }
-        }, {
-            f: {
-                x: rect.x,
-                y: rect.y
-            },
-            s: {
-                x: rect.x,
-                y: rect.y + rect.height
-            }
-        }, {
-            f: {
-                x: rect.x,
-                y: rect.y + rect.height
-            },
-            s: {
-                x: rect.x + rect.width,
-                y: rect.y + rect.height
-            }
-        }, {
-            f: {
-                x: rect.x + rect.width,
-                y: rect.y
-            },
-            s: {
-                x: rect.x + rect.width,
-                y: rect.y + rect.height
-            }
-        });
-        const distances = lines.map(item => this.minDistance(item.f, item.s, p));
-        return Math.min(...distances);
-    }
-    static minDistance(A, B, E) {
-        const AB = { x: B.x - A.x, y: B.y - A.y };
-        const BE = { x: E.x - B.x, y: E.y - B.y };
-        const AE = { x: E.x - A.x, y: E.y - A.y };
-        const AB_BE = (AB.x * BE.x + AB.y * BE.y);
-        const AB_AE = (AB.x * AE.x + AB.y * AE.y);
-        let reqAns = 0;
-        if (AB_BE > 0) {
-            const y = E.y - B.y;
-            const x = E.x - B.x;
-            reqAns = Math.sqrt(x * x + y * y);
-        }
-        else if (AB_AE < 0) {
-            const y = E.y - A.y;
-            const x = E.x - A.x;
-            reqAns = Math.sqrt(x * x + y * y);
-        }
-        else {
-            const x1 = AB.x;
-            const y1 = AB.y;
-            const x2 = AE.x;
-            const y2 = AE.y;
-            const mod = Math.sqrt(x1 * x1 + y1 * y1);
-            reqAns = Math.abs(x1 * y2 - y1 * x2) / mod;
-        }
-        return reqAns;
+    static getDistanceToRect(rect, point) {
+        // 点到矩形左边的距离
+        const dx = Math.max(rect.x - point.x, 0, point.x - (rect.x + rect.width));
+        // 点到矩形上边的距离
+        const dy = Math.max(rect.y - point.y, 0, point.y - (rect.y + rect.height));
+        // 距离公式
+        return Math.sqrt(dx * dx + dy * dy);
     }
+    // /**
+    //  * 获取一个点到一个矩形最短的距离
+    //  * @param rect
+    //  * @param p
+    //  * @returns
+    //  */
+    // static getDistanceToRect(rect: Rect, p: Position) {
+    //     const lines: Array<{ f: PAIR, s: PAIR }> = [];
+    //     lines.push({
+    //         f: {
+    //             x: rect.x,
+    //             y: rect.y
+    //         },
+    //         s: {
+    //             x: rect.x + rect.width,
+    //             y: rect.y
+    //         }
+    //     }, {
+    //         f: {
+    //             x: rect.x,
+    //             y: rect.y
+    //         },
+    //         s: {
+    //             x: rect.x,
+    //             y: rect.y + rect.height
+    //         }
+    //     }, {
+    //         f: {
+    //             x: rect.x,
+    //             y: rect.y + rect.height
+    //         },
+    //         s: {
+    //             x: rect.x + rect.width,
+    //             y: rect.y + rect.height
+    //         }
+    //     }, {
+    //         f: {
+    //             x: rect.x + rect.width,
+    //             y: rect.y
+    //         },
+    //         s: {
+    //             x: rect.x + rect.width,
+    //             y: rect.y + rect.height
+    //         }
+    //     })
+    //     const distances = lines.map(item => this.minDistance(item.f, item.s, p))
+    //     return Math.min(...distances);
+    // }
+    // static minDistance(A: PAIR, B: PAIR, E: PAIR) {
+    //     const AB: PAIR = { x: B.x - A.x, y: B.y - A.y }
+    //     const BE: PAIR = { x: E.x - B.x, y: E.y - B.y };
+    //     const AE: PAIR = { x: E.x - A.x, y: E.y - A.y }
+    //     const AB_BE = (AB.x * BE.x + AB.y * BE.y);
+    //     const AB_AE = (AB.x * AE.x + AB.y * AE.y);
+    //     let reqAns = 0;
+    //     if (AB_BE > 0) {
+    //         const y = E.y - B.y;
+    //         const x = E.x - B.x;
+    //         reqAns = Math.sqrt(x * x + y * y);
+    //     } else if (AB_AE < 0) {
+    //         const y = E.y - A.y;
+    //         const x = E.x - A.x;
+    //         reqAns = Math.sqrt(x * x + y * y);
+    //     } else {
+    //         const x1 = AB.x;
+    //         const y1 = AB.y;
+    //         const x2 = AE.x;
+    //         const y2 = AE.y;
+    //         const mod = Math.sqrt(x1 * x1 + y1 * y1);
+    //         reqAns = Math.abs(x1 * y2 - y1 * x2) / mod;
+    //     }
+    //     return reqAns;
+    // }
     /**
      * 获取父级层级渲染对象
      * @param render
@@ -14101,10 +14107,10 @@ class DynamicExecute {
         this.depItems = undefined;
     }
     cacheList;
-    getControlById(id) {
+    getControlById(id, options) {
         if (!this.cacheList) {
             const ctx = new DocumentContext(this.doc, this.ss);
-            this.cacheList = ctx.getDataElementModelList();
+            this.cacheList = ctx.getDataElementModelList(options);
         }
         const f = this.cacheList.find(item => item.id === id);
         return f;
@@ -14115,11 +14121,10 @@ class DynamicExecute {
         if (this.depItems && this.depItems.has(id)) {
             return this.depItems.get(id);
         }
-        new DocumentContext(this.doc, this.ss);
         if (id.startsWith('$')) {
             id = id.slice(1);
         }
-        const control = this.getControlById(id);
+        const control = this.getControlById(id, { includeChildren: true });
         return {
             get value() {
                 if (control) {
@@ -17584,6 +17589,9 @@ class DocumentChange {
         });
     }
     newInput(data) {
+        if (data.data === '啊' || data.data === 'a') {
+            debugger;
+        }
         const { startControl, startOffset, collapsed } = this.selectionState;
         const enableTrackChanges = this.viewOptions.enableTrackChanges;
         if (!collapsed) {
@@ -21776,14 +21784,15 @@ class DocEditor {
      * @private
      */
     updateInputFont() {
-        const { startControl } = this.selectionState;
+        const { startControl, startOffset } = this.selectionState;
         if (startControl instanceof TextGroupElement) {
             this.viewOptions.currentFontSize = startControl.props.fontSize;
             this.viewOptions.currentFontName = startControl.props.fontName;
         }
         else {
-            this.viewOptions.currentFontSize = this.viewOptions.defaultFontSize;
-            this.viewOptions.currentFontName = this.viewOptions.defaultFontName;
+            const inputTextProps = this.documentChange.getDefaultTextProps(startControl, startOffset);
+            this.viewOptions.currentFontSize = inputTextProps.fontSize;
+            this.viewOptions.currentFontName = inputTextProps.fontName;
         }
     }
     hitInfoChanged(hitInfo) {
@@ -23005,7 +23014,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.21";
+        return "2.2.23";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);