@meta2d/core 1.0.48 → 1.0.49

package/src/core.d.ts

@@ -176,6 +176,8 @@ export declare class Meta2d {
     translate(x: number, y: number): void;
     translatePens(pens: Pen[], x: number, y: number): void;
     getParent(pen: Pen, root?: boolean): Pen;
+    getAllChildren(pen: Pen): Pen[];
+    getAllFollowers(pen: Pen): Pen[];
     data(): Meta2dData;
     copy(pens?: Pen[]): void;
     cut(pens?: Pen[]): void;

package/src/core.js

@@ -83,7 +83,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 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, } 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 } from './pen';
 import { rotatePoint } from './point';
 import { clearStore, EditType, globalStore, register, registerAnchors, registerCanvasDraw, useStore, } from './store';
 import { formatPadding, loadCss, s8, valueInArray, valueInRange, } from './utils';
@@ -270,37 +270,41 @@ var Meta2d = /** @class */ (function () {
                                 }
                             }
                             else {
+                                var pValue = pen[key];
+                                if (['x', 'y', 'width', 'height'].includes(key)) {
+                                    pValue = _this.getPenRect(pen)[key];
+                                }
                                 switch (comparison) {
                                     case '>':
-                                        can = pen[key] > +value;
+                                        can = pValue > +value;
                                         break;
                                     case '>=':
-                                        can = pen[key] >= +value;
+                                        can = pValue >= +value;
                                         break;
                                     case '<':
-                                        can = pen[key] < +value;
+                                        can = pValue < +value;
                                         break;
                                     case '<=':
-                                        can = pen[key] <= +value;
+                                        can = pValue <= +value;
                                         break;
                                     case '=':
                                     case '==':
-                                        can = pen[key] == value;
+                                        can = pValue == value;
                                         break;
                                     case '!=':
-                                        can = pen[key] != value;
+                                        can = pValue != value;
                                         break;
                                     case '[)':
-                                        can = valueInRange(+pen[key], value);
+                                        can = valueInRange(+pValue, value);
                                         break;
                                     case '![)':
-                                        can = !valueInRange(+pen[key], value);
+                                        can = !valueInRange(+pValue, value);
                                         break;
                                     case '[]':
-                                        can = valueInArray(pen[key], value);
+                                        can = valueInArray(pValue, value);
                                         break;
                                     case '![]':
-                                        can = !valueInArray(pen[key], value);
+                                        can = !valueInArray(pValue, value);
                                         break;
                                 }
                             }
@@ -750,6 +754,9 @@ var Meta2d = /** @class */ (function () {
                         }
                     }
                     value.id = _pen.id;
+                    if (_pen.deviceId) {
+                        value.deviceId = _pen.deviceId;
+                    }
                     _this.sendDataToNetWork(value, e.network);
                     return;
                 }
@@ -1838,6 +1845,12 @@ var Meta2d = /** @class */ (function () {
     Meta2d.prototype.getParent = function (pen, root) {
         return getParent(pen, root);
     };
+    Meta2d.prototype.getAllChildren = function (pen) {
+        return getAllChildren(pen, this.store);
+    };
+    Meta2d.prototype.getAllFollowers = function (pen) {
+        return getAllFollowers(pen, this.store);
+    };
     Meta2d.prototype.data = function () {
         var data = deepClone(this.store.data);
         var _a = this.store.data, pens = _a.pens, paths = _a.paths;
@@ -2737,6 +2750,9 @@ var Meta2d = /** @class */ (function () {
                 value = this.store.pens[target][condition.value];
             }
             var compareValue = getter(pen, key);
+            if (['x', 'y', 'width', 'height'].includes(key)) {
+                compareValue = this.getPenRect(pen)[key];
+            }
             switch (operator) {
                 case '>':
                     can = compareValue > +value;
@@ -4512,6 +4528,7 @@ var Meta2d = /** @class */ (function () {
             }
         }
         var allPens = getAllChildren(pen, this.store);
+        allPens.push(pen);
         this.initImageCanvas(allPens);
         render && this.render();
     };