@meta2d/core 1.0.48 → 1.0.50

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;
@@ -206,6 +208,10 @@ export declare class Meta2d {
     updateTimerList: any[];
     connectNetwork(): void;
     randomString(e: number): string;
+    mockValue(data: any): any;
+    dataMock(): void;
+    startDataMock(): void;
+    stopDataMock(): void;
     penMock(pen: Pen): void;
     penNetwork(pen: Pen): void;
     getDynamicParam(key: string): any;
@@ -242,8 +248,14 @@ export declare class Meta2d {
     clearRuleLines(): void;
     private onEvent;
     private doEvent;
+    doDataEvent: (datas: {
+        dataId?: string;
+        id?: string;
+        value: any;
+    }[]) => void;
     initGlobalTriggers(): void;
     initMessageEvents(): void;
+    dataJudegeCondition(data: any, key: string, condition: TriggerCondition): boolean;
     judgeCondition(pen: Pen, key: string, condition: TriggerCondition): boolean;
     pushChildren(parent: Pen, children: Pen[]): void;
     renderPenRaw: typeof renderPenRaw;

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;
                                 }
                             }
@@ -394,6 +398,47 @@ var Meta2d = /** @class */ (function () {
             // 事件冒泡，子执行完，父执行
             _this.doEvent(_this.store.pens[pen.parentId], eventName);
         };
+        this.doDataEvent = function (datas) {
+            var _a, _b, _c;
+            if (!((_a = _this.store.data.dataEvents) === null || _a === void 0 ? void 0 : _a.length)) {
+                return;
+            }
+            var data = datas.reduce(function (accumulator, _a) {
+                var dataId = _a.dataId, id = _a.id, value = _a.value;
+                accumulator[id || dataId] = value;
+                return accumulator;
+            }, {});
+            var indexArr = [];
+            (_b = _this.store.data.dataEvents) === null || _b === void 0 ? void 0 : _b.forEach(function (event, index) {
+                var flag = false;
+                if (event.conditions && event.conditions.length) {
+                    if (event.conditionType === 'and') {
+                        flag = event.conditions.every(function (condition) {
+                            return _this.dataJudegeCondition(data, condition.key, condition);
+                        });
+                    }
+                    else if (event.conditionType === 'or') {
+                        flag = event.conditions.some(function (condition) {
+                            return _this.dataJudegeCondition(data, condition.key, condition);
+                        });
+                    }
+                }
+                else {
+                    flag = true;
+                }
+                if (flag) {
+                    indexArr.push(index);
+                }
+            });
+            (_c = _this.store.data.dataEvents) === null || _c === void 0 ? void 0 : _c.forEach(function (event, index) {
+                var _a;
+                if (indexArr.includes(index)) {
+                    (_a = event.actions) === null || _a === void 0 ? void 0 : _a.forEach(function (action) {
+                        _this.events[action.action](data, action);
+                    });
+                }
+            });
+        };
         this.renderPenRaw = renderPenRaw;
         this.setElemPosition = setElemPosition;
         this.setLifeCycleFunc = setLifeCycleFunc;
@@ -750,6 +795,9 @@ var Meta2d = /** @class */ (function () {
                         }
                     }
                     value.id = _pen.id;
+                    if (_pen.deviceId) {
+                        value.deviceId = _pen.deviceId;
+                    }
                     _this.sendDataToNetWork(value, e.network);
                     return;
                 }
@@ -1101,6 +1149,7 @@ var Meta2d = /** @class */ (function () {
         this.listenSocket();
         this.connectSocket();
         this.connectNetwork();
+        this.startDataMock();
         this.startAnimate();
         this.startVideo();
         this.doInitJS();
@@ -1838,6 +1887,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;
@@ -2142,124 +2197,172 @@ var Meta2d = /** @class */ (function () {
         }
         return n;
     };
-    Meta2d.prototype.penMock = function (pen) {
-        var _this = this;
-        var _a;
-        if (pen.realTimes) {
-            var _d_1 = {};
-            pen.realTimes.forEach(function (realTime) {
-                if (realTime.enableMock && realTime.mock !== undefined) {
-                    if (realTime.type === 'float') {
-                        if (realTime.mock && realTime.mock.indexOf(',') !== -1) {
-                            var arr = realTime.mock.split(',');
-                            var rai = Math.floor(Math.random() * arr.length);
-                            _d_1[realTime.key] = parseFloat(arr[rai]);
-                        }
-                        else if (realTime.mock && realTime.mock.indexOf('-') !== -1) {
-                            var max = void 0;
-                            var min = void 0;
-                            var len = void 0;
-                            var arr = realTime.mock.split('-');
-                            if (realTime.mock.charAt(0) === '-') {
-                                //负数
-                                if (arr.length === 4) {
-                                    max = -parseFloat(arr[3]);
-                                    min = -parseFloat(arr[1]);
-                                    len = arr[3];
-                                }
-                                else {
-                                    max = parseFloat(arr[2]);
-                                    min = -parseFloat(arr[1]);
-                                    len = arr[2];
-                                }
-                            }
-                            else {
-                                max = parseFloat(arr[1]);
-                                min = parseFloat(arr[0]);
-                                len = arr[1];
-                            }
-                            if ((len + '').indexOf('.') !== -1) {
-                                var length_1 = (len + '').split('.')[1].length;
-                                _d_1[realTime.key] = (Math.random() * (max - min) + min).toFixed(length_1);
-                            }
-                            else {
-                                _d_1[realTime.key] = Math.random() * (max - min) + min;
-                            }
-                        }
-                        else {
-                            _d_1[realTime.key] = parseFloat(realTime.mock);
-                        }
-                    }
-                    else if (realTime.type === 'integer') {
-                        if (realTime.mock && realTime.mock.indexOf(',') !== -1) {
-                            var arr = realTime.mock.split(',');
-                            var rai = Math.floor(Math.random() * arr.length);
-                            _d_1[realTime.key] = parseInt(arr[rai]);
-                        }
-                        else if (realTime.mock && realTime.mock.indexOf('-') !== -1) {
-                            var max = void 0;
-                            var min = void 0;
-                            var arr = realTime.mock.split('-');
-                            if (realTime.mock.charAt(0) === '-') {
-                                if (arr.length === 4) {
-                                    max = -parseFloat(arr[3]);
-                                    min = -parseFloat(arr[1]);
-                                }
-                                else {
-                                    max = parseFloat(arr[2]);
-                                    min = -parseFloat(arr[1]);
-                                }
-                            }
-                            else {
-                                max = parseInt(arr[1]);
-                                min = parseInt(arr[0]);
-                            }
-                            _d_1[realTime.key] = parseInt(Math.random() * (max - min) + min + '');
+    Meta2d.prototype.mockValue = function (data) {
+        var value = undefined;
+        if (data.enableMock && data.mock !== undefined) {
+            if (data.type === 'float') {
+                if (data.mock && data.mock.indexOf(',') !== -1) {
+                    var arr = data.mock.split(',');
+                    var rai = Math.floor(Math.random() * arr.length);
+                    value = parseFloat(arr[rai]);
+                }
+                else if (data.mock && data.mock.indexOf('-') !== -1) {
+                    var max = void 0;
+                    var min = void 0;
+                    var len = void 0;
+                    var arr = data.mock.split('-');
+                    if (data.mock.charAt(0) === '-') {
+                        //负数
+                        if (arr.length === 4) {
+                            max = -parseFloat(arr[3]);
+                            min = -parseFloat(arr[1]);
+                            len = arr[3];
                         }
                         else {
-                            _d_1[realTime.key] = parseInt(realTime.mock);
+                            max = parseFloat(arr[2]);
+                            min = -parseFloat(arr[1]);
+                            len = arr[2];
                         }
                     }
-                    else if (realTime.type === 'bool') {
-                        if (typeof realTime.mock === 'boolean') {
-                            _d_1[realTime.key] = realTime.mock;
-                        }
-                        else if ('true' === realTime.mock) {
-                            _d_1[realTime.key] = true;
-                        }
-                        else if ('false' === realTime.mock) {
-                            _d_1[realTime.key] = false;
-                        }
-                        else {
-                            _d_1[realTime.key] = Math.random() < 0.5;
-                        }
+                    else {
+                        max = parseFloat(arr[1]);
+                        min = parseFloat(arr[0]);
+                        len = arr[1];
                     }
-                    else if (realTime.type === 'object' || realTime.type === 'array') {
-                        if (realTime.mock) {
-                            //对象or数组 不mock
-                            // _d[realTime.key] = realTime.value;
-                        }
+                    if ((len + '').indexOf('.') !== -1) {
+                        var length_1 = (len + '').split('.')[1].length;
+                        value = (Math.random() * (max - min) + min).toFixed(length_1);
                     }
                     else {
-                        //if (realTime.type === 'string')
-                        if (realTime.mock &&
-                            realTime.mock.startsWith('{') &&
-                            realTime.mock.endsWith('}')) {
-                            var str = realTime.mock.substring(1, realTime.mock.length - 1);
-                            var arr = str.split(',');
-                            var rai = Math.floor(Math.random() * arr.length);
-                            _d_1[realTime.key] = arr[rai];
-                        }
-                        else if (realTime.mock &&
-                            realTime.mock.startsWith('[') &&
-                            realTime.mock.endsWith(']')) {
-                            var len = parseInt(realTime.mock.substring(1, realTime.mock.length - 1));
-                            _d_1[realTime.key] = _this.randomString(len);
+                        value = Math.random() * (max - min) + min;
+                    }
+                }
+                else {
+                    value = parseFloat(data.mock);
+                }
+            }
+            else if (data.type === 'integer') {
+                if (data.mock && data.mock.indexOf(',') !== -1) {
+                    var arr = data.mock.split(',');
+                    var rai = Math.floor(Math.random() * arr.length);
+                    value = parseInt(arr[rai]);
+                }
+                else if (data.mock && data.mock.indexOf('-') !== -1) {
+                    var max = void 0;
+                    var min = void 0;
+                    var arr = data.mock.split('-');
+                    if (data.mock.charAt(0) === '-') {
+                        if (arr.length === 4) {
+                            max = -parseFloat(arr[3]);
+                            min = -parseFloat(arr[1]);
                         }
                         else {
-                            _d_1[realTime.key] = realTime.mock;
+                            max = parseFloat(arr[2]);
+                            min = -parseFloat(arr[1]);
                         }
                     }
+                    else {
+                        max = parseInt(arr[1]);
+                        min = parseInt(arr[0]);
+                    }
+                    value = parseInt(Math.random() * (max - min) + min + '');
+                }
+                else {
+                    value = parseInt(data.mock);
+                }
+            }
+            else if (data.type === 'bool') {
+                if (typeof data.mock === 'boolean') {
+                    value = data.mock;
+                }
+                else if ('true' === data.mock) {
+                    value = true;
+                }
+                else if ('false' === data.mock) {
+                    value = false;
+                }
+                else {
+                    value = Math.random() < 0.5;
+                }
+            }
+            else if (data.type === 'object' || data.type === 'array') {
+                if (data.mock) {
+                    //对象or数组 不mock
+                    // _d[realTime.key] = realTime.value;
+                }
+            }
+            else {
+                //if (realTime.type === 'string')
+                if (data.mock && data.mock.indexOf(',') !== -1) {
+                    var str = data.mock.substring(1, data.mock.length - 1);
+                    var arr = str.split(',');
+                    var rai = Math.floor(Math.random() * arr.length);
+                    value = arr[rai];
+                }
+                else if (data.mock &&
+                    data.mock.startsWith('[') &&
+                    data.mock.endsWith(']')) {
+                    var len = parseInt(data.mock.substring(1, data.mock.length - 1));
+                    value = this.randomString(len);
+                }
+                else {
+                    value = data.mock;
+                }
+            }
+        }
+        return value;
+    };
+    //数据模拟
+    Meta2d.prototype.dataMock = function () {
+        var _this = this;
+        var _a, _b;
+        var arr = [];
+        (_b = (_a = this.store.data.dataset) === null || _a === void 0 ? void 0 : _a.devices) === null || _b === void 0 ? void 0 : _b.forEach(function (data) {
+            var value = _this.mockValue(data);
+            if (value !== undefined) {
+                arr.push({
+                    id: data.id,
+                    value: value
+                });
+            }
+        });
+        if (arr.length) {
+            this.setDatas(arr, {
+                render: true,
+                doEvent: true,
+                history: false,
+            });
+        }
+    };
+    Meta2d.prototype.startDataMock = function () {
+        var _this = this;
+        var enable = this.store.data.enableMock;
+        if (enable) {
+            this.stopDataMock();
+            this.initBinds();
+            this.updateTimer = setInterval(function () {
+                //本地调试
+                _this.store.data.pens.forEach(function (pen) {
+                    _this.penMock(pen);
+                });
+                _this.dataMock();
+                _this.render();
+            }, this.store.data.networkInterval || 1000);
+        }
+    };
+    Meta2d.prototype.stopDataMock = function () {
+        clearInterval(this.updateTimer);
+        this.updateTimer = undefined;
+    };
+    Meta2d.prototype.penMock = function (pen) {
+        var _this = this;
+        var _a;
+        if (pen.realTimes) {
+            var _d_1 = {};
+            pen.realTimes.forEach(function (realTime) {
+                var value = _this.mockValue(realTime);
+                if (value !== undefined) {
+                    _d_1[realTime.key] = value;
                 }
             });
             if (Object.keys(_d_1).length) {
@@ -2307,8 +2410,8 @@ var Meta2d = /** @class */ (function () {
     };
     Meta2d.prototype.onNetworkConnect = function (https) {
         var _this = this;
-        var enable = this.store.data.enableMock;
-        if (!(https && https.length) && !enable) {
+        // let enable = this.store.data.enableMock;
+        if (!(https && https.length)) {
             return;
         }
         if (this.store.pensNetwork) {
@@ -2324,18 +2427,18 @@ var Meta2d = /** @class */ (function () {
                 });
             }); });
         }
-        if (enable) {
-            this.updateTimer = setInterval(function () {
-                //模拟数据
-                _this.store.data.pens.forEach(function (pen) {
-                    _this.penMock(pen);
-                });
-                // https.forEach(async (_item) => {
-                //   this.requestHttp(_item);
-                // });
-                _this.render();
-            }, this.store.data.networkInterval || 1000);
-        }
+        // if( enable ){
+        //   this.updateTimer = setInterval(() => {
+        //     //模拟数据
+        //     this.store.data.pens.forEach((pen) => {
+        //       this.penMock(pen);
+        //     });
+        //     // https.forEach(async (_item) => {
+        //     //   this.requestHttp(_item);
+        //     // });
+        //     this.render();
+        //   }, this.store.data.networkInterval || 1000);
+        // }
         https.forEach(function (_item, index) {
             _this.updateTimerList[index] = setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
@@ -2402,8 +2505,8 @@ var Meta2d = /** @class */ (function () {
             });
         this.mqttClients = undefined;
         this.websockets = undefined;
-        clearInterval(this.updateTimer);
-        this.updateTimer = undefined;
+        // clearInterval(this.updateTimer);
+        // this.updateTimer = undefined;
         this.updateTimerList &&
             this.updateTimerList.forEach(function (_updateTimer) {
                 clearInterval(_updateTimer);
@@ -2525,6 +2628,7 @@ var Meta2d = /** @class */ (function () {
                 }
             });
         });
+        this.store.data.locked && this.doDataEvent(datas);
         var initPens;
         var pens;
         if (history) {
@@ -2710,6 +2814,69 @@ var Meta2d = /** @class */ (function () {
             });
         });
     };
+    Meta2d.prototype.dataJudegeCondition = function (data, key, condition) {
+        var type = condition.type, target = condition.target, fnJs = condition.fnJs, fn = condition.fn, operator = condition.operator, valueType = condition.valueType;
+        var can = false;
+        if (type === 'fn') {
+            //方法
+            if (fn) {
+                can = fn(data, { meta2d: this });
+            }
+            else if (fnJs) {
+                try {
+                    condition.fn = new Function('data', 'context', fnJs);
+                }
+                catch (err) {
+                    console.error('Error: make function:', err);
+                }
+                if (condition.fn) {
+                    can = condition.fn(data, { meta2d: this });
+                }
+            }
+        }
+        else {
+            //TODO boolean类型 数字类型
+            var value = condition.value;
+            if (valueType === 'prop') {
+                value = data[condition.value];
+            }
+            var compareValue = data[key];
+            switch (operator) {
+                case '>':
+                    can = compareValue > +value;
+                    break;
+                case '>=':
+                    can = compareValue >= +value;
+                    break;
+                case '<':
+                    can = compareValue < +value;
+                    break;
+                case '<=':
+                    can = compareValue <= +value;
+                    break;
+                case '=':
+                case '==':
+                    can = compareValue == value;
+                    break;
+                case '!=':
+                    can = compareValue != value;
+                    break;
+                case '[)':
+                    can = valueInRange(+compareValue, value);
+                    break;
+                case '![)':
+                    can = !valueInRange(+compareValue, value);
+                    break;
+                case '[]':
+                    can = valueInArray(compareValue, value);
+                    break;
+                case '![]':
+                    can = !valueInArray(compareValue, value);
+                    break;
+            }
+        }
+        return can;
+    };
     Meta2d.prototype.judgeCondition = function (pen, key, condition) {
         var type = condition.type, target = condition.target, fnJs = condition.fnJs, fn = condition.fn, operator = condition.operator, valueType = condition.valueType;
         var can = false;
@@ -2737,6 +2904,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;
@@ -3847,7 +4017,7 @@ var Meta2d = /** @class */ (function () {
             this.setValue({ id: pen.id, canvasLayer: layer }, { render: false, doEvent: false, history: false });
         }
         else if (pen.externElement || pen.name === 'gif') {
-            var zIndex = 1;
+            var zIndex = 0;
             // let zIndex = pen.calculative.zIndex === undefined ? 5 : pen.calculative.zIndex + 1;
             if (type === 'top') {
                 pen.calculative.canvas.maxZindex += 1;
@@ -3860,8 +4030,8 @@ var Meta2d = /** @class */ (function () {
             else if (type === 'down') {
                 zIndex =
                     pen.calculative.zIndex === undefined ? 3 : pen.calculative.zIndex - 1;
-                if (zIndex < 1) {
-                    zIndex = 1;
+                if (zIndex < 0) {
+                    zIndex = 0;
                 }
             }
             this.setValue({ id: pen.id, zIndex: zIndex }, { render: false, doEvent: false, history: false });
@@ -4512,6 +4682,7 @@ var Meta2d = /** @class */ (function () {
             }
         }
         var allPens = getAllChildren(pen, this.store);
+        allPens.push(pen);
         this.initImageCanvas(allPens);
         render && this.render();
     };