@riil-frontend/component-topology 9.0.0-a.30 → 9.0.0-a.31

package/es/core/hooks/useTopoEdit.js

@@ -973,13 +973,22 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _relateNodeIp() {
     _relateNodeIp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(txtValue, nodeElement) {
-      var dm, htTopo, elementNodes, isUnique, ip, configObj, configData, _elements, newLinkElements, createElementsData;
+      var dm, htTopo, elementNodes, isUnique, ip, configObj, configData, _elements, newLinkElements, newLink, newLinkGroup, createElementsData;
 
       return _regeneratorRuntime.wrap(function _callee16$(_context16) {
         while (1) {
           switch (_context16.prev = _context16.next) {
             case 0:
-              // console.log("bindIPtoNode", txtValue, nodeElement);
+              console.log("bindIPtoNode", txtValue, nodeElement);
+
+              if (txtValue) {
+                _context16.next = 3;
+                break;
+              }
+
+              return _context16.abrupt("return");
+
+            case 3:
               // 根据配置查询拓扑数据
               dm = topo.getDataModel();
               htTopo = topo.getHtTopo();
@@ -989,42 +998,49 @@ var useTopoEdit = function useTopoEdit(params) {
               ip = buildIpNode(txtValue); // 获取关联链路
 
               if (!isUnique) {
-                _context16.next = 21;
+                _context16.next = 26;
                 break;
               }
 
-              deleteExLink(nodeElement);
+              // deleteExLink(nodeElement);
               nodeElement.a(ip);
               nodeElement.setName(txtValue);
               nodeElement.setTag("ip:" + txtValue); // 获取配置
 
               configObj = topo.resourceConfig.getConfig();
-              _context16.next = 13;
+              _context16.next = 15;
               return resourceConfig.updateConfig(configObj);
 
-            case 13:
-              _context16.next = 15;
+            case 15:
+              _context16.next = 17;
               return editDispatchers.fetchDataByConfig();
 
-            case 15:
+            case 17:
               configData = _context16.sent;
               // console.log("configData", configData);
               _elements = configData.elements;
               newLinkElements = findUNExistedLinkElements(_elements);
+              newLink = newLinkElements.filter(function (item) {
+                return item.type === "link";
+              });
+              newLinkGroup = newLinkElements.filter(function (item) {
+                return item.type === "linkGroup";
+              }); // const newData = elements.find((item) => item.id === `ip:${txtValue}`);
+
+              console.log("newData", newLink);
               createElementsData = {
                 groups: [],
                 nodes: [],
-                links: newLinkElements.filter(function (item) {
-                  return item.type === "link";
-                }),
-                linkGroups: newLinkElements.filter(function (item) {
-                  return item.type === "linkGroup";
-                })
+                links: newLink,
+                linkGroups: newLinkGroup
               };
               console.log("createElementsData", createElementsData);
-              htTopo.createElements(createElementsData);
 
-            case 21:
+              if ([].concat(newLink, newLinkGroup).length > 0) {
+                htTopo.createElements(createElementsData);
+              }
+
+            case 26:
             case "end":
               return _context16.stop();
           }

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "9.0.0-a.30" === 'string' ? "9.0.0-a.30" : null;
+var version = typeof "9.0.0-a.31" === 'string' ? "9.0.0-a.31" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/networkTopo/utils/exitLinkUtil.js

@@ -29,6 +29,7 @@ export function buildIpNode(ip) {
     // 'attributes': [],
     // 'metrics': [],
     type: "node",
+    isbinding: true,
     // 'dtype': 'device'
     operation: "delete"
   };
@@ -128,7 +129,9 @@ export function processExitLink(topoData) {
           // 根据链路序列化数据找目的端节点
           // eslint-disable-next-line no-underscore-dangle
           var targetNodeSerialize = serialize.d.find(function (item) {
-            return item.i === linkSerialize.p.target.__i;
+            var _linkSerialize$p$targ;
+
+            return item.i === (linkSerialize === null || linkSerialize === void 0 ? void 0 : (_linkSerialize$p$targ = linkSerialize.p.target) === null || _linkSerialize$p$targ === void 0 ? void 0 : _linkSerialize$p$targ.__i);
           });
 
           if (targetNodeSerialize) {
@@ -184,10 +187,12 @@ export function processExitLink(topoData) {
       // 根据链路序列化数据找目的端节点
       // eslint-disable-next-line no-underscore-dangle
       var targetNodeSerialize = serialize.d.find(function (item) {
-        return item.i === linkSerialize.p.target.__i;
+        var _linkSerialize$p$targ2;
+
+        return item.i === (linkSerialize === null || linkSerialize === void 0 ? void 0 : (_linkSerialize$p$targ2 = linkSerialize.p.target) === null || _linkSerialize$p$targ2 === void 0 ? void 0 : _linkSerialize$p$targ2.__i);
       });
 
-      if (!targetNodeSerialize.p.tag) {
+      if (targetNodeSerialize && !targetNodeSerialize.p.tag) {
         targetNodeSerialize.a = _extends({}, targetNodeSerialize.a, buildIpNode(destinationIp), {
           isbinding: true
         });

package/lib/core/hooks/useTopoEdit.js

@@ -1014,13 +1014,22 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _relateNodeIp() {
     _relateNodeIp = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee16(txtValue, nodeElement) {
-      var dm, htTopo, elementNodes, isUnique, ip, configObj, configData, _elements, newLinkElements, createElementsData;
+      var dm, htTopo, elementNodes, isUnique, ip, configObj, configData, _elements, newLinkElements, newLink, newLinkGroup, createElementsData;
 
       return _regenerator["default"].wrap(function _callee16$(_context16) {
         while (1) {
           switch (_context16.prev = _context16.next) {
             case 0:
-              // console.log("bindIPtoNode", txtValue, nodeElement);
+              console.log("bindIPtoNode", txtValue, nodeElement);
+
+              if (txtValue) {
+                _context16.next = 3;
+                break;
+              }
+
+              return _context16.abrupt("return");
+
+            case 3:
               // 根据配置查询拓扑数据
               dm = topo.getDataModel();
               htTopo = topo.getHtTopo();
@@ -1030,42 +1039,49 @@ var useTopoEdit = function useTopoEdit(params) {
               ip = (0, _exitLinkUtil.buildIpNode)(txtValue); // 获取关联链路
 
               if (!isUnique) {
-                _context16.next = 21;
+                _context16.next = 26;
                 break;
               }
 
-              deleteExLink(nodeElement);
+              // deleteExLink(nodeElement);
               nodeElement.a(ip);
               nodeElement.setName(txtValue);
               nodeElement.setTag("ip:" + txtValue); // 获取配置
 
               configObj = topo.resourceConfig.getConfig();
-              _context16.next = 13;
+              _context16.next = 15;
               return resourceConfig.updateConfig(configObj);
 
-            case 13:
-              _context16.next = 15;
+            case 15:
+              _context16.next = 17;
               return editDispatchers.fetchDataByConfig();
 
-            case 15:
+            case 17:
               configData = _context16.sent;
               // console.log("configData", configData);
               _elements = configData.elements;
               newLinkElements = findUNExistedLinkElements(_elements);
+              newLink = newLinkElements.filter(function (item) {
+                return item.type === "link";
+              });
+              newLinkGroup = newLinkElements.filter(function (item) {
+                return item.type === "linkGroup";
+              }); // const newData = elements.find((item) => item.id === `ip:${txtValue}`);
+
+              console.log("newData", newLink);
               createElementsData = {
                 groups: [],
                 nodes: [],
-                links: newLinkElements.filter(function (item) {
-                  return item.type === "link";
-                }),
-                linkGroups: newLinkElements.filter(function (item) {
-                  return item.type === "linkGroup";
-                })
+                links: newLink,
+                linkGroups: newLinkGroup
               };
               console.log("createElementsData", createElementsData);
-              htTopo.createElements(createElementsData);
 
-            case 21:
+              if ([].concat(newLink, newLinkGroup).length > 0) {
+                htTopo.createElements(createElementsData);
+              }
+
+            case 26:
             case "end":
               return _context16.stop();
           }

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "9.0.0-a.30" === 'string' ? "9.0.0-a.30" : null;
+var version = typeof "9.0.0-a.31" === 'string' ? "9.0.0-a.31" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/networkTopo/utils/exitLinkUtil.js

@@ -40,6 +40,7 @@ function buildIpNode(ip) {
     // 'attributes': [],
     // 'metrics': [],
     type: "node",
+    isbinding: true,
     // 'dtype': 'device'
     operation: "delete"
   };
@@ -139,7 +140,9 @@ function processExitLink(topoData) {
           // 根据链路序列化数据找目的端节点
           // eslint-disable-next-line no-underscore-dangle
           var targetNodeSerialize = serialize.d.find(function (item) {
-            return item.i === linkSerialize.p.target.__i;
+            var _linkSerialize$p$targ;
+
+            return item.i === (linkSerialize === null || linkSerialize === void 0 ? void 0 : (_linkSerialize$p$targ = linkSerialize.p.target) === null || _linkSerialize$p$targ === void 0 ? void 0 : _linkSerialize$p$targ.__i);
           });
 
           if (targetNodeSerialize) {
@@ -195,10 +198,12 @@ function processExitLink(topoData) {
       // 根据链路序列化数据找目的端节点
       // eslint-disable-next-line no-underscore-dangle
       var targetNodeSerialize = serialize.d.find(function (item) {
-        return item.i === linkSerialize.p.target.__i;
+        var _linkSerialize$p$targ2;
+
+        return item.i === (linkSerialize === null || linkSerialize === void 0 ? void 0 : (_linkSerialize$p$targ2 = linkSerialize.p.target) === null || _linkSerialize$p$targ2 === void 0 ? void 0 : _linkSerialize$p$targ2.__i);
       });
 
-      if (!targetNodeSerialize.p.tag) {
+      if (targetNodeSerialize && !targetNodeSerialize.p.tag) {
         targetNodeSerialize.a = (0, _extends2["default"])({}, targetNodeSerialize.a, buildIpNode(destinationIp), {
           isbinding: true
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "9.0.0-a.30",
+  "version": "9.0.0-a.31",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@9.0.0-a.30/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@9.0.0-a.31/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }