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

package/es/core/models/TopoApp.js

@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "8.0.8" === 'string' ? "8.0.8" : null;
+var version = typeof "9.0.0-a.1" === 'string' ? "9.0.0-a.1" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -29,7 +29,8 @@ import useCiAttrAndMetricData from "./useCiAttrAndMetricData";
 import Configurator from "./components/Configurator";
 import { formatMetric } from "../../../../../../models/attributeFormatter";
 import LinkTopoCard from "./components/LinkTopo/LinkTopoCard";
-import EventsCard from "./EventsCard"; // url 处理，UICBB 的地址需截取前缀
+import EventsCard from "./EventsCard";
+import { queryLastestValue } from "./components/LinkTopo/services"; // url 处理，UICBB 的地址需截取前缀
 
 function formatUrl(url) {
   var _window, _window$location;
@@ -133,7 +134,8 @@ export default function ResourceOverview(props) {
     isMonite: data.manageStatus !== 0,
     ciTypeMeta: ciTypeMeta,
     topo: topo,
-    resourceOverviewProps: resourceOverviewProps
+    resourceOverviewProps: resourceOverviewProps,
+    resourceData: data
   }),
       monitorMetricModels = _useMetricModels.metricModels;
 
@@ -487,39 +489,32 @@ export default function ResourceOverview(props) {
                     switch (_context5.prev = _context5.next) {
                       case 0:
                         _context5.t0 = item.dataIndex;
-                        _context5.next = _context5.t0 === 'display_name' ? 3 : _context5.t0 === 'ciName' ? 6 : _context5.t0 === 'res_address' ? 9 : _context5.t0 === 'imageName' ? 16 : 20;
+                        _context5.next = _context5.t0 === 'display_name' ? 3 : _context5.t0 === 'ciName' ? 7 : _context5.t0 === 'res_address' ? 10 : _context5.t0 === 'imageName' ? 17 : 21;
                         break;
 
                       case 3:
-                        // 无监控模板不能跳转详情。跳转前需判定资源实例数据属性中是否包含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.createElement("span", {
-                            onClick: onClose
-                          }, /*#__PURE__*/React.createElement(Link, {
-                            className: styles.link,
-                            disabled: true,
-                            title: attributeMap.display_name || '',
-                            to: formatUrl(link)
-                          }, attributeMap.display_name || '-'));
-                        } else {
-                          value = attributeMap.display_name || '-';
-                        }
-
+                        link = "/default/pagecenter/resDetail/view/" + id + "?resId=" + id + "&domainCode=" + ciTypeMeta.domain + "&title=" + attributeMap.display_name + "&ciCode=" + ciType; // 资源跳转链接
+
+                        value = /*#__PURE__*/React.createElement("span", {
+                          onClick: onClose
+                        }, /*#__PURE__*/React.createElement(Link, {
+                          className: styles.link,
+                          title: attributeMap.display_name || '',
+                          to: formatUrl(link)
+                        }, attributeMap.display_name || '-'));
                         contentTitle = attributeMap.display_name || '-';
-                        return _context5.abrupt("break", 21);
+                        return _context5.abrupt("break", 22);
 
-                      case 6:
+                      case 7:
                         value = ciTypeMeta.displayName;
                         contentTitle = value;
-                        return _context5.abrupt("break", 21);
+                        return _context5.abrupt("break", 22);
 
-                      case 9:
-                        _context5.next = 11;
+                      case 10:
+                        _context5.next = 12;
                         return getAddressFormat(attributeMap);
 
-                      case 11:
+                      case 12:
                         address = _context5.sent;
                         owned_computer_room = attributeMap.owned_computer_room, owned_cabinet = attributeMap.owned_cabinet; // 跳转3D机房定位设备
 
@@ -539,18 +534,18 @@ export default function ResourceOverview(props) {
                         }
 
                         contentTitle = address;
-                        return _context5.abrupt("break", 21);
+                        return _context5.abrupt("break", 22);
 
-                      case 16:
+                      case 17:
                         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", 21);
-
-                      case 20:
-                        return _context5.abrupt("break", 21);
+                        return _context5.abrupt("break", 22);
 
                       case 21:
+                        return _context5.abrupt("break", 22);
+
+                      case 22:
                       case "end":
                         return _context5.stop();
                     }
@@ -690,7 +685,7 @@ export default function ResourceOverview(props) {
     _metricColChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(col) {
       var _col2, _col3;
 
-      var codes, endTime, params, _ref5, times, metricList;
+      var codes, endTime, params, _ref5, times, metricList, newMetricList, metricLists;
 
       return _regeneratorRuntime.wrap(function _callee8$(_context8) {
         while (1) {
@@ -738,7 +733,15 @@ export default function ResourceOverview(props) {
 
             case 11:
               metricList = _context8.sent;
-              rlog.debug('metricColChange', metricList, monitorMetricModels);
+              _context8.next = 14;
+              return queryLastestValue({
+                'id': data.attributes.name
+              });
+
+            case 14:
+              newMetricList = _context8.sent;
+              metricLists = metricList.concat(getNewMetricList(newMetricList));
+              rlog.debug('metricColChange', metricLists, monitorMetricModels);
               setMetric(col.map(function (item, key) {
                 return {
                   code: item.dataIndex,
@@ -748,7 +751,7 @@ export default function ResourceOverview(props) {
                   metricItem: monitorMetricModels.find(function (m_item) {
                     return m_item.code === item.dataIndex;
                   }),
-                  list: metricList.filter(function (m_item) {
+                  list: metricLists.filter(function (m_item) {
                     return m_item.metricCode === item.dataIndex;
                   })
                 };
@@ -763,7 +766,7 @@ export default function ResourceOverview(props) {
                 }, 60000);
               }
 
-            case 16:
+            case 20:
             case "end":
               return _context8.stop();
           }
@@ -773,6 +776,42 @@ export default function ResourceOverview(props) {
     return _metricColChange.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,
+      subCiId: '',
+      subCiType: null,
+      mainCiType: null
+    }, {
+      errorMsg: null,
+      mainCiId: "upRetransRatio",
+      metricCode: "upRetransRatio",
+      metricValue: data.upRetransRatio,
+      subCiId: '',
+      subCiType: null,
+      mainCiType: null
+    }];
+  };
+
   var defaultCols = useMemo(function () {
     var baseInfo = [];
     var keyIndicators = [];

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

@@ -6,7 +6,8 @@ import useMetricPolling from "./hooks/useMetricPolling";
 import styles from "./LinkTopo.module.scss";
 export default function LinkTopo(props) {
   var data = props.data,
-      linkMetricCodes = props.linkMetricCodes;
+      linkMetricCodes = props.linkMetricCodes,
+      openFlow = props.openFlow;
   var metricData = useMetricPolling({
     linkCi: data,
     linkMetricCodes: linkMetricCodes
@@ -19,5 +20,7 @@ export default function LinkTopo(props) {
     ,
     isNarrow: true,
     jumpto: getHistory().push
-  }, metricData)));
+  }, metricData, {
+    openFlow: openFlow
+  })));
 }

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

@@ -1,7 +1,10 @@
-import React from 'react';
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import React, { useEffect, useState } from 'react';
 import BlockBox from "../../BlockBox";
 import Configurator from "../Configurator";
 import LinkTopo from "./LinkTopo";
+import { isOpenFlow, checkMenu } from "./services";
 export default function LinkTopoCard(props) {
   var _data$attributes;
 
@@ -15,6 +18,75 @@ export default 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 _useState = useState(-1),
+      openFlow = _useState[0],
+      setOpenFlow = _useState[1];
+
+  var analysisUrl = "../../default/trafficControl/linkConfigure?id=" + data.attributes.name + "&num=0";
+  var linkDetailsUrl = "/default/pagecenter/linkDetail/view/" + data.id + "?resId=" + data.id + "&domainCode=network&title=" + data.attributes.name + "&ciCode=network_link&tabByComType=uicbb-res-crucial-link-flow";
+
+  var isOpenFlows = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var checkMenus, isOpen;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return checkMenu();
+
+            case 2:
+              checkMenus = _context.sent;
+
+              if (!(checkMenus[0].passed == 'PASS')) {
+                _context.next = 10;
+                break;
+              }
+
+              _context.next = 6;
+              return isOpenFlow({
+                'name': data.attributes.display_name
+              });
+
+            case 6:
+              isOpen = _context.sent;
+
+              //判断是不是有流量分析
+              if (isOpen) {
+                setOpenFlow({
+                  name: '跳转关键链路详情',
+                  url: linkDetailsUrl
+                });
+              } else {
+                setOpenFlow({
+                  name: '跳转流量分析配置',
+                  url: analysisUrl
+                });
+              }
+
+              _context.next = 11;
+              break;
+
+            case 10:
+              setOpenFlow(null);
+
+            case 11:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function isOpenFlows() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  useEffect(function () {
+    isOpenFlows();
+  }, [data]);
   return /*#__PURE__*/React.createElement(BlockBox, {
     headerTitle: "\u8FD0\u884C\u60C5\u51B5",
     headerExtra: /*#__PURE__*/React.createElement(Configurator, {
@@ -29,6 +101,7 @@ export default function LinkTopoCard(props) {
     })
   }, /*#__PURE__*/React.createElement(LinkTopo, {
     data: data,
-    linkMetricCodes: metricCodes
+    linkMetricCodes: metricCodes,
+    openFlow: openFlow
   }));
 }

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

@@ -1,24 +1,80 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useState } from 'react';
 import { useRequest } from 'ahooks';
-import { queryLinkInterfacesLatestMetrics, queryLinkLatestMetrics } from "../services";
+import { queryLinkInterfacesLatestMetrics, queryLinkLatestMetrics, queryLastestValue } from "../services";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog'; // 资源节点上方色块展示资源的发送速率发送带宽利用率、接收速率发送接收利用率、总错包数
 
 export default function useMetricPolling(_ref) {
   var linkCi = _ref.linkCi,
       linkMetricCodes = _ref.linkMetricCodes;
   var linkId = linkCi.id;
+  var arr = ['downNetDelayRatio', 'downRetansRatio', 'upNetDelayRatio', 'upRetransRatio'];
+  var oldCodes = [];
+  var newCodes = [];
+  linkMetricCodes.map(function (item) {
+    arr.indexOf(item) > -1 ? newCodes.push(item) : oldCodes.push(item);
+  });
 
   var _useState = useState({
     sourceMetrics: null,
     destinationMetrics: null,
     // 链路指标列表
     linkMetrics: [],
-    linkMetricsTs: null
+    linkMetricsTs: null,
+    linkOther: []
   }),
       data = _useState[0],
-      setData = _useState[1]; // 轮询hooks
+      setData = _useState[1];
+
+  var queryLastestValues = useRequest(queryLastestValue, {
+    pollingInterval: 1000 * 15,
+    pollingWhenHidden: false,
+    debounceInterval: 200,
+    manual: true,
+    onSuccess: function onSuccess(result) {
+      var datas = {
+        linkOther: []
+      };
 
+      if (newCodes.includes('downNetDelayRatio')) {
+        datas.linkOther.push({
+          'code': 'downNetDelayRatio',
+          'name': '下行RTT时延',
+          'ts': result.time,
+          'value': result.downNetDelayRatio + ' ms'
+        });
+      }
+
+      if (newCodes.includes('downRetansRatio')) {
+        datas.linkOther.push({
+          'code': 'downRetansRatio',
+          '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 + ' %'
+        });
+      }
+
+      setData(_extends({}, data, datas));
+    }
+  }); // 轮询hooks
 
   var queryLinkMetricsRequest = useRequest(queryLinkLatestMetrics, {
     pollingInterval: 60 * 1000,
@@ -40,16 +96,22 @@ export default function useMetricPolling(_ref) {
       rlog.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 结果', result);
     }
   });
-  var linkMetricCodesStr = linkMetricCodes.map(function (item) {
+  var linkMetricCodesStr = oldCodes.map(function (item) {
     return item;
   }).sort().join(',');
   useEffect(function () {
     if (linkId) {
       rlog.info('链路拓扑指标轮询 切换', {
         linkCi: linkCi,
-        linkMetricCodes: linkMetricCodes
+        oldCodes: oldCodes
       });
-      queryLinkMetricsRequest.run(linkCi, linkMetricCodes);
+      queryLinkMetricsRequest.run(linkCi, oldCodes);
+
+      if (newCodes.length > 0) {
+        queryLastestValues.run({
+          'id': linkCi.attributes.name
+        });
+      }
     }
 
     return function () {};

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

@@ -132,6 +132,10 @@ function _queryLinkLatestMetrics() {
 export function queryLinkInterfacesLatestMetrics(_x5) {
   return _queryLinkInterfacesLatestMetrics.apply(this, arguments);
 }
+/**
+ * @name  checkMenu 判断当前流量监控权限
+ * @returns  
+ */
 
 function _queryLinkInterfacesLatestMetrics() {
   _queryLinkInterfacesLatestMetrics = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(linkCi) {
@@ -207,4 +211,80 @@ function _queryLinkInterfacesLatestMetrics() {
     }, _callee4);
   }));
   return _queryLinkInterfacesLatestMetrics.apply(this, arguments);
+}
+
+export function checkMenu() {
+  return _checkMenu.apply(this, arguments);
+}
+/**
+ * @name  isOpenFlow 是否配置流量分析
+ * @returns  
+ */
+
+function _checkMenu() {
+  _checkMenu = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            return _context5.abrupt("return", request.post('/authorization/v1/api/authority/check/checkMenuAuthentication', [{
+              "url": "/default/trafficControl"
+            }]));
+
+          case 1:
+          case "end":
+            return _context5.stop();
+        }
+      }
+    }, _callee5);
+  }));
+  return _checkMenu.apply(this, arguments);
+}
+
+export function isOpenFlow(_x6) {
+  return _isOpenFlow.apply(this, arguments);
+}
+/**
+ * @name  isOpenFlow 查指标值
+ * @returns  
+ */
+
+function _isOpenFlow() {
+  _isOpenFlow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(params) {
+    return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+      while (1) {
+        switch (_context6.prev = _context6.next) {
+          case 0:
+            return _context6.abrupt("return", request.post('/flow/v1/api/link/isOpenFlowMonitorByName', params));
+
+          case 1:
+          case "end":
+            return _context6.stop();
+        }
+      }
+    }, _callee6);
+  }));
+  return _isOpenFlow.apply(this, arguments);
+}
+
+export function queryLastestValue(_x7) {
+  return _queryLastestValue.apply(this, arguments);
+}
+
+function _queryLastestValue() {
+  _queryLastestValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(params) {
+    return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+      while (1) {
+        switch (_context7.prev = _context7.next) {
+          case 0:
+            return _context7.abrupt("return", request.post('/flow/v1/api/LinkAnalyse/queryLastestValue', params));
+
+          case 1:
+          case "end":
+            return _context7.stop();
+        }
+      }
+    }, _callee7);
+  }));
+  return _queryLastestValue.apply(this, arguments);
 }

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

@@ -3,6 +3,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useRequest } from 'ahooks';
 import { useEffect, useState } from 'react';
 import { queryCiMonitorMetricCodes } from "../../../getCiDisplayMetricModels";
+import { checkMenu, isOpenFlow } from "../components/LinkTopo/services";
 /**
  * 概览指标定义
  * @param {*} props
@@ -15,6 +16,7 @@ var useMetricModels = function useMetricModels(props) {
       ciType = _props$data.ciType,
       isMonite = props.isMonite,
       ciTypeMeta = props.ciTypeMeta,
+      resourceData = props.resourceData,
       topo = props.topo,
       resourceOverviewProps = props.resourceOverviewProps;
 
@@ -33,7 +35,7 @@ var useMetricModels = function useMetricModels(props) {
 
   function _fetchData() {
     _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var monitorMetrics, ciMonitorMetricModels, displayMetricModels, _metricCodes;
+      var monitorMetrics, ciMonitorMetricModels, checkMenus, isOpen, displayMetricModels, _metricCodes;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -48,8 +50,68 @@ var useMetricModels = function useMetricModels(props) {
                 return !!monitorMetrics.find(function (item) {
                   return item === m.code;
                 });
-              }); // 未监控不显示指标，临时在这里处理
+              });
+              _context.next = 6;
+              return 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 isOpenFlow({
+                'name': resourceData.attributes.display_name
+              });
+
+            case 10:
+              isOpen = _context.sent;
+
+              //
+              if (isOpen) {
+                ciMonitorMetricModels.push({
+                  changeValue: null,
+                  code: "downNetDelayRatio",
+                  id: "downNetDelayRatio",
+                  isGoldMetric: true,
+                  key: null,
+                  name: "下行RTT时延",
+                  unit: "ms"
+                });
+                ciMonitorMetricModels.push({
+                  changeValue: null,
+                  code: "downRetansRatio",
+                  id: "downRetansRatio",
+                  isGoldMetric: true,
+                  key: null,
+                  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 = [];
               }
@@ -81,7 +143,7 @@ var useMetricModels = function useMetricModels(props) {
 
               return _context.abrupt("return", displayMetricModels);
 
-            case 9:
+            case 17:
             case "end":
               return _context.stop();
           }

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "8.0.8" === 'string' ? "8.0.8" : null;
+var version = typeof "9.0.0-a.1" === 'string' ? "9.0.0-a.1" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑