@riil-frontend/component-topology 9.0.0-a.8 → 9.0.1

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useState } from 'react';
 import { useRequest } from 'ahooks';
-import { queryLinkInterfacesLatestMetrics, queryLinkLatestMetrics, queryLastestValue } from "../services";
+import { queryLinkInterfacesLatestMetrics, queryLinkLatestMetrics, queryRetansRatioNetDelayRatio } from "../services";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog'; // 资源节点上方色块展示资源的发送速率发送带宽利用率、接收速率发送接收利用率、总错包数
 
 export default function useMetricPolling(_ref) {
@@ -9,10 +9,10 @@ export default function useMetricPolling(_ref) {
       linkMetricCodes = _ref.linkMetricCodes;
   var linkId = linkCi.id;
   var arr = ['netDelayRatio', 'retansRatio'];
-  var oldCodes = [];
-  var newCodes = [];
+  var codes = [];
+  var retansRatioNetDelayRatioCodes = [];
   linkMetricCodes.map(function (item) {
-    arr.indexOf(item) > -1 ? newCodes.push(item) : oldCodes.push(item);
+    arr.indexOf(item) > -1 ? retansRatioNetDelayRatioCodes.push(item) : codes.push(item);
   });
 
   var _useState = useState({
@@ -26,35 +26,15 @@ export default function useMetricPolling(_ref) {
       data = _useState[0],
       setData = _useState[1];
 
-  var queryLastestValues = useRequest(queryLastestValue, {
+  var queryLastestValues = useRequest(queryRetansRatioNetDelayRatio, {
     pollingInterval: 1000 * 15,
     pollingWhenHidden: false,
     debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(result) {
-      var datas = {
-        linkOther: []
-      };
-
-      if (newCodes.includes('netDelayRatio')) {
-        datas.linkOther.push({
-          'code': 'netDelayRatio',
-          'name': '下行RTT时延',
-          'ts': result.time,
-          'value': result.upNetDelayRatio + ' ms' + '|' + result.downNetDelayRatio + ' ms'
-        });
-      }
-
-      if (newCodes.includes('retansRatio')) {
-        datas.linkOther.push({
-          'code': 'retansRatio',
-          'name': '重传率',
-          'ts': result.time,
-          'value': result.upRetransRatio + ' %' + '|' + result.downRetansRatio + ' %'
-        });
-      }
-
-      setData(_extends({}, data, datas));
+      setData(_extends({}, data, {
+        linkOther: result
+      }));
     }
   }); // 轮询hooks
 
@@ -78,26 +58,36 @@ export default function useMetricPolling(_ref) {
       rlog.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 结果', result);
     }
   });
-  var linkMetricCodesStr = oldCodes.map(function (item) {
+  var linkMetricCodesStr = codes.map(function (item) {
     return item;
   }).sort().join(',');
   useEffect(function () {
     if (linkId) {
       rlog.info('链路拓扑指标轮询 切换', {
         linkCi: linkCi,
-        oldCodes: oldCodes
+        codes: codes
       });
-      queryLinkMetricsRequest.run(linkCi, oldCodes);
-
-      if (newCodes.length > 0) {
-        queryLastestValues.run({
-          'id': linkCi.attributes.name
-        });
-      }
+      queryLinkMetricsRequest.run(linkCi, codes);
     }
 
     return function () {};
   }, [linkId, linkMetricCodesStr]);
+  var retansRatioNetDelayRatioCodesStr = retansRatioNetDelayRatioCodes.map(function (item) {
+    return item;
+  }).sort().join(',');
+  useEffect(function () {
+    if (linkId) {
+      rlog.info('链路拓扑指标勾选rtt|重传率 轮询', {
+        linkCi: linkCi,
+        retansRatioNetDelayRatioCodes: retansRatioNetDelayRatioCodes
+      });
+      queryLastestValues.run({
+        'id': linkCi.attributes.name
+      }, retansRatioNetDelayRatioCodes);
+    }
+
+    return function () {};
+  }, [linkId, retansRatioNetDelayRatioCodesStr]);
   useEffect(function () {
     if (linkId) {
       rlog.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js

@@ -245,7 +245,7 @@ export function isOpenFlow(_x6) {
   return _isOpenFlow.apply(this, arguments);
 }
 /**
- * @name  isOpenFlow 查指标值
+ * @name  queryLastestValue 查指标值
  * @returns  
  */
 
@@ -287,4 +287,60 @@ function _queryLastestValue() {
     }, _callee7);
   }));
   return _queryLastestValue.apply(this, arguments);
+}
+
+export function queryRetansRatioNetDelayRatio(_x8, _x9) {
+  return _queryRetansRatioNetDelayRatio.apply(this, arguments);
+}
+
+function _queryRetansRatioNetDelayRatio() {
+  _queryRetansRatioNetDelayRatio = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(params, retansRatioNetDelayRatioCodes) {
+    var result, linkOther;
+    return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+      while (1) {
+        switch (_context8.prev = _context8.next) {
+          case 0:
+            if (retansRatioNetDelayRatioCodes.length) {
+              _context8.next = 2;
+              break;
+            }
+
+            return _context8.abrupt("return", []);
+
+          case 2:
+            _context8.next = 4;
+            return queryLastestValue(params);
+
+          case 4:
+            result = _context8.sent;
+            linkOther = [];
+
+            if (retansRatioNetDelayRatioCodes.includes('netDelayRatio')) {
+              linkOther.push({
+                'code': 'netDelayRatio',
+                'name': 'RTT时延',
+                'ts': result.time,
+                'value': (result.upNetDelayRatio * 1).toFixed(2) + ' ms' + '|' + (result.downNetDelayRatio * 1).toFixed(2) + ' ms'
+              });
+            }
+
+            if (retansRatioNetDelayRatioCodes.includes('retansRatio')) {
+              linkOther.push({
+                'code': 'retansRatio',
+                'name': '重传率',
+                'ts': result.time,
+                'value': result.upRetransRatio + ' %' + '|' + result.downRetansRatio + ' %'
+              });
+            }
+
+            return _context8.abrupt("return", linkOther);
+
+          case 9:
+          case "end":
+            return _context8.stop();
+        }
+      }
+    }, _callee8);
+  }));
+  return _queryRetansRatioNetDelayRatio.apply(this, arguments);
 }

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss

@@ -8,6 +8,12 @@
   margin-top: 16px;
   margin-right: -25px;
   overflow: hidden;
+  .isCrucialLink{
+    line-height: 24px;
+    
+    display: flex;
+    float: left;
+  }
   .item {
     width: 220px;
     max-width: 100%;

package/es/networkTopo/getTopoData.js

@@ -77,6 +77,7 @@ function _addLinkData() {
 
           case 4:
             networkLinks = _context.sent;
+            console.log("如果是网络链路，补充详情信息", networkLinks);
             otherLinks = links.filter(function (link) {
               return link.ciType !== 'network_link';
             });
@@ -85,7 +86,7 @@ function _addLinkData() {
               linkGroups: []
             }));
 
-          case 7:
+          case 8:
           case "end":
             return _context.stop();
         }

package/es/networkTopo/models/IpNodeTagsTipsBuilder.js

@@ -0,0 +1,113 @@
+/**
+ * 连线组标注、悬浮框数据构建
+ */
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import { getEdgeGroups } from "../../utils/htElementUtils";
+import AttributeFormatter from "../../core/models/attributeFormatter"; // 参与计算的链路指标
+
+var metrics = [// 总流速
+{
+  code: "interface_totalbps",
+  calcType: "sum"
+}, // 带宽利用率
+{
+  code: "bandwidth_utilization",
+  calcType: "avg"
+}, // 发送带宽利用率
+{
+  code: "out_bandwidth_utilization",
+  calcType: "avg",
+  showWhenSameSource: true
+}, // 接收带宽利用率
+{
+  code: "in_bandwidth_utilization",
+  calcType: "avg",
+  showWhenSameSource: true
+}, {
+  code: "out_rate",
+  calcType: "sum",
+  showWhenSameSource: true
+}, {
+  code: "in_rate",
+  calcType: "sum",
+  showWhenSameSource: true
+}];
+var calcFnMap = {
+  sum: function sum(values) {
+    return values.reduce(function (total, val) {
+      return total + parseInt(val || 0, 10);
+    }, 0);
+  },
+  avg: function avg(values) {
+    return values.reduce(function (total, val) {
+      return total + parseFloat(val || 0, 10);
+    }, 0) / values.length;
+  }
+};
+
+var IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
+  function IpNodeTagsTipsBuilder(amDisplay) {
+    this.amDisplay = void 0;
+    this.topo = void 0;
+    this.amDisplay = amDisplay;
+    this.topo = amDisplay.topo;
+  }
+
+  var _proto = IpNodeTagsTipsBuilder.prototype;
+
+  _proto.getExtElementTagsAndTips = function getExtElementTagsAndTips() {
+    return this.getIpNodeTagsAndTips();
+  };
+
+  _proto.getIpNodeTagsAndTips = function getIpNodeTagsAndTips() {
+    // const ciConfigs = this.amDisplay.getResourceTagTipConfig();
+    var tts = [];
+    var data = this.amDisplay.getData();
+    var ipNodes = data.filter(function (item) {
+      return item.bindType === "ip";
+    });
+    var topo = this.topo;
+    var dm = this.topo.getDataModel();
+    var config = topo.attributeMetricDisplay.getConfig();
+    console.log("getIpNodeTagsAndTips", config, ipNodes);
+
+    if (config.nodeTag && !config.nodeTag.isCustom) {
+      var tagDatas = config.nodeTag.data;
+      var hasIpv4 = tagDatas.filter(function (item) {
+        return item.code === "ipv4_address";
+      }).length > 0;
+      ipNodes.map(function (node) {
+        if (hasIpv4) {
+          tts.push({
+            type: node,
+            id: node.id,
+            tags: [{
+              type: "attribute",
+              code: "ipv4_address",
+              // 属性code
+              name: "IPv4地址",
+              // 属性名称
+              value: node.bindIp,
+              // 属性值
+              originValue: node.bindIp
+            }],
+            tips: []
+          });
+        } else {
+          tts.push({
+            type: node,
+            id: node.id,
+            tags: [],
+            tips: []
+          });
+        }
+      });
+    }
+
+    return tts;
+  };
+
+  return IpNodeTagsTipsBuilder;
+}();
+
+export { IpNodeTagsTipsBuilder as default };

package/es/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -5,15 +5,15 @@ import { getLinksBetweenNodes } from "../utils/linkUtil"; // network_link.actual
 
 function calcEdgeWidth(actualBandwidth) {
   if (!actualBandwidth) {
-    return 2;
+    return 3;
   } else if (actualBandwidth <= 100) {
-    return 2;
-  } else if (actualBandwidth <= 1000) {
     return 3;
-  } else if (actualBandwidth <= 10000) {
+  } else if (actualBandwidth <= 1000) {
     return 4;
-  } else if (actualBandwidth > 10000) {
+  } else if (actualBandwidth <= 10000) {
     return 5;
+  } else if (actualBandwidth > 10000) {
+    return 6;
   }
 }
 
@@ -169,11 +169,11 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
     var autoChangeEdgeWidth = displayConfig.autoChangeEdgeWidth !== false;
 
     if (!autoChangeEdgeWidth) {
-      return 2;
+      return 3;
     }
 
     if (!links.length) {
-      return 2;
+      return 3;
     }
 
     var total = 0;
@@ -192,7 +192,7 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
     var autoChangeEdgeWidth = displayConfig.autoChangeEdgeWidth !== false;
 
     if (!autoChangeEdgeWidth) {
-      return 2;
+      return 3;
     }
 
     return this.calcEdgeWidth(link.attributes['network_link.actual_bandwidth']);

package/es/networkTopo/models/TopoCenter.js

@@ -8,7 +8,8 @@ import TopoApp from "../../core/models/TopoApp";
 import createMenuCommands from "../../contextmenu/createMenuCommands";
 import getTopoData from "../getTopoData";
 import customStoreModels from "../store";
-import { DEFAULT_LINK_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay"; // import LinkTagsTipsBuilder from './LinkTagsTipsBuilder';
+import { DEFAULT_LINK_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay";
+import IpNodeTagsTipsBuilder from "./IpNodeTagsTipsBuilder";
 
 var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   _inheritsLoose(TopoCenter, _TopoApp);
@@ -28,8 +29,8 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
         },
         getDefaultLinkTipConfig: function getDefaultLinkTipConfig() {
           return DEFAULT_TIP_COMMON_CONFIG;
-        } // ExtElementTagTipBuilder: LinkTagsTipsBuilder,
-
+        },
+        ExtElementTagTipBuilder: IpNodeTagsTipsBuilder
       }
     })) || this;
     _this.resourceConfig = null;

package/es/networkTopo/services/link.js

@@ -1,6 +1,6 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { request } from '@riil-frontend/component-topology-utils';
+import { request } from "@riil-frontend/component-topology-utils";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 export default {
   /**

package/es/networkTopo/services/topo/basic.js

@@ -1,7 +1,7 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["groups", "resources"];
+var _excluded = ["groups", "resources", "exportLinkIdList"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } from '@riil-frontend/component-topology-utils';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
@@ -9,6 +9,7 @@ import blackList from "./blacklist";
 import { TOPO_API_ROOT } from "./constants";
 import { commonQuery } from "../cmdb";
 import { getBatchCi as _getBatchCi, getBatchCiMetric as _getBatchCiMetric } from "../model";
+import { processByConditionResult, processExitLink } from "../../utils/exitLinkUtil";
 var API_ROOT = TOPO_API_ROOT;
 /**
  * 拓扑图（看做一个容器）的“父容器”ID
@@ -53,10 +54,16 @@ function prepareResourceParams(conditions, query) {
     dynamicCondition.sort = query.sortBy + " " + query.sortOrder;
   }
 
-  var fixedConditionIdList = staticRes || undefined;
   return {
     dynamicCondition: dynamicCondition,
-    fixedConditionIdList: fixedConditionIdList
+    fixedConditionIdList: (staticRes || []).filter(function (ciId) {
+      return !ciId.startsWith('ip:');
+    }),
+    linkIps: (staticRes || []).filter(function (ciId) {
+      return ciId.startsWith('ip:');
+    }).map(function (ciId) {
+      return ciId.replace('ip:', '');
+    })
   };
 }
 
@@ -401,38 +408,33 @@ export default _extends({
   */
   getTopoData: function getTopoData(id) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
-      var _result$links, result;
+      var _result$nodes, _result$links;
 
+      var result;
       return _regeneratorRuntime.wrap(function _callee12$(_context12) {
         while (1) {
           switch (_context12.prev = _context12.next) {
             case 0:
-              _context12.prev = 0;
-              _context12.next = 3;
+              _context12.next = 2;
               return request.get(API_ROOT + "/structure/both/" + id);
 
-            case 3:
+            case 2:
               result = _context12.sent;
-              return _context12.abrupt("return", _extends({}, result, {
+              return _context12.abrupt("return", processExitLink(_extends({}, result, {
+                nodes: (_result$nodes = result.nodes) !== null && _result$nodes !== void 0 ? _result$nodes : [],
                 links: ((_result$links = result.links) !== null && _result$links !== void 0 ? _result$links : []).map(function (item) {
                   return _extends({}, item, {
                     ciType: 'network_link'
                   });
                 })
-              }));
+              })));
 
-            case 7:
-              _context12.prev = 7;
-              _context12.t0 = _context12["catch"](0);
-              rlog.debug('getTopoData-error', _context12.t0);
-              return _context12.abrupt("return", null);
-
-            case 11:
+            case 4:
             case "end":
               return _context12.stop();
           }
         }
-      }, _callee12, null, [[0, 7]]);
+      }, _callee12);
     }))();
   },
 
@@ -443,9 +445,9 @@ export default _extends({
   * @param {Array} groups
   * @returns
   */
-  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList) {
+  getTopoDataByResource: function getTopoDataByResource(id, resources, groups) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
-      var _result$links2;
+      var _result$nodes2, _result$links2;
 
       var data, obj, result;
       return _regeneratorRuntime.wrap(function _callee13$(_context13) {
@@ -464,19 +466,18 @@ export default _extends({
 
               obj = prepareGroupParams(data);
               _context13.next = 5;
-              return request.post(API_ROOT + "/structure/byCondition/" + id, _extends({}, obj, {
-                exportLinkIdList: exportLinkIdList
-              }));
+              return request.post(API_ROOT + "/structure/byCondition/" + id, _extends({}, obj));
 
             case 5:
               result = _context13.sent;
-              return _context13.abrupt("return", _extends({}, result, {
+              return _context13.abrupt("return", processByConditionResult(_extends({}, result, {
+                nodes: (_result$nodes2 = result.nodes) !== null && _result$nodes2 !== void 0 ? _result$nodes2 : [],
                 links: ((_result$links2 = result.links) !== null && _result$links2 !== void 0 ? _result$links2 : []).map(function (item) {
                   return _extends({}, item, {
                     ciType: 'network_link'
                   });
                 })
-              }));
+              }), obj.groups));
 
             case 7:
             case "end":
@@ -496,12 +497,12 @@ export default _extends({
   */
   bindResourceToTopo: function bindResourceToTopo(id, config) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
-      var groups, resources, otherConfig, newGroups, obj;
+      var groups, resources, exportLinkIdList, otherConfig, newGroups, obj;
       return _regeneratorRuntime.wrap(function _callee14$(_context14) {
         while (1) {
           switch (_context14.prev = _context14.next) {
             case 0:
-              groups = config.groups, resources = config.resources, otherConfig = _objectWithoutPropertiesLoose(config, _excluded);
+              groups = config.groups, resources = config.resources, exportLinkIdList = config.exportLinkIdList, otherConfig = _objectWithoutPropertiesLoose(config, _excluded);
               newGroups = isAvailableArray(groups) ? groups : [];
 
               if (resources) {

package/es/networkTopo/services/topo/networkLink.js

@@ -6,9 +6,9 @@ var API_ROOT = TOPO_API_ROOT;
 export default {
   /**
    * 批量查询ci类型是否可创建链路
-   * 
-   * @param {*} typeCodes 
-   * @returns 
+   *
+   * @param {*} typeCodes
+   * @returns
    */
   getCiTypesConnectable: function getCiTypesConnectable(typeCodes) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
@@ -29,5 +29,47 @@ export default {
         }
       }, _callee);
     }))();
+  },
+
+  /**
+   * 通过ip查询关联链路
+   *
+   * @param {array} ciIds
+   */
+  queryLinksByIp: function queryLinksByIp(ids, ip) {
+    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      var stag, condition, parm, result;
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              stag = "'" + ids.join("','") + "'";
+              condition = "type('network_link') && network_link.destination_ipv4 = '" + ip + "' && network_link.source_device_id in [" + stag + "]";
+              parm = {
+                condition: condition,
+                sort: "name asc",
+                currentPage: 1,
+                pageSize: 999
+              };
+              _context2.prev = 3;
+              _context2.next = 6;
+              return request.post("/mdc/v1/api/cmdb/commonQueryCiData", parm);
+
+            case 6:
+              result = _context2.sent;
+              return _context2.abrupt("return", result);
+
+            case 10:
+              _context2.prev = 10;
+              _context2.t0 = _context2["catch"](3);
+              rlog.error("通过ip查询关联链路", _context2.t0);
+
+            case 13:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2, null, [[3, 10]]);
+    }))();
   }
 };