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

package/es/core/models/AttributeMetricDisplay.js

@@ -1,13 +1,14 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { rlog } from '@riil-frontend/component-topology-utils';
+import Logger from 'loglevel';
 import { DEFAULT_NODE_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay";
 import { isMonitoring } from "../utils/manageStatusUtil";
 import AttributeFormatter from "./attributeFormatter";
 import DictCache from "./cache/DictCache";
 import { getNodesNameVisible as _getNodesNameVisible, updateNodesNameVisible as _updateNodesNameVisible } from "./utils/nodeNameVisibleUtil";
 import { translateCisRefAttributeName } from "../../utils/ciRefAttributeTranslateUtil";
+var rlog = Logger.getLogger('topo');
 
 function isGraphField(item) {
   return item.type === 'graph';
@@ -526,7 +527,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tags: tags
       });
     });
-    rlog.debug('推送标注 => ht', elementTagsAndTips);
+    rlog.debug(' ==> ht: 推送标注', elementTagsAndTips);
     var htTopo = topo.getHtTopo();
 
     if (htTopo) {
@@ -537,7 +538,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       try {
         htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
       } catch (error) {
-        rlog.error('推送标注 => ht 失败', error);
+        rlog.error(' ==> ht: 推送标注失败', error);
       }
 
       (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');

package/es/core/models/HistoryManager.js

@@ -1,5 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import { rlog } from '@riil-frontend/component-topology-utils';
+import Logger from 'loglevel';
+var log = Logger.getLogger('topo.HistoryManager');
 var ht = window.ht;
 
 var HistoryManager = /*#__PURE__*/function () {
@@ -10,7 +12,7 @@ var HistoryManager = /*#__PURE__*/function () {
     this.topo = topo;
     this.htHistoryManager = htHistoryManager;
     htHistoryManager.clear();
-    rlog.info('HistoryManager 初始化', htHistoryManager);
+    log.info('HistoryManager 初始化', htHistoryManager);
     this.updateStore = this.updateStore.bind(this);
     this.init();
   }
@@ -58,10 +60,10 @@ var HistoryManager = /*#__PURE__*/function () {
 
   _proto.setDisabled = function setDisabled(disabled, message) {
     this.htHistoryManager.setDisabled(disabled);
-    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();
@@ -92,7 +94,7 @@ var HistoryManager = /*#__PURE__*/function () {
         oldValue: _this.topo.store.getModelState(item.modelName)[item.property]
       });
     });
-    rlog.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
+    log.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
   };
 
   _proto.addStoreHistory = function addStoreHistory() {
@@ -117,16 +119,16 @@ var HistoryManager = /*#__PURE__*/function () {
         type: 'store',
         data: storeChanged
       });
-      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();
-    rlog.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
+    log.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
   };
 
   _proto.clear = function clear() {
@@ -170,7 +172,7 @@ var HistoryManager = /*#__PURE__*/function () {
       return;
     }
 
-    rlog.debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
+    log.debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
     var storeHistory = this.getCurrentStoreHistory(true);
 
     if (storeHistory) {
@@ -188,7 +190,7 @@ var HistoryManager = /*#__PURE__*/function () {
   _proto.redo = function redo() {
     var _this4 = this;
 
-    rlog.debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
+    log.debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
     var storeHistory = this.getCurrentStoreHistory(false);
 
     if (storeHistory) {

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./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.2" === 'string' ? "12.1.2" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -508,38 +508,39 @@ var Topo = /*#__PURE__*/function () {
         while (1) switch (_context12.prev = _context12.next) {
           case 0:
             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:
             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();
@@ -549,7 +550,7 @@ var Topo = /*#__PURE__*/function () {
             iconManageDispatchers = this.store.getModelDispatchers('customIcon');
             iconManageDispatchers.loadEditorIcons();
 
-          case 16:
+          case 17:
           case "end":
             return _context12.stop();
         }
@@ -573,18 +574,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/es/core/models/topoData.js

@@ -41,7 +41,7 @@ export function saveTopo(_x) {
 
 function _saveTopo() {
   _saveTopo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -72,7 +72,7 @@ function _saveTopo() {
 
         case 8:
           if (!(resources || groups)) {
-            _context.next = 16;
+            _context.next = 15;
             break;
           }
 
@@ -94,30 +94,23 @@ function _saveTopo() {
             });
           }
 
-          linkIps = []; // resources?.static.map((nodeId) => {
-          //   if (nodeId.startsWith("ip_")) {
-          //     linkIps.push(nodeId.replace("ip_", ""));
-          //   }
-          // });
-
           rlog.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/es/core/models/utils/linkUtils.js

@@ -4,7 +4,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import keyBy from "lodash/keyBy";
 import _ from "lodash"; // 查询所有连线
 
-import { getEdges, isEdgeGroup } from "../../../utils/htElementUtils";
+import { getEdges, isEdgeGroupAgent } from "../../../utils/htElementUtils";
 import CiTypeCache from "../cache/CiTypeCache";
 import CiCache from "../cache/CiCache"; // const interfaceTypeMap = {
 //   "network.interface": {
@@ -172,7 +172,7 @@ export var showLinkByConfig = function showLinkByConfig(props) {
   var gv = topo.getGraphView();
   var dm = gv.getDataModel();
   var edges = getEdges(dm).filter(function (edge) {
-    return !isEdgeGroup(edge);
+    return !isEdgeGroupAgent(edge);
   }); // console.log("edges", edges);
 
   var showPhy = types.indexOf("phy") >= 0;

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

@@ -8,13 +8,14 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { getUUID, isAvailableArray } from "@riil-frontend/utils";
 import { transformTopoElements } from "@riil-frontend/component-topology-graph/es/utils";
 import { TOPO_PARENT_ID } from "@riil-frontend/component-topology-common/es/services/topo";
-import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import Logger from 'loglevel';
 import { removeFromArray } from "../../../utils/format";
 import { DEFAULT_GROUP } from "../../../utils/template";
 import { combTopoData, getCiTypes } from "../../../utils/topoData";
 import { saveTopo as _saveTopo, resToConditions, getLayoutId } from "../../../core/models/topoData";
 import networkLinkServer from "../../../networkTopo/services/topo/networkLink";
 import { addLinkData, buildData as buildTopoData } from "../../../networkTopo/getTopoData";
+var rlog = Logger.getLogger('topo');
 
 var newGroupWithUUID = function newGroupWithUUID(group) {
   if (group === void 0) {
@@ -259,13 +260,7 @@ export default function (topoApp) {
 
                 case 5:
                   data = _context2.sent;
-                  rlog.debug("按配置查询拓扑数据", {
-                    config: {
-                      resources: resources,
-                      groups: groups
-                    },
-                    data: data
-                  });
+                  rlog.debug("按配置查询拓扑数据. 参数:", query, ", 返回结果: ", data);
                   return _context2.abrupt("return", data);
 
                 case 8:
@@ -327,10 +322,11 @@ export default function (topoApp) {
 
                 case 11:
                   data = _context4.sent;
-                  _context4.next = 14;
+                  rlog.debug("getTopoByConditions--------", data, groupInfo);
+                  _context4.next = 15;
                   return Promise.all([addLinkData(data), topoApp.ciTyeCache.load(getCiTypes(data)), dispatch.customIcon.loadCustomIcons()]);
 
-                case 14:
+                case 15:
                   _yield$Promise$all = _context4.sent;
                   dataWithLinkDetail = _yield$Promise$all[0];
                   _combTopoData = combTopoData({
@@ -357,7 +353,7 @@ export default function (topoApp) {
                     topoDataTrans: topoDataTrans
                   });
 
-                case 22:
+                case 23:
                 case "end":
                   return _context4.stop();
               }

package/es/core/utils/edgeUtil.js

@@ -1,13 +1,13 @@
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { showLinkByConfig } from "../models/utils/linkUtils";
-import { isEdgeGroup } from "../../utils/htElementUtils";
+import { isEdgeGroupAgent } from "../../utils/htElementUtils";
 /**
  * 是否手工连线
  * @param {*} edge 
  */
 
 export function isCustomEdge(edge) {
-  return !isEdgeGroup(edge) && (edge.a('type') == 'line' || !edge.a('type'));
+  return !isEdgeGroupAgent(edge) && (edge.a('type') == 'line' || !edge.a('type'));
 }
 /**
  * 根据配置更新连线展开折叠状态
@@ -16,7 +16,7 @@ export function isCustomEdge(edge) {
  */
 
 export 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;
@@ -29,8 +29,7 @@ export 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, '连线展开控制');
 
@@ -39,10 +38,10 @@ export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
       topo: topo,
       showType: 1
     });
-    htTopo.collapseAllEdgeGroups();
+    htTopo.toggleAllEdgeGroups(false);
     rlog.debug("updateEdgeExpanded 折叠");
   } else {
-    htTopo.expandAllEdgeGroups();
+    htTopo.toggleAllEdgeGroups(true);
     showLinkByConfig({
       topo: topo,
       showType: expandAllEdges,
@@ -52,8 +51,5 @@ export 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();
 };

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

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

package/es/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/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/utils/exitLinkUtil.js

@@ -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;
   }
 }

package/es/style.js

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

package/es/utils/clusterUtil.js

@@ -5,7 +5,7 @@ import _extends from "@babel/runtime/helpers/extends";
  */
 import { transformTopoElements } from "@riil-frontend/component-topology-graph/es/utils";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
-import { getGroups, isExistedElement } from "./htElementUtils";
+import { getGroups, containsElement } from "./htElementUtils";
 import { findGroupChildren } from "./topoData";
 export function isCluster(node) {
   return !!node.cluster;
@@ -76,7 +76,7 @@ export function isClusterHtElement(element) {
   return !!element.a('cluster');
 }
 export function isClusterMemberHtElement(element) {
-  return element && element.getParent() && isClusterHtElement(element.getParent());
+  return (element === null || element === void 0 ? void 0 : element.getParent()) && isClusterHtElement(element.getParent());
 }
 /**
  * 集群无权限时收起
@@ -111,7 +111,7 @@ export function upgradeV103GraphClusterNode(topo, topoData) {
     var topoDataTrans = transformTopoElements(topoData);
     var dm = topo.getDataModel();
     var unExistedList = topoDataTrans.filter(function (data) {
-      return !isExistedElement(topo.getHtTopo(), dm, data);
+      return !containsElement(dm, data);
     });
 
     if (!unExistedList.length) {