@meta2d/core 1.0.78 → 1.0.80

package/src/core.d.ts

@@ -3,7 +3,7 @@ import { Canvas } from './canvas';
 import { Options, PenPlugin, PluginOptions } from './options';
 import { calcTextDrawRect, calcTextLines, calcTextRect, facePen, getWords, LockState, Pen, renderPenRaw, IValue, setElemPosition } from './pen';
 import { Point } from './point';
-import { EditAction, register, registerAnchors, registerCanvasDraw, Meta2dData, Meta2dStore, Network, HttpOptions, Sql } from './store';
+import { EditAction, register, registerAnchors, registerCanvasDraw, registerLineAnimateDraws, Meta2dData, Meta2dStore, Network, HttpOptions, Sql } from './store';
 import { Padding } from './utils';
 import { Rect } from './rect';
 import { Event, TriggerCondition } from './event';
@@ -103,6 +103,7 @@ export declare class Meta2d {
     open(data?: Meta2dData, render?: boolean): void;
     cacheData(id: string): void;
     loadCacheData(id: string): void;
+    loadLineAnimateDraws(): void;
     statistics(): {
         图元总数量: number;
         图片图元数量: number;
@@ -148,6 +149,7 @@ export declare class Meta2d {
     register: typeof register;
     registerCanvasDraw: typeof registerCanvasDraw;
     registerAnchors: typeof registerAnchors;
+    registerLineAnimateDraws: typeof registerLineAnimateDraws;
     registerMoveDock(dock: (store: Meta2dStore, rect: Rect, pens: Pen[], offset: Point) => {
         xDock: Point;
         yDock: Point;
@@ -278,6 +280,7 @@ export declare class Meta2d {
         topic?: string;
         url?: string;
         method?: string;
+        name?: string;
     }): void;
     setDatas(datas: {
         dataId?: string;

package/src/core.js

@@ -2,7 +2,7 @@ import { commonAnchors, commonPens, cube, reset, updateFormData } from './diagra
 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, calcWorldAnchors, isDomShapes, } from './pen';
 import { rotatePoint } from './point';
-import { clearStore, EditType, globalStore, register, registerAnchors, registerCanvasDraw, useStore, } from './store';
+import { clearStore, EditType, globalStore, register, registerAnchors, registerCanvasDraw, registerLineAnimateDraws, useStore, } from './store';
 import { formatPadding, loadCss, s8, valueInArray, valueInRange, } from './utils';
 import { calcCenter, calcRelativeRect, calcRightBottom, getRect, rectInRect, } from './rect';
 import { deepClone } from './utils/clone';
@@ -876,6 +876,7 @@ export class Meta2d {
         this.initBindDatas();
         this.initBinds();
         this.doInitFn();
+        this.loadLineAnimateDraws();
         this.initMessageEvents();
         this.initGlobalTriggers();
         this.startAnimate();
@@ -954,6 +955,11 @@ export class Meta2d {
         });
         this.render();
     }
+    loadLineAnimateDraws() {
+        Object.entries(this.store.data.lineAnimateDraws).forEach(([key, drawFunc]) => {
+            globalStore.lineAnimateDraws[key] = eval(drawFunc);
+        });
+    }
     statistics() {
         const num = this.store.data.pens.length;
         const imgNum = this.store.data.pens.filter((pen) => pen.image).length;
@@ -1320,6 +1326,7 @@ export class Meta2d {
     register = register;
     registerCanvasDraw = registerCanvasDraw;
     registerAnchors = registerAnchors;
+    registerLineAnimateDraws = registerLineAnimateDraws;
     // customeDock = (store, rect, pens, offset) => {xDock, yDock}
     // customDock return:
     // {
@@ -1885,6 +1892,9 @@ export class Meta2d {
             ...Object.keys(this.store.bind),
             ...Object.keys(this.store.bindDatas),
         ];
+        Object.entries(globalStore.lineAnimateDraws).forEach(([key, drawFunc]) => {
+            data.lineAnimateDraws[key] = drawFunc.toString();
+        });
         return data;
     }
     copy(pens) {
@@ -2291,7 +2301,7 @@ export class Meta2d {
     connectSSE(net) {
         this.eventSources[net.index] = new EventSource(net.url, { withCredentials: net.withCredentials });
         this.eventSources[net.index].onmessage = (e) => {
-            this.socketCallback(e.data, { type: 'SSE', url: net.url });
+            this.socketCallback(e.data, { type: 'SSE', url: net.url, name: net.name });
         };
         this.eventSources[net.index].onerror = (error) => {
             this.store.emitter.emit('error', { type: 'SSE', error });
@@ -2326,6 +2336,7 @@ export class Meta2d {
                 topic,
                 type: 'mqtt',
                 url: net.url,
+                name: net.name
             });
         });
         this.mqttClients[net.index].on('error', (error) => {
@@ -2361,7 +2372,7 @@ export class Meta2d {
         }
         this.websockets[net.index] = new WebSocket(url, net.protocols || undefined);
         this.websockets[net.index].onmessage = (e) => {
-            this.socketCallback(e.data, { type: 'websocket', url: net.url });
+            this.socketCallback(e.data, { type: 'websocket', url: net.url, name: net.name });
         };
         this.websockets[net.index].onerror = (error) => {
             this.store.emitter.emit('error', { type: 'websocket', error });
@@ -2735,7 +2746,7 @@ export class Meta2d {
             });
             if (res.ok) {
                 const data = await res.text();
-                this.socketCallback(data, { type: 'http', url: req.url });
+                this.socketCallback(data, { type: 'http', url: req.url, name: req.name });
             }
             else {
                 _req.times++;
@@ -3936,7 +3947,7 @@ export class Meta2d {
                     else {
                         right = 0;
                     }
-                    let ratio = (this.canvas.width - left - right) / (rect.width);
+                    let ratio = (this.canvas.width - left - right) / (rect.width - left - right);
                     pens.forEach((pen) => {
                         if (pen.image && pen.imageRatio) {
                             if (pen.calculative.worldRect.width / this.canvas.width > 0.1) {
@@ -3959,7 +3970,7 @@ export class Meta2d {
                         if (pen.externElement) {
                             pen.onResize?.(pen);
                         }
-                        if (pen.children.length) {
+                        if (pen.children?.length) {
                             const cPens = getAllChildren(pen, this.store);
                             cPens.forEach((cPen) => {
                                 if (cPen.externElement) {