@riil-frontend/component-topology 3.5.12 → 3.5.13

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "3.5.12" === 'string' ? "3.5.12" : null;
+var version = typeof "3.5.13" === 'string' ? "3.5.13" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/topoCenter/models/LinkTagsTipsBuilder.js

@@ -4,8 +4,7 @@ import _extends from "@babel/runtime/helpers/extends";
  * 连线组标注、悬浮框数据构建
  */
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import groupBy from 'lodash/groupBy';
-import { getEdgeGroupByNodeTags, getEdgeGroups } from "../../utils/htElementUtils";
+import { getEdgeGroups } from "../../utils/htElementUtils";
 import AttributeFormatter from "../../core/models/attributeFormatter"; // 参与计算的链路指标
 
 var metrics = [// 总流速
@@ -87,11 +86,6 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
     var edgeGroupsTagsTips = groups.map(function (_ref) {
       var groupId = _ref.groupId,
           linkChildren = _ref.children;
-      console.error(1111, {
-        ciConfigs: ciConfigs,
-        linkChildren: linkChildren,
-        data: data
-      });
       var config = ciConfigs.find(function (item) {
         return item.id === linkChildren[0].id;
       });
@@ -101,10 +95,7 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
         linkChildren: linkChildren,
         data: data
       });
-    }); // console.error({
-    //   noParentLinks, groupMap, edgeGroups: edgeGroupsTagsTips, ciTagsAndTips, data
-    // })
-    // 获得连线组及子链路
+    }); // 获得连线组及子链路
     // 关联聚合链路、无子链路 时返回null
 
     function getGroupInfo(group) {

package/es/utils/ResourceConfigUtil.js

@@ -1,3 +1,4 @@
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import sortBy from "lodash/sortBy";
 import { getEdges, getGroupChildrenNodes, getGroups, getLayerChildrenNodes, getLayers, getNodes } from "./htElementUtils";
 /**
@@ -49,18 +50,21 @@ function getResourceConfigFromHt(topo) {
 
   var exportLinkIdList = [];
   var edges = getEdges(dataModel);
-  console.log(" 查询出口链路列表-edges", edges, dataModel);
+  rlog.debug(" 查询出口链路列表-edges", edges, dataModel);
   edges.forEach(function (edge) {
-    var edgeData = htTopo.getEdgeData(edge); // eslint-disable-next-line no-underscore-dangle
+    var edgeData = htTopo.getEdgeData(edge); // 有组无子连线返回null
 
-    var id = edgeData._attrObject.id;
+    if (edgeData) {
+      // eslint-disable-next-line no-underscore-dangle
+      var id = edgeData._attrObject.id;
 
-    if (id) {
-      var linkData = topo.dataModel.getDataById(id);
-      var connectType = linkData !== null && linkData !== void 0 && linkData.attributes ? linkData === null || linkData === void 0 ? void 0 : linkData.attributes["network_link.connect_type"] : undefined;
+      if (id) {
+        var linkData = topo.dataModel.getDataById(id);
+        var connectType = linkData !== null && linkData !== void 0 && linkData.attributes ? linkData === null || linkData === void 0 ? void 0 : linkData.attributes["network_link.connect_type"] : undefined;
 
-      if (connectType === "exit" && !exportLinkIdList.includes(id)) {
-        exportLinkIdList.push(id);
+        if (connectType === "exit" && !exportLinkIdList.includes(id)) {
+          exportLinkIdList.push(id);
+        }
       }
     }
   });

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "3.5.12" === 'string' ? "3.5.12" : null;
+var version = typeof "3.5.13" === 'string' ? "3.5.13" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/topoCenter/models/LinkTagsTipsBuilder.js

@@ -9,8 +9,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _groupBy = _interopRequireDefault(require("lodash/groupBy"));
-
 var _htElementUtils = require("../../utils/htElementUtils");
 
 var _attributeFormatter = _interopRequireDefault(require("../../core/models/attributeFormatter"));
@@ -98,11 +96,6 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
     var edgeGroupsTagsTips = groups.map(function (_ref) {
       var groupId = _ref.groupId,
           linkChildren = _ref.children;
-      console.error(1111, {
-        ciConfigs: ciConfigs,
-        linkChildren: linkChildren,
-        data: data
-      });
       var config = ciConfigs.find(function (item) {
         return item.id === linkChildren[0].id;
       });
@@ -112,10 +105,7 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
         linkChildren: linkChildren,
         data: data
       });
-    }); // console.error({
-    //   noParentLinks, groupMap, edgeGroups: edgeGroupsTagsTips, ciTagsAndTips, data
-    // })
-    // 获得连线组及子链路
+    }); // 获得连线组及子链路
     // 关联聚合链路、无子链路 时返回null
 
     function getGroupInfo(group) {

package/lib/utils/ResourceConfigUtil.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
 var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
 
 var _htElementUtils = require("./htElementUtils");
@@ -57,18 +59,23 @@ function getResourceConfigFromHt(topo) {
 
   var exportLinkIdList = [];
   var edges = (0, _htElementUtils.getEdges)(dataModel);
-  console.log(" 查询出口链路列表-edges", edges, dataModel);
+
+  _rlog["default"].debug(" 查询出口链路列表-edges", edges, dataModel);
+
   edges.forEach(function (edge) {
-    var edgeData = htTopo.getEdgeData(edge); // eslint-disable-next-line no-underscore-dangle
+    var edgeData = htTopo.getEdgeData(edge); // 有组无子连线返回null
 
-    var id = edgeData._attrObject.id;
+    if (edgeData) {
+      // eslint-disable-next-line no-underscore-dangle
+      var id = edgeData._attrObject.id;
 
-    if (id) {
-      var linkData = topo.dataModel.getDataById(id);
-      var connectType = linkData !== null && linkData !== void 0 && linkData.attributes ? linkData === null || linkData === void 0 ? void 0 : linkData.attributes["network_link.connect_type"] : undefined;
+      if (id) {
+        var linkData = topo.dataModel.getDataById(id);
+        var connectType = linkData !== null && linkData !== void 0 && linkData.attributes ? linkData === null || linkData === void 0 ? void 0 : linkData.attributes["network_link.connect_type"] : undefined;
 
-      if (connectType === "exit" && !exportLinkIdList.includes(id)) {
-        exportLinkIdList.push(id);
+        if (connectType === "exit" && !exportLinkIdList.includes(id)) {
+          exportLinkIdList.push(id);
+        }
       }
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "3.5.12",
+  "version": "3.5.13",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -110,6 +110,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@3.5.12/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@3.5.13/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }