@riil-frontend/component-topology 9.0.0-a.12 → 9.0.0-a.15

package/es/utils/htElementUtils.js

@@ -15,7 +15,7 @@ function getElementData(element) {
     styleMap: element.getStyleMap()
   };
 
-  if (className === "ht.Edge") {
+  if (className === 'ht.Edge') {
     return _extends({}, commonData);
   }
 
@@ -27,7 +27,7 @@ function getElementData(element) {
 export function isNode(element) {
   // HT为了支持区域内无节点可展开增加了站位节点，因此 节点的layer等于container_blank的过滤掉就可以了
   // eslint-disable-next-line no-underscore-dangle
-  return element instanceof ht.Node && !isLayer(element) && element._layer !== "container_blank";
+  return element instanceof ht.Node && !isLayer(element) && element._layer !== 'container_blank';
 }
 export function isEdge(element) {
   return element instanceof ht.Edge;
@@ -38,7 +38,7 @@ export function isValidEdge(element) {
   }
 
   if (!element.getSource() || !element.getTarget()) {
-    rlog.error("isValidEdge 连线异常：源或目的为空", element);
+    rlog.error('isValidEdge 连线异常：源或目的为空', element);
     return false;
   }
 
@@ -51,29 +51,7 @@ export function isLayer(element) {
   return element instanceof ht.Grid;
 }
 export function isText(element) {
-  return element instanceof ht.Text && element.a("isText");
-}
-export function isUniqueIp(dataModel, ip) {
-  console.log("isUniqueIp", ip);
-  var nodes = getNodes(dataModel);
-  var isUnique = true;
-
-  for (var i = 0; i < nodes.length; i++) {
-    var element = nodes[i];
-    var tagTxt = element.getTag();
-    console.log("isUniqueIp-element", tagTxt, ip);
-
-    if (tagTxt !== null && tagTxt !== void 0 && tagTxt.startsWith("ip_")) {
-      var ipTxt = tagTxt.replace("ip_", '');
-
-      if (ipTxt === ip) {
-        isUnique = false;
-        break;
-      }
-    }
-  }
-
-  return isUnique;
+  return element instanceof ht.Text && element.a('isText');
 }
 export function getElements(dataModel) {
   // console.error(111, dataModel.getDatas().getArray())
@@ -94,7 +72,7 @@ export function getGroupDatas(dataModel) {
 }
 export function getGroupElementByTag(dataModel, tag) {
   return dataModel.getDataByTag(tag) || dataModel.getDatas().toArray().filter(function (item) {
-    return item.a("tag") === tag;
+    return item.a('tag') === tag;
   })[0];
 }
 export function getGroupData(element) {
@@ -105,14 +83,14 @@ export function getGroupData(element) {
   var parent = element.getParent();
   var groupInfo = parent ? {
     groupId: parent.getTag(),
-    groupTag: parent.a("tag") // 父容器
+    groupTag: parent.a('tag') // 父容器
 
   } : {};
   return _extends({
     name: element.getStyleMap().label
   }, element.getAttrObject(), {
     id: element.getTag(),
-    tag: element.a("tag"),
+    tag: element.a('tag'),
     image: element.getImage()
   }, groupInfo);
 }
@@ -126,7 +104,7 @@ export function getNodeData(element) {
   var parent = element.getParent();
   var groupInfo = parent ? {
     groupId: parent.getTag(),
-    groupTag: parent.a("tag") // 父容器
+    groupTag: parent.a('tag') // 父容器
 
   } : {};
   return _extends({}, element.getAttrObject(), {
@@ -138,12 +116,12 @@ export function getEdges(dataModel) {
   return getElements(dataModel).filter(isValidEdge);
 }
 export function isEdgeGroupExpanded(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
+  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s('edge.expanded');
 }
 /**
  * 是否连线组代理
- * @param {*} edge
- * @returns
+ * @param {*} edge 
+ * @returns 
  */
 
 export function isEdgeGroupAgent(edge) {
@@ -151,9 +129,9 @@ export function isEdgeGroupAgent(edge) {
 }
 /**
  * 获得两个节点间的连线列表
- * @param {*} node1
- * @param {*} node2
- * @returns
+ * @param {*} node1 
+ * @param {*} node2 
+ * @returns 
  */
 
 export function getEdgesBetweenNodes(node1, node2) {
@@ -175,7 +153,7 @@ export function getEdgesBetweenNodes(node1, node2) {
 }
 /**
  * 获得节点间的连线组，连线<=1时返回null
- * @returns
+ * @returns 
  */
 
 export function getEdgeGroupByNodes(node1, node2) {
@@ -194,7 +172,7 @@ export function getEdgeGroupByNodes(node1, node2) {
 }
 /**
  * 获得节点间的连线组，连线<=1时返回null
- * @returns
+ * @returns 
  */
 
 export function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
@@ -202,7 +180,7 @@ export function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
   var node2 = dataModel.getDataByTag(nodeTag2);
 
   if (!node1 || !node2) {
-    console.warn("getEdgeGroupByNodes 未找到节点", {
+    console.warn('getEdgeGroupByNodes 未找到节点', {
       node1: node1,
       node2: node2,
       nodeTag1: nodeTag1,
@@ -283,7 +261,7 @@ export function getGroupChildren(group) {
 
 
   return group.getChildren().getArray().filter(function (node) {
-    return node._layer !== "container_blank";
+    return node._layer !== 'container_blank';
   });
 }
 /**
@@ -313,7 +291,7 @@ export function getGroupChildrenData(group) {
 export function setElementRuntimeStyle(element, name, value) {
   var _extends2;
 
-  var prevRuntimeStyle = element.a("runtimeStyles") || {};
+  var prevRuntimeStyle = element.a('runtimeStyles') || {};
 
   var runtimeStyle = _extends({}, prevRuntimeStyle, (_extends2 = {}, _extends2[name] = value, _extends2)); // if (prevRuntimeStyle[name] === undefined && value === undefined) {
   //   return
@@ -324,7 +302,7 @@ export function setElementRuntimeStyle(element, name, value) {
     runtimeStyle[name] = undefined; // delete runtimeStyle[name]
   }
 
-  element.a("runtimeStyles", runtimeStyle);
+  element.a('runtimeStyles', runtimeStyle);
 }
 /**
  * 判断拓扑图是否存在元素
@@ -337,7 +315,7 @@ export function isExistedElement(htTopo, dataModel, data) {
 
 
   var element = getElements(dataModel).find(function (item) {
-    return data.tag && item.a("tag") === data.tag;
+    return data.tag && item.a('tag') === data.tag;
   });
 
   if (element) {

package/lib/core/editor/components/settings/core/updateElementProperty.js

@@ -5,12 +5,7 @@ exports["default"] = updateElementProperty;
 
 function updateElementProperty(topo, name, value) {
   // const element = topo.getDataModel().getDataById(selection[0].id);
-  var element = topo.getSelectionModel().getFirstData();
-  console.info("updateElementProperty", topo.getSelectionModel().getSelection(), {
-    element: element,
-    name: name,
-    value: value
-  });
+  var element = topo.getSelectionModel().getFirstData(); // console.info("updateElementProperty",topo.getSelectionModel().getSelection(), { selection, element, name, value });
 
   if (name.startsWith('attrObject.')) {
     element.setAttr(name.replace('attrObject.', ''), value);

package/lib/core/editor/components/settings/propertyViews/node/data/Data.js

@@ -27,8 +27,6 @@ var _NodeRelateResourceButton = _interopRequireDefault(require("./NodeRelateReso
 
 var _PlatformDisplay = _interopRequireDefault(require("./PlatformDisplay"));
 
-var _BindIpInput = _interopRequireDefault(require("./BindIpInput"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -39,14 +37,13 @@ var CollapsePanel = _collapse["default"].Panel;
 function parseValues(values) {
   return (0, _extends2["default"])({}, values, {
     "attrObject.customName": values["attrObject.customName"] || values["attrObject.name"],
-    "attrObject.bindTopo": values["attrObject.bindTopo"] || "",
-    // 解决切换节点时关联拓扑选项未重置
-    "attrObject.ipv4": values["attrObject.ipv4"] || ""
+    "attrObject.bindTopo": values["attrObject.bindTopo"] || "" // 解决切换节点时关联拓扑选项未重置
+
   });
 }
 
 function getBindType(values) {
-  if (values.tag && !values.tag.startsWith('Ip_')) {
+  if (values.tag) {
     return "resource";
   }
 
@@ -65,7 +62,6 @@ function Data(props) {
       _onChange = props.onChange,
       editorProps = props.editorProps;
   var bindType = getBindType(values);
-  console.log("node, values", node, values);
 
   var field = _field["default"].useField({
     autoUnmount: false,
@@ -133,7 +129,7 @@ function Data(props) {
   }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
     field: field,
     labelAlign: "top"
-  }, (!values.tag || bindType === "ip") && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+  }, !values.tag && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u5173\u8054\u7C7B\u578B"
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
     name: "bindType",
@@ -147,9 +143,7 @@ function Data(props) {
     value: "none"
   }, "\u672A\u5173\u8054"), /*#__PURE__*/_react["default"].createElement(Option, {
     value: "resource"
-  }, "\u5173\u8054\u8D44\u6E90"), /*#__PURE__*/_react["default"].createElement(Option, {
-    value: "ip"
-  }, "\u5173\u8054IP"), RelateTopoTree && /*#__PURE__*/_react["default"].createElement(Option, {
+  }, "\u5173\u8054\u8D44\u6E90"), RelateTopoTree && /*#__PURE__*/_react["default"].createElement(Option, {
     value: "topo"
   }, "\u5173\u8054\u62D3\u6251"))), bindType === "resource" && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u5173\u8054\u8D44\u6E90"
@@ -163,7 +157,7 @@ function Data(props) {
       flex: 1,
       paddingRight: 16,
       color: "#4D6277",
-      lineHeight: "20px"
+      lineHeight: '20px'
     },
     title: values.tag ? values.name : null
   }, values.tag ? values.name : "—"), /*#__PURE__*/_react["default"].createElement(_NodeRelateResourceButton["default"], {
@@ -172,27 +166,13 @@ function Data(props) {
     topo: topo,
     topoEditApi: topoEditApi,
     nodeBindResourceDrawerComponent: editorProps.nodeBindResourceDrawerComponent
-  }))), bindType === "ip" && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-    label: "\u5173\u8054IP" // style={{ display: "flex" }}
-    ,
-    pattern: /^((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))$/,
-    patternTrigger: "onBlur",
-    patternMessage: "IP\u5730\u5740\u683C\u5F0F\u4E0D\u6B63\u786E"
-  }, /*#__PURE__*/_react["default"].createElement(_BindIpInput["default"], {
-    nodeElement: node,
-    node: values,
-    topo: topo,
-    topoEditApi: topoEditApi,
-    placeholder: "\u8BF7\u8F93\u5165",
-    name: "attrObject.ipv4",
-    maxLength: 128
-  })), bindType === "topo" && RelateTopoTree && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+  }))), bindType === "topo" && RelateTopoTree && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u5173\u8054\u62D3\u6251"
   }, /*#__PURE__*/_react["default"].createElement(RelateTopoTree, {
     name: "attrObject.bindTopo",
     topo: topo,
     onChange: handleBindTopoChange
-  })), (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === "cmpTopo" && node.getTag() && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+  })), (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo' && node.getTag() && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u6240\u5C5E\u5E73\u53F0"
   }, /*#__PURE__*/_react["default"].createElement(_PlatformDisplay["default"], props)))));
 }

package/lib/core/hooks/useTopoEdit.js

@@ -37,8 +37,6 @@ var _htElementDataUtil = require("../../utils/htElementDataUtil");
 
 var _clusterUtil = require("../../utils/clusterUtil");
 
-var _linkUtils = require("../models/utils/linkUtils");
-
 var useTopoEdit = function useTopoEdit(params) {
   var topo = params.topo,
       topoId = params.topoId,
@@ -344,7 +342,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
               edges.map(function (edge) {
                 if (edge.a("dtype") === "link" && exportLinkIdList.indexOf(edge.getTag()) >= 0) {
-                  // exLink.push(edge);
+                  // exLink.push(edge);      
                   topo.getGraphView().dm().remove(edge);
                   exportLinkIdList.splice(config.exportLinkIdList.indexOf(edge.getTag()), 1);
                 }
@@ -408,8 +406,8 @@ var useTopoEdit = function useTopoEdit(params) {
   };
   /**
    * 获得未存在的连线元素
-   * @param {*} elements
-   * @returns
+   * @param {*} elements 
+   * @returns 
    */
 
 
@@ -422,8 +420,8 @@ var useTopoEdit = function useTopoEdit(params) {
   }
   /**
    * 获得未存在的元素
-   * @param {Array} elements
-   * @returns
+   * @param {Array} elements 
+   * @returns 
    */
 
 
@@ -602,7 +600,7 @@ var useTopoEdit = function useTopoEdit(params) {
               // 2022-11-10 修复 添加资源后分层重新布局问题，仅布局新增资源。替换api topo.updateElements(data)
               newElements = findUNExistedElements(elements);
 
-              _rlog["default"].debug("添加分层资源", {
+              _rlog["default"].debug('添加分层资源', {
                 layer: group,
                 newElements: newElements
               });
@@ -676,8 +674,8 @@ var useTopoEdit = function useTopoEdit(params) {
   }
   /**
    * 未选中元素添加资源
-   *
-   * @param {*} data
+   * 
+   * @param {*} data 
    */
 
 
@@ -837,7 +835,7 @@ var useTopoEdit = function useTopoEdit(params) {
                           newLinkElements = findUNExistedLinkElements(elements);
                           createElementsData = null;
 
-                          if (newData.type === "group") {
+                          if (newData.type === 'group') {
                             groupChildren = (0, _topoData.findGroupChildren)(elements, newData);
                             newGroupChildren = [];
                             existedGroupChildren = [];
@@ -854,10 +852,10 @@ var useTopoEdit = function useTopoEdit(params) {
                               groups: [newData],
                               nodes: newGroupChildren,
                               links: newLinkElements.filter(function (item) {
-                                return item.type === "link";
+                                return item.type === 'link';
                               }),
                               linkGroups: newLinkElements.filter(function (item) {
-                                return item.type === "linkGroup";
+                                return item.type === 'linkGroup';
                               })
                             };
                             htTopo.createElements(createElementsData); // 切换前图上如果存在集群内的节点，切换节点为集群后，移到集群内
@@ -872,16 +870,16 @@ var useTopoEdit = function useTopoEdit(params) {
                               groups: [],
                               nodes: [newData],
                               links: newLinkElements.filter(function (item) {
-                                return item.type === "link";
+                                return item.type === 'link';
                               }),
                               linkGroups: newLinkElements.filter(function (item) {
-                                return item.type === "linkGroup";
+                                return item.type === 'linkGroup';
                               })
                             };
                             htTopo.createElements(createElementsData);
                           }
 
-                          _rlog["default"].debug("批量创建元素", createElementsData); // 恢复图标、大小、位置
+                          _rlog["default"].debug('批量创建元素', createElementsData); // 恢复图标、大小、位置
 
 
                           newElement = dm.getDataByTag(newData.id);
@@ -1001,117 +999,6 @@ var useTopoEdit = function useTopoEdit(params) {
       return _ref8.apply(this, arguments);
     };
   }();
-  /**
-   * 关联IP的图片节点
-   */
-
-
-  function relateNodeIp(_x15, _x16) {
-    return _relateNodeIp.apply(this, arguments);
-  }
-
-  function _relateNodeIp() {
-    _relateNodeIp = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee16(txtValue, nodeElement) {
-      var dm, htTopo, elements, _yield$editDispatcher5, elementDatas, isUnique, ipTxt, ids, ip, re, config, linksData, createElementsData;
-
-      return _regenerator["default"].wrap(function _callee16$(_context16) {
-        while (1) {
-          switch (_context16.prev = _context16.next) {
-            case 0:
-              // console.log("bindIPtoNode", data);
-              // 根据配置查询拓扑数据
-              dm = topo.getDataModel();
-              htTopo = topo.getHtTopo();
-              elements = (0, _htElementUtils.getNodes)(dm);
-              _context16.next = 5;
-              return editDispatchers.fetchDataByConfig();
-
-            case 5:
-              _yield$editDispatcher5 = _context16.sent;
-              elementDatas = _yield$editDispatcher5.elementDatas;
-              console.log("bindIPtoNode", txtValue, nodeElement, elements);
-              console.log("elementDatas", elementDatas);
-              isUnique = true;
-              ipTxt = txtValue;
-              ids = []; // 执行唯一性验证
-
-              elements.map(function (element) {
-                // if (node.getId() !== element.getId()) {
-                // }
-                if (element.getTag()) {
-                  ids.push(element.getTag());
-                }
-              });
-              ip = {
-                id: "ip_1.1.1.1",
-                name: "1.1.1.1",
-                customName: null,
-                // 'groupId': null,
-                // 'groupTag': null,
-                ipAddress: "1.1.1.1",
-                // 'attributes': [],
-                // 'metrics': [],
-                type: "node" // 'dtype': 'device'
-
-              }; // 获取关联链路
-
-              if (!isUnique) {
-                _context16.next = 27;
-                break;
-              }
-
-              nodeElement.a(ip);
-              nodeElement.setName(txtValue);
-              nodeElement.a("name", txtValue);
-              nodeElement.a("customName", null);
-              nodeElement.setTag("ip_" + txtValue);
-              _context16.next = 22;
-              return editDispatchers.queryAllLinkByIp({
-                ids: ids,
-                ip: txtValue
-              });
-
-            case 22:
-              re = _context16.sent;
-              console.log("queryAllLinkByIp", re);
-              config = resourceConfig.getConfig();
-              console.log("resourceConfig.getConfig", config);
-
-              if (re && re.length > 0) {
-                linksData = [];
-                re.map(function (link) {
-                  var sourceId = link.attributes["network_link.source_device_id"];
-                  var source = dm.getDataByTag(sourceId);
-                  var target = nodeElement; // console.log("source, nodeElement, link", source, target, link);
-
-                  if (source && target) {
-                    var linkData = (0, _linkUtils.mergeExportLinkData)({
-                      source: source,
-                      target: target,
-                      link: link
-                    });
-                    console.log("linkData", linkData);
-                    linksData.push(linkData); // htTopo.createEdge(source, target, link);
-                  }
-                });
-                createElementsData = {
-                  groups: [],
-                  nodes: [],
-                  links: [].concat(linksData),
-                  linkGroups: []
-                };
-                htTopo.createElements(createElementsData); // htTopo.addElements({ lines: [...re] });
-              }
-
-            case 27:
-            case "end":
-              return _context16.stop();
-          }
-        }
-      }, _callee16);
-    }));
-    return _relateNodeIp.apply(this, arguments);
-  }
 
   var onEvent = function onEvent(e) {
     var map = {};
@@ -1129,7 +1016,7 @@ var useTopoEdit = function useTopoEdit(params) {
    */
 
   var setViewMouseMode = function setViewMouseMode(mode) {
-    _rlog["default"].debug("设置视图鼠标模式", mode);
+    _rlog["default"].debug('设置视图鼠标模式', mode);
 
     topo.getHtTopo().setViewMouseMode(mode);
     topoEditDispatchers.update({
@@ -1208,11 +1095,6 @@ var useTopoEdit = function useTopoEdit(params) {
      */
     onDeleteElement: onDeleteElement,
 
-    /**
-     * 绑定图片ip
-     */
-    relateNodeIp: relateNodeIp,
-
     /**
      * 拓扑图保存回调
      */

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.12" === 'string' ? "9.0.0-a.12" : null;
+var version = typeof "9.0.0-a.15" === 'string' ? "9.0.0-a.15" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/utils/linkUtils.js

@@ -8,7 +8,6 @@ exports.compatibleWith = void 0;
 exports.getLinksDetail = getLinksDetail;
 exports.isCrucialLink = isCrucialLink;
 exports.isExitLink = isExitLink;
-exports.mergeExportLinkData = void 0;
 exports.mergeLinksData = mergeLinksData;
 exports.showLinkByConfig = exports.plurals = void 0;
 
@@ -219,23 +218,4 @@ var showLinkByConfig = function showLinkByConfig(props) {
   }
 };
 
-exports.showLinkByConfig = showLinkByConfig;
-
-var mergeExportLinkData = function mergeExportLinkData(props) {
-  var source = props.source,
-      target = props.target,
-      link = props.link;
-  var attrObj = link.attributes;
-  var linkData = (0, _extends2["default"])({}, link, {
-    name: attrObj.name,
-    source: attrObj["network_link.source_device_id"],
-    target: attrObj.destination_type === 'ip' ? target.getTag() : attrObj["network_link.destination_device_id"],
-    operation: attrObj.operation,
-    interfaceSource: attrObj["source_id"],
-    interfaceTarget: attrObj["destination_id"],
-    ciType: link.typeCode
-  });
-  return linkData;
-};
-
-exports.mergeExportLinkData = mergeExportLinkData;
+exports.showLinkByConfig = showLinkByConfig;

package/lib/core/store/models/topoConfig.js

@@ -27,8 +27,6 @@ var _topoData = require("../../../utils/topoData");
 
 var _topoData2 = require("../../../core/models/topoData");
 
-var _networkLink = _interopRequireDefault(require("../../../networkTopo/services/topo/networkLink"));
-
 var _getTopoData = require("../../../networkTopo/getTopoData");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -266,20 +264,19 @@ function _default(topoApp) {
           var _this2 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-            var editState, resources, _editState$groups, groups, _editState$exportLink, exportLinkIdList, _editState$ipNodes, ipNodes, query, data;
+            var editState, resources, _editState$groups, groups, _editState$exportLink, exportLinkIdList, query, data;
 
             return _regenerator["default"].wrap(function _callee2$(_context2) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
                     editState = rootState.topoConfig;
-                    resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes;
+                    resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink;
                     query = {
                       id: rootState.topoMod.topoId,
                       resources: resources,
                       groups: groups,
-                      exportLinkIdList: exportLinkIdList,
-                      ipNodes: ipNodes
+                      exportLinkIdList: exportLinkIdList
                     };
                     _context2.next = 5;
                     return _this2.getTopoByConditions(query);
@@ -333,14 +330,14 @@ function _default(topoApp) {
           var _this4 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-            var topoId, resources, groups, exportLinkIdList, ipNodes, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
+            var topoId, resources, groups, exportLinkIdList, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
 
             return _regenerator["default"].wrap(function _callee4$(_context4) {
               while (1) {
                 switch (_context4.prev = _context4.next) {
                   case 0:
                     // rlog.debug("getTopoByConditions--------", params);
-                    topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList, ipNodes = params.ipNodes;
+                    topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList;
                     viewConditions = (0, _topoData2.resToConditions)(resources);
                     groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
                       return (0, _extends2["default"])({}, group, {
@@ -350,7 +347,7 @@ function _default(topoApp) {
                     }); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
 
                     _context4.next = 5;
-                    return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList, ipNodes);
+                    return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
 
                   case 5:
                     data = _context4.sent;
@@ -419,7 +416,7 @@ function _default(topoApp) {
                       }))
                     };
 
-                    _rlog["default"].debug("saveGlobalConfig", config);
+                    _rlog["default"].debug('saveGlobalConfig', config);
 
                     _context5.next = 5;
                     return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
@@ -488,33 +485,6 @@ function _default(topoApp) {
         switchToViewMode: function switchToViewMode() {
           this.reset();
           dispatch.topoMod.switchToViewMode();
-        },
-        queryAllLinkByIp: function queryAllLinkByIp(data) {
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
-            var _result$data;
-
-            var ids, ip, result;
-            return _regenerator["default"].wrap(function _callee8$(_context8) {
-              while (1) {
-                switch (_context8.prev = _context8.next) {
-                  case 0:
-                    ids = data.ids, ip = data.ip;
-                    console.log("queryAllLinkByIp", ids, ip);
-                    _context8.next = 4;
-                    return _networkLink["default"].queryLinksByIp(ids, ip);
-
-                  case 4:
-                    result = _context8.sent;
-                    console.log("queryAllLinkByIp-result", result);
-                    return _context8.abrupt("return", (_result$data = result === null || result === void 0 ? void 0 : result.data) !== null && _result$data !== void 0 ? _result$data : []);
-
-                  case 7:
-                  case "end":
-                    return _context8.stop();
-                }
-              }
-            }, _callee8);
-          }))();
         }
       };
     }