@riil-frontend/component-topology 9.0.0-a.20 → 9.0.0-a.21

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

@@ -0,0 +1,120 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = BindIpInput;
+
+var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
+
+var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
+
+var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _exitLinkUtil = require("../../../../../../../networkTopo/utils/exitLinkUtil");
+
+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; }
+
+var FormItem = _form["default"].Item;
+/**
+ * @return {React.ReactNode | null}
+ */
+
+function BindIpInput(props) {
+  var _values$attrObjectBi;
+
+  var nodeElement = props.nodeElement,
+      topo = props.topo,
+      topoEditApi = props.topoEditApi,
+      values = props.values,
+      onChange = props.onChange,
+      fieldItem = props.fieldItem; // const currentResId = node.tag;
+  // console.log(
+  //   "nodeElement, topo, topoEditApi, node",
+  //   nodeElement,
+  //   topo,
+  //   topoEditApi,
+  //   values
+  // );
+
+  var _useState = (0, _react.useState)(""),
+      error = _useState[0],
+      setError = _useState[1];
+
+  var _useState2 = (0, _react.useState)((_values$attrObjectBi = values["attrObject.bindIp"]) !== null && _values$attrObjectBi !== void 0 ? _values$attrObjectBi : ""),
+      txtValue = _useState2[0],
+      setTxtValue = _useState2[1];
+
+  var saveIp = function saveIp(v) {
+    fieldItem.validate(function (errors, vals) {
+      if (errors) {
+        console.error("saveIp-error", errors, vals);
+      } else {
+        console.log("saveIp", txtValue);
+        setError("");
+        onChange(txtValue);
+        topoEditApi.relateNodeIp(txtValue, nodeElement);
+      }
+    });
+  };
+
+  (0, _react.useEffect)(function () {
+    fieldItem.reset();
+    setTxtValue(values["attrObject.bindIp"]);
+  }, [values]);
+
+  var inputChange = function inputChange(v) {
+    setTxtValue(v); // onChange(v);
+  }; // 图片节点验证ip唯一性
+
+
+  var checkIp = function checkIp(rule, value, callback) {
+    var dm = topo.getDataModel();
+    var rex = /^((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)))$/;
+    var reg = value.match(rex);
+
+    if (reg === null) {
+      return callback();
+    }
+
+    var isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, value, nodeElement);
+    console.log("checkIp", isUnique);
+
+    if (!isUnique) {
+      return callback("ip不能重复");
+    } else {
+      return callback();
+    }
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      display: "flex"
+    }
+  }, /*#__PURE__*/_react["default"].createElement(FormItem, {
+    label: "\u5173\u8054IP",
+    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",
+    validator: checkIp
+  }, /*#__PURE__*/_react["default"].createElement(_input["default"], {
+    placeholder: "\u8BF7\u8F93\u5165Ip\u5730\u5740",
+    name: "attrObject.bindIp",
+    state: error,
+    value: txtValue,
+    maxLength: 128,
+    onChange: inputChange
+  })), /*#__PURE__*/_react["default"].createElement(_button["default"], {
+    type: "primary",
+    text: true,
+    onClick: saveIp,
+    style: {
+      marginLeft: 10,
+      marginTop: 27
+    }
+  }, "\u4FDD\u5B58"));
+}

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

@@ -27,6 +27,10 @@ var _NodeRelateResourceButton = _interopRequireDefault(require("./NodeRelateReso
 
 var _PlatformDisplay = _interopRequireDefault(require("./PlatformDisplay"));
 
+var _BindIpInput = _interopRequireDefault(require("./BindIpInput"));
+
+var _exitLinkUtil = require("../../../../../../../networkTopo/utils/exitLinkUtil");
+
 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; }
@@ -37,20 +41,21 @@ 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.bindTopo": values["attrObject.bindTopo"] || "",
+    // 解决切换节点时关联拓扑选项未重置
+    "attrObject.bindIp": values["attrObject.bindIp"] || ""
   });
 }
 
 function getBindType(values) {
-  if (values.tag) {
-    return "resource";
-  }
-
   if (values.attrObject.bindType) {
     return values.attrObject.bindType;
   }
 
+  if (values.tag && !values.tag.startsWith("ip:")) {
+    return "resource";
+  }
+
   return "none";
 }
 
@@ -61,15 +66,21 @@ function Data(props) {
       values = props.values,
       _onChange = props.onChange,
       editorProps = props.editorProps;
-  var bindType = getBindType(values);
+  var bindType = getBindType(values); // console.log("node, values", node, values);
 
   var field = _field["default"].useField({
     autoUnmount: false,
     values: parseValues(values),
     onChange: function onChange(name, value) {
-      var newValues = field.getValues();
+      field.validate(function (errors, vals) {
+        if (errors) {
+          console.error("field-Data", errors, vals);
+        } else {
+          var newValues = field.getValues();
 
-      _onChange(name, value, newValues);
+          _onChange(name, value, newValues);
+        }
+      });
     }
   });
 
@@ -129,7 +140,7 @@ function Data(props) {
   }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
     field: field,
     labelAlign: "top"
-  }, !values.tag && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+  }, (!values.tag || bindType === "ip") && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u5173\u8054\u7C7B\u578B"
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
     name: "bindType",
@@ -143,7 +154,9 @@ function Data(props) {
     value: "none"
   }, "\u672A\u5173\u8054"), /*#__PURE__*/_react["default"].createElement(Option, {
     value: "resource"
-  }, "\u5173\u8054\u8D44\u6E90"), RelateTopoTree && /*#__PURE__*/_react["default"].createElement(Option, {
+  }, "\u5173\u8054\u8D44\u6E90"), /*#__PURE__*/_react["default"].createElement(Option, {
+    value: "ip"
+  }, "\u5173\u8054IP"), 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"
@@ -157,7 +170,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"], {
@@ -166,13 +179,35 @@ function Data(props) {
     topo: topo,
     topoEditApi: topoEditApi,
     nodeBindResourceDrawerComponent: editorProps.nodeBindResourceDrawerComponent
-  }))), bindType === "topo" && RelateTopoTree && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+  }))), bindType === "ip" &&
+  /*#__PURE__*/
+  // <Form.Item
+  //   label="关联IP"
+  //   // 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地址格式不正确"
+  // >
+  _react["default"].createElement(_BindIpInput["default"], {
+    nodeElement: node,
+    values: values,
+    topo: topo,
+    fieldItem: field,
+    topoEditApi: topoEditApi,
+    placeholder: "\u8BF7\u8F93\u5165",
+    name: "attrObject.bindIp",
+    onChange: _onChange,
+    maxLength: 128
+  }) // </Form.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

@@ -17,6 +17,8 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _react = require("react");
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
@@ -37,6 +39,10 @@ var _htElementDataUtil = require("../../utils/htElementDataUtil");
 
 var _clusterUtil = require("../../utils/clusterUtil");
 
+var _linkUtils = require("../models/utils/linkUtils");
+
+var _exitLinkUtil = require("../../networkTopo/utils/exitLinkUtil");
+
 var useTopoEdit = function useTopoEdit(params) {
   var topo = params.topo,
       topoId = params.topoId,
@@ -342,7 +348,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);
                 }
@@ -406,8 +412,8 @@ var useTopoEdit = function useTopoEdit(params) {
   };
   /**
    * 获得未存在的连线元素
-   * @param {*} elements 
-   * @returns 
+   * @param {*} elements
+   * @returns
    */
 
 
@@ -420,8 +426,8 @@ var useTopoEdit = function useTopoEdit(params) {
   }
   /**
    * 获得未存在的元素
-   * @param {Array} elements 
-   * @returns 
+   * @param {Array} elements
+   * @returns
    */
 
 
@@ -600,7 +606,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
               });
@@ -674,8 +680,8 @@ var useTopoEdit = function useTopoEdit(params) {
   }
   /**
    * 未选中元素添加资源
-   * 
-   * @param {*} data 
+   *
+   * @param {*} data
    */
 
 
@@ -835,7 +841,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 = [];
@@ -852,10 +858,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); // 切换前图上如果存在集群内的节点，切换节点为集群后，移到集群内
@@ -870,16 +876,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);
@@ -999,6 +1005,126 @@ 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 _configObj$linkIps;
+
+      var dm, htTopo, elements, configObj, _yield$editDispatcher5, elementDatas, isUnique, 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); // 获取配置
+
+              configObj = topo.resourceConfig.getConfig();
+              console.log("configObj", configObj);
+              configObj.linkIps = [].concat((_configObj$linkIps = configObj.linkIps) !== null && _configObj$linkIps !== void 0 ? _configObj$linkIps : [], [txtValue]);
+              console.log("configObj---over", configObj);
+              _context16.next = 9;
+              return resourceConfig.updateConfig(configObj);
+
+            case 9:
+              _context16.next = 11;
+              return editDispatchers.fetchDataByConfig();
+
+            case 11:
+              _yield$editDispatcher5 = _context16.sent;
+              elementDatas = _yield$editDispatcher5.elementDatas;
+              console.log("bindIPtoNode", txtValue, nodeElement, elements);
+              console.log("elementDatas", elementDatas); // 执行唯一性验证
+
+              isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, txtValue, nodeElement);
+              ids = [];
+              elements.map(function (element) {
+                if (element.getTag()) {
+                  ids.push(element.getTag());
+                }
+              });
+              ip = {
+                id: "ip:" + txtValue,
+                name: txtValue,
+                customName: null,
+                // 'groupId': null,
+                // 'groupTag': null,
+                ipAddress: txtValue,
+                // 'attributes': [],
+                // 'metrics': [],
+                type: "node",
+                isbinding: true // 'dtype': 'device'
+
+              }; // 获取关联链路
+
+              if (!isUnique) {
+                _context16.next = 30;
+                break;
+              }
+
+              nodeElement.a(ip);
+              nodeElement.setName(txtValue); // nodeElement.a("name", txtValue);
+              // nodeElement.a("customName", null);
+
+              nodeElement.setTag("ip:" + txtValue);
+              _context16.next = 25;
+              return editDispatchers.queryAllLinkByIp({
+                ids: ids,
+                ip: txtValue
+              });
+
+            case 25:
+              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 30:
+            case "end":
+              return _context16.stop();
+          }
+        }
+      }, _callee16);
+    }));
+    return _relateNodeIp.apply(this, arguments);
+  }
 
   var onEvent = function onEvent(e) {
     var map = {};
@@ -1016,7 +1142,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({
@@ -1095,6 +1221,11 @@ 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.20" === 'string' ? "9.0.0-a.20" : null;
+var version = typeof "9.0.0-a.21" === 'string' ? "9.0.0-a.21" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -8,6 +8,7 @@ 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;
 
@@ -218,4 +219,23 @@ var showLinkByConfig = function showLinkByConfig(props) {
   }
 };
 
-exports.showLinkByConfig = showLinkByConfig;
+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;

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

@@ -27,6 +27,8 @@ 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); }
@@ -264,19 +266,20 @@ 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, query, data;
+            var editState, resources, _editState$groups, groups, _editState$exportLink, exportLinkIdList, _editState$ipNodes, ipNodes, 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;
+                    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;
                     query = {
                       id: rootState.topoMod.topoId,
                       resources: resources,
                       groups: groups,
-                      exportLinkIdList: exportLinkIdList
+                      exportLinkIdList: exportLinkIdList,
+                      ipNodes: ipNodes
                     };
                     _context2.next = 5;
                     return _this2.getTopoByConditions(query);
@@ -330,14 +333,14 @@ function _default(topoApp) {
           var _this4 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-            var topoId, resources, groups, exportLinkIdList, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
+            var topoId, resources, groups, exportLinkIdList, ipNodes, 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;
+                    topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList, ipNodes = params.ipNodes;
                     viewConditions = (0, _topoData2.resToConditions)(resources);
                     groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
                       return (0, _extends2["default"])({}, group, {
@@ -347,7 +350,7 @@ function _default(topoApp) {
                     }); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
 
                     _context4.next = 5;
-                    return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
+                    return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList, ipNodes);
 
                   case 5:
                     data = _context4.sent;
@@ -416,7 +419,7 @@ function _default(topoApp) {
                       }))
                     };
 
-                    _rlog["default"].debug('saveGlobalConfig', config);
+                    _rlog["default"].debug("saveGlobalConfig", config);
 
                     _context5.next = 5;
                     return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
@@ -485,6 +488,33 @@ 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);
+          }))();
         }
       };
     }