@meta2d/core 1.0.16 → 1.0.17

package/src/core.d.ts

@@ -16,8 +16,11 @@ export declare class Meta2d {
     mqttClient: MqttClient;
     websockets: WebSocket[];
     mqttClients: MqttClient[];
-    socketFn: (e: string, topic: string, context?: {
-        meta2d: Meta2d;
+    socketFn: (e: string, context?: {
+        meta2d?: Meta2d;
+        type?: string;
+        topic?: string;
+        url?: string;
     }) => boolean;
     events: Record<number, (pen: Pen, e: Event) => void>;
     map: ViewMap;
@@ -72,7 +75,7 @@ export declare class Meta2d {
         rule?: boolean;
         ruleColor?: string;
     }): void;
-    open(data?: Meta2dData): void;
+    open(data?: Meta2dData, render?: boolean): void;
     initBindDatas(): void;
     connectSocket(): void;
     /**
@@ -186,11 +189,17 @@ export declare class Meta2d {
     connectHttp(): void;
     sendDatabyHttp(data: string): Promise<void>;
     closeHttp(): void;
-    networkTimer: any;
+    updateTimer: any;
     connectNetwork(): void;
+    randomString(e: number): string;
+    penMock(pen: Pen): void;
     onNetworkConnect(https: Network[]): void;
     closeNetwork(): void;
-    socketCallback(message: string, topic?: string): void;
+    socketCallback(message: string, context?: {
+        type?: string;
+        topic?: string;
+        url?: string;
+    }): void;
     setDatas(datas: {
         dataId: string;
         value: any;

package/src/core.js

@@ -756,7 +756,7 @@ var Meta2d = /** @class */ (function () {
         this.store.patchFlagsBackground = true;
     };
     Meta2d.prototype.setGrid = function (_a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.grid, grid = _c === void 0 ? this.store.data.grid : _c, _d = _b.gridColor, gridColor = _d === void 0 ? this.store.data.gridColor : _d, _e = _b.gridSize, gridSize = _e === void 0 ? this.store.data.gridSize : _e, _f = _b.gridRotate, gridRotate = _f === void 0 ? this.store.data.gridRotate : _f;
+        var _b = _a === void 0 ? {} : _a, _c = _b.grid, grid = _c === void 0 ? this.store.data.grid : _c, _e = _b.gridColor, gridColor = _e === void 0 ? this.store.data.gridColor : _e, _f = _b.gridSize, gridSize = _f === void 0 ? this.store.data.gridSize : _f, _g = _b.gridRotate, gridRotate = _g === void 0 ? this.store.data.gridRotate : _g;
         this.store.data.grid = grid;
         this.store.data.gridColor = gridColor;
         this.store.data.gridSize = gridSize;
@@ -764,13 +764,14 @@ var Meta2d = /** @class */ (function () {
         this.store.patchFlagsBackground = true;
     };
     Meta2d.prototype.setRule = function (_a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.rule, rule = _c === void 0 ? this.store.data.rule : _c, _d = _b.ruleColor, ruleColor = _d === void 0 ? this.store.data.ruleColor : _d;
+        var _b = _a === void 0 ? {} : _a, _c = _b.rule, rule = _c === void 0 ? this.store.data.rule : _c, _e = _b.ruleColor, ruleColor = _e === void 0 ? this.store.data.ruleColor : _e;
         this.store.data.rule = rule;
         this.store.data.ruleColor = ruleColor;
         this.store.patchFlagsTop = true;
     };
-    Meta2d.prototype.open = function (data) {
+    Meta2d.prototype.open = function (data, render) {
         var e_1, _a, e_2, _b;
+        if (render === void 0) { render = true; }
         this.clear(false);
         if (data) {
             this.setBackgroundImage(data.bkImage);
@@ -778,8 +779,8 @@ var Meta2d = /** @class */ (function () {
             this.store.data.pens = [];
             try {
                 // 第一遍赋初值
-                for (var _c = __values(data.pens), _d = _c.next(); !_d.done; _d = _c.next()) {
-                    var pen = _d.value;
+                for (var _c = __values(data.pens), _e = _c.next(); !_e.done; _e = _c.next()) {
+                    var pen = _e.value;
                     if (!pen.id) {
                         pen.id = s8();
                     }
@@ -790,24 +791,27 @@ var Meta2d = /** @class */ (function () {
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                    if (_e && !_e.done && (_a = _c.return)) _a.call(_c);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
             try {
-                for (var _e = __values(data.pens), _f = _e.next(); !_f.done; _f = _e.next()) {
-                    var pen = _f.value;
+                for (var _f = __values(data.pens), _g = _f.next(); !_g.done; _g = _f.next()) {
+                    var pen = _g.value;
                     this.canvas.makePen(pen);
                 }
             }
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
-                    if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+                    if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
                 }
                 finally { if (e_2) throw e_2.error; }
             }
         }
+        if (!render) {
+            this.canvas.opening = true;
+        }
         this.initBindDatas();
         this.render();
         this.listenSocket();
@@ -982,15 +986,15 @@ var Meta2d = /** @class */ (function () {
         var _b;
         if (render === void 0) { render = true; }
         try {
-            for (var _c = __values(this.store.data.pens), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var pen = _d.value;
+            for (var _c = __values(this.store.data.pens), _e = _c.next(); !_e.done; _e = _c.next()) {
+                var pen = _e.value;
                 (_b = pen.onDestroy) === null || _b === void 0 ? void 0 : _b.call(pen, pen);
             }
         }
         catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
-                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                if (_e && !_e.done && (_a = _c.return)) _a.call(_c);
             }
             finally { if (e_3) throw e_3.error; }
         }
@@ -1449,7 +1453,7 @@ var Meta2d = /** @class */ (function () {
             var socketFn = void 0;
             var socketCbJs = this.store.data.socketCbJs;
             if (socketCbJs) {
-                socketFn = new Function('e', 'topic', 'context', socketCbJs);
+                socketFn = new Function('e', 'context', socketCbJs);
             }
             if (!socketFn) {
                 return false;
@@ -1471,7 +1475,10 @@ var Meta2d = /** @class */ (function () {
         if (this.store.data.websocket) {
             this.websocket = new WebSocket(this.store.data.websocket, this.store.data.websocketProtocols);
             this.websocket.onmessage = function (e) {
-                _this.socketCallback(e.data);
+                _this.socketCallback(e.data, {
+                    type: 'websocket',
+                    url: _this.store.data.websocket,
+                });
             };
             this.websocket.onclose = function () {
                 console.info('Canvas websocket closed and reconneting...');
@@ -1501,7 +1508,11 @@ var Meta2d = /** @class */ (function () {
             }
             this.mqttClient = mqtt.connect(this.store.data.mqtt, this.store.data.mqttOptions);
             this.mqttClient.on('message', function (topic, message) {
-                _this.socketCallback(message.toString(), topic);
+                _this.socketCallback(message.toString(), {
+                    topic: topic,
+                    type: 'mqtt',
+                    url: _this.store.data.mqtt,
+                });
             });
             if (this.store.data.mqttTopics) {
                 this.mqttClient.subscribe(this.store.data.mqttTopics.split(','));
@@ -1532,7 +1543,7 @@ var Meta2d = /** @class */ (function () {
                                     return [4 /*yield*/, res.text()];
                                 case 2:
                                     data = _a.sent();
-                                    this.socketCallback(data);
+                                    this.socketCallback(data, { type: 'http', url: item.http });
                                     _a.label = 3;
                                 case 3: return [2 /*return*/];
                             }
@@ -1557,7 +1568,7 @@ var Meta2d = /** @class */ (function () {
                                 return [4 /*yield*/, res.text()];
                             case 2:
                                 data = _a.sent();
-                                this.socketCallback(data);
+                                this.socketCallback(data, { type: 'http', url: http_1 });
                                 _a.label = 3;
                             case 3: return [2 /*return*/];
                         }
@@ -1642,7 +1653,11 @@ var Meta2d = /** @class */ (function () {
                     }
                     _this.mqttClients[mqttIndex_1] = mqtt.connect(net.url, net.options);
                     _this.mqttClients[mqttIndex_1].on('message', function (topic, message) {
-                        _this.socketCallback(message.toString(), topic);
+                        _this.socketCallback(message.toString(), {
+                            topic: topic,
+                            type: 'mqtt',
+                            url: net.url,
+                        });
                     });
                     if (net.topics) {
                         _this.mqttClients[mqttIndex_1].subscribe(net.topics.split(','));
@@ -1652,7 +1667,7 @@ var Meta2d = /** @class */ (function () {
                 else if (net.type === 'websocket') {
                     _this.websockets[websocketIndex_1] = new WebSocket(net.url, net.protocols);
                     _this.websockets[websocketIndex_1].onmessage = function (e) {
-                        _this.socketCallback(e.data);
+                        _this.socketCallback(e.data, { type: 'websocket', url: net.url });
                     };
                     websocketIndex_1 += 1;
                 }
@@ -1663,9 +1678,90 @@ var Meta2d = /** @class */ (function () {
             this.onNetworkConnect(https_1);
         }
     };
+    Meta2d.prototype.randomString = function (e) {
+        e = e || 32;
+        var t = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678', a = t.length, n = '';
+        for (var i = 0; i < e; i++) {
+            n += t.charAt(Math.floor(Math.random() * a));
+        }
+        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.binds || !realTime.binds.length) {
+                    if (realTime.type === 'number') {
+                        if (realTime.value && realTime.value.indexOf(',') !== -1) {
+                            var arr = realTime.value.split(',');
+                            var rai = Math.floor(Math.random() * arr.length);
+                            _d_1[realTime.key] = parseFloat(arr[rai]);
+                        }
+                        else if (realTime.value && realTime.value.indexOf('-') !== -1) {
+                            var arr = realTime.value.split('-');
+                            var max = parseFloat(arr[1]);
+                            var min = parseFloat(arr[0]);
+                            _d_1[realTime.key] = Math.random() * (max - min) + min;
+                        }
+                        else {
+                            _d_1[realTime.key] = parseFloat(realTime.value);
+                        }
+                    }
+                    else if (realTime.type === 'bool') {
+                        if (typeof realTime.value === 'boolean') {
+                            _d_1[realTime.key] = realTime.value;
+                        }
+                        else if ('true' === realTime.value) {
+                            _d_1[realTime.key] = true;
+                        }
+                        else if ('false' === realTime.value) {
+                            _d_1[realTime.key] = false;
+                        }
+                        else {
+                            _d_1[realTime.key] = Math.random() < 0.5;
+                        }
+                    }
+                    else if (realTime.type === 'object' || realTime.type === 'array') {
+                        _d_1[realTime.key] = realTime.value;
+                    }
+                    else {
+                        //if (realTime.type === 'string')
+                        if (realTime.value &&
+                            realTime.value.startsWith('{') &&
+                            realTime.value.endsWith('}')) {
+                            var str = realTime.value.substring(1, realTime.value.length - 1);
+                            var arr = str.split(',');
+                            var rai = Math.floor(Math.random() * arr.length);
+                            _d_1[realTime.key] = arr[rai];
+                        }
+                        else if (realTime.value &&
+                            realTime.value.startsWith('[') &&
+                            realTime.value.endsWith(']')) {
+                            var len = parseInt(realTime.value.substring(1, realTime.value.length - 1));
+                            _d_1[realTime.key] = _this.randomString(len);
+                        }
+                        else {
+                            _d_1[realTime.key] = realTime.value;
+                        }
+                    }
+                }
+            });
+            if (Object.keys(_d_1).length) {
+                this.canvas.updateValue(pen, _d_1);
+                this.store.emitter.emit('valueUpdate', pen);
+                (_a = pen.onValue) === null || _a === void 0 ? void 0 : _a.call(pen, pen);
+            }
+        }
+    };
     Meta2d.prototype.onNetworkConnect = function (https) {
         var _this = this;
-        this.networkTimer = setInterval(function () {
+        this.updateTimer = setInterval(function () {
+            //模拟数据
+            _this.store.data.pens.forEach(function (pen) {
+                _this.penMock(pen);
+            });
             https.forEach(function (item) { return __awaiter(_this, void 0, void 0, function () {
                 var res, data;
                 return __generator(this, function (_a) {
@@ -1683,14 +1779,13 @@ var Meta2d = /** @class */ (function () {
                             return [4 /*yield*/, res.text()];
                         case 2:
                             data = _a.sent();
-                            this.socketCallback(data);
+                            this.socketCallback(data, { type: 'http', url: item.url });
                             _a.label = 3;
                         case 3: return [2 /*return*/];
                     }
                 });
             }); });
-            //模拟数据
-            _this.store.data.mockData && _this.store.data.mockData();
+            _this.render();
         }, this.store.data.networkInterval || 1000);
     };
     Meta2d.prototype.closeNetwork = function () {
@@ -1704,14 +1799,19 @@ var Meta2d = /** @class */ (function () {
             });
         this.mqttClients = undefined;
         this.websockets = undefined;
-        clearInterval(this.networkTimer);
-        this.networkTimer = undefined;
+        clearInterval(this.updateTimer);
+        this.updateTimer = undefined;
     };
-    Meta2d.prototype.socketCallback = function (message, topic) {
+    Meta2d.prototype.socketCallback = function (message, context) {
         var _this = this;
-        if (topic === void 0) { topic = ''; }
-        this.store.emitter.emit('socket', { message: message, topic: topic });
-        if (this.socketFn && !this.socketFn(message, topic, { meta2d: this })) {
+        this.store.emitter.emit('socket', { message: message, context: context });
+        if (this.socketFn &&
+            !this.socketFn(message, {
+                meta2d: this,
+                type: context.type,
+                topic: context.topic,
+                url: context.url,
+            })) {
             return;
         }
         var data;
@@ -1747,7 +1847,7 @@ var Meta2d = /** @class */ (function () {
     // 绑定变量方式更新组件数据
     Meta2d.prototype.setDatas = function (datas, _a) {
         var _this = this;
-        var _b = _a === void 0 ? {} : _a, _c = _b.render, render = _c === void 0 ? true : _c, _d = _b.doEvent, doEvent = _d === void 0 ? true : _d, history = _b.history;
+        var _b = _a === void 0 ? {} : _a, _c = _b.render, render = _c === void 0 ? true : _c, _e = _b.doEvent, doEvent = _e === void 0 ? true : _e, history = _b.history;
         // 把{dataId: string; value: any}转成setValue格式数据
         var penValues = new Map();
         datas.forEach(function (v) {
@@ -1803,7 +1903,7 @@ var Meta2d = /** @class */ (function () {
     };
     Meta2d.prototype.setValue = function (data, _a) {
         var _this = this;
-        var _b = _a === void 0 ? {} : _a, _c = _b.render, render = _c === void 0 ? true : _c, _d = _b.doEvent, doEvent = _d === void 0 ? true : _d, history = _b.history;
+        var _b = _a === void 0 ? {} : _a, _c = _b.render, render = _c === void 0 ? true : _c, _e = _b.doEvent, doEvent = _e === void 0 ? true : _e, history = _b.history;
         var pens = [];
         if (data.id) {
             if (data.id === this.store.data.id) {
@@ -2020,12 +2120,33 @@ var Meta2d = /** @class */ (function () {
      * @param padding 上右下左的内边距
      */
     Meta2d.prototype.downloadPng = function (name, padding) {
-        var a = document.createElement('a');
-        a.setAttribute('download', name || 'le5le.meta2d.png');
-        a.setAttribute('href', this.toPng(padding, undefined, true));
-        var evt = document.createEvent('MouseEvents');
-        evt.initEvent('click', true, true);
-        a.dispatchEvent(evt);
+        var e_4, _a;
+        var _this = this;
+        var _b;
+        try {
+            for (var _c = __values(this.store.data.pens), _e = _c.next(); !_e.done; _e = _c.next()) {
+                var pen = _e.value;
+                if (pen.calculative.img) {
+                    //重新生成绘制图片
+                    (_b = pen.onRenderPenRaw) === null || _b === void 0 ? void 0 : _b.call(pen, pen);
+                }
+            }
+        }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        finally {
+            try {
+                if (_e && !_e.done && (_a = _c.return)) _a.call(_c);
+            }
+            finally { if (e_4) throw e_4.error; }
+        }
+        setTimeout(function () {
+            var a = document.createElement('a');
+            a.setAttribute('download', name || 'le5le.meta2d.png');
+            a.setAttribute('href', _this.toPng(padding, undefined, true));
+            var evt = document.createEvent('MouseEvents');
+            evt.initEvent('click', true, true);
+            a.dispatchEvent(evt);
+        });
     };
     Meta2d.prototype.getRect = function (pens) {
         if (pens === void 0) { pens = this.store.data.pens; }
@@ -2346,7 +2467,7 @@ var Meta2d = /** @class */ (function () {
         this.formatPainter();
     };
     Meta2d.prototype.alignNodes = function (align, pens, rect) {
-        var e_4, _a;
+        var e_5, _a;
         if (pens === void 0) { pens = this.store.data.pens; }
         !rect && (rect = this.getPenRect(this.getRect(pens)));
         var initPens = deepClone(pens); // 原 pens ，深拷贝一下
@@ -2356,12 +2477,12 @@ var Meta2d = /** @class */ (function () {
                 this.alignPen(align, item, rect);
             }
         }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
         finally {
             try {
                 if (pens_1_1 && !pens_1_1.done && (_a = pens_1.return)) _a.call(pens_1);
             }
-            finally { if (e_4) throw e_4.error; }
+            finally { if (e_5) throw e_5.error; }
         }
         this.render();
         this.pushHistory({
@@ -2450,7 +2571,7 @@ var Meta2d = /** @class */ (function () {
      * @param distance 总的宽 or 高
      */
     Meta2d.prototype.spaceBetweenByDirection = function (direction, pens, distance) {
-        var e_5, _a;
+        var e_6, _a;
         var _this = this;
         if (pens === void 0) { pens = this.store.data.pens; }
         !distance && (distance = this.getPenRect(this.getRect(pens))[direction]);
@@ -2484,12 +2605,12 @@ var Meta2d = /** @class */ (function () {
                 this.setValue(__assign({ id: pen.id }, penRect), { render: false, doEvent: false });
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
                 if (pens_2_1 && !pens_2_1.done && (_a = pens_2.return)) _a.call(pens_2);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         this.render();
         this.pushHistory({
@@ -2657,7 +2778,7 @@ var Meta2d = /** @class */ (function () {
      * @param pen 画笔
      */
     Meta2d.prototype.upByArea = function (pen) {
-        var _a, e_6, _b;
+        var _a, e_7, _b;
         var _this = this;
         var index = this.store.data.pens.findIndex(function (p) { return p.id === pen.id; });
         if (index === -1) {
@@ -2707,12 +2828,12 @@ var Meta2d = /** @class */ (function () {
                 _loop_4(pen_2);
             }
         }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (allPens_1_1 && !allPens_1_1.done && (_b = allPens_1.return)) _b.call(allPens_1);
             }
-            finally { if (e_6) throw e_6.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         this.initImageCanvas([pen]);
     };
@@ -2872,7 +2993,7 @@ var Meta2d = /** @class */ (function () {
             var nextNodes_1 = [];
             // 2. 遍历出线的 nextNode
             lines.forEach(function (line) {
-                var e_7, _a;
+                var e_8, _a;
                 var lineNextNode = _this.nextNode(line);
                 var _loop_7 = function (node) {
                     var have = nextNodes_1.find(function (next) { return next.id === node.id; });
@@ -2885,12 +3006,12 @@ var Meta2d = /** @class */ (function () {
                         _loop_7(node);
                     }
                 }
-                catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                catch (e_8_1) { e_8 = { error: e_8_1 }; }
                 finally {
                     try {
                         if (lineNextNode_1_1 && !lineNextNode_1_1.done && (_a = lineNextNode_1.return)) _a.call(lineNextNode_1);
                     }
-                    finally { if (e_7) throw e_7.error; }
+                    finally { if (e_8) throw e_8.error; }
                 }
             });
             return nextNodes_1;
@@ -2913,7 +3034,7 @@ var Meta2d = /** @class */ (function () {
             var preNodes_1 = [];
             // 2. 遍历入线的 preNode
             lines.forEach(function (line) {
-                var e_8, _a;
+                var e_9, _a;
                 var linePreNode = _this.previousNode(line);
                 var _loop_8 = function (node) {
                     var have = preNodes_1.find(function (pre) { return pre.id === node.id; });
@@ -2926,12 +3047,12 @@ var Meta2d = /** @class */ (function () {
                         _loop_8(node);
                     }
                 }
-                catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                catch (e_9_1) { e_9 = { error: e_9_1 }; }
                 finally {
                     try {
                         if (linePreNode_1_1 && !linePreNode_1_1.done && (_a = linePreNode_1.return)) _a.call(linePreNode_1);
                     }
-                    finally { if (e_8) throw e_8.error; }
+                    finally { if (e_9) throw e_9.error; }
                 }
             });
             return preNodes_1;
@@ -3207,7 +3328,7 @@ var Meta2d = /** @class */ (function () {
             : deepClone(__spreadArray([parent], __read(components), false));
     };
     Meta2d.prototype.setVisible = function (pen, visible, render) {
-        var e_9, _a;
+        var e_10, _a;
         if (render === void 0) { render = true; }
         this.onSizeUpdate();
         this.setValue({ id: pen.id, visible: visible }, { render: false, doEvent: false });
@@ -3219,12 +3340,12 @@ var Meta2d = /** @class */ (function () {
                     child && this.setVisible(child, visible, false);
                 }
             }
-            catch (e_9_1) { e_9 = { error: e_9_1 }; }
+            catch (e_10_1) { e_10 = { error: e_10_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_9) throw e_9.error; }
+                finally { if (e_10) throw e_10.error; }
             }
         }
         render && this.render();