@riil-frontend/component-topology 4.0.0-beta.9 → 4.0.2

package/lib/topoCenter/models/LinkDynamicStyleExecutor.js

@@ -7,9 +7,11 @@ exports["default"] = void 0;
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _clusterUtil = require("../../utils/clusterUtil");
+
 var _htElementUtils = require("../../utils/htElementUtils");
 
-var _topoData = require("../../utils/topoData");
+var _linkUtil = require("../utils/linkUtil");
 
 // network_link.actual_bandwidth
 function calcEdgeWidth(actualBandwidth) {
@@ -26,6 +28,26 @@ function calcEdgeWidth(actualBandwidth) {
   }
 }
 
+var getChildrenNodeCiIds = function getChildrenNodeCiIds(nodes) {
+  var ciIds = [];
+  nodes.forEach(function (node) {
+    if ((0, _htElementUtils.isNode)(node) || (0, _clusterUtil.isClusterHtElement)(node)) {
+      var nodeTag = node.getTag();
+
+      if (nodeTag) {
+        ciIds.push(nodeTag);
+      }
+    }
+  });
+  nodes.forEach(function (node) {
+    if (node instanceof ht.Group) {
+      var children = node.getChildren().toArray();
+      ciIds.push.apply(ciIds, getChildrenNodeCiIds(children));
+    }
+  });
+  return ciIds;
+};
+
 var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
   function LinkDynamicStyleExecutor(topo) {
     this.calcEdgeWidth = calcEdgeWidth;
@@ -84,19 +106,26 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
     var edges = (0, _htElementUtils.getEdges)(dataModel);
     edges.forEach(function (edge) {
       try {
-        // 查询是否有聚合链路
-        var sourceId = edge.getSource().getTag();
-        var targetId = edge.getTarget().getTag();
+        // 获取两端代理节点
+        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 edgeGroupLinks = (0, _topoData.getLinksBetweenTwoNodes)(links, sourceId, targetId); // 如果有子链路，计算线宽并设置
-
-          if (edgeGroupLinks.length) {
-            var edgeWidth = _this.calcEdgeGroupEdgeWidth(edgeGroupLinks);
+          // 查询两端代理节点（包含子节点）间的子链路列表
+          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);
           }

package/lib/topoCenter/models/TopoCenter.js

@@ -21,16 +21,13 @@ var _createMenuCommands = _interopRequireDefault(require("../../contextmenu/crea
 
 var _getTopoData = _interopRequireDefault(require("../getTopoData"));
 
-var _SortResourcesUtil = _interopRequireDefault(require("../utils/SortResourcesUtil"));
-
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _store = _interopRequireDefault(require("../store"));
 
 var _ResourceInfoDisplay = require("../../constants/ResourceInfoDisplay");
 
-var _LinkTagsTipsBuilder = _interopRequireDefault(require("./LinkTagsTipsBuilder"));
-
+// import LinkTagsTipsBuilder from './LinkTagsTipsBuilder';
 var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   (0, _inheritsLoose2["default"])(TopoCenter, _TopoApp);
 
@@ -49,8 +46,8 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
         },
         getDefaultLinkTipConfig: function getDefaultLinkTipConfig() {
           return _ResourceInfoDisplay.DEFAULT_TIP_COMMON_CONFIG;
-        },
-        ExtElementTagTipBuilder: _LinkTagsTipsBuilder["default"]
+        } // ExtElementTagTipBuilder: LinkTagsTipsBuilder,
+
       },
       onSwitchToEditModeBegin: function () {
         var _onSwitchToEditModeBegin = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topo) {
@@ -106,12 +103,6 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
           id: topo.id
         });
         topoModDispatchers.refreshTopoTree();
-      },
-      editor: {
-        // 分层、区域的关联资源按名称排序
-        sortResources: function sortResources(nodes) {
-          return (0, _SortResourcesUtil["default"])(_this.store, nodes);
-        }
       }
     })) || this;
     _this.resourceConfig = null;

package/lib/topoCenter/store/functionAuth.js

@@ -81,6 +81,8 @@ var _default = {
                     func: 'topo_manageNavTree'
                   }, {
                     func: 'topo_setTopoPermission'
+                  }, {
+                    func: 'addResource'
                   }]);
 
                 case 2:

package/lib/topoCenter/utils/SortResourcesUtil.js

@@ -9,9 +9,9 @@ function sortResources(store, nodes) {
 
   var resources = [];
   ((data === null || data === void 0 ? void 0 : data.nodes) || []).forEach(function (res) {
-    var node = nodes.filter(function (node) {
-      return node.id === res.id;
-    })[0];
+    var node = nodes.find(function (item) {
+      return item.id === res.id;
+    });
 
     if (node) {
       resources.push(node);

package/lib/topoCenter/utils/exportData.js

@@ -13,29 +13,36 @@ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _clusterUtil = require("../../utils/clusterUtil");
+
 function _default(_x) {
   return _ref.apply(this, arguments);
 }
 
 function _ref() {
   _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topo) {
-    var _topo$store$getModelS, nodes, links, params, fileData, fileName, blob, elink;
+    var _topo$store$getModelS, nodes, links, linkGroups, clusters, params, fileData, fileName, blob, elink;
 
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            _topo$store$getModelS = topo.store.getModelState('topoMod').data, nodes = _topo$store$getModelS.nodes, links = _topo$store$getModelS.links;
+            _topo$store$getModelS = topo.store.getModelState('topoMod').data, nodes = _topo$store$getModelS.nodes, links = _topo$store$getModelS.links, linkGroups = _topo$store$getModelS.linkGroups;
+            clusters = (0, _clusterUtil.findClusters)(nodes);
             params = {
               id: topo.id,
-              'nodes': nodes.map(function (node) {
+              'nodes': nodes.filter(function (node) {
+                return !clusters.find(function (c) {
+                  return c.id === node.ownerId;
+                });
+              }).map(function (node) {
                 var element = topo.getDataModel().getDataByTag(node.id);
                 return {
                   'id': node.id,
                   'imageName': element.a('customName') || element.a('name') || element.getName()
                 };
               }),
-              'links': links.map(function (link) {
+              'links': [].concat(links, linkGroups).map(function (link) {
                 var id = link.id,
                     source = link.source,
                     target = link.target,
@@ -53,13 +60,13 @@ function _ref() {
 
             _rlog["default"].error('导出数据', params);
 
-            _context.next = 5;
+            _context.next = 6;
             return _componentTopologyUtils.request.post('/topo/v1/api/structure/excel', params, {
               responseType: 'blob' // responseType: 'arraybuffer',
 
             });
 
-          case 5:
+          case 6:
             fileData = _context.sent;
             fileName = topo.store.getModelState('topoMod').topoData.config.name + ".xls";
             blob = new Blob([fileData]); // 处理文档流
@@ -74,7 +81,7 @@ function _ref() {
 
             document.body.removeChild(elink);
 
-          case 16:
+          case 17:
           case "end":
             return _context.stop();
         }

package/lib/topoCenter/utils/linkUtil.js

@@ -0,0 +1,15 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getLinksBetweenNodes = getLinksBetweenNodes;
+exports.isLink = isLink;
+
+function isLink(link, id1, id2) {
+  return link.source === id1 && link.target === id2 || link.target === id1 && link.source === id2;
+}
+
+function getLinksBetweenNodes(links, ids1, ids2) {
+  return links.filter(function (link) {
+    return ids1.indexOf(link.source) !== -1 && ids2.indexOf(link.target) !== -1 || ids2.indexOf(link.source) !== -1 && ids1.indexOf(link.target) !== -1;
+  });
+}

package/lib/utils/ResourceConfigUtil.js

@@ -11,6 +11,8 @@ var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
 
 var _clusterUtil = require("./clusterUtil");
 
+var _htElementDataUtil = require("./htElementDataUtil");
+
 var _htElementUtils = require("./htElementUtils");
 
 /**
@@ -31,9 +33,7 @@ function getResourceConfigFromHt(topo) {
       name: layerElement.s("label"),
       order: layerElement.a("order"),
       resources: {
-        "static": (0, _htElementUtils.getLayerChildrenNodes)(layerElement).filter(function (node) {
-          return !!node.getTag();
-        }).map(function (node) {
+        "static": (0, _htElementDataUtil.getLayerChildrenResourceElements)(layerElement).map(function (node) {
           return node.getTag();
         })
       }
@@ -106,7 +106,7 @@ function getGroupConfigByElement(groupElement) {
     name: groupElement.a("name"),
     order: groupElement.a("order"),
     resources: {
-      "static": (0, _htElementUtils.getGroupChildrenNodes)(groupElement).filter(function (node) {
+      "static": (0, _htElementDataUtil.getGroupChildrenResourceElements)(groupElement).filter(function (node) {
         return !!node.getTag();
       }).map(function (node) {
         return node.getTag();

package/lib/utils/clusterUtil.js

@@ -4,14 +4,19 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 exports.buildClusterGroups = buildClusterGroups;
+exports.findClusters = findClusters;
+exports.handleClusterNoPermission = handleClusterNoPermission;
 exports.isCluster = isCluster;
 exports.isClusterHtElement = isClusterHtElement;
+exports.isClusterMemberHtElement = isClusterMemberHtElement;
 exports.processCluster = processCluster;
 exports.processClusterChildNode = processClusterChildNode;
 exports.processClusterChildrenNodes = processClusterChildrenNodes;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _htElementUtils = require("./htElementUtils");
+
 /**
  * 集群处理工具类
  */
@@ -30,19 +35,27 @@ function processCluster(topoData) {
 }
 
 function buildClusterGroups(nodes) {
-  return nodes.filter(isCluster).map(function (n) {
+  return findClusters(nodes).map(function (n) {
     return (0, _extends2["default"])({
       tag: null,
       parentId: n.groupId,
       parentTag: n.groupTag
     }, n, {
       elementTemplate: 'cluster',
-      expandable: !!n.operation // 无权限禁用展开折叠
+      expandable: !!n.operation,
+      // 无权限禁用展开折叠
+      styles: {
+        showExpanded: false // 是否默认展开
 
+      }
     });
   });
 }
 
+function findClusters(nodes) {
+  return nodes.filter(isCluster);
+}
+
 function processClusterChildrenNodes(nodes, groups) {
   return nodes // 过滤集群
   .filter(function (node) {
@@ -78,4 +91,23 @@ function processClusterChildNode(node, groups) {
 
 function isClusterHtElement(element) {
   return !!element.a('cluster');
+}
+
+function isClusterMemberHtElement(element) {
+  return element && element.getParent() && isClusterHtElement(element.getParent());
+}
+/**
+ * 集群无权限时收起
+ * @param {*} topo 
+ */
+
+
+function handleClusterNoPermission(topo) {
+  var dm = topo.getHtTopo().getGraphView().dm();
+  var groups = (0, _htElementUtils.getGroups)(dm);
+  groups.forEach(function (group) {
+    if (isClusterHtElement(group) && !group.a('operation') && group.isExpanded()) {
+      group.setExpanded(false);
+    }
+  });
 }

package/lib/utils/htElementDataUtil.js

@@ -1,12 +1,23 @@
 "use strict";
 
 exports.__esModule = true;
+exports.getAllEdgeResourceIds = void 0;
+exports.getGroupChildrenResourceElements = getGroupChildrenResourceElements;
+exports.getLayerChildrenResourceElements = getLayerChildrenResourceElements;
 exports.isEdge = isEdge;
 exports.isGroup = isGroup;
 exports.isLayer = isLayer;
 exports.isNode = isNode;
+exports.isResourceElement = isResourceElement;
+exports.isResourceNodeElement = isResourceNodeElement;
 exports.isText = isText;
 
+var htElementUtils = _interopRequireWildcard(require("./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; }
+
 function isLayer(element) {
   return element.className === 'ht.Grid';
 }
@@ -25,4 +36,30 @@ function isEdge(element) {
 
 function isText(element) {
   return element.className === 'ht.Text' && element.attrObject.isText;
-}
+}
+
+function isResourceElement(element) {
+  return !!element.a('ciType');
+}
+
+function isResourceNodeElement(element) {
+  return (htElementUtils.isGroup(element) || htElementUtils.isNode(element)) && isResourceElement(element);
+}
+
+function getGroupChildrenResourceElements(element) {
+  return (0, htElementUtils.getGroupChildren)(element).filter(isResourceElement);
+}
+
+function getLayerChildrenResourceElements(layerElement) {
+  return (0, htElementUtils.getLayerChildren)(layerElement).filter(isResourceElement);
+}
+
+var getAllEdgeResourceIds = function getAllEdgeResourceIds(dm) {
+  return (0, htElementUtils.getEdges)(dm).filter(function (node) {
+    return !!node.getTag();
+  }).map(function (node) {
+    return node.getTag();
+  });
+};
+
+exports.getAllEdgeResourceIds = getAllEdgeResourceIds;

package/lib/utils/htElementUtils.js

@@ -17,6 +17,7 @@ exports.getGroupData = getGroupData;
 exports.getGroupDatas = getGroupDatas;
 exports.getGroupElementByTag = getGroupElementByTag;
 exports.getGroups = getGroups;
+exports.getLayerChildren = getLayerChildren;
 exports.getLayerChildrenNodes = getLayerChildrenNodes;
 exports.getLayers = getLayers;
 exports.getNodeData = getNodeData;
@@ -291,6 +292,21 @@ function getLayerChildrenNodes(layer) {
 
   return layer.getChildren().getArray().filter(isNode);
 }
+/**
+ * 获取分层里的节点列表
+ *
+ * @param layer
+ * @return {*}
+ */
+
+
+function getLayerChildren(layer) {
+  if (!layer) {
+    return [];
+  }
+
+  return layer.getChildren().getArray();
+}
 /**
  * 获取容器里的子元素列表
  *
@@ -353,7 +369,7 @@ function setElementRuntimeStyle(element, name, value) {
  */
 
 
-function isExistedElement(dataModel, data) {
+function isExistedElement(htTopo, dataModel, data) {
   var type = data.type,
       id = data.id;
 
@@ -361,15 +377,14 @@ function isExistedElement(dataModel, data) {
     return true;
   }
 
-  if (type === 'group') {
-    var group = getElements(dataModel).find(function (item) {
-      return item.a('tag') === data.tag;
-    });
+  var element = getElements(dataModel).find(function (item) {
+    return item.a('tag') === data.tag;
+  });
+
+  if (element) {
+    return true;
+  } // 连线/连线组
 
-    if (group) {
-      return true;
-    }
-  }
 
   return false;
 }

package/lib/utils/showGraphManageStatusUtil.js

@@ -0,0 +1,78 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.removeManageStatus = removeManageStatus;
+exports.showManageStatus = showManageStatus;
+
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
+
+var _htElementUtils = require("./htElementUtils");
+
+function showManageStatus(options) {
+  var topo = options.topo,
+      resources = options.resources,
+      isEditMode = options.isEditMode,
+      graphLoaded = options.graphLoaded,
+      cisEventLevel = options.cisEventLevel;
+
+  var hasAlarm = function hasAlarm(id) {
+    return !!cisEventLevel.find(function (item) {
+      return item.id === id;
+    });
+  }; // 首次加载和监控状态变化后，更新节点和连线置灰状态
+
+
+  if (!isEditMode && graphLoaded) {
+    resources.forEach(function (resource) {
+      var type = resource.type,
+          id = resource.id,
+          manageStatus = resource.manageStatus,
+          permission = resource.permission;
+      var isNotMonite = manageStatus === 0;
+      var readable = !!(permission !== null && permission !== void 0 && permission.readable);
+      var showUnMoniteStatus = !hasAlarm(id) && isNotMonite && readable;
+      var element = topo.getDataModel().getDataByTag(id);
+      if (!element) return;
+
+      if (type === 'node') {
+        try {
+          if (showUnMoniteStatus) {
+            topo.getHtTopo().setNodeStyleIcon(element, {
+              styleIcon: 'unMoniter',
+              icon: 'resource.subIcon.unMoniter'
+            });
+          } else {
+            element.removeStyleIcon('unMoniter');
+          }
+        } catch (error) {
+          _rlog["default"].error('设置监控图标异常', element, error);
+        }
+      } else {
+        (0, _htElementUtils.setElementRuntimeStyle)(element, 'color', showUnMoniteStatus ? '#C9CED2' : undefined);
+      }
+    });
+  }
+}
+
+function removeManageStatus(options) {
+  var topo = options.topo,
+      resources = options.resources;
+  resources.forEach(function (resource) {
+    var type = resource.type,
+        id = resource.id;
+    var element = topo.getDataModel().getDataByTag(id);
+    if (!element) return;
+
+    if (type === 'node') {
+      try {
+        element.removeStyleIcon('unMoniter');
+      } catch (error) {
+        _rlog["default"].error('设置监控图标异常', element, error);
+      }
+    } else {
+      (0, _htElementUtils.setElementRuntimeStyle)(element, 'color', undefined);
+    }
+  });
+}

package/lib/utils/topoData.js

@@ -41,6 +41,8 @@ var _backgroundUtil = require("../core/utils/backgroundUtil");
 
 var _clusterUtil = require("./clusterUtil");
 
+var _htElementUtils = require("./htElementUtils");
+
 var _excluded = ["extraConfig"];
 
 /**
@@ -127,40 +129,35 @@ function formatGroup(group) {
 
 function formatGroups(groups) {
   return groups.map(formatGroup);
-}
-/**
- *
- * @param attributes {array|object}
- * @return {object}
- */
-
-
-function nodeAttributesAdapter(attributes) {
-  if (Array.isArray(attributes)) {
-    var map = {};
-    attributes.forEach(function (attr) {
-      map[attr.code] = attr.value;
-    });
-    return map;
-  }
-
-  return attributes || {};
 } // 格式化节点
 
 
-var tfNode = function tfNode(engine, node) {
-  var attributes = nodeAttributesAdapter(node.attributes); // rlog.debug('tfNode---------',node);
-
-  var result = (0, _extends2["default"])({
-    ipAddress: attributes.ipAddress || null
-  }, node, {
-    operation: node.hasOwnProperty("operation") ? node.operation : null,
+var tfNode = function tfNode(topoEngine, node) {
+  return (0, _extends2["default"])({}, node, {
     metrics: [],
-    attributes: [],
-    isShowName: engine.isViewMode() ? engine.attributeMetricDisplay.getNodeNameVisible(node) : true
+    attributes: []
   });
-  return result;
-}; // 格式化连线
+};
+/**
+ * ip、是否显示名称
+ * 
+ * @param {*} topoEngine 
+ * @param {*} topoData 
+ * @returns 
+ */
+
+
+function updateNodeInfo(topoEngine, topoData) {
+  return (0, _extends2["default"])({}, topoData, {
+    nodes: topoData.nodes.map(function (node) {
+      var attributes = node.attributes;
+      return (0, _extends2["default"])({}, node, {
+        ipAddress: node.ipAddress || (attributes === null || attributes === void 0 ? void 0 : attributes.ipAddress) || (attributes === null || attributes === void 0 ? void 0 : attributes.ipv4_address) || null,
+        isShowName: topoEngine.attributeMetricDisplay.getNodeNameVisible(node)
+      });
+    })
+  });
+} // 格式化连线
 
 
 var tfLink = function tfLink(engine, link) {
@@ -376,7 +373,37 @@ function buildGlobal(_ref2) {
     },
     icons: (0, _icon.getEditorIcons)(engine),
     // 获取默认节点图标，可选参数。如果无返回值则继续使用内部默认
-    getDefaultNodeIcon: engine.options.getDefaultNodeIcon
+    getDefaultNodeIcon: engine.options.getDefaultNodeIcon,
+
+    /**
+     * 编辑界面左侧面板控制元素是否可拖动到区域中node代表拖动的元素，group代表图上的区域
+     * 区域不能拖拽到区域
+     * 元素不能拖拽到集群
+     */
+    canDragElementToGroup: function canDragElementToGroup(element, group) {
+      if (!(0, _htElementUtils.isGroup)(group)) {
+        return true;
+      }
+
+      if (element.dtype === 'container' && (0, _htElementUtils.isGroup)(group)) {
+        return false;
+      }
+
+      if ((0, _htElementUtils.isGroup)(group) && group.a('cluster')) {
+        return false;
+      }
+
+      console.error(element, group);
+      return true;
+    },
+    // 图上元素能否拖动到区域中
+    canDragGraphElementsToGroup: function canDragGraphElementsToGroup(elemetns, group) {
+      if (!(0, _htElementUtils.isGroup)(group)) {
+        return true;
+      }
+
+      return true;
+    }
   };
 }
 /**
@@ -395,7 +422,7 @@ var combTopoData = function combTopoData(_ref3) {
       globalConfig = _ref3.globalConfig,
       ciTypeMap = _ref3.ciTypeMap,
       engine = _ref3.engine;
-  var result = (0, _clusterUtil.processCluster)(data); // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
+  var result = (0, _clusterUtil.processCluster)(updateNodeInfo(engine, data)); // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
 
   var config = (0, _extends2["default"])({
     type: "auto"
@@ -809,7 +836,7 @@ function findGroupChildren(elements, group) {
     var type = element.type,
         groupId = element.groupId,
         groupTag = element.groupTag;
-    var isChild = groupId === id || groupTag === tag;
+    var isChild = groupId === id || tag && groupTag === tag;
 
     if (isChild) {
       children.push(element);