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

package/lib/core/models/cache/CiCache.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Ci缓存
+ */
+declare class CiCache {
+    /**
+     * @param {object<string, object>}
+     */
+    ciMap: {};
+    /**
+     *
+     * @param ids {string[]}
+     * @returns {Promise<Object>}
+     */
+    load(ids: string[]): Promise<Object>;
+    getCi(id: string): Object;
+}
+declare const _default: CiCache;
+export default _default;

package/lib/core/models/cache/CiCache.js

@@ -0,0 +1,89 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _services = require("../../services");
+
+/**
+ * Ci缓存
+ */
+var CiCache = /*#__PURE__*/function () {
+  function CiCache() {
+    this.ciMap = {};
+  }
+
+  var _proto = CiCache.prototype;
+
+  /**
+   * 
+   * @param ids {string[]}
+   * @returns {Promise<Object>}
+   */
+  _proto.load =
+  /*#__PURE__*/
+  function () {
+    var _load = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids) {
+      var _this = this;
+
+      var unloadCiIds, cis, map;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              unloadCiIds = ids.filter(function (id) {
+                return !_this.ciMap[id];
+              });
+
+              if (!unloadCiIds.length) {
+                _context.next = 6;
+                break;
+              }
+
+              _context.next = 4;
+              return (0, _services.queryCisByIds)(unloadCiIds);
+
+            case 4:
+              cis = _context.sent;
+              cis.forEach(function (ci) {
+                _this.ciMap[ci.id] = ci;
+              });
+
+            case 6:
+              map = {};
+              ids.forEach(function (id) {
+                map[id] = _this.ciMap[id];
+              });
+              return _context.abrupt("return", this.ciMap);
+
+            case 9:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, this);
+    }));
+
+    function load(_x) {
+      return _load.apply(this, arguments);
+    }
+
+    return load;
+  }();
+
+  _proto.getCi = function getCi(id) {
+    return this.ciMap[id];
+  };
+
+  return CiCache;
+}();
+
+var _default = new CiCache();
+
+exports["default"] = _default;

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

@@ -27,6 +27,8 @@ var _htElementUtils = require("../../../utils/htElementUtils");
 
 var _CiTypeCache = _interopRequireDefault(require("../cache/CiTypeCache"));
 
+var _CiCache = _interopRequireDefault(require("../cache/CiCache"));
+
 // 查询所有连线
 // const interfaceTypeMap = {
 //   "network.interface": {
@@ -56,10 +58,10 @@ function isExitLink(link) {
   return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
 
-function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc) {
+function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc) {
   var linkCiMap = (0, _keyBy["default"])(links, 'id');
   return links.map(function (link) {
-    var _interfaceCis$find, _interfaceCis$find2;
+    var _interfaceCiMap$attri, _interfaceCiMap$attri2;
 
     var linkCi = linkCiMap[link.id];
     var attributes = (0, _extends2["default"])({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes);
@@ -84,14 +86,10 @@ function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc) {
         destination_type_object: interfaceDoc[attributes.destination_type],
         // 源/目的接口
         source_id_object: {
-          displayName: (_interfaceCis$find = interfaceCis.find(function (node) {
-            return node.id === attributes.source_id;
-          })) === null || _interfaceCis$find === void 0 ? void 0 : _interfaceCis$find.attributes['display_name']
+          displayName: (_interfaceCiMap$attri = interfaceCiMap[attributes.source_id]) === null || _interfaceCiMap$attri === void 0 ? void 0 : _interfaceCiMap$attri.attributes['display_name']
         },
         destination_id_object: {
-          displayName: (_interfaceCis$find2 = interfaceCis.find(function (node) {
-            return node.id === attributes.destination_id;
-          })) === null || _interfaceCis$find2 === void 0 ? void 0 : _interfaceCis$find2.attributes['display_name']
+          displayName: (_interfaceCiMap$attri2 = interfaceCiMap[attributes.destination_id]) === null || _interfaceCiMap$attri2 === void 0 ? void 0 : _interfaceCiMap$attri2.attributes['display_name']
         }
       })
     });
@@ -104,7 +102,7 @@ function getLinksDetail(_x, _x2) {
 
 function _getLinksDetail() {
   _getLinksDetail = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(links, nodes) {
-    var linkCis, interfaceIds, interfaceTypes, interfaceCis, interfaceDoc;
+    var linkCis, interfaceIds, interfaceTypes, interfaceCiMap, interfaceDoc;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -134,16 +132,16 @@ function _getLinksDetail() {
               return item !== 'ip';
             });
             _context.next = 7;
-            return (0, _services.queryCisByIds)(interfaceIds);
+            return _CiCache["default"].load(interfaceIds);
 
           case 7:
-            interfaceCis = _context.sent;
+            interfaceCiMap = _context.sent;
             _context.next = 10;
             return _CiTypeCache["default"].getCiTypeMap(interfaceTypes);
 
           case 10:
             interfaceDoc = _context.sent;
-            return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc));
+            return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc));
 
           case 12:
           case "end":

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

@@ -18,6 +18,10 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 function _default(engine) {
   return {
     state: {
+      /**
+       * 格式：{id1: {attributes: {}}}
+       */
+      ciMap: {},
       // 指标默认设置
       resAndMetrics: {},
       metricDoc: {},

package/lib/core/store/models/viewer/resourceDetail.js

@@ -29,6 +29,13 @@ var _default = {
         visible: false,
         id: null // 资源id
 
+      };
+    },
+    close: function close() {
+      return {
+        visible: false,
+        id: null // 资源id
+
       };
     }
   },

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

@@ -98,9 +98,7 @@ function ResourceDetailDrawer(props) {
   }, []); // 解决切换拓扑图隐藏概览
 
   (0, _react.useEffect)(function () {
-    resourceDetailDispatchers.update({
-      visible: false
-    }); // TODO 其他数据重置
+    close(); // TODO 其他数据重置
   }, [topoId]);
 
   function getUser() {
@@ -176,6 +174,12 @@ function ResourceDetailDrawer(props) {
     }
   }
 
+  function close() {
+    resourceDetailDispatchers.update({
+      visible: false
+    });
+  }
+
   function init(data, targetType) {
     // console.log('初始化基本信息', data, targetType);
     var id = data.id,
@@ -236,7 +240,8 @@ function ResourceDetailDrawer(props) {
       topo: topo,
       userId: userId,
       activeData: activeData,
-      resourceData: resourceData
+      resourceData: resourceData,
+      onClose: close
     }));
   };
 
@@ -250,11 +255,7 @@ function ResourceDetailDrawer(props) {
     })),
     width: 580,
     hasMask: false,
-    onClose: function onClose() {
-      return resourceDetailDispatchers.update({
-        visible: false
-      });
-    }
+    onClose: close
   }, visible && resourceData && renderContent()));
 }
 

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

@@ -523,32 +523,39 @@ function ResourceOverview(props) {
                     switch (_context5.prev = _context5.next) {
                       case 0:
                         _context5.t0 = item.dataIndex;
-                        _context5.next = _context5.t0 === 'display_name' ? 3 : _context5.t0 === 'ciName' ? 7 : _context5.t0 === 'res_address' ? 10 : _context5.t0 === 'imageName' ? 17 : 21;
+                        _context5.next = _context5.t0 === 'display_name' ? 3 : _context5.t0 === 'ciName' ? 6 : _context5.t0 === 'res_address' ? 9 : _context5.t0 === 'imageName' ? 16 : 20;
                         break;
 
                       case 3:
-                        link = "/default/pagecenter/resDetail/view/" + id + "?resId=" + id + "&domainCode=" + ciTypeMeta.domain + "&title=" + attributeMap.display_name + "&ciCode=" + ciType; // 资源跳转链接
-
-                        value = /*#__PURE__*/_react["default"].createElement("span", {
-                          onClick: onClose
-                        }, /*#__PURE__*/_react["default"].createElement(_Link["default"], {
-                          className: _indexModule["default"].link,
-                          title: attributeMap.display_name || '',
-                          to: formatUrl(link)
-                        }, attributeMap.display_name || '-'));
+                        // 无监控模板不能跳转详情。跳转前需判定资源实例数据属性中是否包含support_templates属性。若不包含，则不能跳转
+                        if (attributeMap.support_templates) {
+                          link = "/default/pagecenter/resDetail/view/" + id + "?resId=" + id + "&domainCode=" + ciTypeMeta.domain + "&title=" + attributeMap.display_name + "&ciCode=" + ciType; // 资源跳转链接
+
+                          value = /*#__PURE__*/_react["default"].createElement("span", {
+                            onClick: onClose
+                          }, /*#__PURE__*/_react["default"].createElement(_Link["default"], {
+                            className: _indexModule["default"].link,
+                            disabled: true,
+                            title: attributeMap.display_name || '',
+                            to: formatUrl(link)
+                          }, attributeMap.display_name || '-'));
+                        } else {
+                          value = attributeMap.display_name || '-';
+                        }
+
                         contentTitle = attributeMap.display_name || '-';
-                        return _context5.abrupt("break", 22);
+                        return _context5.abrupt("break", 21);
 
-                      case 7:
+                      case 6:
                         value = ciTypeMeta.displayName;
                         contentTitle = value;
-                        return _context5.abrupt("break", 22);
+                        return _context5.abrupt("break", 21);
 
-                      case 10:
-                        _context5.next = 12;
+                      case 9:
+                        _context5.next = 11;
                         return getAddressFormat(attributeMap);
 
-                      case 12:
+                      case 11:
                         address = _context5.sent;
                         owned_computer_room = attributeMap.owned_computer_room, owned_cabinet = attributeMap.owned_cabinet; // 跳转3D机房定位设备
 
@@ -568,18 +575,18 @@ function ResourceOverview(props) {
                         }
 
                         contentTitle = address;
-                        return _context5.abrupt("break", 22);
+                        return _context5.abrupt("break", 21);
 
-                      case 17:
+                      case 16:
                         node = topo.getDataModel().getDataByTag(id);
                         value = (node === null || node === void 0 ? void 0 : node.a('customName')) || (node === null || node === void 0 ? void 0 : node.a('name')) || '-';
                         contentTitle = value;
-                        return _context5.abrupt("break", 22);
+                        return _context5.abrupt("break", 21);
 
-                      case 21:
-                        return _context5.abrupt("break", 22);
+                      case 20:
+                        return _context5.abrupt("break", 21);
 
-                      case 22:
+                      case 21:
                       case "end":
                         return _context5.stop();
                     }
@@ -768,7 +775,9 @@ function ResourceOverview(props) {
             case 11:
               metricList = _context8.sent;
               _context8.next = 14;
-              return (0, _services2.queryLastestValue)({
+              return queryMetricList({
+                'name': data.attributes.display_name
+              }, {
                 'id': data.attributes.name
               });
 
@@ -812,36 +821,81 @@ 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) {
     return [{
       errorMsg: null,
-      mainCiId: "downNetDelayRatio",
-      metricCode: "downNetDelayRatio",
-      metricValue: data.downNetDelayRatio,
-      subCiId: '',
-      subCiType: null,
-      mainCiType: null
-    }, {
-      errorMsg: null,
-      mainCiId: "downRetansRatio",
-      metricCode: "downRetansRatio",
-      metricValue: data.downRetansRatio,
-      subCiId: '',
-      subCiType: null,
-      mainCiType: null
-    }, {
-      errorMsg: null,
-      mainCiId: "upNetDelayRatio",
-      metricCode: "upNetDelayRatio",
-      metricValue: data.upNetDelayRatio,
+      mainCiId: "netDelayRatio",
+      metricCode: "netDelayRatio",
+      metricValue: data.upNetDelayRatio + ' ms' + '|' + data.downNetDelayRatio + ' ms',
       subCiId: '',
       subCiType: null,
       mainCiType: null
     }, {
       errorMsg: null,
-      mainCiId: "upRetransRatio",
-      metricCode: "upRetransRatio",
-      metricValue: data.upRetransRatio,
+      mainCiId: "retansRatio",
+      metricCode: "retansRatio",
+      metricValue: data.upRetransRatio + ' %' + '|' + data.downRetansRatio + ' %',
       subCiId: '',
       subCiType: null,
       mainCiType: null

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

@@ -35,9 +35,9 @@ function LinkTopoCard(props) {
 
   var supportTemplates = (data === null || data === void 0 ? void 0 : (_data$attributes = data.attributes) === null || _data$attributes === void 0 ? void 0 : _data$attributes.support_templates) || ''; // 该资源监控模板
 
-  var isCrucial = data === null || data === void 0 ? void 0 : data.attributes['network_link.is_crucial'];
+  var isCrucial = data === null || data === void 0 ? void 0 : data.attributes['network_link.is_crucial']; //是不是关键链路
 
-  var _useState = (0, _react.useState)(-1),
+  var _useState = (0, _react.useState)(null),
       openFlow = _useState[0],
       setOpenFlow = _useState[1];
 
@@ -57,7 +57,7 @@ function LinkTopoCard(props) {
             case 2:
               checkMenus = _context.sent;
 
-              if (!(checkMenus[0].passed == 'PASS')) {
+              if (!(checkMenus[0].passed == 'PASS' && isCrucial)) {
                 _context.next = 10;
                 break;
               }
@@ -73,12 +73,12 @@ function LinkTopoCard(props) {
               //判断是不是有流量分析
               if (isOpen) {
                 setOpenFlow({
-                  name: '跳转关键链路详情',
+                  name: '查看流量构成',
                   url: linkDetailsUrl
                 });
               } else {
                 setOpenFlow({
-                  name: '跳转流量分析配置',
+                  name: '配置流量分析',
                   url: analysisUrl
                 });
               }
@@ -119,7 +119,9 @@ function LinkTopoCard(props) {
     })
   }, /*#__PURE__*/_react["default"].createElement(_LinkTopo["default"], {
     data: data,
-    linkMetricCodes: metricCodes,
+    linkMetricCodes: openFlow && openFlow.name == '查看流量构成' ? metricCodes : metricCodes.filter(function (i) {
+      return i != 'netDelayRatio' && i != 'retansRatio';
+    }),
     openFlow: openFlow
   }));
 }

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

@@ -24,7 +24,7 @@ function useMetricPolling(_ref) {
   var linkCi = _ref.linkCi,
       linkMetricCodes = _ref.linkMetricCodes;
   var linkId = linkCi.id;
-  var arr = ['downNetDelayRatio', 'downRetansRatio', 'upNetDelayRatio', 'upRetransRatio'];
+  var arr = ['netDelayRatio', 'retansRatio'];
   var oldCodes = [];
   var newCodes = [];
   linkMetricCodes.map(function (item) {
@@ -52,39 +52,21 @@ function useMetricPolling(_ref) {
         linkOther: []
       };
 
-      if (newCodes.includes('downNetDelayRatio')) {
+      if (newCodes.includes('netDelayRatio')) {
         datas.linkOther.push({
-          'code': 'downNetDelayRatio',
+          'code': 'netDelayRatio',
           'name': '下行RTT时延',
           'ts': result.time,
-          'value': result.downNetDelayRatio + ' ms'
+          'value': result.upNetDelayRatio + ' ms' + '|' + result.downNetDelayRatio + ' ms'
         });
       }
 
-      if (newCodes.includes('downRetansRatio')) {
+      if (newCodes.includes('retansRatio')) {
         datas.linkOther.push({
-          'code': 'downRetansRatio',
-          'name': '下行重传率',
+          'code': 'retansRatio',
+          'name': '重传率',
           'ts': result.time,
-          'value': result.downRetansRatio + ' %'
-        });
-      }
-
-      if (newCodes.includes('upNetDelayRatio')) {
-        datas.linkOther.push({
-          'code': 'upNetDelayRatio',
-          'name': '上行RTT时延',
-          'ts': result.time,
-          'value': result.upNetDelayRatio + ' ms'
-        });
-      }
-
-      if (newCodes.includes('upRetransRatio')) {
-        datas.linkOther.push({
-          'code': 'upRetransRatio',
-          'name': '上行重传率',
-          'ts': result.time,
-          'value': result.upRetransRatio + ' %'
+          'value': result.upRetransRatio + ' %' + '|' + result.downRetansRatio + ' %'
         });
       }
 

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

@@ -15,8 +15,6 @@ var _react = require("react");
 
 var _getCiDisplayMetricModels = require("../../../getCiDisplayMetricModels");
 
-var _services = require("../components/LinkTopo/services");
-
 /**
  * 概览指标定义
  * @param {*} props
@@ -47,7 +45,7 @@ var useMetricModels = function useMetricModels(props) {
 
   function _fetchData() {
     _fetchData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var monitorMetrics, ciMonitorMetricModels, checkMenus, isOpen, displayMetricModels, _metricCodes;
+      var monitorMetrics, ciMonitorMetricModels, displayMetricModels, _metricCodes;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
@@ -63,67 +61,29 @@ var useMetricModels = function useMetricModels(props) {
                   return item === m.code;
                 });
               });
-              _context.next = 6;
-              return (0, _services.checkMenu)();
-
-            case 6:
-              checkMenus = _context.sent;
-
-              if (!(checkMenus[0].passed == 'PASS' && resourceData.attributes.display_name && resourceData.attributes['network_link.is_crucial'])) {
-                _context.next = 12;
-                break;
-              }
-
-              _context.next = 10;
-              return (0, _services.isOpenFlow)({
-                'name': resourceData.attributes.display_name
-              });
 
-            case 10:
-              isOpen = _context.sent;
-
-              //
-              if (isOpen) {
-                ciMonitorMetricModels.push({
+              if (resourceData.attributes['network_link.is_crucial']) {
+                ciMonitorMetricModels.unshift({
                   changeValue: null,
-                  code: "downNetDelayRatio",
-                  id: "downNetDelayRatio",
+                  code: "netDelayRatio",
+                  id: "netDelayRatio",
                   isGoldMetric: true,
                   key: null,
-                  name: "下行RTT时延",
+                  name: "RTT时延",
                   unit: "ms"
                 });
-                ciMonitorMetricModels.push({
+                ciMonitorMetricModels.unshift({
                   changeValue: null,
-                  code: "downRetansRatio",
-                  id: "downRetansRatio",
+                  code: "retansRatio",
+                  id: "retansRatio",
                   isGoldMetric: true,
                   key: null,
-                  name: "下行重传率",
+                  name: "重传率",
                   unit: "%"
                 });
-                ciMonitorMetricModels.push({
-                  changeValue: null,
-                  code: "upNetDelayRatio",
-                  id: "upNetDelayRatio",
-                  isGoldMetric: true,
-                  key: null,
-                  name: "上行RTT时延",
-                  unit: "ms"
-                });
-                ciMonitorMetricModels.push({
-                  changeValue: null,
-                  code: "upRetransRatio",
-                  id: "upRetransRatio",
-                  isGoldMetric: true,
-                  key: null,
-                  name: "上行重传率",
-                  unit: "%"
-                });
-              }
+              } // 未监控不显示指标，临时在这里处理
+
 
-            case 12:
-              // 未监控不显示指标，临时在这里处理
               if (!isMonite) {
                 ciMonitorMetricModels = [];
               }
@@ -155,7 +115,7 @@ var useMetricModels = function useMetricModels(props) {
 
               return _context.abrupt("return", displayMetricModels);
 
-            case 17:
+            case 10:
             case "end":
               return _context.stop();
           }

package/lib/style.js

@@ -3,10 +3,10 @@ require('@alifd/next/lib/box/style');
 require('@alifd/next/lib/message/style');
 require('@riil-frontend/component-topology-utils/lib/style');
 require('@riil-frontend/component-riil-event-emitter/lib/style');
+require('@riil-frontend/utils/lib/style');
 require('@alifd/next/lib/drawer/style');
 require('@alifd/next/lib/menu-button/style');
 require('@alifd/next/lib/search/style');
-require('@riil-frontend/utils/lib/style');
 require('@alifd/next/lib/tab/style');
 require('@alifd/next/lib/table/style');
 require('@riil-frontend/component-table-layout/lib/style');