dcim-topology2d 2.0.8 → 3.0.2

package/core/src/canvas.js

@@ -13,59 +13,58 @@ var __extends = (this && this.__extends) || (function () {
 })();
 import { Store } from 'le5le-store';
 import { Layer } from './layer';
-import { commonStore } from './store'
 var Canvas = /** @class */ (function (_super) {
     __extends(Canvas, _super);
-    function Canvas(TID) {
+    function Canvas(parentElem, options, TID) {
+        if (options === void 0) { options = {}; }
         var _this = _super.call(this, TID) || this;
+        _this.parentElem = parentElem;
+        _this.options = options;
         _this.canvas = document.createElement('canvas');
-        _this.canvas.setAttribute('class', 'canvas-draw');
-        _this.width = commonStore[TID].parentElem.clientWidth;
-        _this.height = commonStore[TID].parentElem.clientHeight;
+        _this.width = parentElem.clientWidth;
+        _this.height = parentElem.clientHeight;
+        _this.data = Store.get(_this.generateStoreKey('topology-data'));
         _this.canvas.style.position = 'absolute';
         _this.canvas.style.left = '0';
         _this.canvas.style.top = '0';
         _this.canvas.style.outline = 'none';
         if (!Canvas.dpiRatio) {
-            if (!commonStore[TID].options.extDpiRatio && commonStore[TID].options.extDpiRatio !== 0) {
+            if (!options.extDpiRatio && options.extDpiRatio !== 0) {
                 if (window.devicePixelRatio > 1) {
-                    commonStore[TID].options.extDpiRatio = 0.25;
+                    options.extDpiRatio = 0.25;
                 }
                 else {
-                    commonStore[TID].options.extDpiRatio = 0;
+                    options.extDpiRatio = 0;
                 }
             }
-            Canvas.dpiRatio = window.devicePixelRatio + commonStore[TID].options.extDpiRatio;
+            Canvas.dpiRatio = window.devicePixelRatio + options.extDpiRatio;
         }
         return _this;
     }
     Canvas.prototype.resize = function (size) {
         if (size) {
-            this.width = size.width  | 0;
+            this.width = size.width | 0;
             this.height = size.height | 0;
         }
         else {
-            const TID = this.TID;
-            if(!commonStore[TID] || !commonStore[TID].options) return;
-            if (commonStore[TID].options.width && commonStore[TID].options.width !== 'auto') {
-                this.width = commonStore[TID].options.width;
+            if (this.options.width && this.options.width !== 'auto') {
+                this.width = this.options.width;
             }
             else {
-                this.width = commonStore[TID].parentElem.clientWidth;
+                this.width = this.parentElem.clientWidth;
             }
-            if (commonStore[TID].options.height && commonStore[TID].options.height !== 'auto') {
-                this.height = commonStore[TID].options.height;
+            if (this.options.height && this.options.height !== 'auto') {
+                this.height = this.options.height;
             }
             else {
-                this.height = commonStore[TID].parentElem.clientHeight;
+                this.height = this.parentElem.clientHeight;
             }
         }
         this.canvas.style.width = this.width + 'px';
         this.canvas.style.height = this.height + 'px';
-        const dpr = window.devicePixelRatio || 1;
-        this.canvas.width = (this.width * dpr) | 0;
-        this.canvas.height = (this.height * dpr) | 0;
-        this.canvas.getContext('2d').scale(dpr, dpr);
+        this.canvas.width = (this.width * Canvas.dpiRatio) | 0;
+        this.canvas.height = (this.height * Canvas.dpiRatio) | 0;
+        this.canvas.getContext('2d').scale(Canvas.dpiRatio, Canvas.dpiRatio);
         Store.set(this.generateStoreKey('LT:size'), { width: this.canvas.width, height: this.canvas.height });
     };
     Canvas.prototype.render = function () {

package/core/src/common.d.ts

@@ -4,9 +4,9 @@ import { DivLayer } from './divLayer';
 import { AnimateLayer } from './animateLayer';
 import { RenderLayer } from './renderLayer';
 import { Offscreen } from './offscreen';
-import {Line, Node, Pen, Point, Rect} from './models';
+import {Line, Node, Pen, Point, Rect, TopologyData} from './models';
 import {Padding, Options} from './options';
-import { visualization2DStore } from './store'
+import { Socket } from './socket';
 declare enum MoveInType {
   None = 0,
   Line = 1,
@@ -21,7 +21,8 @@ declare enum MoveInType {
 }
 export declare class Common {
   //constructor(parent: HTMLElement, options: Options);
-  store: visualization2DStore;
+  options: Options;
+  data: TopologyData;
   moveInType: MoveInType;
   id: String;
   parentElem: HTMLElement;
@@ -32,6 +33,7 @@ export declare class Common {
   input: HTMLTextAreaElement;
   tipMarkdown: HTMLElement;
   tipElem: HTMLElement;
+  socket: Socket;
   private subcribe;
   private subcribeRender;
   private subcribeImage;
@@ -56,8 +58,6 @@ export declare class Common {
     y: number;
     restore?: boolean;
   };
-  renderTimer: number;
-  lastRender: number;
   lastTranlated: {
     x: number;
     y: number;
@@ -75,7 +75,8 @@ export declare class Common {
   ratioCord: Object;
   _emitter: Emitter;
   conversionData(data?: any): void;
-  switchStaticsCheckType(node: Node | any, staticTypeNode: any): any;
+  setSwitchTabData(node: Node | any, index: Number): void;
+  switchStaticsCheckType(node: Node | any): any;
   canvasResize(size?: {
     width: number;
     height: number;