@meta2d/core 1.0.57 → 1.0.59

package/src/core.d.ts

@@ -59,7 +59,7 @@ export declare class Meta2d {
     setDatabyOptions(options?: Options): void;
     private init;
     initEventFns(): void;
-    navigatorTo(id: string): void;
+    navigatorTo(id: string): Promise<void>;
     doSendDataEvent(value: any, topics?: string): void;
     sendDataToNetWork(value: any, pen: Pen, e: any): Promise<void>;
     resize(width?: number, height?: number): void;
@@ -160,6 +160,13 @@ export declare class Meta2d {
     combine(pens?: Pen[], showChild?: number): any;
     uncombine(pen?: Pen): void;
     appendChild(pens?: Pen[]): void;
+    /***
+     * 修改子图元大小，更新整个组合图元
+     * @param rect 新的大小 世界坐标
+     * @param child 待更新子图元
+     * @param parent 父图元
+     */
+    updateRectbyChild(rect: Rect, child: Pen, parent: Pen): void;
     isCombine(pen: Pen): boolean;
     active(pens: Pen[], emit?: boolean): void;
     inactive(): void;
@@ -218,6 +225,7 @@ export declare class Meta2d {
     stopDataMock(): void;
     penMock(pen: Pen): void;
     penNetwork(pen: Pen): void;
+    getCookie(name: string): string;
     getDynamicParam(key: string): any;
     onNetworkConnect(https: Network[]): void;
     requestHttp(_req: Network): Promise<void>;

package/src/core.js

@@ -1,10 +1,10 @@
 import { commonAnchors, commonPens, cube } from './diagrams';
 import { Canvas } from './canvas';
-import { calcInView, calcTextDrawRect, calcTextLines, calcTextRect, facePen, formatAttrs, getAllChildren, getFromAnchor, getParent, getToAnchor, getWords, LockState, PenType, renderPenRaw, setElemPosition, connectLine, nearestAnchor, setChildValue, isAncestor, isShowChild, CanvasLayer, validationPlugin, setLifeCycleFunc, getAllFollowers, isInteraction } from './pen';
+import { calcInView, calcTextDrawRect, calcTextLines, calcTextRect, facePen, formatAttrs, getAllChildren, getFromAnchor, getParent, getToAnchor, getWords, LockState, PenType, renderPenRaw, setElemPosition, connectLine, nearestAnchor, setChildValue, isAncestor, isShowChild, CanvasLayer, validationPlugin, setLifeCycleFunc, getAllFollowers, isInteraction, calcWorldAnchors } from './pen';
 import { rotatePoint } from './point';
 import { clearStore, EditType, globalStore, register, registerAnchors, registerCanvasDraw, useStore, } from './store';
 import { formatPadding, loadCss, s8, valueInArray, valueInRange, } from './utils';
-import { calcCenter, calcRelativeRect, getRect, rectInRect, } from './rect';
+import { calcCenter, calcRelativeRect, calcRightBottom, getRect, rectInRect, } from './rect';
 import { deepClone } from './utils/clone';
 import { EventAction } from './event';
 import { ViewMap } from './map';
@@ -144,7 +144,7 @@ export class Meta2d {
         this.render();
     }
     setDatabyOptions(options = {}) {
-        const { color, activeColor, activeBackground, grid, gridColor, gridSize, fromArrow, toArrow, rule, ruleColor, textColor, } = options;
+        const { color, activeColor, activeBackground, grid, gridColor, gridSize, fromArrow, toArrow, rule, ruleColor, textColor, x = 0, y = 0, } = options;
         this.setRule({ rule, ruleColor });
         this.setGrid({
             grid,
@@ -158,6 +158,8 @@ export class Meta2d {
             activeBackground,
             fromArrow,
             toArrow,
+            x,
+            y
         });
     }
     init(parent) {
@@ -363,6 +365,12 @@ export class Meta2d {
                         if (value[key] === undefined || value[key] === '') {
                             value[key] = _pen[key];
                         }
+                        else if (typeof value[key] === 'string' && value[key]?.indexOf('${') > -1) {
+                            let keys = value[key].match(/(?<=\$\{).*?(?=\})/g);
+                            if (keys?.length) {
+                                value[key] = _pen[keys[0]];
+                            }
+                        }
                     }
                     // value.id = _pen.id;
                     if (_pen.deviceId) {
@@ -399,20 +407,49 @@ export class Meta2d {
             return;
         };
     }
-    navigatorTo(id) {
+    async navigatorTo(id) {
         if (!id) {
             return;
         }
-        let href = window.location.href;
-        let arr = href.split('id=');
-        if (arr.length > 1) {
-            let idx = arr[1].indexOf('&');
-            if (idx === -1) {
-                window.location.href = arr[0] + 'id=' + id;
+        // let href = window.location.href;
+        // let arr: string[] = href.split('id=');
+        // if (arr.length > 1) {
+        //   let idx = arr[1].indexOf('&');
+        //   if (idx === -1) {
+        //     window.location.href = arr[0] + 'id=' + id;
+        //   } else {
+        //     window.location.href = arr[0] + 'id=' + id + arr[1].slice(idx);
+        //   }
+        // }
+        //路径参数更新
+        const url = new URL(window.location);
+        url.searchParams.set('id', id);
+        history.pushState({}, '', url);
+        //图纸更新
+        const netWork = this.store.options.navigatorNetWork;
+        const collection = (location.href.includes('2d.') || location.href.includes('/2d')) ? '2d' : 'v';
+        const res = await fetch((netWork?.url || `/api/data/${collection}/get`) + (netWork?.method === 'GET' ? `?id=${id}` : ''), {
+            headers: {
+                Authorization: `Bearer ${this.getCookie('token') || localStorage.getItem('token') || new URLSearchParams(location.search).get('token') || ''}`,
+            },
+            method: netWork?.method || 'POST',
+            body: netWork?.method === 'GET' ? undefined : JSON.stringify({ id: id }),
+        });
+        if (res.ok) {
+            let data = await res.text();
+            if (data.constructor === Object || data.constructor === Array) {
+                data = JSON.parse(JSON.stringify(data));
             }
-            else {
-                window.location.href = arr[0] + 'id=' + id + arr[1].slice(idx);
+            else if (typeof data === 'string') {
+                data = JSON.parse(data);
             }
+            if (data.data) {
+                data = data.data;
+            }
+            this.open(data);
+        }
+        else {
+            this.store.emitter.emit('error', { type: 'http', error: res });
         }
     }
     doSendDataEvent(value, topics) {
@@ -1231,7 +1268,7 @@ export class Meta2d {
             pen.parentId = parent.id;
             const childRect = calcRelativeRect(pen.calculative.worldRect, rect);
             Object.assign(pen, childRect);
-            pen.locked = pen.lockedOnCombine ?? LockState.DisableMove;
+            pen.locked = pen.lockedOnCombine ?? LockState.None;
             pen.locked = (pen.interaction || isInteraction.includes(pen.name)) ? 0 : pen.locked;
         });
         //将组合后的父节点置底
@@ -1328,9 +1365,26 @@ export class Meta2d {
         const pIdx = pens.findIndex(pen => pen.name === 'combine' && pen.showChild !== undefined);
         if (pIdx !== -1) {
             let parent = pens[pIdx];
-            this.pushChildren(parent, [...pens.slice(0, pIdx), ...pens.slice(pIdx + 1)]);
+            // this.pushChildren(parent,[...pens.slice(0, pIdx), ...pens.slice(pIdx + 1)]);
+            const rect = getRect(pens);
+            Object.assign(parent, rect);
+            Object.assign(parent.calculative.worldRect, rect);
+            calcWorldAnchors(parent);
+            parent.children.forEach(penId => {
+                const pen = this.store.pens[penId];
+                const childRect = calcRelativeRect(pen.calculative.worldRect, rect);
+                Object.assign(pen, childRect);
+            });
             pens.forEach((pen) => {
-                calcInView(pen, true);
+                if (pen.id !== parent.id) {
+                    parent.children.push(pen.id);
+                    pen.parentId = parent.id;
+                    const childRect = calcRelativeRect(pen.calculative.worldRect, rect);
+                    Object.assign(pen, childRect);
+                    pen.locked = pen.lockedOnCombine ?? LockState.DisableMove;
+                    pen.locked = (pen.interaction || isInteraction.includes(pen.name)) ? 0 : pen.locked;
+                    calcInView(pen, true);
+                }
             });
             this.initImageCanvas(pens);
             this.render();
@@ -1339,6 +1393,49 @@ export class Meta2d {
             console.warn('Invalid operation!');
         }
     }
+    /***
+     * 修改子图元大小，更新整个组合图元
+     * @param rect 新的大小 世界坐标
+     * @param child 待更新子图元
+     * @param parent 父图元
+     */
+    updateRectbyChild(rect, child, parent) {
+        calcRightBottom(rect);
+        calcCenter(rect);
+        child.calculative.worldRect = rect;
+        if (rectInRect(rect, parent.calculative.worldRect, true)) {
+            const childRect = calcRelativeRect(rect, parent.calculative.worldRect);
+            Object.assign(child, childRect);
+        }
+        else {
+            let x = Math.min(rect.x, parent.calculative.worldRect.x);
+            let y = Math.min(rect.y, parent.calculative.worldRect.y);
+            let ex = Math.max(rect.ex, parent.calculative.worldRect.ex);
+            let ey = Math.max(rect.ey, parent.calculative.worldRect.ey);
+            parent.calculative.worldRect = {
+                x: x,
+                y: y,
+                width: ex - x,
+                height: ey - y,
+                ex,
+                ey
+            };
+            if (!parent.parentId) {
+                Object.assign(parent, parent.calculative.worldRect);
+            }
+            calcCenter(parent.calculative.worldRect);
+            parent.children.forEach((cid) => {
+                const cPen = this.store.pens[cid];
+                const childRect = calcRelativeRect(cPen.calculative.worldRect, parent.calculative.worldRect);
+                Object.assign(cPen, childRect);
+            });
+            if (parent.parentId) {
+                this.updateRectbyChild(parent.calculative.worldRect, parent, this.store.pens[parent.parentId]);
+            }
+        }
+        this.canvas.updatePenRect(parent);
+        this.render();
+    }
     isCombine(pen) {
         if (pen.name === 'combine') {
             return true;
@@ -1944,20 +2041,20 @@ export class Meta2d {
             delete this.store.pensNetwork[pen.id];
         }
     }
+    getCookie(name) {
+        let arr;
+        const reg = new RegExp('(^| )' + name + '=([^;]*)(;|$)');
+        if ((arr = document.cookie.match(reg))) {
+            return decodeURIComponent(arr[2]);
+        }
+        else {
+            return '';
+        }
+    }
     //获取动态参数
     getDynamicParam(key) {
-        function getCookie(name) {
-            let arr;
-            const reg = new RegExp('(^| )' + name + '=([^;]*)(;|$)');
-            if ((arr = document.cookie.match(reg))) {
-                return decodeURIComponent(arr[2]);
-            }
-            else {
-                return '';
-            }
-        }
         let params = queryURLParams();
-        let value = params[key] || localStorage[key] || getCookie(key) || '';
+        let value = params[key] || localStorage[key] || this.getCookie(key) || '';
         return value;
     }
     onNetworkConnect(https) {
@@ -4570,6 +4667,7 @@ export class Meta2d {
     setLifeCycleFunc = setLifeCycleFunc;
     destroy(onlyData) {
         this.clear(false);
+        this.stopDataMock();
         this.closeSocket();
         this.closeNetwork();
         this.store.emitter.all.clear(); // 内存释放