@riil-frontend/component-topology 10.0.27 → 10.0.29

package/es/core/hooks/ht/useHtDataPropertyChangeListener.js

@@ -12,13 +12,13 @@ export default function useHtDataPropertyChangeListener(props) {
     var dm = topo.getDataModel();
     var inited = false;
 
-    if (graphLoaded || graphLoaded2) {
+    if (dm) {
       dm.addDataPropertyChangeListener(onChange);
       inited = true;
     }
 
     return function () {
-      if (inited) {
+      if (inited && dm) {
         dm.removeDataPropertyChangeListener(onChange);
       }
     };

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.27" === 'string' ? "10.0.27" : null;
+var version = typeof "10.0.29" === 'string' ? "10.0.29" : 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/core/store/models/viewer/resourceDetail.js

@@ -23,6 +23,13 @@ export default {
 
       };
     },
+    open: function open(prevState, id) {
+      return {
+        visible: true,
+        id: id // 资源id
+
+      };
+    },
     close: function close() {
       return {
         visible: false,

package/es/core/utils/linkUtil.js

@@ -0,0 +1,12 @@
+/**
+ * 
+ * @param {Array} links 
+ * @param {Array} ids1 
+ * @param {Array} ids2 
+ * @returns 
+ */
+export function getLinksInNodes(links, ids1, ids2) {
+  return links.filter(function (link) {
+    return ids1.includes(link.source) && ids2.includes(link.target) || ids2.includes(link.source) && ids1.includes(link.target);
+  });
+}

package/es/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js

@@ -62,8 +62,9 @@ function useElementDetailManager(props) {
   }
 
   function openByHtElement(htElement) {
+    var isEdgeGroupAgent = htElement instanceof ht.Edge && htElement.isEdgeGroupAgent() && !htElement.s('edge.expanded');
     open({
-      id: htElement.getTag() || "ht:" + htElement.getId(),
+      id: isEdgeGroupAgent || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
       htElement: htElement
     });
   }

package/es/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js

@@ -42,10 +42,11 @@ function ResourceDetailDrawer(props) {
       detailManager: detailManager
     }),
     onClose: detailManager.close
-  }, visible && /*#__PURE__*/React.createElement(Content, _extends({}, props, {
+  }, visible && Content && /*#__PURE__*/React.createElement(Content, _extends({}, props, {
     topo: topo,
     id: id,
     htElement: htElement,
+    detailManager: detailManager,
     viewerProps: viewerProps,
     onClose: detailManager.close
   })));

package/es/networkTopo/utils/edgeGroupTagUtil.js

@@ -1,10 +1,74 @@
-// 获得连线组标注配置的链路id。无配置时取默认链路
-export function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
-  var _links$;
+import { getLinksInNodes } from "../../core/utils/linkUtil";
+/**
+ * 查询节点/区域及子节点
+ * @param {*} nodes 
+ * @returns 
+ */
 
-  // const { } = options
+var getChildrenNodes = function getChildrenNodes(nodes) {
+  var allNodes = [].concat(nodes);
+  nodes.forEach(function (node) {
+    if (node instanceof ht.Group) {
+      var children = node.getChildren().toArray();
+      allNodes.push.apply(allNodes, getChildrenNodes(children));
+    }
+  });
+  return allNodes;
+};
+/**
+ * 查询连线两端节点间的链路列表
+ * @param {*} topo 
+ * @param {*} edgeGroup 
+ * @returns 
+ */
+
+
+export function getLinksByEdgeGroup(topo, edgeGroup) {
   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;
+  var links = getLinksInNodes(topo.dataModel.getEdges(), [sourceId], [targetId]);
+  return links;
+} // 获得连线组标注配置的链路id。无配置时取默认链路
+
+export function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
+  // const { } = options
+  var links = getLinksByEdgeGroup(topo, edgeGroup);
+
+  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/ht/useHtDataPropertyChangeListener.js

@@ -21,13 +21,13 @@ function useHtDataPropertyChangeListener(props) {
     var dm = topo.getDataModel();
     var inited = false;
 
-    if (graphLoaded || graphLoaded2) {
+    if (dm) {
       dm.addDataPropertyChangeListener(onChange);
       inited = true;
     }
 
     return function () {
-      if (inited) {
+      if (inited && dm) {
         dm.removeDataPropertyChangeListener(onChange);
       }
     };

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.27" === 'string' ? "10.0.27" : null;
+var version = typeof "10.0.29" === 'string' ? "10.0.29" : 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/core/store/models/viewer/resourceDetail.js

@@ -31,6 +31,13 @@ var _default = {
 
       };
     },
+    open: function open(prevState, id) {
+      return {
+        visible: true,
+        id: id // 资源id
+
+      };
+    },
     close: function close() {
       return {
         visible: false,

package/lib/core/utils/linkUtil.js

@@ -0,0 +1,17 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getLinksInNodes = getLinksInNodes;
+
+/**
+ * 
+ * @param {Array} links 
+ * @param {Array} ids1 
+ * @param {Array} ids2 
+ * @returns 
+ */
+function getLinksInNodes(links, ids1, ids2) {
+  return links.filter(function (link) {
+    return ids1.includes(link.source) && ids2.includes(link.target) || ids2.includes(link.source) && ids1.includes(link.target);
+  });
+}

package/lib/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js

@@ -74,8 +74,9 @@ function useElementDetailManager(props) {
   }
 
   function openByHtElement(htElement) {
+    var isEdgeGroupAgent = htElement instanceof ht.Edge && htElement.isEdgeGroupAgent() && !htElement.s('edge.expanded');
     open({
-      id: htElement.getTag() || "ht:" + htElement.getId(),
+      id: isEdgeGroupAgent || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
       htElement: htElement
     });
   }

package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js

@@ -58,10 +58,11 @@ function ResourceDetailDrawer(props) {
       detailManager: detailManager
     }),
     onClose: detailManager.close
-  }, visible && /*#__PURE__*/_react["default"].createElement(Content, (0, _extends2["default"])({}, props, {
+  }, visible && Content && /*#__PURE__*/_react["default"].createElement(Content, (0, _extends2["default"])({}, props, {
     topo: topo,
     id: id,
     htElement: htElement,
+    detailManager: detailManager,
     viewerProps: viewerProps,
     onClose: detailManager.close
   })));

package/lib/networkTopo/utils/edgeGroupTagUtil.js

@@ -1,15 +1,85 @@
 "use strict";
 
 exports.__esModule = true;
+exports.getEdgeGroupConfigId = getEdgeGroupConfigId;
+exports.getEdgeGroupLinkConfig = getEdgeGroupLinkConfig;
 exports.getEdgeGroupLinkIdConfig = getEdgeGroupLinkIdConfig;
+exports.getLinksByEdgeGroup = getLinksByEdgeGroup;
 
-// 获得连线组标注配置的链路id。无配置时取默认链路
-function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
-  var _links$;
+var _linkUtil = require("../../core/utils/linkUtil");
 
-  // const { } = options
+/**
+ * 查询节点/区域及子节点
+ * @param {*} nodes 
+ * @returns 
+ */
+var getChildrenNodes = function getChildrenNodes(nodes) {
+  var allNodes = [].concat(nodes);
+  nodes.forEach(function (node) {
+    if (node instanceof ht.Group) {
+      var children = node.getChildren().toArray();
+      allNodes.push.apply(allNodes, getChildrenNodes(children));
+    }
+  });
+  return allNodes;
+};
+/**
+ * 查询连线两端节点间的链路列表
+ * @param {*} topo 
+ * @param {*} edgeGroup 
+ * @returns 
+ */
+
+
+function getLinksByEdgeGroup(topo, edgeGroup) {
   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;
+  var links = (0, _linkUtil.getLinksInNodes)(topo.dataModel.getEdges(), [sourceId], [targetId]);
+  return links;
+} // 获得连线组标注配置的链路id。无配置时取默认链路
+
+
+function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
+  // const { } = options
+  var links = getLinksByEdgeGroup(topo, edgeGroup);
+
+  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.27",
+  "version": "10.0.29",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@10.0.27/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@10.0.29/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }