@riil-frontend/component-topology 2.15.25 → 2.15.28

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

@@ -5,8 +5,9 @@
   // box-shadow: 0px 0px 6px 1px #F2F7FD;
   width: 360px !important;
   box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.16);
-border-radius: 4px;
-border: 1px solid #DCDEE3;
+  border-radius: 4px;
+  background-color: #FFF;
+  border: 1px solid #DCDEE3;
 
   .listTitle {
     color: #4D6277;
@@ -27,22 +28,25 @@ border: 1px solid #DCDEE3;
     .#{$css-prefix}dialog-body {
       padding: 0px;
     }
-   
+
 
     .#{$css-prefix}list-header {
-      padding: 8px 16px 12px 16px !important; 
+      padding: 8px 16px 12px 16px !important;
       border-bottom: none;
-      height:44px;
+      height: 44px;
       box-shadow: 0px 1px 0px 0px #E4E9EE;
     }
-    .#{$css-prefix}list-empty{
+
+    .#{$css-prefix}list-empty {
       padding: 1px;
-      
+
     }
+
     .#{$css-prefix}list-items {
       max-height: 230px;
-      overflow-y: scroll;
+      overflow-y: auto;
     }
+
     .#{$css-prefix}list-item {
       border-bottom: none !important;
       padding: 12px 16px !important;
@@ -70,11 +74,13 @@ border: 1px solid #DCDEE3;
       margin-top: 6px;
     }
   }
-.emptyContent{
-  height: 224px;
-  color: #586477;
-  font-size: 14px;
-}
+
+  .emptyContent {
+    height: 224px;
+    color: #586477;
+    font-size: 14px;
+  }
+
   //告警级别颜色
   .alarm-color {
 

package/es/core/editor/components/settings/Settings.module.scss

@@ -54,10 +54,12 @@
       }
     }
 
-    .#{$css-prefix}collapse-panel-content {
+    .#{$css-prefix}collapse-panel-content,
+    .#{$css-prefix}collapse-panel-expanded>.#{$css-prefix}collapse-panel-content {
       padding-left: 32px;
       padding-top: 8px;
     }
+
   }
 
   .header {

package/es/core/models/AttributeMetricDisplay.js

@@ -308,7 +308,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   _proto.getNodesNameVisible = function getNodesNameVisible() {
     var _this3 = this;
 
-    var nodes = this.topo.store.getModelState('topoMod').data.nodes;
+    var nodes = this.topo.dataModel.getNodes();
     return nodes.map(function (node) {
       return {
         id: node.id,
@@ -680,9 +680,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _this6 = this;
 
     // 查询没有关联链路的连线组及对应子链路列表
-    var _this$topo$store$getM = this.topo.store.getModelState('topoMod').data,
-        links = _this$topo$store$getM.links,
-        linkGroups = _this$topo$store$getM.linkGroups;
+    var _this$topo$dataModel$ = this.topo.dataModel.getData(),
+        links = _this$topo$dataModel$.links,
+        linkGroups = _this$topo$dataModel$.linkGroups;
 
     var getLinkUId = function getLinkUId(link) {
       return [link.source, link.target].sort().join('-');
@@ -710,19 +710,24 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       calcType: 'sum'
     }, {
       code: 'bandwidth_utilization',
-      calcType: 'avg'
-    }, {
-      code: 'out_rate',
-      calcType: 'avg'
+      calcType: 'avg',
+      showWhenSameSource: true
     }, {
       code: 'out_bandwidth_utilization',
-      calcType: 'avg'
-    }, {
-      code: 'in_rate',
-      calcType: 'avg'
+      calcType: 'avg',
+      showWhenSameSource: true
     }, {
       code: 'in_bandwidth_utilization',
-      calcType: 'avg'
+      calcType: 'avg',
+      showWhenSameSource: true
+    }, {
+      code: 'out_rate',
+      calcType: 'avg',
+      showWhenSameSource: true
+    }, {
+      code: 'in_rate',
+      calcType: 'avg',
+      showWhenSameSource: true
     }];
     var connectTypePrefixMap = {
       phy: 'physical_link.',
@@ -730,17 +735,44 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     };
     var calcFnMap = {
       sum: function sum(values) {
-        return values.reduce(function (val, total) {
-          return total + parseInt(val, 10);
+        return values.reduce(function (total, val) {
+          return total + parseInt(val || 0, 10);
         }, 0);
       },
       avg: function avg(values) {
-        return values.reduce(function (val, total) {
-          return total + parseFloat(val, 10);
+        return values.reduce(function (total, val) {
+          return total + parseFloat(val || 0, 10);
         }, 0) / values.length;
       }
+    };
+
+    var filterField = function filterField(item, linkChildren) {
+      var fieldConfig = metrics.find(function (m) {
+        return item.code.endsWith(m.code);
+      });
+
+      if (item.type !== 'metric' || !fieldConfig) {
+        return false;
+      } // 如果需要校验取值接口，如果取值接口为不同设备的接口，则不显示这四个指标
+
+
+      if (fieldConfig.showWhenSameSource) {
+        var sources = [];
+        linkChildren.forEach(function (link) {
+          if (sources.indexOf(link.source) !== -1) {
+            sources.push(link.source);
+          }
+        });
+
+        if (sources.length > 1) {
+          return false;
+        }
+      }
+
+      return true;
     }; // 计算标注和指标
 
+
     var edgeGroupsTagsTips = Object.keys(groupMap) // 过滤非连线组
     .filter(function (groupId) {
       var linkChildren = groupMap[groupId];
@@ -754,14 +786,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       });
       config = _extends({}, config, {
         tags: config.tags.filter(function (item) {
-          return item.type === 'metric' && !!metrics.find(function (m) {
-            return item.code.endsWith(m.code);
-          });
+          return filterField(item, linkChildren);
         }),
         tips: config.tips.filter(function (item) {
-          return item.type === 'metric' && !!metrics.find(function (m) {
-            return item.code.endsWith(m.code);
-          });
+          return filterField(item, linkChildren);
         })
       }); // 构造数据，计算指标值
 

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

package/es/core/viewer/components/titlebar/widgets/AlarmListShowButton.js

@@ -41,6 +41,8 @@ export default function AlarmListShowButton(props) {
     })),
     cache: true,
     defaultVisible: true,
+    canCloseByOutSideClick: false,
+    canCloseByTrigger: false,
     visible: alarmPanelIsOpen,
     onVisibleChange: onVisibleChange,
     offset: [112, 5],

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/es/topoCenter/models/LinkDynamicStyleExecutor.js

@@ -33,9 +33,11 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
     var _this = this;
 
     var topo = this.topo;
-    var _topo$store$getModelS = topo.store.getModelState('topoMod').data,
-        links = _topo$store$getModelS.links,
-        linkGroups = _topo$store$getModelS.linkGroups;
+
+    var _topo$dataModel$getDa = topo.dataModel.getData(),
+        links = _topo$dataModel$getDa.links,
+        linkGroups = _topo$dataModel$getDa.linkGroups;
+
     var dataModel = this.topo.getDataModel(); // 1、如果连线可见，设置线宽
 
     links.forEach(function (link) {

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

@@ -5,8 +5,9 @@
   // box-shadow: 0px 0px 6px 1px #F2F7FD;
   width: 360px !important;
   box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.16);
-border-radius: 4px;
-border: 1px solid #DCDEE3;
+  border-radius: 4px;
+  background-color: #FFF;
+  border: 1px solid #DCDEE3;
 
   .listTitle {
     color: #4D6277;
@@ -27,22 +28,25 @@ border: 1px solid #DCDEE3;
     .#{$css-prefix}dialog-body {
       padding: 0px;
     }
-   
+
 
     .#{$css-prefix}list-header {
-      padding: 8px 16px 12px 16px !important; 
+      padding: 8px 16px 12px 16px !important;
       border-bottom: none;
-      height:44px;
+      height: 44px;
       box-shadow: 0px 1px 0px 0px #E4E9EE;
     }
-    .#{$css-prefix}list-empty{
+
+    .#{$css-prefix}list-empty {
       padding: 1px;
-      
+
     }
+
     .#{$css-prefix}list-items {
       max-height: 230px;
-      overflow-y: scroll;
+      overflow-y: auto;
     }
+
     .#{$css-prefix}list-item {
       border-bottom: none !important;
       padding: 12px 16px !important;
@@ -70,11 +74,13 @@ border: 1px solid #DCDEE3;
       margin-top: 6px;
     }
   }
-.emptyContent{
-  height: 224px;
-  color: #586477;
-  font-size: 14px;
-}
+
+  .emptyContent {
+    height: 224px;
+    color: #586477;
+    font-size: 14px;
+  }
+
   //告警级别颜色
   .alarm-color {
 

package/lib/core/editor/components/settings/Settings.module.scss

@@ -54,10 +54,12 @@
       }
     }
 
-    .#{$css-prefix}collapse-panel-content {
+    .#{$css-prefix}collapse-panel-content,
+    .#{$css-prefix}collapse-panel-expanded>.#{$css-prefix}collapse-panel-content {
       padding-left: 32px;
       padding-top: 8px;
     }
+
   }
 
   .header {

package/lib/core/models/AttributeMetricDisplay.js

@@ -327,7 +327,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   _proto.getNodesNameVisible = function getNodesNameVisible() {
     var _this3 = this;
 
-    var nodes = this.topo.store.getModelState('topoMod').data.nodes;
+    var nodes = this.topo.dataModel.getNodes();
     return nodes.map(function (node) {
       return {
         id: node.id,
@@ -700,9 +700,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _this6 = this;
 
     // 查询没有关联链路的连线组及对应子链路列表
-    var _this$topo$store$getM = this.topo.store.getModelState('topoMod').data,
-        links = _this$topo$store$getM.links,
-        linkGroups = _this$topo$store$getM.linkGroups;
+    var _this$topo$dataModel$ = this.topo.dataModel.getData(),
+        links = _this$topo$dataModel$.links,
+        linkGroups = _this$topo$dataModel$.linkGroups;
 
     var getLinkUId = function getLinkUId(link) {
       return [link.source, link.target].sort().join('-');
@@ -730,19 +730,24 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       calcType: 'sum'
     }, {
       code: 'bandwidth_utilization',
-      calcType: 'avg'
-    }, {
-      code: 'out_rate',
-      calcType: 'avg'
+      calcType: 'avg',
+      showWhenSameSource: true
     }, {
       code: 'out_bandwidth_utilization',
-      calcType: 'avg'
-    }, {
-      code: 'in_rate',
-      calcType: 'avg'
+      calcType: 'avg',
+      showWhenSameSource: true
     }, {
       code: 'in_bandwidth_utilization',
-      calcType: 'avg'
+      calcType: 'avg',
+      showWhenSameSource: true
+    }, {
+      code: 'out_rate',
+      calcType: 'avg',
+      showWhenSameSource: true
+    }, {
+      code: 'in_rate',
+      calcType: 'avg',
+      showWhenSameSource: true
     }];
     var connectTypePrefixMap = {
       phy: 'physical_link.',
@@ -750,17 +755,44 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     };
     var calcFnMap = {
       sum: function sum(values) {
-        return values.reduce(function (val, total) {
-          return total + parseInt(val, 10);
+        return values.reduce(function (total, val) {
+          return total + parseInt(val || 0, 10);
         }, 0);
       },
       avg: function avg(values) {
-        return values.reduce(function (val, total) {
-          return total + parseFloat(val, 10);
+        return values.reduce(function (total, val) {
+          return total + parseFloat(val || 0, 10);
         }, 0) / values.length;
       }
+    };
+
+    var filterField = function filterField(item, linkChildren) {
+      var fieldConfig = metrics.find(function (m) {
+        return item.code.endsWith(m.code);
+      });
+
+      if (item.type !== 'metric' || !fieldConfig) {
+        return false;
+      } // 如果需要校验取值接口，如果取值接口为不同设备的接口，则不显示这四个指标
+
+
+      if (fieldConfig.showWhenSameSource) {
+        var sources = [];
+        linkChildren.forEach(function (link) {
+          if (sources.indexOf(link.source) !== -1) {
+            sources.push(link.source);
+          }
+        });
+
+        if (sources.length > 1) {
+          return false;
+        }
+      }
+
+      return true;
     }; // 计算标注和指标
 
+
     var edgeGroupsTagsTips = Object.keys(groupMap) // 过滤非连线组
     .filter(function (groupId) {
       var linkChildren = groupMap[groupId];
@@ -774,14 +806,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       });
       config = (0, _extends2["default"])({}, config, {
         tags: config.tags.filter(function (item) {
-          return item.type === 'metric' && !!metrics.find(function (m) {
-            return item.code.endsWith(m.code);
-          });
+          return filterField(item, linkChildren);
         }),
         tips: config.tips.filter(function (item) {
-          return item.type === 'metric' && !!metrics.find(function (m) {
-            return item.code.endsWith(m.code);
-          });
+          return filterField(item, linkChildren);
         })
       }); // 构造数据，计算指标值
 

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

package/lib/core/viewer/components/titlebar/widgets/AlarmListShowButton.js

@@ -58,6 +58,8 @@ function AlarmListShowButton(props) {
     })),
     cache: true,
     defaultVisible: true,
+    canCloseByOutSideClick: false,
+    canCloseByTrigger: false,
     visible: alarmPanelIsOpen,
     onVisibleChange: onVisibleChange,
     offset: [112, 5],

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/lib/topoCenter/models/LinkDynamicStyleExecutor.js

@@ -43,9 +43,11 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
     var _this = this;
 
     var topo = this.topo;
-    var _topo$store$getModelS = topo.store.getModelState('topoMod').data,
-        links = _topo$store$getModelS.links,
-        linkGroups = _topo$store$getModelS.linkGroups;
+
+    var _topo$dataModel$getDa = topo.dataModel.getData(),
+        links = _topo$dataModel$getDa.links,
+        linkGroups = _topo$dataModel$getDa.linkGroups;
+
     var dataModel = this.topo.getDataModel(); // 1、如果连线可见，设置线宽
 
     links.forEach(function (link) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.15.25",
+  "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.25/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.28/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }