update

src/main/webapp/app/netTopology/model/line/line.component.ts

@@ -100,7 +100,9 @@ export class LineComponent implements OnInit {
 
     showModal(linkObj) {
         this.hostIds = linkObj.hostIds;  //线条上的主机id；
+        if(linkObj.itemId.length > 0){
             this.itemId = linkObj.itemId.split(',');   //线条上的监测点id；
+        }
         this.isLine = true;
         this.getInList();
         this.getOutList();

src/main/webapp/app/netTopology/model/node/node.component.html

@@ -7,26 +7,25 @@
         <input nz-input type="text" [(ngModel)]="name">
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
-      <nz-form-label [nzSpan]="7" nzFor="host1">选择设备</nz-form-label>
-      <nz-form-control [nzSpan]="12">
-        <div class="tree-div" style="height: 300px">
-          <nz-tree #nzTree
-                   [(ngModel)]="nodes"
-                   [nzAsyncData]="true"
-                   [nzCheckStrictly]="true"
-                   (nzClick)="mouseAction('expand',$event)"
-                   (nzExpandChange)="mouseAction('expand',$event)" >
-            <ng-template #nzTreeTemplate let-node>
-                <span class="custom-node" draggable="true" aria-grabbed="true" [class.active]="node.isSelected">
-                    <label *ngIf="node.level == 0"> {{node.title}}</label>
-                    <label [(ngModel)]="node.isChecked" [nzDisabled]="node.origin.disabled" (click)="selectItem($event,node)" *ngIf="node.level == 1" nz-checkbox> {{node.title}}</label>
-                </span>
-            </ng-template>
-
-          </nz-tree>
-        </div>
-      </nz-form-control>
-    </nz-form-item>
+    <!--<nz-form-item>-->
+      <!--<nz-form-label [nzSpan]="7" nzFor="host1">选择设备</nz-form-label>-->
+      <!--<nz-form-control [nzSpan]="12">-->
+        <!--<div class="tree-div" style="height: 300px">-->
+          <!--<nz-tree #nzTree-->
+                   <!--[(ngModel)]="nodes"-->
+                   <!--[nzAsyncData]="true"-->
+                   <!--[nzCheckStrictly]="true"-->
+                   <!--(nzClick)="mouseAction('expand',$event)"-->
+                   <!--(nzExpandChange)="mouseAction('expand',$event)" >-->
+            <!--<ng-template #nzTreeTemplate let-node>-->
+                <!--<span class="custom-node" draggable="true" aria-grabbed="true" [class.active]="node.isSelected">-->
+                    <!--<label *ngIf="node.level == 0"> {{node.title}}</label>-->
+                    <!--<label [(ngModel)]="node.isChecked" [nzDisabled]="node.origin.disabled" (click)="selectItem($event,node)" *ngIf="node.level == 1" nz-checkbox> {{node.title}}</label>-->
+                <!--</span>-->
+            <!--</ng-template>-->
+          <!--</nz-tree>-->
+        <!--</div>-->
+      <!--</nz-form-control>-->
+    <!--</nz-form-item>-->
   </div>
 </nz-modal>
\ No newline at end of file

src/main/webapp/app/netTopology/model/node/node.component.ts

@@ -4,6 +4,7 @@ import {LocalStorageService} from 'ngx-webstorage';
 import {NzFormatEmitEvent, NzMessageService, NzTreeNode} from 'ng-zorro-antd';
 
 declare let editor: any;
+
 @Component({
     selector: 'smart-node',
     templateUrl: './node.component.html',
@@ -13,6 +14,7 @@ export class NodeComponent implements OnInit {
 
     isNode = false;
     name;
+    hostId;
 
     nodes;
     nodeList;
@@ -21,9 +23,12 @@ export class NodeComponent implements OnInit {
     constructor(private topologySer: TopologyService, private message: NzMessageService, private localStorage: LocalStorageService,) {
     }
 
-    ngOnInit() {}
+    ngOnInit() {
+    }
 
-    showModal() {
+    showModal(nodeObj) {
+        this.hostId = nodeObj.hostIds;  //主机id；
+        this.name = nodeObj.name;  //主机名称；
         this.isNode = true;
         this.findTree();
     }
@@ -66,7 +71,7 @@ export class NodeComponent implements OnInit {
         if (event.node.level == 0) {
             type = 'host';   //主机
         }
-        if(event.node.level == 1){
+        if (event.node.level == 1) {
             return false;
         }
         const index = <any>event.node.key - 1;
@@ -108,25 +113,34 @@ export class NodeComponent implements OnInit {
     handleNodeCancel() {
         this.isNode = false;
         this.selectList = [];
-        localStorage.setItem("node",'false');
+        localStorage.setItem('node', 'false');
     }
 
     handleNodeOk() {
-        const data = {
-            hostIds:this.selectList
-        }
-        this.topologySer.findByHostIdOrWeb(data).subscribe(
-            (res)=>{
-                this.selectList = [];
+        if (this.name) {
             const item = {
-                    name:this.name,
-                    img:res.data[0].url
+                name: this.name,
             };
             this.isNode = false;
             editor.utils.setNode(item);
-                localStorage.setItem("node",'false');
         }
-        )
+        this.isNode = false;
+        localStorage.setItem("node",'false');
+        // const data = {
+        //     hostIds:this.selectList
+        // };
+        // this.topologySer.findByHostIdOrWeb(data).subscribe(
+        //     (res)=>{
+        //         this.selectList = [];
+        //         const item = {
+        //             name:this.name,
+        //             img:res.data[0].url
+        //         };
+        //         this.isNode = false;
+        //         editor.utils.setNode(item);
+        //         localStorage.setItem("node",'false');
+        //     }
+        // )
 
     }
 

src/main/webapp/app/netTopology/ne-topology/ne-topology.component.ts

@@ -145,10 +145,11 @@ export class NeTopologyComponent implements OnInit, DoCheck, AfterViewInit, OnDe
         const changesNode = this.customerDifferNode.diff(this.node);
         if (changesLine && changesLine['_appendAfter'].currentValue == "true") {
             const linkObj = localStorage.getItem('linkObj');
-           this.smartLine.showModal(JSON.parse(linkObj));
+           this.smartLine.showModal( JSON.parse(linkObj) );
         }
         if (changesNode && changesNode['_appendAfter'].currentValue == "true") {
-            this.smartNode.showModal();
+            const nodeObj = localStorage.getItem('nodeObj');
+            this.smartNode.showModal( JSON.parse(nodeObj) );
         }
     }
 

src/main/webapp/content/javascript/jtopo/js/jtopo-editor.js

@@ -647,16 +647,21 @@ TopologyEditor.prototype.init = function (topologyGuid, backImg, topologyJson) {
 
         // 只处理双击节点事件
         if (event.target instanceof JTopo.Node && editor.stageMode === 'edit') {
+            const nodeObj = {
+                name:event.target.text,
+                hostId:event.target.hostId
+            }
             localStorage.setItem("node",'true');
+            localStorage.setItem("nodeObj",JSON.stringify(nodeObj));
         } else if (event.target instanceof JTopo.Link && editor.stageMode === 'edit') {
-            const obj = {
+            const lineObj = {
                 hostIds:[],
                 itemId:event.target.itemId
             }
-            obj.hostIds.push(event.target.nodeA.hostId);
-            obj.hostIds.push(event.target.nodeZ.hostId);
+            lineObj.hostIds.push(event.target.nodeA.hostId);
+            lineObj.hostIds.push(event.target.nodeZ.hostId);
             localStorage.setItem("line",'true');
-            localStorage.setItem("linkObj",JSON.stringify(obj));
+            localStorage.setItem("linkObj",JSON.stringify(lineObj));
         }
     });
 
@@ -1193,8 +1198,8 @@ editor.utils = {
         var self = this;
         var node = editor.scene.selectedElements;
         node[0].text = item.name;
-        node[0].setImage(topoImgPath + item.img);
-        node[0].nodeImage = item.img;
+        // node[0].setImage(topoImgPath + item.img);
+        // node[0].nodeImage = item.img;
         editor.stage.paint();
     },
     // 放大