dcim-topology2d 2.2.0 → 3.0.2

package/core/src/models/node.js

@@ -1,8 +1,8 @@
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+                ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+                function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
@@ -20,9 +20,8 @@ import { defaultAnchors } from '../middles/default.anchor';
 import { defaultIconRect, defaultTextRect } from '../middles/default.rect';
 import { text, tableText, defaultText, iconfont } from '../middles/nodes/text';
 import { Store } from 'le5le-store';
-import { abs, s8, animateType } from '../utils';
-export const images = {};
-export const defaultImages = {};
+import { abs, s8, animateType, createChildrenDivByElementId } from '../utils';
+export var images = {};
 var Node = /** @class */ (function (_super) {
     __extends(Node, _super);
     function Node(json, noChild) {
@@ -35,13 +34,9 @@ var Node = /** @class */ (function (_super) {
         _this.rotatedAnchors = [];
         _this.animateDuration = 0;
         _this.animateFrames = [];
-        _this.attribute = json.attribute || 'default';
         _this.type = PenType.Node;
-        _this.TID = json.TID;
-        _this.selectDropdown = json.selectDropdown || false;
         _this.is3D = json.is3D;
         _this.z = json.z;
-        _this.order = json.order;
         _this.zRotate = json.zRotate || 0;
         _this.borderRadius = +json.borderRadius || 0;
         _this.icon = json.icon;
@@ -49,16 +44,8 @@ var Node = /** @class */ (function (_super) {
         _this.iconSize = +json.iconSize;
         _this.iconColor = json.iconColor;
         _this.image = json.image;
-        _this.tabData = json.tabData || {
-            state: false,
-            name: '℃',
-            min: 0,
-            max: 60,
-            interval: 20
-        };
         _this.floorImageIndex = json.floorImageIndex || false;
         _this.formData = json.formData || null;
-        _this.pickerOptions = json.pickerOptions || null;
         _this.formStyle = json.formStyle || null;
         _this.formEvents = json.formEvents || [];
         _this.paginationData = json.paginationData || null;
@@ -92,8 +79,8 @@ var Node = /** @class */ (function (_super) {
         _this.leakageEnd = json.leakageEnd || 0;
         _this.leakageFillStyle = json.leakageFillStyle || '#ff0000';
         _this.bindStaticId = json.bindStaticId || '';
-        //_this.buttonCheckSlide = json.buttonCheckSlide || '';
-        _this.visitStrokeStyle = json.visitStrokeStyle || '';
+        _this.buttonCheckSlide = json.buttonCheckSlide || '';
+        _this.activeImgeIndex = json.activeImgeIndex || false;
         _this.thBottomStrokeStyle = json.thBottomStrokeStyle || '#fff';
         _this.thBottomLineWidth = json.thBottomLineWidth || 1;
         // 兼容老数据
@@ -134,31 +121,28 @@ var Node = /** @class */ (function (_super) {
             _this.animateDuration = json.animateDuration;
         }
         _this.animateType = json.animateType
-            ? json.animateType
-            : json.animateDuration
-                ? 'custom'
-                : '';
+                ? json.animateType
+                : json.animateDuration
+                        ? 'custom'
+                        : '';
         _this.animateAlone = json.animateAlone;
         _this.iframe = json.iframe;
-        _this.iframePageAuto = json.iframePageAuto || false;
         _this.elementId = json.elementId;
         _this.audio = json.audio;
         _this.video = json.video;
         _this.play = json.play;
         _this.nextPlay = json.nextPlay;
-        _this.time = json.time;
-        _this.isOpen = json.isOpen;
         if (json.elementLoaded !== undefined) {
             _this.elementId = null;
             _this.elementLoaded = false;
         }
-        if (this.name == 'arbitraryGraph') {
+        if(this.name == 'arbitraryGraph') {
             this.rect.circles = json.rect.circles;
             //let {x, y} = this.centroid(json.rect.circles);
-            let minX = Math.min.apply(Math, json.rect.circles.map((item) => { return item.x }));
-            let minY = Math.min.apply(Math, json.rect.circles.map((item) => { return item.y }));
-            this.rect.x = minX;
-            this.rect.y = minY;
+            let minX =  Math.min.apply(Math, json.rect.circles.map((item)=>{ return item.x}));
+            let minY = Math.min.apply(Math, json.rect.circles.map((item)=>{ return item.y}));
+            this.rect.x =  minX;
+            this.rect.y =  minY;
             this.rect.ex = this.rect.x + this.rect.width;
             this.rect.ey = this.rect.y + this.rect.height;
             // this.rect.center.x = x;
@@ -166,8 +150,8 @@ var Node = /** @class */ (function (_super) {
             // console.log('this.rect', this.rect);
             // console.log('this---node---', this);
         }
-        if (json.name === 'formTable') _this.setFormTableData(json);
-        if (json.name === 'tablePagination') _this.setTablePagination(json);
+        if(json.name === 'formTable') _this.setFormTableData(json);
+        if(json.name === 'tablePagination') _this.setTablePagination(json);
         _this.init();
         if (!noChild) {
             _this.setChild(json.children);
@@ -176,16 +160,6 @@ var Node = /** @class */ (function (_super) {
             _this.children = null;
         }
 
-        if (json.name === 'time') {
-            _this.animateFn = function () {
-                let date = new Date();
-                var hour = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
-                var minute = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
-                var second = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
-                _this.time = { h: hour, m: minute, s: second }
-            }
-        }
-
         return _this;
     }
     Node.cloneState = function (json) {
@@ -214,7 +188,7 @@ var Node = /** @class */ (function (_super) {
         this.addToDiv();
     };
     Node.prototype.setFormTableData = function (json) {
-        if (!Store.get('FORM:tableData')) {
+        if(!Store.get('FORM:tableData')){
             Store.set('FORM:tableData', {
                 data: {
                     tableNodes: {},
@@ -229,18 +203,18 @@ var Node = /** @class */ (function (_super) {
             data: tableData
         })
         const fromData = Store.get('SYNC:tableData');
-        if (fromData) {
-            if (!fromData[json.id].loading) {
+        if(fromData) {
+            if(!fromData[json.id].loading){
                 this.formData.tableBody = fromData[json.id].tableBody;
                 this.formData.total = fromData[json.id].total;
-            } else {
+            }else {
                 this.formData.tableBody = null;
                 this.formData.total = 0;
             }
         }
     };
     Node.prototype.setTablePagination = function (json) {
-        if (!Store.get('FORM:tableData')) {
+        if(!Store.get('FORM:tableData')){
             Store.set('FORM:tableData', {
                 data: {
                     tableNodes: {},
@@ -252,17 +226,24 @@ var Node = /** @class */ (function (_super) {
         const tableData = Store.get('FORM:tableData').data;
         const fromData = Store.get('SYNC:tableData');
         const tnode = fromData ? fromData[json.paginationData.bindFromTableId] : null;
-        if (tnode) json.paginationData.total = tnode.total;
+        if(tnode) json.paginationData.total = tnode.total;
         tableData.paginationNodes[json.id] = json;
         Store.set('FORM:tableData', {
             data: tableData
         })
     };
-    Node.prototype.addToDiv = function () {
-        if (this.iframe ||
-            this.elementId ||
-            this.hasGif()) {
+    Node.prototype.addToDiv = function (type) {
+        if (this.audio ||
+                this.video ||
+                this.iframe ||
+                this.elementId ||
+                this.hasGif()) {
+          if(type) {
+            // 复合Echarts初始化
+            createChildrenDivByElementId(this);
+          }else {
             Store.set(this.generateStoreKey('LT:addDiv'), this);
+          }
         }
     };
     Node.prototype.hasGif = function () {
@@ -292,7 +273,6 @@ var Node = /** @class */ (function (_super) {
         this.children = [];
         for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
             var item = children_1[_i];
-            item.visible = this.visible;
             var child = void 0;
             switch (item.type) {
                 case PenType.Line:
@@ -337,13 +317,13 @@ var Node = /** @class */ (function (_super) {
                 this.drawBkRadialGradient(ctx);
                 break;
         }
-        if (this.name === 'tablePagination') defaultText(ctx, this);
+        if(this.name === 'tablePagination') defaultText(ctx, this);
         // Draw shape.
         drawNodeFns[this.name](ctx, this);
         // Draw text.
-        if (this.name === 'formTable') {
+        if(this.name === 'formTable') {
             tableText(ctx, this);
-        } else {
+        }else {
             if (this.name !== 'text' && this.text && !(this.image && this.floorImageIndex === true)) {
                 text(ctx, this);
             }
@@ -425,10 +405,9 @@ var Node = /** @class */ (function (_super) {
             //this.drawImg(ctx);
             return;
         }
-        const defaultImageNode = defaultImages[this.id];
         var img = new Image();
         img.crossOrigin = 'anonymous';
-        img.src = defaultImageNode && defaultImageNode.status === 404 ? '' : this.image;
+        img.src = this.image;
         img.onload = function (e) {
             _this.lastImage = _this.image;
             _this.imgNaturalWidth = img.naturalWidth;
@@ -438,22 +417,14 @@ var Node = /** @class */ (function (_super) {
                 img: img,
                 cnt: 1,
             };
-            if (defaultImageNode) delete defaultImages[_this.id];
             Store.set(_this.generateStoreKey('LT:imageLoaded'), true);
             if (!_this.gif && gif) {
                 _this.gif = true;
                 Store.set(_this.generateStoreKey('LT:addDiv'), _this);
             }
         };
-        img.onerror = function (e) {
-            // 图片加载失败时预留默认图为空
-            defaultImages[_this.id] = {
-                img: '',
-                status: 404
-            };
-        };
     };
-    Node.prototype.initDrawImg = function (ctx) {
+    Node.prototype.initDrawImg = function (ctx){
         var _this = this;
         ctx.save();
         ctx.shadowColor = '';
@@ -511,7 +482,7 @@ var Node = /** @class */ (function (_super) {
                 y = rect.ey - h;
                 break;
         }
-        if (!_this.activeImgeIndex) ctx.drawImage(this.img, x, y, w, h);
+        if(!_this.activeImgeIndex) ctx.drawImage(this.img, x, y, w, h);
         ctx.restore();
     };
     Node.prototype.calcAnchors = function () {
@@ -556,21 +527,21 @@ var Node = /** @class */ (function (_super) {
         var parentW = parent.rect.width - parent.paddingLeftNum - parent.paddingRightNum;
         var parentH = parent.rect.height - parent.paddingTopNum - parent.paddingBottomNum;
         var x = parent.rect.x +
-            parent.paddingLeftNum +
-            abs(parentW, this.rectInParent.x) +
-            abs(parentW, this.rectInParent.marginLeft);
+                parent.paddingLeftNum +
+                abs(parentW, this.rectInParent.x) +
+                abs(parentW, this.rectInParent.marginLeft);
         var y = parent.rect.y +
-            parent.paddingTopNum +
-            abs(parentH, this.rectInParent.y) +
-            abs(parentW, this.rectInParent.marginTop);
+                parent.paddingTopNum +
+                abs(parentH, this.rectInParent.y) +
+                abs(parentW, this.rectInParent.marginTop);
         var w = abs(parentW, this.rectInParent.width);
         var h = abs(parentH, this.rectInParent.height);
         if (this.rectInParent.marginLeft === undefined &&
-            this.rectInParent.marginRight) {
+                this.rectInParent.marginRight) {
             x -= abs(parentW, this.rectInParent.marginRight);
         }
         if (this.rectInParent.marginTop === undefined &&
-            this.rectInParent.marginBottom) {
+                this.rectInParent.marginBottom) {
             y -= abs(parentW, this.rectInParent.marginBottom);
         }
         this.rect = new Rect(x, y, w, h);
@@ -601,15 +572,15 @@ var Node = /** @class */ (function (_super) {
         var parentH = parent.rect.height - parent.paddingTopNum - parent.paddingBottomNum;
         this.rectInParent = {
             x: ((this.rect.x - parent.rect.x - parent.paddingLeftNum) * 100) /
-                parentW +
-                '%',
+                    parentW +
+                    '%',
             y: ((this.rect.y - parent.rect.y - parent.paddingTopNum) * 100) / parentH +
-                '%',
+                    '%',
             width: (this.rect.width * 100) / parentW + '%',
             height: (this.rect.height * 100) / parentH + '%',
             rotate: this.rectInParent
-                ? this.rectInParent.rotate || 0
-                : this.rotate || 0,
+                    ? this.rectInParent.rotate || 0
+                    : this.rotate || 0,
             rect: this.rect.clone(),
         };
     };
@@ -630,7 +601,7 @@ var Node = /** @class */ (function (_super) {
         var timeline = now - this.animateStart;
         if (timeline > this.animateDuration) {
             if (++this.animateCycleIndex >= this.animateCycle &&
-                this.animateCycle > 0) {
+                    this.animateCycle > 0) {
                 this.animateStart = 0;
                 this.animateCycleIndex = 0;
                 var item = this.animateFrames[this.animateFrames.length - 1];
@@ -638,8 +609,8 @@ var Node = /** @class */ (function (_super) {
                     this.dash = item.state.dash;
                     this.strokeStyle = item.state.strokeStyle;
                     this.fillStyle = item.state.fillStyle;
-                    //this.text = item.state.text;
-                    //this.font = item.state.font;
+                    this.text = item.state.text;
+                    this.font = item.state.font;
                     this.lineWidth = item.state.lineWidth;
                     this.rotate = item.state.rotate;
                     this.globalAlpha = item.state.globalAlpha;
@@ -665,83 +636,72 @@ var Node = /** @class */ (function (_super) {
                 this.dash = item.state.dash;
                 this.strokeStyle = item.state.strokeStyle;
                 this.fillStyle = item.state.fillStyle;
-                //this.text = item.state.text;
-                //this.font = item.state.font;
+                this.text = item.state.text;
+                this.font = item.state.font;
                 var rate = (timeline - item.start) / item.duration;
                 if (item.linear) {
                     // 线条左右流动动画
-                    if ([animateType.LeftFlow, animateType.RightFlow].includes(this.animateType) && item.state.lineDashOffset) {
-                        let o = item.state.lineDashOffset;
-                        switch (this.animateType) {
-                            case animateType.LeftFlow:
-                                o = Math.abs(o)
-                                if (o > 100) o = 1;
-                                o++
-
-                                break;
-                            case animateType.RightFlow:
-                                o = Math.abs(o) * -1
-                                if (o < -100) o = -1;
-                                o--
-                                break;
-                        }
-                        item.state.lineDashOffset = o
+                    if([animateType.LeftFlow, animateType.RightFlow].includes(this.animateType) && item.state.lineDashOffset){
+                        const lineDashOffset = item.state.lineDashOffset;
+                        if (lineDashOffset > 100) item.state.lineDashOffset = 1;
+                        if (lineDashOffset < -100) item.state.lineDashOffset = -1;
+                        lineDashOffset > 0 ? item.state.lineDashOffset++ : item.state.lineDashOffset--;
                         this.lineDashOffset = item.state.lineDashOffset;
-                    } else if (([animateType.Show, animateType.Rotate].includes(this.animateType) || this.name === 'electricFan') && item.state.rotate !== item.initState.rotate) {
+                    }else if(([animateType.Show, animateType.Rotate].includes(this.animateType) || this.name === 'electricFan') && item.state.rotate !== item.initState.rotate) {
                         // 旋转动画，判断逻辑先这么写，日后将所有动画统一在编辑器中配置，再做优化
                         this.rotate =
-                            item.initState.rotate +
-                            (item.state.rotate - item.initState.rotate) * rate;
+                                item.initState.rotate +
+                                (item.state.rotate - item.initState.rotate) * rate;
                         rectChanged = true;
-                    } else {
+                    }else {
 
                         if (item.state.rect.x !== item.initState.rect.x) {
                             this.rect.x =
-                                item.initState.rect.x +
-                                (item.state.rect.x - item.initState.rect.x) * rate;
+                                    item.initState.rect.x +
+                                    (item.state.rect.x - item.initState.rect.x) * rate;
                             rectChanged = true;
                         }
                         if (item.state.rect.y !== item.initState.rect.y) {
                             this.rect.y =
-                                item.initState.rect.y +
-                                (item.state.rect.y - item.initState.rect.y) * rate;
+                                    item.initState.rect.y +
+                                    (item.state.rect.y - item.initState.rect.y) * rate;
                             rectChanged = true;
                         }
                         if (item.state.rect.width !== item.initState.rect.width) {
                             this.rect.width =
-                                item.initState.rect.width +
-                                (item.state.rect.width - item.initState.rect.width) * rate;
+                                    item.initState.rect.width +
+                                    (item.state.rect.width - item.initState.rect.width) * rate;
                             rectChanged = true;
                         }
                         if (item.state.rect.height !== item.initState.rect.height) {
                             this.rect.height =
-                                item.initState.rect.height +
-                                (item.state.rect.height - item.initState.rect.height) * rate;
+                                    item.initState.rect.height +
+                                    (item.state.rect.height - item.initState.rect.height) * rate;
                             rectChanged = true;
                         }
                         this.rect.ex = this.rect.x + this.rect.width;
                         this.rect.ey = this.rect.y + this.rect.height;
                         this.rect.calcCenter();
                         if (item.initState.z !== undefined &&
-                            item.state.z !== item.initState.z) {
+                                item.state.z !== item.initState.z) {
                             this.z =
-                                item.initState.z + (item.state.z - item.initState.z) * rate;
+                                    item.initState.z + (item.state.z - item.initState.z) * rate;
                             rectChanged = true;
                         }
                         if (item.state.borderRadius !== item.initState.borderRadius) {
                             this.borderRadius =
-                                item.initState.borderRadius +
-                                (item.state.borderRadius - item.initState.borderRadius) * rate;
+                                    item.initState.borderRadius +
+                                    (item.state.borderRadius - item.initState.borderRadius) * rate;
                         }
                         if (item.state.lineWidth !== item.initState.lineWidth) {
                             this.lineWidth =
-                                item.initState.lineWidth +
-                                (item.state.lineWidth - item.initState.lineWidth) * rate;
+                                    item.initState.lineWidth +
+                                    (item.state.lineWidth - item.initState.lineWidth) * rate;
                         }
                         if (item.state.globalAlpha !== item.initState.globalAlpha) {
                             this.globalAlpha =
-                                item.initState.globalAlpha +
-                                (item.state.globalAlpha - item.initState.globalAlpha) * rate;
+                                    item.initState.globalAlpha +
+                                    (item.state.globalAlpha - item.initState.globalAlpha) * rate;
                         }
                     }
                 }
@@ -772,29 +732,28 @@ var Node = /** @class */ (function (_super) {
             h = scale;
         }
         this['oldRect'] = this.rect.clone();
-        if (this.rect.circles) {
-            for (let c = 0, circles = this.rect.circles; c < circles.length; c++) {
-                circles[c].x = center.x - (center.x - circles[c].x) * w;
-                circles[c].y = center.y - (center.y - circles[c].y) * h;
+        if(this.rect.circles) {
+            for(let c=0, circles= this.rect.circles; c<circles.length; c++) {
+                circles[c].x = (center.x - (center.x - circles[c].x)) * w;
+                circles[c].y = (center.y - (center.y - circles[c].y)) * h + 15;
             }
+        }else {
+            this.rect.x = center.x - (center.x - this.rect.x) * w;
+            if(this.rotate % 180) {
+                this.rect.x = this.rect.x + (this.rect.width * w - this.rect.width * h) / 2;
+            }
+            this.rect.y = center.y - (center.y - this.rect.y) * h;
         }
-        this.rect.x = center.x - (center.x - this.rect.x) * w;
-        if (this.rotate % 180) {
-            this.rect.x = this.rect.x + (this.rect.width * w - this.rect.width * h) / 2;
-        }
-        this.rect.y = center.y - (center.y - this.rect.y) * h;
+        this.z *= scale;
         this.rect.width *= this.rotate % 180 ? h : w;
         this.rect.height *= h;
         this.rect.ex = this.rect.x + this.rect.width;
         this.rect.ey = this.rect.y + this.rect.height;
-        this.z *= scale;
-        if (!(center.type && center.type === 'bottLogo')) {
-            if (this.imageWidth) {
-                this.imageWidth *= w;
-            }
-            if (this.imageHeight) {
-                this.imageHeight *= h;
-            }
+        if (this.imageWidth) {
+            this.imageWidth *= w;
+        }
+        if (this.imageHeight) {
+            this.imageHeight *= h;
         }
         this.lastImage = null;
         this.font.fontSize *= scale;
@@ -892,12 +851,6 @@ var Node = /** @class */ (function (_super) {
         }
     };
     Node.prototype.translate = function (x, y) {
-        if (this.rect.circles) {
-            for (let c = 0, circles = this.rect.circles; c < circles.length; c++) {
-                circles[c].x += x;
-                circles[c].y += y;
-            }
-        }
         this.rect.x += x;
         this.rect.y += y;
         this.rect.ex = this.rect.x + this.rect.width;
@@ -950,7 +903,7 @@ var Node = /** @class */ (function (_super) {
         return n;
     };
     //新增属性
-    Node.prototype.area = function (pts) {
+    Node.prototype.area = function(pts) {
         var area = 0;
         var pts = pts;
         var nPts = pts.length;
@@ -966,7 +919,7 @@ var Node = /** @class */ (function (_super) {
         area /= 2;
         return area;
     };
-    Node.prototype.centroid = function (pts) {
+    Node.prototype.centroid = function(pts) {
         var pts = pts;
         var nPts = pts.length;
         var x = 0;