@riil-frontend/component-topology 10.0.26 → 10.0.28

package/es/core/hooks/useCanvasTheme.js

@@ -54,8 +54,7 @@ export default function useCanvasTheme(props) {
     // 设置
     if (graphLoaded) {
       try {
-        topo.getHtTopo().getGraphView().dm().setBackground(canvasColor);
-        topo.getHtTopo().getGraphView().dm().setBackground(canvasbackgroundImage);
+        topo.getHtTopo().getGraphView().dm().setBackground(canvasColor); // topo.getHtTopo().getGraphView().dm().setBackground(canvasbackgroundImage)
       } catch (error) {
         console.error('切换主题失败', error);
       }

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 "10.0.26" === 'string' ? "10.0.26" : null;
+var version = typeof "10.0.28" === 'string' ? "10.0.28" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/models/tagstips/ElementTagTipConfig.js

@@ -149,7 +149,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
     var ciType = this.mtCiTypeMap[mtCode];
     var ciTypeModel = this.topo.ciTyeCache.getCiType(ciType);
     var metrics = ciTypeModel.metrics.filter(function (m) {
-      return !!_this2.mtMetricsMap[mtCode][m.code];
+      return _this2.mtMetricsMap[mtCode] && !!_this2.mtMetricsMap[mtCode][m.code];
     });
     return metrics;
   };

package/es/networkTopo/utils/edgeGroupTagUtil.js

@@ -1,10 +1,45 @@
 // 获得连线组标注配置的链路id。无配置时取默认链路
 export function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
-  var _links$;
-
   // const { } = options
   var sourceId = edgeGroup.getSource().getTag();
   var targetId = edgeGroup.getTarget().getTag();
   var links = topo.dataModel.getEdgesBetweenTwoNodes(sourceId, targetId);
-  return (_links$ = links[0]) === null || _links$ === void 0 ? void 0 : _links$.id;
+
+  if (!links.length) {
+    return null;
+  }
+
+  return getEdgeGroupLinkConfig({
+    htElement: edgeGroup,
+    topo: topo,
+    links: links
+  });
+}
+export function getEdgeGroupConfigId(links) {
+  var link = links[0];
+  var sourceId = link.attributes['network_link.source_device_id'];
+  var targetId = link.attributes.destination_type === 'ip' ? link.attributes['network_link.destination_device_ipv4'] : link.attributes['network_link.destination_device_id'];
+  return [sourceId, targetId].sort().join(',');
+}
+/**
+ * 默认选中/显示标注为按名称排序第一条
+ * @param {*} links 
+ * @returns 
+ */
+
+function getDefaultLinkId(links) {
+  var sortedLinks = links.sort(function (a, b) {
+    return a.attributes.display_name.localeCompare(b.attributes.display_name);
+  });
+  return sortedLinks[0].id;
+}
+
+export function getEdgeGroupLinkConfig(_ref) {
+  var htElement = _ref.htElement,
+      topo = _ref.topo,
+      links = _ref.links;
+  var displayConfig = topo.store.getModelState('displayConfig');
+  var edgeGroupShowLinkTag = displayConfig.edgeGroupShowLinkTag || {};
+  var edgeGroupId = getEdgeGroupConfigId(links);
+  return edgeGroupShowLinkTag[edgeGroupId] || getDefaultLinkId(links);
 }

package/lib/core/hooks/useCanvasTheme.js

@@ -68,8 +68,7 @@ function useCanvasTheme(props) {
     // 设置
     if (graphLoaded) {
       try {
-        topo.getHtTopo().getGraphView().dm().setBackground(canvasColor);
-        topo.getHtTopo().getGraphView().dm().setBackground(canvasbackgroundImage);
+        topo.getHtTopo().getGraphView().dm().setBackground(canvasColor); // topo.getHtTopo().getGraphView().dm().setBackground(canvasbackgroundImage)
       } catch (error) {
         console.error('切换主题失败', error);
       }

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "10.0.26" === 'string' ? "10.0.26" : null;
+var version = typeof "10.0.28" === 'string' ? "10.0.28" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/tagstips/ElementTagTipConfig.js

@@ -162,7 +162,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
     var ciType = this.mtCiTypeMap[mtCode];
     var ciTypeModel = this.topo.ciTyeCache.getCiType(ciType);
     var metrics = ciTypeModel.metrics.filter(function (m) {
-      return !!_this2.mtMetricsMap[mtCode][m.code];
+      return _this2.mtMetricsMap[mtCode] && !!_this2.mtMetricsMap[mtCode][m.code];
     });
     return metrics;
   };

package/lib/networkTopo/utils/edgeGroupTagUtil.js

@@ -1,15 +1,54 @@
 "use strict";
 
 exports.__esModule = true;
+exports.getEdgeGroupConfigId = getEdgeGroupConfigId;
+exports.getEdgeGroupLinkConfig = getEdgeGroupLinkConfig;
 exports.getEdgeGroupLinkIdConfig = getEdgeGroupLinkIdConfig;
 
 // 获得连线组标注配置的链路id。无配置时取默认链路
 function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
-  var _links$;
-
   // const { } = options
   var sourceId = edgeGroup.getSource().getTag();
   var targetId = edgeGroup.getTarget().getTag();
   var links = topo.dataModel.getEdgesBetweenTwoNodes(sourceId, targetId);
-  return (_links$ = links[0]) === null || _links$ === void 0 ? void 0 : _links$.id;
+
+  if (!links.length) {
+    return null;
+  }
+
+  return getEdgeGroupLinkConfig({
+    htElement: edgeGroup,
+    topo: topo,
+    links: links
+  });
+}
+
+function getEdgeGroupConfigId(links) {
+  var link = links[0];
+  var sourceId = link.attributes['network_link.source_device_id'];
+  var targetId = link.attributes.destination_type === 'ip' ? link.attributes['network_link.destination_device_ipv4'] : link.attributes['network_link.destination_device_id'];
+  return [sourceId, targetId].sort().join(',');
+}
+/**
+ * 默认选中/显示标注为按名称排序第一条
+ * @param {*} links 
+ * @returns 
+ */
+
+
+function getDefaultLinkId(links) {
+  var sortedLinks = links.sort(function (a, b) {
+    return a.attributes.display_name.localeCompare(b.attributes.display_name);
+  });
+  return sortedLinks[0].id;
+}
+
+function getEdgeGroupLinkConfig(_ref) {
+  var htElement = _ref.htElement,
+      topo = _ref.topo,
+      links = _ref.links;
+  var displayConfig = topo.store.getModelState('displayConfig');
+  var edgeGroupShowLinkTag = displayConfig.edgeGroupShowLinkTag || {};
+  var edgeGroupId = getEdgeGroupConfigId(links);
+  return edgeGroupShowLinkTag[edgeGroupId] || getDefaultLinkId(links);
 }

package/package.json

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