@riil-frontend/component-topology 13.0.0-dev.1 → 13.0.0-dev.11

package/es/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js

@@ -1,5 +1,6 @@
 import React, { useMemo } from 'react';
 import DefaultDetailContent from "../../ResourceDetail/DefaultDetailContent";
+import { isEdgeGroupAgent } from "../../../../../../utils/htElementUtils";
 
 function useElementDetailManager(props) {
   var topo = props.topo,
@@ -62,9 +63,8 @@ function useElementDetailManager(props) {
   }
 
   function openByHtElement(htElement) {
-    var isEdgeGroupAgent = htElement instanceof ht.Edge && htElement.isEdgeGroupAgent() && !htElement.s('edge.expanded');
     open({
-      id: isEdgeGroupAgent || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
+      id: isEdgeGroupAgent(htElement) || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
       htElement: htElement
     });
   }

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js

@@ -10,11 +10,11 @@ import Link from "../../../../../../../components/Link";
 import service from "../../../../../../services/overview";
 import styles from "./index.module.scss";
 import { getHistory } from '@riil-frontend/component-topology-utils';
+import loglevel from 'loglevel';
 
 function formatUrl(url) {
   var _window, _window$location;
 
-  console.log(url);
   var prefix = '/default/pagecenter';
 
   if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
@@ -28,12 +28,14 @@ function EventsCard(props) {
   var alarmRiskList = props.alarmRiskList,
       closeDetailDrawer = props.closeDetailDrawer,
       onHandleAlarm = props.onHandleAlarm;
+  var log = loglevel.getLogger('topo');
 
   var jumpTo = function jumpTo(url) {
     closeDetailDrawer();
 
     if (topo.viewProps.jumpto) {
-      topo.viewProps.jumpto(formatUrl(url));
+      log.debug('formatUrl(url)', url);
+      topo.viewProps.jumpto(url);
     } else {
       getHistory().push(formatUrl(url));
     }

package/es/networkTopo/models/EdgeGroupTagTipBuilder.js

@@ -1,4 +1,4 @@
-import { getEdgeGroups } from "../../utils/htElementUtils";
+import { getEdgeGroupAgents, getEdgeGroups } from "../../utils/htElementUtils";
 import { getEdgeGroupLinkIdConfig } from "../utils/edgeGroupTagUtil";
 
 var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
@@ -16,11 +16,11 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
 
     var topo = this.topo;
     var dm = this.topo.getDataModel();
-    var edgeGroupsTagsTips = getEdgeGroups(dm).map(function (edgeGroup) {
-      var edge = edgeGroup.getEdges().getArray()[0]; // 获取配置的链路
-
-      var linkId = getEdgeGroupLinkIdConfig(edge, topo);
-      var edgeGroupId = [edge.getSourceAgent().getId(), edge.getTargetAgent().getId()];
+    var edgeGroupAgents = getEdgeGroupAgents(dm);
+    var edgeGroupsTagsTips = edgeGroupAgents.map(function (edgeGroupAgent) {
+      // 获取配置的链路
+      var linkId = getEdgeGroupLinkIdConfig(edgeGroupAgent, topo);
+      var edgeGroupId = [edgeGroupAgent.getSource().getId(), edgeGroupAgent.getTarget().getId()];
       var data = {
         tags: [],
         tips: []
@@ -31,7 +31,7 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
       }
 
       return {
-        htId: edge.getId(),
+        htId: edgeGroupAgent.getId(),
         edgeGroupId: edgeGroupId,
         tags: data.tags,
         tips: data.tips,

package/es/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -1,7 +1,5 @@
-import { rlog } from '@riil-frontend/component-topology-utils';
 import { isClusterHtElement } from "../../utils/clusterUtil";
-import { getEdgeGroupByNodeTags, getEdges, isNode } from "../../utils/htElementUtils";
-import { getLinksBetweenNodes } from "../utils/linkUtil"; // network_link.actual_bandwidth
+import { isNode } from "../../utils/htElementUtils"; // network_link.actual_bandwidth
 
 function calcEdgeWidth(actualBandwidth) {
   if (!actualBandwidth) {
@@ -52,16 +50,17 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
   var _proto = LinkDynamicStyleExecutor.prototype;
 
   _proto.execute = function execute() {
-    var _this = this;
+    var _topo$historyManager,
+        _this = this,
+        _topo$historyManager2;
 
     var topo = this.topo;
 
     var _topo$dataModel$getDa = topo.dataModel.getData(),
-        links = _topo$dataModel$getDa.links,
-        linkGroups = _topo$dataModel$getDa.linkGroups;
+        links = _topo$dataModel$getDa.links;
 
     var dataModel = this.topo.getDataModel();
-    topo.historyManager && topo.historyManager.setDisabled(true, '链路动态样式'); // 1、如果连线可见，设置线宽
+    (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '链路动态粗细'); // 1、如果连线可见，设置线宽
 
     links.forEach(function (link) {
       var edge = dataModel.getDataByTag(link.id);
@@ -69,63 +68,8 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
       if (edge) {
         edge.s('edge.width', _this.calcLinkEdgeWidth(link));
       }
-    }); // 2、如果连线组关联链路并可见，设置线宽
-
-    linkGroups.forEach(function (link) {
-      // 聚合链路是连线/连线组，并可以查询到
-      var edge = topo.getDataModel().getDataByTag(link.id);
-
-      if (edge) {
-        edge.s('edge.width', _this.calcLinkEdgeWidth(link));
-        return;
-      } // 聚合链路是连线组（编辑模式还未关联业务信息）
-
-
-      var edgeGroup = getEdgeGroupByNodeTags(dataModel, link.source, link.target);
-
-      if (edgeGroup) {
-        var edgeGroupAgent = edgeGroup.getEdgeGroupAgent(); // 判断是显示的连线组元素
-
-        if (edgeGroupAgent) {
-          edgeGroup.getEdgeGroupAgent().s('edge.width', _this.calcLinkEdgeWidth(link));
-        }
-      } else {
-        rlog.warn('动态链路样式执行：未找到聚合链路的ht元素', link);
-      }
-    }); // 3、如果连线组未关联链路并可见，设置线宽。
-
-    var edges = getEdges(dataModel);
-    edges.forEach(function (edge) {
-      try {
-        // 获取两端代理节点
-        var sourceAgent = edge.getSourceAgent();
-        var targetAgent = edge.getTargetAgent();
-        var sourceId = sourceAgent.getTag();
-        var targetId = targetAgent.getTag(); // 查询是否有聚合链路
-
-        var aggLink = linkGroups.find(function (link) {
-          return link.source === sourceId && link.target === targetId || link.target === sourceId && link.source === targetId;
-        }); // 如果连线组未关联链路并可见
-
-        if (!aggLink && edge.isEdgeGroupAgent()) {
-          // 查询两端代理节点（包含子节点）间的子链路列表
-          var sourceCiIds = getChildrenNodeCiIds([sourceAgent]);
-          var targetCiIds = getChildrenNodeCiIds([targetAgent]);
-          var aggLinks = getLinksBetweenNodes(linkGroups, sourceCiIds, targetCiIds);
-          var phyLinks = getLinksBetweenNodes(links, sourceCiIds, targetCiIds);
-          var linkBetweenNodes = aggLinks.length ? aggLinks : phyLinks; // 如果有子链路，计算线宽并设置
-
-          if (linkBetweenNodes.length) {
-            var edgeWidth = _this.calcEdgeGroupEdgeWidth(linkBetweenNodes);
-
-            edge.s('edge.width', edgeWidth);
-          }
-        }
-      } catch (error) {
-        rlog.error('连线组未关联链路并可见，设置线宽：异常', edge, error);
-      }
     });
-    topo.historyManager && topo.historyManager.setDisabled(false, '链路动态样式');
+    (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '链路动态粗细');
   }
   /**
    * 处理单个连线组切换。有链路时设置

package/es/networkTopo/services/topo/basic.js

@@ -1,7 +1,5 @@
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["groups", "resources"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } from '@riil-frontend/component-topology-utils';
 import { rlog } from '@riil-frontend/component-topology-utils';
@@ -9,6 +7,7 @@ import blackList from "./blacklist";
 import { TOPO_API_ROOT } from "./constants";
 import { getBatchCi as _getBatchCi, getBatchCiMetric as _getBatchCiMetric } from "../model";
 import { processByConditionResult, processExitLink } from "../../utils/exitLinkUtil";
+import * as relateTopoDataUtil from "../../utils/relateTopoDataUtil";
 var API_ROOT = TOPO_API_ROOT;
 /**
  * 拓扑图（看做一个容器）的“父容器”ID
@@ -49,7 +48,7 @@ function prepareResourceParams(conditions, query) {
   return {
     dynamicCondition: dynamicCondition,
     fixedConditionIdList: (staticRes || []).filter(function (ciId) {
-      return !ciId.startsWith('ip:');
+      return !ciId.includes(':');
     }),
     linkIps: (staticRes || []).filter(function (ciId) {
       return ciId.startsWith('ip:');
@@ -98,7 +97,8 @@ function prepareGroupParams(modifiedGroups) {
     };
   }).filter(Boolean);
   return {
-    groups: groups
+    groups: groups,
+    relateTopoIdList: relateTopoDataUtil.getRelateTopoIdListFromConfig(modifiedGroups)
   };
 }
 
@@ -389,16 +389,20 @@ export default _extends({
 
           case 2:
             result = _context12.sent;
-            return _context12.abrupt("return", processExitLink(_extends({}, result, {
+            result = _extends({}, result, {
               nodes: (_result$nodes = result.nodes) !== null && _result$nodes !== void 0 ? _result$nodes : [],
               links: ((_result$links = result.links) !== null && _result$links !== void 0 ? _result$links : []).map(function (item) {
                 return _extends({}, item, {
                   ciType: 'network_link'
                 });
-              })
-            })));
+              }),
+              serialize: result.serialize ? JSON.parse(result.serialize) : undefined
+            });
+            result = relateTopoDataUtil.processBothTopoData(result);
+            result = processExitLink(result);
+            return _context12.abrupt("return", result);
 
-          case 4:
+          case 7:
           case "end":
             return _context12.stop();
         }
@@ -417,7 +421,7 @@ export default _extends({
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
       var _result$nodes2, _result$links2;
 
-      var data, obj, result;
+      var data, params, result;
       return _regeneratorRuntime.wrap(function _callee13$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
           case 0:
@@ -431,22 +435,28 @@ export default _extends({
               });
             }
 
-            obj = prepareGroupParams(data);
+            params = prepareGroupParams(data);
             _context13.next = 5;
-            return request.post(API_ROOT + "/structure/byCondition/" + id, _extends({}, obj));
+            return request.post(API_ROOT + "/structure/byCondition/" + id, params);
 
           case 5:
             result = _context13.sent;
-            return _context13.abrupt("return", processByConditionResult(_extends({}, result, {
+            result = _extends({}, result, {
               nodes: (_result$nodes2 = result.nodes) !== null && _result$nodes2 !== void 0 ? _result$nodes2 : [],
               links: ((_result$links2 = result.links) !== null && _result$links2 !== void 0 ? _result$links2 : []).map(function (item) {
                 return _extends({}, item, {
                   ciType: 'network_link'
                 });
               })
-            }), obj.groups));
+            });
+            result = relateTopoDataUtil.processByConditionTopoData({
+              data: result,
+              config: data
+            });
+            result = processByConditionResult(result, params.groups);
+            return _context13.abrupt("return", result);
 
-          case 7:
+          case 10:
           case "end":
             return _context13.stop();
         }
@@ -463,11 +473,11 @@ export default _extends({
   */
   bindResourceToTopo: function bindResourceToTopo(id, config) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
-      var groups, resources, otherConfig, newGroups, obj;
+      var groups, resources, newGroups, obj;
       return _regeneratorRuntime.wrap(function _callee14$(_context14) {
         while (1) switch (_context14.prev = _context14.next) {
           case 0:
-            groups = config.groups, resources = config.resources, otherConfig = _objectWithoutPropertiesLoose(config, _excluded);
+            groups = config.groups, resources = config.resources;
             newGroups = Array.isArray(groups) ? groups : [];
 
             if (resources) {
@@ -481,7 +491,7 @@ export default _extends({
 
             obj = prepareGroupParams(newGroups);
             _context14.next = 6;
-            return request.post(API_ROOT + "/resource/" + id, _extends({}, otherConfig, obj));
+            return request.post(API_ROOT + "/resource/" + id, obj);
 
           case 6:
             return _context14.abrupt("return", _context14.sent);

package/es/networkTopo/utils/__tests__/relateTopoData.js

@@ -0,0 +1,205 @@
+// 二、子拓扑链路
+// - 资源-子拓扑资源
+// - 资源-子拓扑IP、Ping资源
+// - 子拓扑资源-IP、Ping资源
+// - 子拓扑资源-子拓扑资源
+// - 子拓扑资源-子拓扑IP、Ping资源
+export var topoLinks = [// 资源-子拓扑资源
+{
+  ciType: 'network_link',
+  "id": "00000000010decab",
+  "name": '资源、Ping资源-子拓扑资源',
+  "source": "00000000010de861",
+  'targetType': 'topo',
+  "target": "6",
+  "operation": "delete",
+  "interfaceSource": "00000000010de8da",
+  "interfaceTarget": "00000000010de973",
+  "attributes": {
+    "network_link.to_if_connect": "r926054146526674944",
+    "network_link.source_device_ipv4": "172.17.166.18",
+    "network_link.destination_ipv4": "172.17.166.20",
+    "network_link.work_mode": "single",
+    "support_templates": "m.ethernet_link",
+    "destination_id": "00000000010de973",
+    "rated_bandwidth": 1000,
+    "network_link.actual_bandwidth": 1000,
+    "source_type": "network.interface",
+    "network_link.connect_type": "phy",
+    "display_name": "资源-子拓扑资源",
+    "asset_status": "2",
+    "destination_type": "network.interface",
+    "network_link.network_category": "CAN",
+    "network_link.source_ipv4": "172.17.166.18",
+    "name": "资源-子拓扑资源",
+    "distance_outlet": 2147483647,
+    "network_link.is_crucial": false,
+    "source_id": "00000000010de8da",
+    "network_link.source_device_id": "00000000010de861",
+    "network_link.destination_device_id": "00000000010de864",
+    "network_link.destination_device_ipv4": "172.17.166.20"
+  },
+  "sourceCode": null,
+  "level": null,
+  "customType": null,
+  "manageStatus": 3
+}, // 资源-子拓扑IP、Ping资源
+{
+  ciType: 'network_link',
+  "id": "00000000019990f1",
+  "name": "资源-子拓扑IP",
+  "source": "00000000010de861",
+  'targetType': 'topo',
+  "target": "6",
+  "operation": "delete",
+  "interfaceSource": "00000000010de8b3",
+  "interfaceTarget": "",
+  "attributes": {
+    "network_link.source_device_ipv4": "172.17.166.18",
+    "network_link.destination_ipv4": "1.1.1.1",
+    "network_link.work_mode": "AandS",
+    "support_templates": "m.ethernet_link",
+    "rated_bandwidth": 100,
+    "network_link.actual_bandwidth": 100,
+    "source_type": "network.interface",
+    "network_link.connect_type": "phy",
+    "display_name": "资源-子拓扑IP",
+    "asset_status": "2",
+    "network_link_type": "2",
+    "destination_type": "ip",
+    "network_link.role": "master",
+    "network_link.network_category": "CAN",
+    "dcs": "331268969",
+    "network_link.source_ipv4": "172.17.166.18",
+    "name": "资源-子拓扑IP",
+    "distance_outlet": 2147483647,
+    "network_link.is_crucial": false,
+    "source_id": "00000000010de8b3",
+    "network_link.source_device_id": "00000000010de861",
+    "network_link.destination_device_ipv4": "1.1.1.1"
+  },
+  "sourceCode": null,
+  "level": null,
+  "customType": null,
+  "manageStatus": 3
+}, // 子拓扑资源-IP、Ping资源
+{
+  ciType: 'network_link',
+  "id": "0000000001999538",
+  "name": "IP-子拓扑资源",
+  'sourceType': 'topo',
+  "source": "6",
+  "target": "",
+  "operation": "delete",
+  "interfaceSource": "00000000010de95e",
+  "interfaceTarget": "",
+  "attributes": {
+    "network_link.source_device_ipv4": "172.17.166.20",
+    "network_link.destination_ipv4": "1.5.5.5",
+    "network_link.work_mode": "AandS",
+    "support_templates": "m.ethernet_link",
+    "rated_bandwidth": 1000,
+    "network_link.actual_bandwidth": 1000,
+    "source_type": "network.interface",
+    "network_link.connect_type": "phy",
+    "display_name": "IP-子拓扑资源",
+    "asset_status": "2",
+    "network_link_type": "2",
+    "destination_type": "ip",
+    "network_link.role": "master",
+    "network_link.network_category": "CAN",
+    "dcs": "331268969",
+    "network_link.source_ipv4": "172.17.166.20",
+    "name": "172.17.166.20(Gi 0/1) - 1.5.5.5",
+    "distance_outlet": 2147483647,
+    "network_link.is_crucial": false,
+    "source_id": "00000000010de95e",
+    "network_link.source_device_id": "00000000010de864",
+    "network_link.destination_device_ipv4": "1.5.5.5"
+  },
+  "sourceCode": null,
+  "level": null,
+  "customType": null,
+  "manageStatus": 3
+}, // 子拓扑资源-子拓扑资源
+{
+  ciType: 'network_link',
+  "id": "0000000001899476",
+  "name": '子拓扑资源-子拓扑资源',
+  'sourceType': 'topo',
+  "source": "3",
+  'targetType': 'topo',
+  "target": "6",
+  "operation": "delete",
+  "interfaceSource": "00000000010de90e",
+  "interfaceTarget": "00000000010de973",
+  "attributes": {
+    "network_link.to_if_connect": "r933757920628178944",
+    "network_link.source_device_ipv4": "172.17.166.19",
+    "network_link.destination_ipv4": "172.17.166.20",
+    "network_link.work_mode": "single",
+    "support_templates": "m.ethernet_link",
+    "destination_id": "00000000010de973",
+    "rated_bandwidth": 1000,
+    "network_link.actual_bandwidth": 1000,
+    "source_type": "network.interface",
+    "network_link.connect_type": "phy",
+    "display_name": "子拓扑资源-子拓扑资源",
+    "asset_status": "2",
+    "network_link_type": "2",
+    "destination_type": "network.interface",
+    "network_link.network_category": "CAN",
+    "network_link.source_ipv4": "172.17.166.19",
+    "name": "172.17.166.19(Gi 0/50) - 172.17.166.20(Gi 0/22)",
+    "distance_outlet": 2147483647,
+    "network_link.is_crucial": false,
+    "source_id": "00000000010de90e",
+    "network_link.source_device_id": "00000000010de862",
+    "network_link.destination_device_id": "00000000010de864",
+    "network_link.destination_device_ipv4": "172.17.166.20"
+  },
+  "sourceCode": null,
+  "level": null,
+  "customType": null,
+  "manageStatus": 3
+}, // 子拓扑资源-子拓扑IP、Ping资源
+{
+  ciType: 'network_link',
+  "id": "0000000001999c86",
+  "name": "子拓扑资源-子拓扑IP",
+  'sourceType': 'topo',
+  "source": "3",
+  'targetType': 'topo',
+  "target": "6",
+  "operation": "delete",
+  "interfaceSource": "00000000010de95e",
+  "interfaceTarget": "",
+  "attributes": {
+    "network_link.source_device_ipv4": "172.17.166.20",
+    "network_link.destination_ipv4": "2.2.2.2",
+    "network_link.work_mode": "AandS",
+    "support_templates": "m.ethernet_link",
+    "rated_bandwidth": 1000,
+    "network_link.actual_bandwidth": 1000,
+    "source_type": "network.interface",
+    "network_link.connect_type": "phy",
+    "display_name": "子拓扑资源-子拓扑IP",
+    "asset_status": "2",
+    "network_link_type": "2",
+    "destination_type": "ip",
+    "network_link.role": "master",
+    "network_link.network_category": "CAN",
+    "dcs": "331268969",
+    "network_link.source_ipv4": "172.17.166.20",
+    "name": "172.17.166.20(Gi 0/1) - 2.2.2.2",
+    "distance_outlet": 2147483647,
+    "network_link.is_crucial": false,
+    "source_id": "00000000010de95e",
+    "network_link.source_device_id": "00000000010de864",
+    "network_link.destination_device_ipv4": "2.2.2.2"
+  },
+  "sourceCode": null,
+  "level": null,
+  "customType": null,
+  "manageStatus": 3
+}];

package/es/networkTopo/utils/edgeGroupTagUtil.js

@@ -55,8 +55,8 @@ export function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
   });
 }
 export function getEdgeGroupConfigId(edgeGroup) {
-  var sourceNode = edgeGroup.getSourceAgent();
-  var targetNode = edgeGroup.getTargetAgent();
+  var sourceNode = edgeGroup.getSource();
+  var targetNode = edgeGroup.getTarget();
   var sourceId = sourceNode.a('uuid');
   var targetId = targetNode.a('uuid');
   return [sourceId, targetId].sort().join(',');

package/es/networkTopo/utils/exitLinkUtil.js

@@ -36,11 +36,11 @@ export function buildIpNode(ip) {
 }
 
 function getHtSerialize(serialize) {
-  if (serialize) {
+  if (serialize && typeof serialize === 'string') {
     return JSON.parse(serialize);
   }
 
-  return null;
+  return serialize;
 }
 
 function isExitLink(link) {
@@ -239,9 +239,10 @@ function updateLinkTarget(links, nodes) {
 
 
 export function processByConditionResult(topoData, groupConfigs) {
-  var nodes = topoData.nodes,
+  var groups = topoData.groups,
+      nodes = topoData.nodes,
       links = topoData.links;
-  var ipNodes = getIpNodes(groupConfigs, nodes); // 出口链路目的端设置为IP节点或者ping资源节点id
+  var ipNodes = getIpNodes(groupConfigs, topoData); // 出口链路目的端设置为IP节点或者ping资源节点id
 
   var newLinks = updateLinkTarget(links, nodes);
   return _extends({}, topoData, {
@@ -249,15 +250,26 @@ export function processByConditionResult(topoData, groupConfigs) {
     links: newLinks
   });
 
-  function getIpNodes(groupConfigs, nodes) {
-    var ips = groupConfigs.map(function (g) {
-      return g.condition.linkIps;
-    }).reduce(function (result, groupIps) {
-      return [].concat(result, groupIps);
-    }, []) // 过滤ping资源对应的ip节点
-    .filter(function (ip) {
-      return !findPingNode(nodes, ip);
+  function getIpNodes(groupConfigs, _ref) {
+    var groups = _ref.groups,
+        nodes = _ref.nodes;
+    var ipNodes = [];
+    groupConfigs.forEach(function (g) {
+      g.condition.linkIps // 过滤ping资源对应的ip节点
+      .filter(function (ip) {
+        return !findPingNode(nodes, ip);
+      }).map(function (ip) {
+        var topoGroup = g.topoGroup;
+        var group = groups.find(function (item) {
+          return item.id === topoGroup.id || item.tag === topoGroup.tag;
+        });
+        ipNodes.push(_extends({}, buildIpNode(ip), {
+          // 解决区域里有ip添加资源ip消失的问题
+          'groupId': group === null || group === void 0 ? void 0 : group.id,
+          'groupTag': group === null || group === void 0 ? void 0 : group.tag
+        }));
+      });
     });
-    return ips.map(buildIpNode);
+    return ipNodes;
   }
 }