@riil-frontend/component-topology 12.1.0-dev.5 → 12.1.0-dev.7

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

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

@@ -1,5 +1,6 @@
 import React, { useMemo } from 'react';
 import DefaultDetailContent from "../../ResourceDetail/DefaultDetailContent";
+import { isEdgeGroupAgent } from "../../../../../../utils/htElementUtils";
 
 function useElementDetailManager(props) {
   var topo = props.topo,
@@ -62,9 +63,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: isEdgeGroupAgent(htElement) || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
       htElement: htElement
     });
   }

package/es/networkTopo/models/EdgeGroupTagTipBuilder.js

@@ -1,4 +1,4 @@
-import { getEdgeGroups } from "../../utils/htElementUtils";
+import { getEdgeGroupAgents, getEdgeGroups } from "../../utils/htElementUtils";
 import { getEdgeGroupLinkIdConfig } from "../utils/edgeGroupTagUtil";
 
 var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
@@ -16,11 +16,11 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
 
     var topo = this.topo;
     var dm = this.topo.getDataModel();
-    var edgeGroupsTagsTips = getEdgeGroups(dm).map(function (edgeGroup) {
-      var edge = edgeGroup.getEdges().getArray()[0]; // 获取配置的链路
-
-      var linkId = getEdgeGroupLinkIdConfig(edge, topo);
-      var edgeGroupId = [edge.getSourceAgent().getId(), edge.getTargetAgent().getId()];
+    var edgeGroupAgents = getEdgeGroupAgents(dm);
+    var edgeGroupsTagsTips = edgeGroupAgents.map(function (edgeGroupAgent) {
+      // 获取配置的链路
+      var linkId = getEdgeGroupLinkIdConfig(edgeGroupAgent, topo);
+      var edgeGroupId = [edgeGroupAgent.getSource().getId(), edgeGroupAgent.getTarget().getId()];
       var data = {
         tags: [],
         tips: []
@@ -31,7 +31,7 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
       }
 
       return {
-        htId: edge.getId(),
+        htId: edgeGroupAgent.getId(),
         edgeGroupId: edgeGroupId,
         tags: data.tags,
         tips: data.tips,

package/es/networkTopo/utils/edgeGroupTagUtil.js

@@ -55,8 +55,8 @@ export function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
   });
 }
 export function getEdgeGroupConfigId(edgeGroup) {
-  var sourceNode = edgeGroup.getSourceAgent();
-  var targetNode = edgeGroup.getTargetAgent();
+  var sourceNode = edgeGroup.getSource();
+  var targetNode = edgeGroup.getTarget();
   var sourceId = sourceNode.a('uuid');
   var targetId = targetNode.a('uuid');
   return [sourceId, targetId].sort().join(',');

package/es/utils/htElementUtils.js

@@ -122,7 +122,7 @@ export function getEdges(dataModel) {
  */
 
 export function isEdgeGroup(edge) {
-  return isEdge(edge) && edge.a('edgegroup.isEdgeGroup');
+  return isEdge(edge) && edge.a('x.edgegroup.isEdgeGroup');
 }
 /**
  * 是否连线组代理
@@ -131,7 +131,7 @@ export function isEdgeGroup(edge) {
  */
 
 export function isEdgeGroupAgent(edge) {
-  return isEdgeGroup(edge) && isEdgeVisible(edge);
+  return isEdgeGroup(edge);
 }
 /**
  * TODO
@@ -209,6 +209,12 @@ export function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
 
   return getEdgeGroupByNodes(node1, node2);
 }
+/**
+ * 获得连线组连线列表
+ * @param {*} dataModel 
+ * @returns 
+ */
+
 export function getEdgeGroups(dataModel) {
   var edgeGroups = [];
   getEdges(dataModel).forEach(function (edge) {
@@ -220,6 +226,12 @@ export function getEdgeGroups(dataModel) {
   });
   return edgeGroups;
 }
+/**
+ * 获得连线组连线列表
+ * @param {*} dataModel 
+ * @returns 
+ */
+
 export function getEdgeGroupAgents(dataModel) {
   return getEdges(dataModel).filter(isEdgeGroupAgent);
 }

package/lib/core/models/TopoApp.js

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

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/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/utils/edgeGroupTagUtil.js

@@ -65,8 +65,8 @@ function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
 }
 
 function getEdgeGroupConfigId(edgeGroup) {
-  var sourceNode = edgeGroup.getSourceAgent();
-  var targetNode = edgeGroup.getTargetAgent();
+  var sourceNode = edgeGroup.getSource();
+  var targetNode = edgeGroup.getTarget();
   var sourceId = sourceNode.a('uuid');
   var targetId = targetNode.a('uuid');
   return [sourceId, targetId].sort().join(',');

package/lib/utils/htElementUtils.js

@@ -182,7 +182,7 @@ function getEdges(dataModel) {
 
 
 function isEdgeGroup(edge) {
-  return isEdge(edge) && edge.a('edgegroup.isEdgeGroup');
+  return isEdge(edge) && edge.a('x.edgegroup.isEdgeGroup');
 }
 /**
  * 是否连线组代理
@@ -192,7 +192,7 @@ function isEdgeGroup(edge) {
 
 
 function isEdgeGroupAgent(edge) {
-  return isEdgeGroup(edge) && isEdgeVisible(edge);
+  return isEdgeGroup(edge);
 }
 /**
  * TODO
@@ -275,6 +275,12 @@ function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
 
   return getEdgeGroupByNodes(node1, node2);
 }
+/**
+ * 获得连线组连线列表
+ * @param {*} dataModel 
+ * @returns 
+ */
+
 
 function getEdgeGroups(dataModel) {
   var edgeGroups = [];
@@ -287,6 +293,12 @@ function getEdgeGroups(dataModel) {
   });
   return edgeGroups;
 }
+/**
+ * 获得连线组连线列表
+ * @param {*} dataModel 
+ * @returns 
+ */
+
 
 function getEdgeGroupAgents(dataModel) {
   return getEdges(dataModel).filter(isEdgeGroupAgent);

package/package.json

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