@riil-frontend/component-topology 12.0.1 → 12.1.0-dev.10

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 ? "(" + message + ")" : '') + ": " + this.toString(), 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.0.1" === 'string' ? "12.0.1" : null;
+var version = typeof "12.1.0-dev.10" === 'string' ? "12.1.0-dev.10" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -218,37 +218,29 @@ var Topo = /*#__PURE__*/function () {
 
   _proto.getData = function getData() {
     return {
-      groups: this.getGroups(),
-      nodes: this.getNodes(),
-      lines: this.getLines(),
+      groups: (0, _htElementUtils.getGroupDatas)(this.getDataModel()),
+      nodes: (0, _htElementUtils.getNodes)(this.getDataModel()).filter(function (node) {
+        return !!node.getTag();
+      }).map(_htElementUtils.getNodeData),
       customNodes: (0, _htElementUtils.getNodeDatas)(this.getDataModel()).filter(function (item) {
         return !item.id;
       }),
-      customLines: this.getEdges().filter(function (item) {
+      lines: (0, _htElementUtils.getEdgeDatas)(this.getDataModel()).filter(function (item) {
+        return !!item.id;
+      }),
+      customLines: (0, _htElementUtils.getEdgeDatas)(this.getDataModel()).filter(function (item) {
         return !item.id;
       })
     };
-  };
-
-  _proto.getGroups = function getGroups() {
-    return (0, _htElementUtils.getGroupDatas)(this.getDataModel());
-  };
-
-  _proto.getNodes = function getNodes() {
-    var nodes = (0, _htElementUtils.getNodes)(this.getDataModel()).filter(function (node) {
-      return !!node.getTag();
-    });
-    return nodes.map(_htElementUtils.getNodeData);
-  };
+  }
+  /**
+   * @deprecated 待移除。uicbb有使用
+   * @returns 
+   */
+  ;
 
   _proto.getLines = function getLines() {
-    return this.getEdges().filter(function (item) {
-      return !!item.id;
-    });
-  };
-
-  _proto.getEdges = function getEdges() {
-    return (0, _htElementUtils.getEdgeDatas)(this.getDataModel());
+    return this.getData().lines;
   }
   /**
    * 全量更新数据
@@ -307,18 +299,19 @@ var Topo = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _addElements = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(elements) {
-      var data;
+      var prevData, data;
       return _regenerator["default"].wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
+            prevData = this.getData();
             data = {
-              groups: [].concat(this.getGroups(), elements.groups || []),
-              nodes: [].concat(this.getNodes(), elements.nodes || []),
-              lines: [].concat(this.getLines(), elements.lines || [])
+              groups: [].concat(prevData.groups, elements.groups || []),
+              nodes: [].concat(prevData.nodes, elements.nodes || []),
+              lines: [].concat(prevData.lines, elements.lines || [])
             };
             this.updateElements(data); // TODO 更新store，触发属性、指标模型加载，更新指标
 
-          case 2:
+          case 3:
           case "end":
             return _context5.stop();
         }

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

@@ -6,6 +6,7 @@ exports.__esModule = true;
 exports.buildTopoLinkData = buildTopoLinkData;
 exports.compatibleWith = void 0;
 exports.getLinksDetail = getLinksDetail;
+exports.isAggLink = isAggLink;
 exports.isCrucialLink = isCrucialLink;
 exports.isExitLink = isExitLink;
 exports.mergeExportLinkData = void 0;
@@ -22,8 +23,6 @@ var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _services = require("../../services");
-
 var _htElementUtils = require("../../../utils/htElementUtils");
 
 var _CiTypeCache = _interopRequireDefault(require("../cache/CiTypeCache"));
@@ -56,7 +55,21 @@ function isCrucialLink(link) {
 
 
 function isExitLink(link) {
-  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes["destination_id"]);
+  var _link$attributes;
+
+  return (link === null || link === void 0 ? void 0 : (_link$attributes = link.attributes) === null || _link$attributes === void 0 ? void 0 : _link$attributes.destination_type) === "ip";
+}
+/**
+ * 是否聚合链路
+ * @param {*} link 
+ * @returns 
+ */
+
+
+function isAggLink(link) {
+  var _link$attributes2, _link$attributes3;
+
+  return (link === null || link === void 0 ? void 0 : (_link$attributes2 = link.attributes) === null || _link$attributes2 === void 0 ? void 0 : _link$attributes2.destination_type) === "network.agg_interface" && (link === null || link === void 0 ? void 0 : (_link$attributes3 = link.attributes) === null || _link$attributes3 === void 0 ? void 0 : _link$attributes3.source_type) === "network.agg_interface";
 }
 
 function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc) {
@@ -107,7 +120,7 @@ function _getLinksDetail() {
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (!(!links || !links.length)) {
+          if (links !== null && links !== void 0 && links.length) {
             _context.next = 2;
             break;
           }
@@ -115,9 +128,6 @@ function _getLinksDetail() {
           return _context.abrupt("return", []);
 
         case 2:
-          // const linkCis = await topoService.relation.batchQueryRelation(
-          //   links.map((link) => link.id)
-          // );
           linkCis = links;
           interfaceIds = [].concat(linkCis.map(function (item) {
             return item.attributes.source_id;
@@ -176,7 +186,8 @@ var plurals = {
   2: ["phy"],
   3: ["agg"],
   4: ["phy", "agg"]
-};
+}; // 待办：移到网络拓扑组件
+
 exports.plurals = plurals;
 
 var showLinkByConfig = function showLinkByConfig(props) {
@@ -190,31 +201,29 @@ var showLinkByConfig = function showLinkByConfig(props) {
 
   var gv = topo.getGraphView();
   var dm = gv.getDataModel();
-  var edges = (0, _htElementUtils.getEdges)(dm); // console.log("edges", edges);
+  var edges = (0, _htElementUtils.getEdges)(dm).filter(function (edge) {
+    return !(0, _htElementUtils.isEdgeGroupAgent)(edge);
+  }); // console.log("edges", edges);
 
   var showPhy = types.indexOf("phy") >= 0;
   var showAgg = types.indexOf("agg") >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
 
-  if (Array.isArray(edges) && edges.length > 0) {
-    edges.forEach(function (edge) {
-      if (showType === 1 || showType === true) {
-        // 单链路全部显示
-        // console.log("单链路全部显示", edge);
-        edge.s("2d.visible", true);
-      } else {
-        var _d$attributes, _d$attributes2;
-
-        var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
+  edges.forEach(function (edge) {
+    if (showType === 1 || showType === true) {
+      // 单链路全部显示
+      // console.log("单链路全部显示", edge);
+      edge.s("x.visible", true);
+    } else {
+      var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
 
-        if ((d === null || d === void 0 ? void 0 : (_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === "network.agg_interface" && (d === null || d === void 0 ? void 0 : (_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === "network.agg_interface") {
-          edge.s("2d.visible", showAgg);
-        } else {
-          // console.log("edge", edge, d, showAgg);
-          edge.s("2d.visible", showPhy);
-        }
+      if (isAggLink(d)) {
+        edge.s("x.visible", showAgg);
+      } else {
+        // console.log("edge", edge, d, showAgg);
+        edge.s("x.visible", showPhy);
       }
-    });
-  }
+    }
+  });
 };
 
 exports.showLinkByConfig = showLinkByConfig;

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,13 @@ function _default(topoApp) {
 
                 case 5:
                   data = _context2.sent;
-
-                  _rlog["default"].debug("按配置查询拓扑数据", {
+                  rlog.debug("按配置查询拓扑数据", {
                     config: {
                       resources: resources,
                       groups: groups
                     },
                     data: data
                   });
-
                   return _context2.abrupt("return", data);
 
                 case 8:
@@ -325,8 +325,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,17 +334,13 @@ 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);
 
@@ -408,9 +403,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

@@ -10,12 +10,14 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _linkUtils = require("../models/utils/linkUtils");
 
+var _htElementUtils = require("../../utils/htElementUtils");
+
 /**
  * 是否手工连线
  * @param {*} edge 
  */
 function isCustomEdge(edge) {
-  return !edge.isEdgeGroupAgent() && (edge.a('type') == 'line' || !edge.a('type'));
+  return !(0, _htElementUtils.isEdgeGroupAgent)(edge) && (edge.a('type') == 'line' || !edge.a('type'));
 }
 /**
  * 根据配置更新连线展开折叠状态
@@ -25,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;
@@ -38,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, '连线展开控制');
 
@@ -48,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,
@@ -63,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/ElementDetailDrawer/hooks/useElementDetailManager.js

@@ -9,6 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _DefaultDetailContent = _interopRequireDefault(require("../../ResourceDetail/DefaultDetailContent"));
 
+var _htElementUtils = require("../../../../../../utils/htElementUtils");
+
 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; }
@@ -74,9 +76,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: (0, _htElementUtils.isEdgeGroupAgent)(htElement) || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
       htElement: htElement
     });
   }

package/lib/networkTopo/models/EdgeGroupTagTipBuilder.js

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

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/edgeGroupTagUtil.js

@@ -65,8 +65,8 @@ function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
 }
 
 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/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) {