@riil-frontend/component-topology 5.0.0-alpha.21 → 5.0.0-alpha.23

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

@@ -570,7 +570,7 @@ function ResourceOverview(props) {
     _baseInfoColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(col) {
       var _col;
 
-      var infoData, attributeMap, _iterator, _step, item, value, contentTitle, link, node, _data, _ref2, _ref2$, _item, _attributeMap, object, _object, displayName, attr;
+      var infoData, attributeMap, _iterator, _step, item, value, contentTitle, link, address, owned_computer_room, owned_cabinet, roomLink, node, _data, _ref2, _ref2$, _item, _attributeMap, object, _object, displayName, attr;
 
       return _regenerator["default"].wrap(function _callee5$(_context5) {
         while (1) {
@@ -600,7 +600,7 @@ function ResourceOverview(props) {
 
             case 11:
               if ((_step = _iterator()).done) {
-                _context5.next = 46;
+                _context5.next = 48;
                 break;
               }
 
@@ -608,7 +608,7 @@ function ResourceOverview(props) {
               value = (0, _attributeFormatter.formatMetric)(attributeMap[item.dataIndex], ciTypeMeta.attributeMap[item.dataIndex]);
               contentTitle = value;
               _context5.t0 = item.dataIndex;
-              _context5.next = _context5.t0 === 'display_name' ? 18 : _context5.t0 === 'ciName' ? 22 : _context5.t0 === 'res_address' ? 25 : _context5.t0 === 'imageName' ? 30 : 34;
+              _context5.next = _context5.t0 === 'display_name' ? 18 : _context5.t0 === 'ciName' ? 22 : _context5.t0 === 'res_address' ? 25 : _context5.t0 === 'imageName' ? 32 : 36;
               break;
 
             case 18:
@@ -618,36 +618,53 @@ function ResourceOverview(props) {
                 onClick: onClose
               }, /*#__PURE__*/_react["default"].createElement(_Link["default"], {
                 className: _indexModule["default"].link,
-                title: attributeMap.display_name || "",
+                title: attributeMap.display_name || '',
                 to: formatUrl(link)
-              }, attributeMap.display_name || "-"));
-              contentTitle = attributeMap.display_name || "-";
-              return _context5.abrupt("break", 35);
+              }, attributeMap.display_name || '-'));
+              contentTitle = attributeMap.display_name || '-';
+              return _context5.abrupt("break", 37);
 
             case 22:
               value = ciTypeMeta.displayName;
               contentTitle = value;
-              return _context5.abrupt("break", 35);
+              return _context5.abrupt("break", 37);
 
             case 25:
               _context5.next = 27;
               return getAddressFormat(attributeMap);
 
             case 27:
-              value = _context5.sent;
-              contentTitle = value;
-              return _context5.abrupt("break", 35);
+              address = _context5.sent;
+              owned_computer_room = attributeMap.owned_computer_room, owned_cabinet = attributeMap.owned_cabinet; // 跳转3D机房定位设备
+
+              if (owned_computer_room && owned_cabinet) {
+                // /visual/room/index_runtime.html?type=preview&room_id=00000000383e3381&rack_id=11&device_id=122
+                roomLink = "/visual/room/index_runtime.html?type=preview&room_id=" + owned_computer_room + "&rack_id=" + owned_cabinet + "&device_id=" + id;
+                value = /*#__PURE__*/_react["default"].createElement("span", {
+                  onClick: onClose
+                }, /*#__PURE__*/_react["default"].createElement(_Link["default"], {
+                  className: _indexModule["default"].link,
+                  title: address,
+                  to: roomLink,
+                  target: "_blank"
+                }, address));
+              } else {
+                value = address;
+              }
 
-            case 30:
+              contentTitle = address;
+              return _context5.abrupt("break", 37);
+
+            case 32:
               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", 35);
+              return _context5.abrupt("break", 37);
 
-            case 34:
-              return _context5.abrupt("break", 35);
+            case 36:
+              return _context5.abrupt("break", 37);
 
-            case 35:
+            case 37:
               // 拿翻译字段属性数据
               if (attributeMap[item.dataIndex] && attributeMap[item.dataIndex + ".name"]) {
                 value = attributeMap[item.dataIndex + ".name"];
@@ -683,15 +700,15 @@ function ResourceOverview(props) {
                 contentTitle: contentTitle
               }));
 
-            case 44:
+            case 46:
               _context5.next = 11;
               break;
 
-            case 46:
+            case 48:
               settBaseInfoInitLoading(false);
               setBaseInfo(infoData);
 
-            case 48:
+            case 50:
             case "end":
               return _context5.stop();
           }
@@ -727,8 +744,8 @@ function ResourceOverview(props) {
                 condition: "id('" + id + "')",
                 refAttribute: true,
                 orders: [{
-                  name: "CREATED_TIME",
-                  type: "asc"
+                  name: 'CREATED_TIME',
+                  type: 'asc'
                 }],
                 pageIndex: 1,
                 pageSize: 100000

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

@@ -9,14 +9,53 @@ var _react = _interopRequireDefault(require("react"));
 
 var _componentCrucialLinkTopo = _interopRequireDefault(require("@riil-frontend/component-crucial-link-topo"));
 
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
+
 var _LinkTopoModule = _interopRequireDefault(require("./LinkTopo.module.scss"));
 
 function LinkTopo(props) {
+  var data = props.data; // 资源节点上方色块展示资源的发送速率发送带宽利用率、接收速率发送接收利用率、总错包数
+
+  var sourceMetrics = {
+    out_rate: '5M/s',
+    // 发送速率
+    out_bandwidth_utilization: '20%',
+    // 发送带宽利用率
+    in_rate: '6M/s',
+    // 接收速率
+    in_bandwidth_utilization: '15%',
+    // 接收带宽利用率
+    total_errors_packets: '151' // 总错包数
+
+  };
+  var destinationMetrics = {
+    out_rate: '5M/s',
+    // 发送速率
+    out_bandwidth_utilization: '20%',
+    // 发送带宽利用率
+    in_rate: '6M/s',
+    // 接收速率
+    in_bandwidth_utilization: '15%',
+    // 接收带宽利用率
+    total_errors_packets: '151' // 总错包数
+
+  };
+  var linkMetrics = [{
+    code: 'xxxx',
+    name: '端到端ping时延',
+    value: '500ms'
+  }];
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _LinkTopoModule["default"].container
   }, /*#__PURE__*/_react["default"].createElement(_componentCrucialLinkTopo["default"], {
-    request: null,
-    data: null // 链路ci数据
+    request: _componentTopologyUtils.request,
+    data: data // 链路ci数据
+    ,
+    sourceMetrics: sourceMetrics // 源设备指标列表
+    ,
+    destinationMetrics: destinationMetrics // 目的设备指标列表
+    ,
+    linkMetrics: linkMetrics // 链路指标列表
 
   }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "5.0.0-alpha.21",
+  "version": "5.0.0-alpha.23",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -115,6 +115,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.0-alpha.21/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.0-alpha.23/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }