@riil-frontend/component-topology 9.0.0-a.10 → 9.0.0-a.12

package/lib/core/hooks/useTopoEdit.js

@@ -37,6 +37,8 @@ var _htElementDataUtil = require("../../utils/htElementDataUtil");
 
 var _clusterUtil = require("../../utils/clusterUtil");
 
+var _linkUtils = require("../models/utils/linkUtils");
+
 var useTopoEdit = function useTopoEdit(params) {
   var topo = params.topo,
       topoId = params.topoId,
@@ -342,7 +344,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
               edges.map(function (edge) {
                 if (edge.a("dtype") === "link" && exportLinkIdList.indexOf(edge.getTag()) >= 0) {
-                  // exLink.push(edge);      
+                  // exLink.push(edge);
                   topo.getGraphView().dm().remove(edge);
                   exportLinkIdList.splice(config.exportLinkIdList.indexOf(edge.getTag()), 1);
                 }
@@ -406,8 +408,8 @@ var useTopoEdit = function useTopoEdit(params) {
   };
   /**
    * 获得未存在的连线元素
-   * @param {*} elements 
-   * @returns 
+   * @param {*} elements
+   * @returns
    */
 
 
@@ -420,8 +422,8 @@ var useTopoEdit = function useTopoEdit(params) {
   }
   /**
    * 获得未存在的元素
-   * @param {Array} elements 
-   * @returns 
+   * @param {Array} elements
+   * @returns
    */
 
 
@@ -600,7 +602,7 @@ var useTopoEdit = function useTopoEdit(params) {
               // 2022-11-10 修复 添加资源后分层重新布局问题，仅布局新增资源。替换api topo.updateElements(data)
               newElements = findUNExistedElements(elements);
 
-              _rlog["default"].debug('添加分层资源', {
+              _rlog["default"].debug("添加分层资源", {
                 layer: group,
                 newElements: newElements
               });
@@ -674,8 +676,8 @@ var useTopoEdit = function useTopoEdit(params) {
   }
   /**
    * 未选中元素添加资源
-   * 
-   * @param {*} data 
+   *
+   * @param {*} data
    */
 
 
@@ -835,7 +837,7 @@ var useTopoEdit = function useTopoEdit(params) {
                           newLinkElements = findUNExistedLinkElements(elements);
                           createElementsData = null;
 
-                          if (newData.type === 'group') {
+                          if (newData.type === "group") {
                             groupChildren = (0, _topoData.findGroupChildren)(elements, newData);
                             newGroupChildren = [];
                             existedGroupChildren = [];
@@ -852,10 +854,10 @@ var useTopoEdit = function useTopoEdit(params) {
                               groups: [newData],
                               nodes: newGroupChildren,
                               links: newLinkElements.filter(function (item) {
-                                return item.type === 'link';
+                                return item.type === "link";
                               }),
                               linkGroups: newLinkElements.filter(function (item) {
-                                return item.type === 'linkGroup';
+                                return item.type === "linkGroup";
                               })
                             };
                             htTopo.createElements(createElementsData); // 切换前图上如果存在集群内的节点，切换节点为集群后，移到集群内
@@ -870,16 +872,16 @@ var useTopoEdit = function useTopoEdit(params) {
                               groups: [],
                               nodes: [newData],
                               links: newLinkElements.filter(function (item) {
-                                return item.type === 'link';
+                                return item.type === "link";
                               }),
                               linkGroups: newLinkElements.filter(function (item) {
-                                return item.type === 'linkGroup';
+                                return item.type === "linkGroup";
                               })
                             };
                             htTopo.createElements(createElementsData);
                           }
 
-                          _rlog["default"].debug('批量创建元素', createElementsData); // 恢复图标、大小、位置
+                          _rlog["default"].debug("批量创建元素", createElementsData); // 恢复图标、大小、位置
 
 
                           newElement = dm.getDataByTag(newData.id);
@@ -999,6 +1001,117 @@ var useTopoEdit = function useTopoEdit(params) {
       return _ref8.apply(this, arguments);
     };
   }();
+  /**
+   * 关联IP的图片节点
+   */
+
+
+  function relateNodeIp(_x15, _x16) {
+    return _relateNodeIp.apply(this, arguments);
+  }
+
+  function _relateNodeIp() {
+    _relateNodeIp = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee16(txtValue, nodeElement) {
+      var dm, htTopo, elements, _yield$editDispatcher5, elementDatas, isUnique, ipTxt, ids, ip, re, config, linksData, createElementsData;
+
+      return _regenerator["default"].wrap(function _callee16$(_context16) {
+        while (1) {
+          switch (_context16.prev = _context16.next) {
+            case 0:
+              // console.log("bindIPtoNode", data);
+              // 根据配置查询拓扑数据
+              dm = topo.getDataModel();
+              htTopo = topo.getHtTopo();
+              elements = (0, _htElementUtils.getNodes)(dm);
+              _context16.next = 5;
+              return editDispatchers.fetchDataByConfig();
+
+            case 5:
+              _yield$editDispatcher5 = _context16.sent;
+              elementDatas = _yield$editDispatcher5.elementDatas;
+              console.log("bindIPtoNode", txtValue, nodeElement, elements);
+              console.log("elementDatas", elementDatas);
+              isUnique = true;
+              ipTxt = txtValue;
+              ids = []; // 执行唯一性验证
+
+              elements.map(function (element) {
+                // if (node.getId() !== element.getId()) {
+                // }
+                if (element.getTag()) {
+                  ids.push(element.getTag());
+                }
+              });
+              ip = {
+                id: "ip_1.1.1.1",
+                name: "1.1.1.1",
+                customName: null,
+                // 'groupId': null,
+                // 'groupTag': null,
+                ipAddress: "1.1.1.1",
+                // 'attributes': [],
+                // 'metrics': [],
+                type: "node" // 'dtype': 'device'
+
+              }; // 获取关联链路
+
+              if (!isUnique) {
+                _context16.next = 27;
+                break;
+              }
+
+              nodeElement.a(ip);
+              nodeElement.setName(txtValue);
+              nodeElement.a("name", txtValue);
+              nodeElement.a("customName", null);
+              nodeElement.setTag("ip_" + txtValue);
+              _context16.next = 22;
+              return editDispatchers.queryAllLinkByIp({
+                ids: ids,
+                ip: txtValue
+              });
+
+            case 22:
+              re = _context16.sent;
+              console.log("queryAllLinkByIp", re);
+              config = resourceConfig.getConfig();
+              console.log("resourceConfig.getConfig", config);
+
+              if (re && re.length > 0) {
+                linksData = [];
+                re.map(function (link) {
+                  var sourceId = link.attributes["network_link.source_device_id"];
+                  var source = dm.getDataByTag(sourceId);
+                  var target = nodeElement; // console.log("source, nodeElement, link", source, target, link);
+
+                  if (source && target) {
+                    var linkData = (0, _linkUtils.mergeExportLinkData)({
+                      source: source,
+                      target: target,
+                      link: link
+                    });
+                    console.log("linkData", linkData);
+                    linksData.push(linkData); // htTopo.createEdge(source, target, link);
+                  }
+                });
+                createElementsData = {
+                  groups: [],
+                  nodes: [],
+                  links: [].concat(linksData),
+                  linkGroups: []
+                };
+                htTopo.createElements(createElementsData); // htTopo.addElements({ lines: [...re] });
+              }
+
+            case 27:
+            case "end":
+              return _context16.stop();
+          }
+        }
+      }, _callee16);
+    }));
+    return _relateNodeIp.apply(this, arguments);
+  }
 
   var onEvent = function onEvent(e) {
     var map = {};
@@ -1016,7 +1129,7 @@ var useTopoEdit = function useTopoEdit(params) {
    */
 
   var setViewMouseMode = function setViewMouseMode(mode) {
-    _rlog["default"].debug('设置视图鼠标模式', mode);
+    _rlog["default"].debug("设置视图鼠标模式", mode);
 
     topo.getHtTopo().setViewMouseMode(mode);
     topoEditDispatchers.update({
@@ -1095,6 +1208,11 @@ var useTopoEdit = function useTopoEdit(params) {
      */
     onDeleteElement: onDeleteElement,
 
+    /**
+     * 绑定图片ip
+     */
+    relateNodeIp: relateNodeIp,
+
     /**
      * 拓扑图保存回调
      */

package/lib/core/models/TopoApp.js

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

package/lib/core/models/utils/linkUtils.js

@@ -8,6 +8,7 @@ exports.compatibleWith = void 0;
 exports.getLinksDetail = getLinksDetail;
 exports.isCrucialLink = isCrucialLink;
 exports.isExitLink = isExitLink;
+exports.mergeExportLinkData = void 0;
 exports.mergeLinksData = mergeLinksData;
 exports.showLinkByConfig = exports.plurals = void 0;
 
@@ -218,4 +219,23 @@ var showLinkByConfig = function showLinkByConfig(props) {
   }
 };
 
-exports.showLinkByConfig = showLinkByConfig;
+exports.showLinkByConfig = showLinkByConfig;
+
+var mergeExportLinkData = function mergeExportLinkData(props) {
+  var source = props.source,
+      target = props.target,
+      link = props.link;
+  var attrObj = link.attributes;
+  var linkData = (0, _extends2["default"])({}, link, {
+    name: attrObj.name,
+    source: attrObj["network_link.source_device_id"],
+    target: attrObj.destination_type === 'ip' ? target.getTag() : attrObj["network_link.destination_device_id"],
+    operation: attrObj.operation,
+    interfaceSource: attrObj["source_id"],
+    interfaceTarget: attrObj["destination_id"],
+    ciType: link.typeCode
+  });
+  return linkData;
+};
+
+exports.mergeExportLinkData = mergeExportLinkData;

package/lib/core/store/models/topoConfig.js

@@ -27,6 +27,8 @@ var _topoData = require("../../../utils/topoData");
 
 var _topoData2 = require("../../../core/models/topoData");
 
+var _networkLink = _interopRequireDefault(require("../../../networkTopo/services/topo/networkLink"));
+
 var _getTopoData = require("../../../networkTopo/getTopoData");
 
 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); }
@@ -264,19 +266,20 @@ function _default(topoApp) {
           var _this2 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-            var editState, resources, _editState$groups, groups, _editState$exportLink, exportLinkIdList, query, data;
+            var editState, resources, _editState$groups, groups, _editState$exportLink, exportLinkIdList, _editState$ipNodes, ipNodes, query, data;
 
             return _regenerator["default"].wrap(function _callee2$(_context2) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
                     editState = rootState.topoConfig;
-                    resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink;
+                    resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes;
                     query = {
                       id: rootState.topoMod.topoId,
                       resources: resources,
                       groups: groups,
-                      exportLinkIdList: exportLinkIdList
+                      exportLinkIdList: exportLinkIdList,
+                      ipNodes: ipNodes
                     };
                     _context2.next = 5;
                     return _this2.getTopoByConditions(query);
@@ -330,14 +333,14 @@ function _default(topoApp) {
           var _this4 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-            var topoId, resources, groups, exportLinkIdList, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
+            var topoId, resources, groups, exportLinkIdList, ipNodes, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
 
             return _regenerator["default"].wrap(function _callee4$(_context4) {
               while (1) {
                 switch (_context4.prev = _context4.next) {
                   case 0:
                     // rlog.debug("getTopoByConditions--------", params);
-                    topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList;
+                    topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList, ipNodes = params.ipNodes;
                     viewConditions = (0, _topoData2.resToConditions)(resources);
                     groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
                       return (0, _extends2["default"])({}, group, {
@@ -347,7 +350,7 @@ function _default(topoApp) {
                     }); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
 
                     _context4.next = 5;
-                    return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
+                    return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList, ipNodes);
 
                   case 5:
                     data = _context4.sent;
@@ -416,7 +419,7 @@ function _default(topoApp) {
                       }))
                     };
 
-                    _rlog["default"].debug('saveGlobalConfig', config);
+                    _rlog["default"].debug("saveGlobalConfig", config);
 
                     _context5.next = 5;
                     return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
@@ -485,6 +488,33 @@ function _default(topoApp) {
         switchToViewMode: function switchToViewMode() {
           this.reset();
           dispatch.topoMod.switchToViewMode();
+        },
+        queryAllLinkByIp: function queryAllLinkByIp(data) {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
+            var _result$data;
+
+            var ids, ip, result;
+            return _regenerator["default"].wrap(function _callee8$(_context8) {
+              while (1) {
+                switch (_context8.prev = _context8.next) {
+                  case 0:
+                    ids = data.ids, ip = data.ip;
+                    console.log("queryAllLinkByIp", ids, ip);
+                    _context8.next = 4;
+                    return _networkLink["default"].queryLinksByIp(ids, ip);
+
+                  case 4:
+                    result = _context8.sent;
+                    console.log("queryAllLinkByIp-result", result);
+                    return _context8.abrupt("return", (_result$data = result === null || result === void 0 ? void 0 : result.data) !== null && _result$data !== void 0 ? _result$data : []);
+
+                  case 7:
+                  case "end":
+                    return _context8.stop();
+                }
+              }
+            }, _callee8);
+          }))();
         }
       };
     }

package/lib/core/test/Test.js

@@ -27,6 +27,58 @@ var Test = /*#__PURE__*/function () {
   _proto.onReady = function onReady() {// TODO 待移除测试代码
     // this.iconManage.openUpload()
     // this.topo.store.getModelDispatchers('linkDynamicStyleConfig').open({type: 'networkLink'});
+  }
+  /**
+   * 关联IP示例代码
+   */
+  ;
+
+  _proto.createExportLink = function createExportLink() {
+    var htTopo = this.topo.getHtTopo();
+    var dm = htTopo.getGraphView().dm(); // 设置节点关联IP
+
+    var nodeElement = htTopo.getGraphView().sm().fd();
+    var ip = {
+      'id': 'ip_1.1.1.1',
+      'name': '1.1.1.1',
+      customName: null,
+      // 'groupId': null,
+      // 'groupTag': null,
+      'ipAddress': '1.1.1.1',
+      // 'attributes': [],
+      // 'metrics': [],
+      'type': 'node' // 'dtype': 'device'
+
+    };
+    nodeElement.a(ip);
+    nodeElement.setTag('ip_1.1.1.1');
+    var link = {
+      'id': '0000000019b462d1',
+      'name': '172.17.160.116(Gi2/2/0/1) - 172.27.130.13(Gi 0/9)',
+      'source': '00000000029f9411',
+      'target': 'ip_1.1.1.1',
+      'operation': 'delete',
+      'interfaceSource': '0000000018080aee',
+      'interfaceTarget': '000000000341b015',
+      'ciType': 'network_link',
+      'attributes': [],
+      'manageStatus': 0,
+      'permission': {
+        'readable': true,
+        'writeable': true,
+        'deleteable': true
+      },
+      'metrics': [],
+      'type': 'link',
+      'dtype': 'link'
+    };
+    var createElementsData = {
+      groups: [],
+      nodes: [],
+      links: [link],
+      linkGroups: []
+    };
+    htTopo.createElements(createElementsData);
   };
 
   return Test;

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -53,8 +53,6 @@ var _LinkTopoCard = _interopRequireDefault(require("./components/LinkTopo/LinkTo
 
 var _EventsCard = _interopRequireDefault(require("./EventsCard"));
 
-var _services2 = require("./components/LinkTopo/services");
-
 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; }
@@ -726,7 +724,7 @@ function ResourceOverview(props) {
     _metricColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(col) {
       var _col2, _col3;
 
-      var codes, endTime, params, _ref5, times, metricList, newMetricList, metricLists;
+      var codes, endTime, params, _ref5, times, metricList, metricLists;
 
       return _regenerator["default"].wrap(function _callee8$(_context8) {
         while (1) {
@@ -774,16 +772,7 @@ function ResourceOverview(props) {
 
             case 11:
               metricList = _context8.sent;
-              _context8.next = 14;
-              return queryMetricList({
-                'name': data.attributes.display_name
-              }, {
-                'id': data.attributes.name
-              });
-
-            case 14:
-              newMetricList = _context8.sent;
-              metricLists = metricList.concat(getNewMetricList(newMetricList));
+              metricLists = metricList.concat(getNewMetricList());
 
               _rlog.rlog.debug('metricColChange', metricLists, monitorMetricModels);
 
@@ -811,7 +800,7 @@ function ResourceOverview(props) {
                 }, 60000);
               }
 
-            case 20:
+            case 17:
             case "end":
               return _context8.stop();
           }
@@ -821,73 +810,12 @@ function ResourceOverview(props) {
     return _metricColChange.apply(this, arguments);
   }
 
-  function queryMetricList(_x9, _x10) {
-    return _queryMetricList.apply(this, arguments);
-  }
-
-  function _queryMetricList() {
-    _queryMetricList = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(data, param) {
-      var checkMenus, isOpen, list;
-      return _regenerator["default"].wrap(function _callee9$(_context9) {
-        while (1) {
-          switch (_context9.prev = _context9.next) {
-            case 0:
-              if (!(ciType !== 'network_link')) {
-                _context9.next = 2;
-                break;
-              }
-
-              return _context9.abrupt("return", []);
-
-            case 2:
-              _context9.next = 4;
-              return (0, _services2.checkMenu)();
-
-            case 4:
-              checkMenus = _context9.sent;
-
-              if (!(checkMenus[0].passed == 'PASS')) {
-                _context9.next = 14;
-                break;
-              }
-
-              _context9.next = 8;
-              return (0, _services2.isOpenFlow)(data);
-
-            case 8:
-              isOpen = _context9.sent;
-
-              if (!isOpen) {
-                _context9.next = 14;
-                break;
-              }
-
-              _context9.next = 12;
-              return (0, _services2.queryLastestValue)(param);
-
-            case 12:
-              list = _context9.sent;
-              return _context9.abrupt("return", list);
-
-            case 14:
-              return _context9.abrupt("return", []);
-
-            case 15:
-            case "end":
-              return _context9.stop();
-          }
-        }
-      }, _callee9);
-    }));
-    return _queryMetricList.apply(this, arguments);
-  }
-
-  var getNewMetricList = function getNewMetricList(data) {
+  var getNewMetricList = function getNewMetricList() {
     return [{
       errorMsg: null,
       mainCiId: "netDelayRatio",
       metricCode: "netDelayRatio",
-      metricValue: data.upNetDelayRatio + ' ms' + '|' + data.downNetDelayRatio + ' ms',
+      metricValue: '0',
       subCiId: '',
       subCiType: null,
       mainCiType: null
@@ -895,7 +823,7 @@ function ResourceOverview(props) {
       errorMsg: null,
       mainCiId: "retansRatio",
       metricCode: "retansRatio",
-      metricValue: data.upRetransRatio + ' %' + '|' + data.downRetansRatio + ' %',
+      metricValue: '0',
       subCiId: '',
       subCiType: null,
       mainCiType: null

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

@@ -25,10 +25,10 @@ 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 = (0, _react.useState)({
@@ -42,35 +42,15 @@ function useMetricPolling(_ref) {
       data = _useState[0],
       setData = _useState[1];
 
-  var queryLastestValues = (0, _ahooks.useRequest)(_services.queryLastestValue, {
+  var queryLastestValues = (0, _ahooks.useRequest)(_services.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((0, _extends2["default"])({}, data, datas));
+      setData((0, _extends2["default"])({}, data, {
+        linkOther: result
+      }));
     }
   }); // 轮询hooks
 
@@ -96,27 +76,38 @@ function useMetricPolling(_ref) {
       _rlog["default"].info('链路拓扑指标轮询 queryInterfaceMetricsRequest 结果', result);
     }
   });
-  var linkMetricCodesStr = oldCodes.map(function (item) {
+  var linkMetricCodesStr = codes.map(function (item) {
     return item;
   }).sort().join(',');
   (0, _react.useEffect)(function () {
     if (linkId) {
       _rlog["default"].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(',');
+  (0, _react.useEffect)(function () {
+    if (linkId) {
+      _rlog["default"].info('链路拓扑指标勾选rtt|重传率 轮询', {
+        linkCi: linkCi,
+        retansRatioNetDelayRatioCodes: retansRatioNetDelayRatioCodes
+      });
+
+      queryLastestValues.run({
+        'id': linkCi.attributes.name
+      }, retansRatioNetDelayRatioCodes);
+    }
+
+    return function () {};
+  }, [linkId, retansRatioNetDelayRatioCodesStr]);
   (0, _react.useEffect)(function () {
     if (linkId) {
       _rlog["default"].info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {