@riil-frontend/component-topology 2.15.23 → 2.15.26

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;
     }
+
     .#{$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

@@ -24,7 +24,12 @@ function filterUnExistedFields(fields, ciTypeMeta) {
   return fields.filter(function (item) {
     return isFieldExisted(item, ciTypeMeta);
   });
-}
+} // 无权限不显示标注、悬浮框
+
+
+var filterByPermission = function filterByPermission(resource, items) {
+  return resource.operation ? items : [];
+};
 /**
  * 资源标注、悬浮框数据
  */
@@ -152,6 +157,31 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       tips: []
     };
   }
+  /**
+   * 查询需要查询数据的连线
+   * @param {*} data 
+   * @returns 
+   */
+  ;
+
+  _proto.getEdges = function getEdges(data) {
+    // 获得图上业务节点、业务连线
+    var _ref2 = data || this.topo.dataModel.getData(),
+        links = _ref2.links,
+        linkGroups = _ref2.linkGroups;
+
+    return [].concat(links.map(function (link) {
+      return _extends({}, link, {
+        type: 'edge'
+      });
+    }), linkGroups.map(function (link) {
+      return _extends({}, link, {
+        type: 'edgeGroup'
+      });
+    })).filter(function (link) {
+      return link.ciType === 'network_link';
+    });
+  }
   /**
    * 获取资源的标注、悬浮框配置，只包含属性和指标字段。无权限的资源无配置
    * 
@@ -165,15 +195,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _this = this;
 
     // 获得图上业务节点、业务连线
-    var _ref2 = data || this.topo.store.getModelState('topoMod').data,
-        nodes = _ref2.nodes,
-        links = _ref2.links,
-        linkGroups = _ref2.linkGroups; // 无权限不显示标注、悬浮框
-
-
-    var filterByPermission = function filterByPermission(resource, items) {
-      return resource.operation ? items : [];
-    };
+    var _ref3 = data || this.topo.dataModel.getData(),
+        nodes = _ref3.nodes;
 
     return [].concat(nodes.filter(function (node) {
       return !!node.ciType;
@@ -189,29 +212,13 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tags: filterByPermission(node, ciTypeConfig.tags),
         tips: filterByPermission(node, ciTypeConfig.tips)
       };
-    }), links.filter(function (link) {
-      return link.ciType === 'network_link';
-    }).map(function (link) {
-      var ciType = link.ciType;
-
-      var ciTypeConfig = _this.getNetworkLinkConfig(link, config);
-
-      return {
-        type: 'edge',
-        id: link.id,
-        ciType: ciType,
-        tags: filterByPermission(link, ciTypeConfig.tags),
-        tips: filterByPermission(link, ciTypeConfig.tips)
-      };
-    }), linkGroups.filter(function (link) {
-      return link.ciType === 'network_link';
-    }).map(function (link) {
+    }), this.getEdges().map(function (link) {
       var ciType = link.ciType;
 
       var ciTypeConfig = _this.getNetworkLinkConfig(link, config);
 
       return {
-        type: 'edgeGroup',
+        type: link.type,
         id: link.id,
         ciType: ciType,
         tags: filterByPermission(link, ciTypeConfig.tags),
@@ -226,6 +233,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
     return this.getResourceTagTipConfig().map(function (ciConfig) {
       var fields = {
+        ciType: ciConfig.ciType,
+        type: ciConfig.type,
         id: ciConfig.id,
         attributes: [],
         metrics: []
@@ -299,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,
@@ -314,9 +323,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
   _proto.updateNodesNameVisible = function updateNodesNameVisible() {
     var dm = this.topo.getDataModel();
-    this.getNodesNameVisible().forEach(function (_ref3) {
-      var id = _ref3.id,
-          visible = _ref3.visible;
+    this.getNodesNameVisible().forEach(function (_ref4) {
+      var id = _ref4.id,
+          visible = _ref4.visible;
       dm.getDataByTag(id).a('isShowName', visible);
     });
   }
@@ -333,14 +342,14 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _this4 = this;
 
-      var _this$topo$store$getS, resIdsList, nodeIdsList, linkIdsList, _this$topo$store$getM, links, linkGroups, codes, param, linkAdapter, result;
+      var topo, _topo$store$getState$, resIdsList, nodeIdsList, codes, param, linkAdapter, result;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               linkAdapter = function _linkAdapter(data) {
-                var link = findItem([].concat(links, linkGroups), 'id', data.id);
+                var link = topo.dataModel.getDataById(data.id);
 
                 if (!link) {
                   return data;
@@ -353,9 +362,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                 });
               };
 
-              _this$topo$store$getS = this.topo.store.getState().topoBizMod.resAndMetrics, resIdsList = _this$topo$store$getS.resIdsList, nodeIdsList = _this$topo$store$getS.nodeIdsList, linkIdsList = _this$topo$store$getS.linkIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
-
-              _this$topo$store$getM = this.topo.store.getModelState('topoMod').data, links = _this$topo$store$getM.links, linkGroups = _this$topo$store$getM.linkGroups; // 无资源，不查询
+              topo = this.topo;
+              _topo$store$getState$ = topo.store.getState().topoBizMod.resAndMetrics, resIdsList = _topo$store$getState$.resIdsList, nodeIdsList = _topo$store$getState$.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
+              // 无资源，不查询
 
               if (resIdsList.length) {
                 _context.next = 5;
@@ -370,14 +379,17 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
             case 7:
               // 需要查询的指标列表
-              codes = this.getResourceMetricCodes(); // if (!codes.length) {
-              //   return [];
-              // }
-
+              codes = this.getResourceMetricCodes();
               param = {
                 ciId: nodeIdsList,
                 codes: codes,
-                relationId: linkIdsList
+                // 过滤掉不需要查询的
+                relationId: this.getEdges().map(function (edge) {
+                  return {
+                    ciId: edge.id,
+                    operation: edge.operation
+                  };
+                })
               };
               /**
                * 链路属性适配
@@ -668,9 +680,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _this6 = this;
 
     // 查询没有关联链路的连线组及对应子链路列表
-    var _this$topo$store$getM2 = this.topo.store.getModelState('topoMod').data,
-        links = _this$topo$store$getM2.links,
-        linkGroups = _this$topo$store$getM2.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('-');
@@ -698,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.',
@@ -718,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];
@@ -742,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.23" === 'string' ? "2.15.23" : null;
+var version = typeof "2.15.26" === 'string' ? "2.15.26" : 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/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;
     }
+
     .#{$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 {