@riil-frontend/component-topology 12.1.0-dev.9 → 12.1.1

package/lib/core/models/AttributeMetricDisplay.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
+var _loglevel = _interopRequireDefault(require("loglevel"));
 
 var _ResourceInfoDisplay = require("../../constants/ResourceInfoDisplay");
 
@@ -25,6 +25,8 @@ var _nodeNameVisibleUtil = require("./utils/nodeNameVisibleUtil");
 
 var _ciRefAttributeTranslateUtil = require("../../utils/ciRefAttributeTranslateUtil");
 
+var rlog = _loglevel["default"].getLogger('topo');
+
 function isGraphField(item) {
   return item.type === 'graph';
 }
@@ -451,7 +453,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                   });
                 });
               } else {
-                _componentTopologyUtils.rlog.warn("\u63A8\u9001\u5C5E\u6027\u6307\u6807\u6570\u636E\uFF1A\u672A\u67E5\u8BE2\u5230ciType " + ciType, ciData);
+                rlog.warn("\u63A8\u9001\u5C5E\u6027\u6307\u6807\u6570\u636E\uFF1A\u672A\u67E5\u8BE2\u5230ciType " + ciType, ciData);
               }
             });
             refIds = Object.keys(refIdMap);
@@ -540,9 +542,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tags: tags
       });
     });
-
-    _componentTopologyUtils.rlog.debug('推送标注 => ht', elementTagsAndTips);
-
+    rlog.debug(' ==> ht: 推送标注', elementTagsAndTips);
     var htTopo = topo.getHtTopo();
 
     if (htTopo) {
@@ -553,7 +553,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       try {
         htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
       } catch (error) {
-        _componentTopologyUtils.rlog.error('推送标注 => ht 失败', error);
+        rlog.error(' ==> ht: 推送标注失败', error);
       }
 
       (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');

package/lib/core/models/HistoryManager.js

@@ -9,6 +9,10 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
+var _loglevel = _interopRequireDefault(require("loglevel"));
+
+var log = _loglevel["default"].getLogger('topo.HistoryManager');
+
 var ht = window.ht;
 
 var HistoryManager = /*#__PURE__*/function () {
@@ -19,9 +23,7 @@ var HistoryManager = /*#__PURE__*/function () {
     this.topo = topo;
     this.htHistoryManager = htHistoryManager;
     htHistoryManager.clear();
-
-    _componentTopologyUtils.rlog.info('HistoryManager 初始化', htHistoryManager);
-
+    log.info('HistoryManager 初始化', htHistoryManager);
     this.updateStore = this.updateStore.bind(this);
     this.init();
   }
@@ -69,11 +71,10 @@ var HistoryManager = /*#__PURE__*/function () {
 
   _proto.setDisabled = function setDisabled(disabled, message) {
     this.htHistoryManager.setDisabled(disabled);
-
-    _componentTopologyUtils.rlog.debug("HistoryManager.setDisabled " + (disabled ? '禁用' : '启用') + (message ? "(" + message + ")" : '') + ": " + this.toString(), this.getHistories());
+    log.debug("HistoryManager.setDisabled: " + (disabled ? '禁用' : '启用') + ". <" + message + ">, " + this.toString() + ", ", 'Histories: ', this.getHistories());
   };
 
-  _proto.beginTransaction = function beginTransaction() {
+  _proto.beginTransaction = function beginTransaction(name) {
     var _this = this;
 
     this.htHistoryManager.beginTransaction();
@@ -104,8 +105,7 @@ var HistoryManager = /*#__PURE__*/function () {
         oldValue: _this.topo.store.getModelState(item.modelName)[item.property]
       });
     });
-
-    _componentTopologyUtils.rlog.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
+    log.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
   };
 
   _proto.addStoreHistory = function addStoreHistory() {
@@ -130,18 +130,16 @@ var HistoryManager = /*#__PURE__*/function () {
         type: 'store',
         data: storeChanged
       });
-
-      _componentTopologyUtils.rlog.debug('HistoryManager.addStoreHistory', storeChanged);
+      log.debug('HistoryManager.addStoreHistory', storeChanged);
     }
 
     this.storeHistory = [];
   };
 
-  _proto.endTransaction = function endTransaction() {
+  _proto.endTransaction = function endTransaction(name) {
     this.addStoreHistory();
     this.htHistoryManager.endTransaction();
-
-    _componentTopologyUtils.rlog.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
+    log.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
   };
 
   _proto.clear = function clear() {
@@ -185,8 +183,7 @@ var HistoryManager = /*#__PURE__*/function () {
       return;
     }
 
-    _componentTopologyUtils.rlog.debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
-
+    log.debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
     var storeHistory = this.getCurrentStoreHistory(true);
 
     if (storeHistory) {
@@ -204,8 +201,7 @@ var HistoryManager = /*#__PURE__*/function () {
   _proto.redo = function redo() {
     var _this4 = this;
 
-    _componentTopologyUtils.rlog.debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
-
+    log.debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
     var storeHistory = this.getCurrentStoreHistory(false);
 
     if (storeHistory) {

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "12.1.0-dev.9" === 'string' ? "12.1.0-dev.9" : null;
+var version = typeof "12.1.1" === 'string' ? "12.1.1" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -540,37 +540,39 @@ var Topo = /*#__PURE__*/function () {
           case 0:
             _componentTopologyUtils.rlog.info('TopoApp.enterEditMode');
 
+            this.historyManager = null;
+
             if (!this.options.onSwitchToEditModeBegin) {
-              _context12.next = 4;
+              _context12.next = 5;
               break;
             }
 
-            _context12.next = 4;
+            _context12.next = 5;
             return this.options.onSwitchToEditModeBegin(this);
 
-          case 4:
+          case 5:
             topoDispatchers = this.store.getModelDispatchers('topoMod');
-            _context12.next = 7;
+            _context12.next = 8;
             return topoDispatchers.update({
               viewState: 'edit'
             });
 
-          case 7:
-            _context12.next = 9;
+          case 8:
+            _context12.next = 10;
             return this.view.switchToEditMode();
 
-          case 9:
+          case 10:
             (0, _edgeUtil.updateEdgeExpanded)(this);
 
             if (!this.options.onSwitchToEditMode) {
-              _context12.next = 13;
+              _context12.next = 14;
               break;
             }
 
-            _context12.next = 13;
+            _context12.next = 14;
             return this.options.onSwitchToEditMode(this);
 
-          case 13:
+          case 14:
             if (this.getDataModel()) {
               // 更新节点名称显示隐藏
               this.attributeMetricDisplay.updateNodesNameVisible();
@@ -580,7 +582,7 @@ var Topo = /*#__PURE__*/function () {
             iconManageDispatchers = this.store.getModelDispatchers('customIcon');
             iconManageDispatchers.loadEditorIcons();
 
-          case 16:
+          case 17:
           case "end":
             return _context12.stop();
         }
@@ -604,18 +606,19 @@ var Topo = /*#__PURE__*/function () {
             return this.view.switchToViewMode();
 
           case 2:
+            this.historyManager = null;
             editDispatchers = this.store.getModelDispatchers('topoConfig');
             editDispatchers.switchToViewMode(this.id);
 
             if (!this.options.onSwitchToViewMode) {
-              _context13.next = 7;
+              _context13.next = 8;
               break;
             }
 
-            _context13.next = 7;
+            _context13.next = 8;
             return this.options.onSwitchToViewMode(this);
 
-          case 7:
+          case 8:
           case "end":
             return _context13.stop();
         }

package/lib/core/models/topoData.js

@@ -57,7 +57,7 @@ function saveTopo(_x) {
 
 function _saveTopo() {
   _saveTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
-    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources, linkIps;
+    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -90,7 +90,7 @@ function _saveTopo() {
 
         case 8:
           if (!(resources || groups)) {
-            _context.next = 16;
+            _context.next = 15;
             break;
           }
 
@@ -112,31 +112,24 @@ function _saveTopo() {
             });
           }
 
-          linkIps = []; // resources?.static.map((nodeId) => {
-          //   if (nodeId.startsWith("ip_")) {
-          //     linkIps.push(nodeId.replace("ip_", ""));
-          //   }
-          // });
-
           _rlog["default"].debug("saveTopo-groupInfo", groupInfo);
 
-          _context.next = 16;
+          _context.next = 15;
           return topoService.bindResourceToTopo(topoId, {
             groups: groupInfo,
-            linkIps: linkIps,
             relateTopoIdList: relateTopoIdList
           });
 
-        case 16:
+        case 15:
           if (!serialize) {
-            _context.next = 19;
+            _context.next = 18;
             break;
           }
 
-          _context.next = 19;
+          _context.next = 18;
           return topoService.saveSerializeData(topoId, serialize);
 
-        case 19:
+        case 18:
         case "end":
           return _context.stop();
       }

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

@@ -202,7 +202,7 @@ var showLinkByConfig = function showLinkByConfig(props) {
   var gv = topo.getGraphView();
   var dm = gv.getDataModel();
   var edges = (0, _htElementUtils.getEdges)(dm).filter(function (edge) {
-    return !(0, _htElementUtils.isEdgeGroup)(edge);
+    return !(0, _htElementUtils.isEdgeGroupAgent)(edge);
   }); // console.log("edges", edges);
 
   var showPhy = types.indexOf("phy") >= 0;

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

@@ -17,7 +17,7 @@ var _utils2 = require("@riil-frontend/component-topology-graph/es/utils");
 
 var _topo = require("@riil-frontend/component-topology-common/es/services/topo");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _loglevel = _interopRequireDefault(require("loglevel"));
 
 var _format = require("../../../utils/format");
 
@@ -34,6 +34,8 @@ var _getTopoData = require("../../../networkTopo/getTopoData");
 /**
  * 拓扑配置
  */
+var rlog = _loglevel["default"].getLogger('topo');
+
 var newGroupWithUUID = function newGroupWithUUID(group) {
   if (group === void 0) {
     group = _template.DEFAULT_GROUP;
@@ -96,7 +98,7 @@ function conditionToRes(conditions) {
 }
 
 function updateGroupData(groups, index, data) {
-  _rlog["default"].debug("容器侦查-----updateGroupData", groups, index, data);
+  rlog.debug("容器侦查-----updateGroupData", groups, index, data);
 
   if (groups && groups[index]) {
     var group = (0, _extends2["default"])({}, groups[index], data);
@@ -276,15 +278,7 @@ function _default(topoApp) {
 
                 case 5:
                   data = _context2.sent;
-
-                  _rlog["default"].debug("按配置查询拓扑数据", {
-                    config: {
-                      resources: resources,
-                      groups: groups
-                    },
-                    data: data
-                  });
-
+                  rlog.debug("按配置查询拓扑数据. 参数:", query, ", 返回结果: ", data);
                   return _context2.abrupt("return", data);
 
                 case 8:
@@ -325,8 +319,7 @@ function _default(topoApp) {
             return _regenerator["default"].wrap(function _callee4$(_context4) {
               while (1) switch (_context4.prev = _context4.next) {
                 case 0:
-                  _rlog["default"].debug("getTopoByConditions--------", params);
-
+                  rlog.debug("getTopoByConditions--------", params);
                   topoId = params.id, resources = params.resources, groups = params.groups;
                   viewConditions = (0, _topoData2.resToConditions)(resources);
                   groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
@@ -335,26 +328,23 @@ function _default(topoApp) {
                       resources: (0, _topoData2.resToConditions)(group.resources)
                     });
                   });
-
-                  _rlog["default"].debug("getTopoByConditions--------", viewConditions, groupInfo);
-
+                  rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
                   _context4.next = 7;
                   return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo);
 
                 case 7:
                   data = _context4.sent;
-
-                  _rlog["default"].debug("getTopoByConditions--------data", data);
-
+                  rlog.debug("getTopoByConditions--------data", data);
                   _context4.next = 11;
                   return (0, _getTopoData.buildData)(data);
 
                 case 11:
                   data = _context4.sent;
-                  _context4.next = 14;
+                  rlog.debug("getTopoByConditions--------", data, groupInfo);
+                  _context4.next = 15;
                   return Promise.all([(0, _getTopoData.addLinkData)(data), topoApp.ciTyeCache.load((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
 
-                case 14:
+                case 15:
                   _yield$Promise$all = _context4.sent;
                   dataWithLinkDetail = _yield$Promise$all[0];
                   _combTopoData = (0, _topoData.combTopoData)({
@@ -381,7 +371,7 @@ function _default(topoApp) {
                     topoDataTrans: topoDataTrans
                   });
 
-                case 22:
+                case 23:
                 case "end":
                   return _context4.stop();
               }
@@ -408,9 +398,7 @@ function _default(topoApp) {
                       }].concat(displayConfig.saveHistories || [])
                     }))
                   };
-
-                  _rlog["default"].debug("saveGlobalConfig", config);
-
+                  rlog.debug("saveGlobalConfig", config);
                   _context5.next = 5;
                   return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
 

package/lib/core/utils/edgeUtil.js

@@ -17,7 +17,7 @@ var _htElementUtils = require("../../utils/htElementUtils");
  * @param {*} edge 
  */
 function isCustomEdge(edge) {
-  return !(0, _htElementUtils.isEdgeGroup)(edge) && (edge.a('type') == 'line' || !edge.a('type'));
+  return !(0, _htElementUtils.isEdgeGroupAgent)(edge) && (edge.a('type') == 'line' || !edge.a('type'));
 }
 /**
  * 根据配置更新连线展开折叠状态
@@ -27,7 +27,7 @@ function isCustomEdge(edge) {
 
 
 var updateEdgeExpanded = function updateEdgeExpanded(topo) {
-  var _topo$historyManager, _topo$historyManager2;
+  var _topo$historyManager, _topo$historyManager2, _topo$linkDynamicStyl;
 
   var _topo$store$getModelS = topo.store.getModelState("topoMod"),
       viewState = _topo$store$getModelS.viewState;
@@ -40,8 +40,7 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
   }
 
   var _topo$store$getModelS2 = topo.store.getModelState("displayConfig"),
-      expandAllEdges = _topo$store$getModelS2.expandAllEdges; // console.log("expandAllEdges----------", expandAllEdges);
-
+      expandAllEdges = _topo$store$getModelS2.expandAllEdges;
 
   (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '连线展开控制');
 
@@ -50,11 +49,11 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
       topo: topo,
       showType: 1
     });
-    htTopo.collapseAllEdgeGroups();
+    htTopo.toggleAllEdgeGroups(false);
 
     _rlog["default"].debug("updateEdgeExpanded 折叠");
   } else {
-    htTopo.expandAllEdgeGroups();
+    htTopo.toggleAllEdgeGroups(true);
     (0, _linkUtils.showLinkByConfig)({
       topo: topo,
       showType: expandAllEdges,
@@ -65,10 +64,7 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
   }
 
   (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '连线展开控制');
-
-  if (topo.linkDynamicStyleExecutor) {
-    topo.linkDynamicStyleExecutor.execute();
-  }
+  (_topo$linkDynamicStyl = topo.linkDynamicStyleExecutor) === null || _topo$linkDynamicStyl === void 0 ? void 0 : _topo$linkDynamicStyl.execute();
 };
 
 exports.updateEdgeExpanded = updateEdgeExpanded;

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

@@ -51,7 +51,7 @@ function EventsCard(props) {
     closeDetailDrawer();
 
     if (topo.viewProps.jumpto) {
-      topo.viewProps.jumpto(url);
+      topo.viewProps.jumpto(formatUrl(url));
     } else {
       (0, _componentTopologyUtils.getHistory)().push(formatUrl(url));
     }

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.module.scss

@@ -1,7 +1,7 @@
 .container {
   width: 100%;
   height: 100%;
-  min-height: 250px;
+  min-height: 260px;
   position: relative;
   .floatBox{
     position: absolute;

package/lib/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -3,14 +3,10 @@
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
-
 var _clusterUtil = require("../../utils/clusterUtil");
 
 var _htElementUtils = require("../../utils/htElementUtils");
 
-var _linkUtil = require("../utils/linkUtil");
-
 // network_link.actual_bandwidth
 function calcEdgeWidth(actualBandwidth) {
   if (!actualBandwidth) {
@@ -61,16 +57,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);
@@ -78,63 +75,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 = (0, _htElementUtils.getEdgeGroupByNodeTags)(dataModel, link.source, link.target);
-
-      if (edgeGroup) {
-        var edgeGroupAgent = edgeGroup.getEdgeGroupAgent(); // 判断是显示的连线组元素
-
-        if (edgeGroupAgent) {
-          edgeGroup.getEdgeGroupAgent().s('edge.width', _this.calcLinkEdgeWidth(link));
-        }
-      } else {
-        _componentTopologyUtils.rlog.warn('动态链路样式执行：未找到聚合链路的ht元素', link);
-      }
-    }); // 3、如果连线组未关联链路并可见，设置线宽。
-
-    var edges = (0, _htElementUtils.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 = (0, _linkUtil.getLinksBetweenNodes)(linkGroups, sourceCiIds, targetCiIds);
-          var phyLinks = (0, _linkUtil.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) {
-        _componentTopologyUtils.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/lib/networkTopo/utils/exitLinkUtil.js

@@ -251,9 +251,10 @@ function updateLinkTarget(links, nodes) {
 
 
 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 (0, _extends2["default"])({}, topoData, {
@@ -261,15 +262,26 @@ 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((0, _extends2["default"])({}, 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;
   }
 }

package/lib/style.js

@@ -1,7 +1,7 @@
 require('@riil-frontend/component-topology-graph/lib/style');
 require('@alifd/next/lib/box/style');
-require('@riil-frontend/component-topology-utils/lib/style');
 require('@alifd/next/lib/message/style');
+require('@riil-frontend/component-topology-utils/lib/style');
 require('@riil-frontend/utils/lib/style');
 require('@riil-frontend/component-riil-event-emitter/lib/style');
 require('@alifd/next/lib/menu-button/style');

package/lib/utils/clusterUtil.js

@@ -103,7 +103,7 @@ function isClusterHtElement(element) {
 }
 
 function isClusterMemberHtElement(element) {
-  return element && element.getParent() && isClusterHtElement(element.getParent());
+  return (element === null || element === void 0 ? void 0 : element.getParent()) && isClusterHtElement(element.getParent());
 }
 /**
  * 集群无权限时收起
@@ -140,7 +140,7 @@ function upgradeV103GraphClusterNode(topo, topoData) {
     var topoDataTrans = (0, _utils.transformTopoElements)(topoData);
     var dm = topo.getDataModel();
     var unExistedList = topoDataTrans.filter(function (data) {
-      return !(0, _htElementUtils.isExistedElement)(topo.getHtTopo(), dm, data);
+      return !(0, _htElementUtils.containsElement)(dm, data);
     });
 
     if (!unExistedList.length) {