dcim-topology2d 1.1.4 → 1.1.5

package/chart-diagram/src/register.js

@@ -1,13 +1,13 @@
-import { registerNode, loadJS } from '../../core';
+import { registerNode } from '../../core';
 import { echarts } from './echarts';
 import { echartsDataStore } from '../../static';
-import './echarts/echarts.min.js';
+// import './echarts/echarts.min.js';
 export function register(_echarts) {
   echartsDataStore.echarts = _echarts;
-    if (process.browser && !echartsDataStore.echarts && !window.echarts) {
-        //loadJS('https://cdn.bootcdn.net/ajax/libs/echarts/4.8.0/echarts.min.js', null, true);
-        loadJS(`${location.origin}/libary/echarts.min.js`, null, true);
-    }
+    // if (process.browser && !echartsDataStore.echarts && !window.echarts) {
+    //     //loadJS('https://cdn.bootcdn.net/ajax/libs/echarts/4.8.0/echarts.min.js', null, true);
+    //     loadJS(`${location.origin}/libary/echarts.min.js`, null, true);
+    // }
     registerNode('echarts', echarts, null, null, null);
 }
 //# sourceMappingURL=register.js.map

package/core/src/core.js

@@ -677,23 +677,40 @@ var Topology = (function (_super) {
                     return;
                 var obj = JSON.parse(json);
                 event.preventDefault();
-                if (obj.name && obj.name == 'arbitraryGraph') {
-                    Store.set('addingArbitraryGraph', true);
-                    _this.addingArbitraryGraph = true;
-                    _this.dispatch('addingArbitraryGraph', true);
-                    return
+                if(obj.type && obj.type === 'temp') {
+                    obj.locked = 0;
+                    // 模板
+                    _this.animateLayer.stop();
+                    _this.closeMqtt();
+                    _this.open(obj);
+                    const tempData = {
+                        name: obj.name,
+                        component: obj.component,
+                        image: obj.image,
+                        useType: obj.useType,
+                        data: JSON.parse(json)
+                    };
+                    delete tempData.data['pens'];
+                    _this.dispatch('template', tempData);
+                }else {
+                    if (obj.name && obj.name == 'arbitraryGraph') {
+                        Store.set('addingArbitraryGraph', true);
+                        _this.addingArbitraryGraph = true;
+                        _this.dispatch('addingArbitraryGraph', true);
+                        return
+                    }
+                    _this.addingArbitraryGraph = false;
+                    Store.set('addingArbitraryGraph', false);
+                    _this.arbitrarygGraphData = {
+                        points: [],
+                        circles: [],
+                        indexCircle: 0, //当前点击的圆圈
+                        oZindex: -1, //是否达到起点
+                        isDragging: false, //是否在抓取
+                        close: false, //闭合
+                    };
+                    _this.dropNodes(Array.isArray(obj) ? obj : [obj], event.offsetX, event.offsetY);
                 }
-                _this.addingArbitraryGraph = false;
-                Store.set('addingArbitraryGraph', false);
-                _this.arbitrarygGraphData = {
-                    points: [],
-                    circles: [],
-                    indexCircle: 0, //当前点击的圆圈
-                    oZindex: -1, //是否达到起点
-                    isDragging: false, //是否在抓取
-                    close: false, //闭合
-                };
-                _this.dropNodes(Array.isArray(obj) ? obj : [obj], event.offsetX, event.offsetY);
             } catch (_a) {
             }
         };

package/core/src/utils/dom.js

@@ -84,20 +84,20 @@ export function createDiv(node) {
     return div;
 }
 
-export function loadJS(url, callback, render) {
-    var loaderScript = document.createElement('script');
-    loaderScript.type = 'text/javascript';
-    loaderScript.src = url;
-    loaderScript.addEventListener('load', function () {
-        if (callback) {
-            callback();
-        }
-        // how to do
-        if (render) {
-            Store.set('LT:render', true);
-        }
-    });
-    document.body.appendChild(loaderScript);
-}
+// export function loadJS(url, callback, render) {
+//     var loaderScript = document.createElement('script');
+//     loaderScript.type = 'text/javascript';
+//     loaderScript.src = url;
+//     loaderScript.addEventListener('load', function () {
+//         if (callback) {
+//             callback();
+//         }
+//         // how to do
+//         if (render) {
+//             Store.set('LT:render', true);
+//         }
+//     });
+//     document.body.appendChild(loaderScript);
+// }
 
 //# sourceMappingURL=dom.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcim-topology2d",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "",
   "main": "-",
   "scripts": {