@riil-frontend/component-topology 2.15.27 → 2.15.28

package/es/core/components/AlarmListPanel/index.module.scss

@@ -44,7 +44,7 @@
 
     .#{$css-prefix}list-items {
       max-height: 230px;
-      overflow-y: scroll;
+      overflow-y: auto;
     }
 
     .#{$css-prefix}list-item {

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

package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js

@@ -14,6 +14,7 @@ import EditLinkInfo from "./components/editLinkInfo";
 import styles from "./index.module.scss";
 import service from "./server";
 import { clone } from "../../../../../../utils/copyUtil";
+import { getEdgesBetweenNodes } from "../../../../../../utils/htElementUtils";
 var CollapsePanel = _Collapse.Panel;
 
 function AddLinkDrawer(props) {
@@ -326,7 +327,7 @@ function AddLinkDrawer(props) {
 
     try {
       // 获取两个节点间的连线数据列表
-      var edgesInNodes = htTopo.getEdgeDatasInNodes(source, target);
+      var edgesInNodes = getEdgesBetweenNodes(source, target);
 
       if (isAgg) {
         // 聚合链路
@@ -340,8 +341,10 @@ function AddLinkDrawer(props) {
         htTopo.toggleEdgeGroup(source, target, false);
       } else {
         // 物理、出口链路
-        if (edgesInNodes.length === 1 && !htTopo.getEdgeData(edgesInNodes[0])) {
-          htTopo.setEdgeData(htTopo.getEdgeData(edgesInNodes[0], linkData));
+        var firstEdge = edgesInNodes[0];
+
+        if (edgesInNodes.length === 1 && !htTopo.getEdgeData(firstEdge)) {
+          htTopo.setEdgeData(firstEdge, linkData);
         } else {
           htTopo.createEdge(source, target, linkData);
         }

package/lib/core/components/AlarmListPanel/index.module.scss

@@ -44,7 +44,7 @@
 
     .#{$css-prefix}list-items {
       max-height: 230px;
-      overflow-y: scroll;
+      overflow-y: auto;
     }
 
     .#{$css-prefix}list-item {

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

package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js

@@ -35,6 +35,8 @@ var _server = _interopRequireDefault(require("./server"));
 
 var _copyUtil = require("../../../../../../utils/copyUtil");
 
+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; }
@@ -366,7 +368,7 @@ function AddLinkDrawer(props) {
 
     try {
       // 获取两个节点间的连线数据列表
-      var edgesInNodes = htTopo.getEdgeDatasInNodes(source, target);
+      var edgesInNodes = (0, _htElementUtils.getEdgesBetweenNodes)(source, target);
 
       if (isAgg) {
         // 聚合链路
@@ -380,8 +382,10 @@ function AddLinkDrawer(props) {
         htTopo.toggleEdgeGroup(source, target, false);
       } else {
         // 物理、出口链路
-        if (edgesInNodes.length === 1 && !htTopo.getEdgeData(edgesInNodes[0])) {
-          htTopo.setEdgeData(htTopo.getEdgeData(edgesInNodes[0], linkData));
+        var firstEdge = edgesInNodes[0];
+
+        if (edgesInNodes.length === 1 && !htTopo.getEdgeData(firstEdge)) {
+          htTopo.setEdgeData(firstEdge, linkData);
         } else {
           htTopo.createEdge(source, target, linkData);
         }

package/package.json

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