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

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

@@ -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/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js

@@ -29,10 +29,11 @@ var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
+var _loglevel = _interopRequireDefault(require("loglevel"));
+
 function formatUrl(url) {
   var _window, _window$location;
 
-  console.log(url);
   var prefix = '/default/pagecenter';
 
   if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
@@ -47,11 +48,14 @@ function EventsCard(props) {
       closeDetailDrawer = props.closeDetailDrawer,
       onHandleAlarm = props.onHandleAlarm;
 
+  var log = _loglevel["default"].getLogger('topo');
+
   var jumpTo = function jumpTo(url) {
     closeDetailDrawer();
 
     if (topo.viewProps.jumpto) {
-      topo.viewProps.jumpto(formatUrl(url));
+      log.debug('formatUrl(url)', url);
+      topo.viewProps.jumpto(url);
     } else {
       (0, _componentTopologyUtils.getHistory)().push(formatUrl(url));
     }

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/services/topo/basic.js

@@ -5,8 +5,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = exports.TOPO_PARENT_ID = exports.TOPO_GROUP_ID = void 0;
 
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -23,7 +21,12 @@ var _model = require("../model");
 
 var _exitLinkUtil = require("../../utils/exitLinkUtil");
 
-var _excluded = ["groups", "resources"];
+var relateTopoDataUtil = _interopRequireWildcard(require("../../utils/relateTopoDataUtil"));
+
+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; }
+
 var API_ROOT = _constants.TOPO_API_ROOT;
 /**
  * 拓扑图（看做一个容器）的“父容器”ID
@@ -66,7 +69,7 @@ function prepareResourceParams(conditions, query) {
   return {
     dynamicCondition: dynamicCondition,
     fixedConditionIdList: (staticRes || []).filter(function (ciId) {
-      return !ciId.startsWith('ip:');
+      return !ciId.includes(':');
     }),
     linkIps: (staticRes || []).filter(function (ciId) {
       return ciId.startsWith('ip:');
@@ -115,7 +118,8 @@ function prepareGroupParams(modifiedGroups) {
     };
   }).filter(Boolean);
   return {
-    groups: groups
+    groups: groups,
+    relateTopoIdList: relateTopoDataUtil.getRelateTopoIdListFromConfig(modifiedGroups)
   };
 }
 
@@ -406,16 +410,20 @@ var _default = (0, _extends2["default"])({
 
           case 2:
             result = _context12.sent;
-            return _context12.abrupt("return", (0, _exitLinkUtil.processExitLink)((0, _extends2["default"])({}, result, {
+            result = (0, _extends2["default"])({}, result, {
               nodes: (_result$nodes = result.nodes) !== null && _result$nodes !== void 0 ? _result$nodes : [],
               links: ((_result$links = result.links) !== null && _result$links !== void 0 ? _result$links : []).map(function (item) {
                 return (0, _extends2["default"])({}, item, {
                   ciType: 'network_link'
                 });
-              })
-            })));
+              }),
+              serialize: result.serialize ? JSON.parse(result.serialize) : undefined
+            });
+            result = relateTopoDataUtil.processBothTopoData(result);
+            result = (0, _exitLinkUtil.processExitLink)(result);
+            return _context12.abrupt("return", result);
 
-          case 4:
+          case 7:
           case "end":
             return _context12.stop();
         }
@@ -434,7 +442,7 @@ var _default = (0, _extends2["default"])({
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13() {
       var _result$nodes2, _result$links2;
 
-      var data, obj, result;
+      var data, params, result;
       return _regenerator["default"].wrap(function _callee13$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
           case 0:
@@ -448,22 +456,28 @@ var _default = (0, _extends2["default"])({
               });
             }
 
-            obj = prepareGroupParams(data);
+            params = prepareGroupParams(data);
             _context13.next = 5;
-            return _componentTopologyUtils.request.post(API_ROOT + "/structure/byCondition/" + id, (0, _extends2["default"])({}, obj));
+            return _componentTopologyUtils.request.post(API_ROOT + "/structure/byCondition/" + id, params);
 
           case 5:
             result = _context13.sent;
-            return _context13.abrupt("return", (0, _exitLinkUtil.processByConditionResult)((0, _extends2["default"])({}, result, {
+            result = (0, _extends2["default"])({}, result, {
               nodes: (_result$nodes2 = result.nodes) !== null && _result$nodes2 !== void 0 ? _result$nodes2 : [],
               links: ((_result$links2 = result.links) !== null && _result$links2 !== void 0 ? _result$links2 : []).map(function (item) {
                 return (0, _extends2["default"])({}, item, {
                   ciType: 'network_link'
                 });
               })
-            }), obj.groups));
+            });
+            result = relateTopoDataUtil.processByConditionTopoData({
+              data: result,
+              config: data
+            });
+            result = (0, _exitLinkUtil.processByConditionResult)(result, params.groups);
+            return _context13.abrupt("return", result);
 
-          case 7:
+          case 10:
           case "end":
             return _context13.stop();
         }
@@ -480,11 +494,11 @@ var _default = (0, _extends2["default"])({
   */
   bindResourceToTopo: function bindResourceToTopo(id, config) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14() {
-      var groups, resources, otherConfig, newGroups, obj;
+      var groups, resources, newGroups, obj;
       return _regenerator["default"].wrap(function _callee14$(_context14) {
         while (1) switch (_context14.prev = _context14.next) {
           case 0:
-            groups = config.groups, resources = config.resources, otherConfig = (0, _objectWithoutPropertiesLoose2["default"])(config, _excluded);
+            groups = config.groups, resources = config.resources;
             newGroups = Array.isArray(groups) ? groups : [];
 
             if (resources) {
@@ -498,7 +512,7 @@ var _default = (0, _extends2["default"])({
 
             obj = prepareGroupParams(newGroups);
             _context14.next = 6;
-            return _componentTopologyUtils.request.post(API_ROOT + "/resource/" + id, (0, _extends2["default"])({}, otherConfig, obj));
+            return _componentTopologyUtils.request.post(API_ROOT + "/resource/" + id, obj);
 
           case 6:
             return _context14.abrupt("return", _context14.sent);