@meta2d/core 1.0.47 → 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;
@@ -303,6 +305,11 @@ export declare class Meta2d {
      * @param pens 画笔们
      */
     formatPainterByFirst(pens?: Pen[]): void;
+    /**
+     * 格式刷（样式相同，大小无需一致。）
+     * @param pens 画笔们
+     */
+    formatPainterByLast(pens?: Pen[]): void;
     setFormatPainter(): void;
     formatPainter(): void;
     clearFormatPainter(): 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';
@@ -143,29 +143,29 @@ var Meta2d = /** @class */ (function () {
                     }
                     break;
                 case 'click':
-                    e.pen && e.pen.onClick && e.pen.onClick(e.pen, _this.canvas.mousePos);
-                    _this.store.data.locked && e.pen && _this.doEvent(e.pen, eventName);
+                    e.pen && e.pen.onClick && (!e.pen.disabled) && e.pen.onClick(e.pen, _this.canvas.mousePos);
+                    _this.store.data.locked && e.pen && (!e.pen.disabled) && _this.doEvent(e.pen, eventName);
                     break;
                 case 'contextmenu':
                     e.pen &&
-                        e.pen.onContextmenu &&
+                        e.pen.onContextmenu && (!e.pen.disabled) &&
                         e.pen.onContextmenu(e.pen, _this.canvas.mousePos);
-                    _this.store.data.locked && e.pen && _this.doEvent(e.pen, eventName);
+                    _this.store.data.locked && e.pen && (!e.pen.disabled) && _this.doEvent(e.pen, eventName);
                     break;
                 case 'mousedown':
                     e.pen &&
-                        e.pen.onMouseDown &&
+                        e.pen.onMouseDown && (!e.pen.disabled) &&
                         e.pen.onMouseDown(e.pen, _this.canvas.mousePos);
-                    _this.store.data.locked && e.pen && _this.doEvent(e.pen, eventName);
+                    _this.store.data.locked && e.pen && (!e.pen.disabled) && _this.doEvent(e.pen, eventName);
                     break;
                 case 'mouseup':
                     e.pen &&
-                        e.pen.onMouseUp &&
+                        e.pen.onMouseUp && (!e.pen.disabled) &&
                         e.pen.onMouseUp(e.pen, _this.canvas.mousePos);
-                    _this.store.data.locked && e.pen && _this.doEvent(e.pen, eventName);
+                    _this.store.data.locked && e.pen && (!e.pen.disabled) && _this.doEvent(e.pen, eventName);
                     break;
                 case 'dblclick':
-                    _this.store.data.locked && e.pen && _this.doEvent(e.pen, eventName);
+                    _this.store.data.locked && e.pen && (!e.pen.disabled) && _this.doEvent(e.pen, eventName);
                     break;
                 case 'valueUpdate':
                     _this.store.data.locked && _this.doEvent(e, eventName);
@@ -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;
@@ -1855,6 +1868,7 @@ var Meta2d = /** @class */ (function () {
         for (var pathId in paths) {
             _loop_2(pathId);
         }
+        data.dataPoints = __spreadArray(__spreadArray([], __read(Object.keys(this.store.bind)), false), __read(Object.keys(this.store.bindDatas)), false);
         return data;
     };
     Meta2d.prototype.copy = function (pens) {
@@ -2592,6 +2606,22 @@ var Meta2d = /** @class */ (function () {
             pens = this.find(data.tag);
         }
         else {
+            var binds = [];
+            for (var key in data) {
+                binds.push({
+                    dataId: key,
+                    id: key,
+                    value: data[key]
+                });
+            }
+            ;
+            if (binds.length) {
+                this.setDatas(binds, {
+                    render: render,
+                    doEvent: doEvent,
+                    history: history,
+                });
+            }
             return;
         }
         history = history && !this.store.data.locked;
@@ -2720,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;
@@ -2747,10 +2780,10 @@ var Meta2d = /** @class */ (function () {
                     can = !valueInRange(+compareValue, value);
                     break;
                 case '[]':
-                    can = valueInArray(+compareValue, value);
+                    can = valueInArray(compareValue, value);
                     break;
                 case '![]':
-                    can = !valueInArray(+compareValue, value);
+                    can = !valueInArray(compareValue, value);
                     break;
             }
         }
@@ -3240,6 +3273,30 @@ var Meta2d = /** @class */ (function () {
             pens: pens,
         });
     };
+    /**
+     * 格式刷（样式相同，大小无需一致。）
+     * @param pens 画笔们
+     */
+    Meta2d.prototype.formatPainterByLast = function (pens) {
+        if (pens === void 0) { pens = this.store.data.pens; }
+        var initPens = deepClone(pens); // 原 pens ，深拷贝一下
+        var firstPen = pens[pens.length - 1];
+        // 格式刷修改的属性，除开宽高
+        var attrs = {};
+        formatAttrs.forEach(function (attr) {
+            attrs[attr] = firstPen[attr];
+        });
+        for (var i = 0; i < pens.length - 1; i++) {
+            var pen = pens[i];
+            this.setValue(__assign({ id: pen.id }, attrs), { render: false, doEvent: false });
+        }
+        this.render();
+        this.pushHistory({
+            type: EditType.Update,
+            initPens: initPens,
+            pens: pens,
+        });
+    };
     Meta2d.prototype.setFormatPainter = function () {
         var _this = this;
         var pens = this.store.active;
@@ -4471,6 +4528,7 @@ var Meta2d = /** @class */ (function () {
             }
         }
         var allPens = getAllChildren(pen, this.store);
+        allPens.push(pen);
         this.initImageCanvas(allPens);
         render && this.render();
     };