@riil-frontend/component-topology 3.0.0 → 3.1.2

package/lib/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js

@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _table = _interopRequireDefault(require("@alifd/next/lib/table"));
 
-var _divider = _interopRequireDefault(require("@alifd/next/lib/divider"));
-
 var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
 
 var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
@@ -31,10 +29,10 @@ var _moment = _interopRequireDefault(require("moment"));
 
 var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
 
-var _topoData = require("../../../../../../../utils/topoData");
-
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
+var _topoData = require("../../../../../../../utils/topoData");
+
 var _overview = _interopRequireDefault(require("../../../../../../services/overview"));
 
 var _alarm = _interopRequireDefault(require("../../../../../../services/alarm"));
@@ -45,6 +43,10 @@ var _services = require("../../../../../../services");
 
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
+var _SingleResourceStrategyLink = _interopRequireDefault(require("./SingleResourceStrategyLink"));
+
+var _BlockBox = _interopRequireDefault(require("./BlockBox"));
+
 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; }
@@ -301,7 +303,7 @@ function ResourceOverview(props) {
 
               res_address = false;
 
-              if (!((_modelAttributeMap$ow = modelAttributeMap['owned_computer_room']) !== null && _modelAttributeMap$ow !== void 0 && _modelAttributeMap$ow.userVisible)) {
+              if (!((_modelAttributeMap$ow = modelAttributeMap.owned_computer_room) !== null && _modelAttributeMap$ow !== void 0 && _modelAttributeMap$ow.userVisible)) {
                 _context.next = 19;
                 break;
               }
@@ -329,15 +331,15 @@ function ResourceOverview(props) {
 
               setBaseInfo({
                 // 资源
-                //display_name: modelAttributeMap['display_name'] ? attributeMap.display_name : false,
-                resource: (_modelAttributeMap$di = modelAttributeMap['display_name']) !== null && _modelAttributeMap$di !== void 0 && _modelAttributeMap$di.userVisible ? {
+                // display_name: modelAttributeMap['display_name'] ? attributeMap.display_name : false,
+                resource: (_modelAttributeMap$di = modelAttributeMap.display_name) !== null && _modelAttributeMap$di !== void 0 && _modelAttributeMap$di.userVisible ? {
                   display_name: attributeMap.display_name,
                   // 资源名称/显示名称
                   link: "/default/pagecenter/resDetail/view/" + id + "?resId=" + id + "&domainCode=" + domain + "&title=" + attributeMap.display_name + "&ciCode=" + ciType // 资源跳转链接
 
                 } : false,
-                ipv4_address: (_modelAttributeMap$ip = modelAttributeMap['ipv4_address']) !== null && _modelAttributeMap$ip !== void 0 && _modelAttributeMap$ip.userVisible ? attributeMap.ipv4_address : false,
-                asset_number: (_modelAttributeMap$as = modelAttributeMap['asset_number']) !== null && _modelAttributeMap$as !== void 0 && _modelAttributeMap$as.userVisible ? attributeMap.asset_number : false,
+                ipv4_address: (_modelAttributeMap$ip = modelAttributeMap.ipv4_address) !== null && _modelAttributeMap$ip !== void 0 && _modelAttributeMap$ip.userVisible ? attributeMap.ipv4_address : false,
+                asset_number: (_modelAttributeMap$as = modelAttributeMap.asset_number) !== null && _modelAttributeMap$as !== void 0 && _modelAttributeMap$as.userVisible ? attributeMap.asset_number : false,
                 ciName: ciName,
                 res_address: res_address,
                 // principal: modelAttributeMap[`${ciType}.principal`] ? attributeMap[`${ciType}.principal`] : false,
@@ -345,8 +347,8 @@ function ResourceOverview(props) {
                 rated_bandwidth: rated_bandwidth,
                 source_ipv4: (_modelAttributeMap$5 = modelAttributeMap[ciType + ".source_ipv4"]) !== null && _modelAttributeMap$5 !== void 0 && _modelAttributeMap$5.userVisible ? attributeMap[ciType + ".source_ipv4"] : false,
                 destination_ipv4: (_modelAttributeMap$6 = modelAttributeMap[ciType + ".destination_ipv4"]) !== null && _modelAttributeMap$6 !== void 0 && _modelAttributeMap$6.userVisible ? attributeMap[ciType + ".destination_ipv4"] : false,
-                source_Interface: (_modelAttributeMap$so = modelAttributeMap['source_id']) !== null && _modelAttributeMap$so !== void 0 && _modelAttributeMap$so.userVisible ? (_attributeMap$source_ = attributeMap.source_id_object) === null || _attributeMap$source_ === void 0 ? void 0 : _attributeMap$source_.displayName : false,
-                destination_Interface: (_modelAttributeMap$de = modelAttributeMap['destination_id']) !== null && _modelAttributeMap$de !== void 0 && _modelAttributeMap$de.userVisible ? (_attributeMap$destina = attributeMap.destination_id_object) === null || _attributeMap$destina === void 0 ? void 0 : _attributeMap$destina.displayName : false
+                source_Interface: (_modelAttributeMap$so = modelAttributeMap.source_id) !== null && _modelAttributeMap$so !== void 0 && _modelAttributeMap$so.userVisible ? (_attributeMap$source_ = attributeMap.source_id_object) === null || _attributeMap$source_ === void 0 ? void 0 : _attributeMap$source_.displayName : false,
+                destination_Interface: (_modelAttributeMap$de = modelAttributeMap.destination_id) !== null && _modelAttributeMap$de !== void 0 && _modelAttributeMap$de.userVisible ? (_attributeMap$destina = attributeMap.destination_id_object) === null || _attributeMap$destina === void 0 ? void 0 : _attributeMap$destina.displayName : false
               }); // 资源/链路-关键指标 数据 metrics，模型 topo.ciTyeCache.getCiType(ciType)
 
               setIndicator(topModelMetrics.map(function (item) {
@@ -408,7 +410,7 @@ function ResourceOverview(props) {
               // 位置
               res_address = false;
 
-              if (!((_modelAttributeMap$ow2 = modelAttributeMap['owned_computer_room']) !== null && _modelAttributeMap$ow2 !== void 0 && _modelAttributeMap$ow2.userVisible)) {
+              if (!((_modelAttributeMap$ow2 = modelAttributeMap.owned_computer_room) !== null && _modelAttributeMap$ow2 !== void 0 && _modelAttributeMap$ow2.userVisible)) {
                 _context2.next = 17;
                 break;
               }
@@ -429,15 +431,15 @@ function ResourceOverview(props) {
             case 18:
               setBaseInfo({
                 // 资源
-                //display_name: modelAttributeMap['display_name'] ? attributeMap.display_name : false,
-                resource: (_modelAttributeMap$di2 = modelAttributeMap['display_name']) !== null && _modelAttributeMap$di2 !== void 0 && _modelAttributeMap$di2.userVisible ? {
+                // display_name: modelAttributeMap['display_name'] ? attributeMap.display_name : false,
+                resource: (_modelAttributeMap$di2 = modelAttributeMap.display_name) !== null && _modelAttributeMap$di2 !== void 0 && _modelAttributeMap$di2.userVisible ? {
                   display_name: attributeMap.display_name,
                   // 资源名称/显示名称
                   link: "/default/pagecenter/resDetail/view/" + id + "?resId=" + id + "&domainCode=" + domain + "&title=" + attributeMap.display_name + "&ciCode=" + ciType // 资源跳转链接
 
                 } : false,
-                ipv4_address: (_modelAttributeMap$ip2 = modelAttributeMap['ipv4_address']) !== null && _modelAttributeMap$ip2 !== void 0 && _modelAttributeMap$ip2.userVisible ? attributeMap.ipv4_address : false,
-                asset_number: (_modelAttributeMap$as2 = modelAttributeMap['asset_number']) !== null && _modelAttributeMap$as2 !== void 0 && _modelAttributeMap$as2.userVisible ? attributeMap.asset_number : false,
+                ipv4_address: (_modelAttributeMap$ip2 = modelAttributeMap.ipv4_address) !== null && _modelAttributeMap$ip2 !== void 0 && _modelAttributeMap$ip2.userVisible ? attributeMap.ipv4_address : false,
+                asset_number: (_modelAttributeMap$as2 = modelAttributeMap.asset_number) !== null && _modelAttributeMap$as2 !== void 0 && _modelAttributeMap$as2.userVisible ? attributeMap.asset_number : false,
                 ciName: ciName,
                 res_address: res_address // principal: modelAttributeMap[`${ciType}.principal`] ? attributeMap[`${ciType}.principal`] : false,
 
@@ -458,7 +460,7 @@ function ResourceOverview(props) {
                   status: item.status,
                   params: [{
                     alertId: item.alertId,
-                    status: "dealing",
+                    status: 'dealing',
                     userId: userId,
                     isBaseAlert: false
                   }]
@@ -563,7 +565,7 @@ function ResourceOverview(props) {
                 u = (start_u_location || '') + "-" + (end_u_location || '');
               }
 
-              return _context4.abrupt("return", address || u ? "" + (address || '') + (u ? ' ' + u : '') : '');
+              return _context4.abrupt("return", address || u ? "" + (address || '') + (u ? " " + u : '') : '');
 
             case 11:
             case "end":
@@ -594,8 +596,8 @@ function ResourceOverview(props) {
                 // toDeal: 待处理, dealing：处理中
                 pageNum: 1,
                 pageSize: 999,
-                sortField: "alertLevel",
-                sortOrder: "desc"
+                sortField: 'alertLevel',
+                sortOrder: 'desc'
               });
 
             case 2:
@@ -612,7 +614,7 @@ function ResourceOverview(props) {
                   status: item.status,
                   params: [{
                     alertId: item.alertId,
-                    status: "dealing",
+                    status: 'dealing',
                     userId: userId,
                     isBaseAlert: false
                   }]
@@ -658,12 +660,12 @@ function ResourceOverview(props) {
     key: 'title',
     cell: function cell(value, index, record) {
       return /*#__PURE__*/_react["default"].createElement("div", {
-        className: _indexModule["default"]["alarm-title"],
+        className: _indexModule["default"]['alarm-title'],
         title: value
       }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
         type: record.icon,
         size: "xs",
-        className: _indexModule["default"]["alarm-color-icon"] + " " + record.className
+        className: _indexModule["default"]['alarm-color-icon'] + " " + record.className
       }), /*#__PURE__*/_react["default"].createElement(_reactRouterDom.Link, {
         className: _indexModule["default"].link,
         to: formatUrl(record.link)
@@ -749,42 +751,29 @@ function ResourceOverview(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"]['resource-overview']
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: _indexModule["default"]['block-box']
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: _indexModule["default"].title
-  }, /*#__PURE__*/_react["default"].createElement(_divider["default"], {
-    direction: "ver"
-  }), "\u57FA\u672C\u4FE1\u606F"), /*#__PURE__*/_react["default"].createElement("div", {
-    className: _indexModule["default"].body
-  }, BaseInfoRender(type, baseInfo))), /*#__PURE__*/_react["default"].createElement("div", {
-    className: _indexModule["default"]['block-box']
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: _indexModule["default"].title
-  }, /*#__PURE__*/_react["default"].createElement(_divider["default"], {
-    direction: "ver"
-  }), "\u5173\u952E\u6307\u6807"), /*#__PURE__*/_react["default"].createElement("div", {
-    className: _indexModule["default"].body
+  }, /*#__PURE__*/_react["default"].createElement(_BlockBox["default"], {
+    headerTitle: "\u57FA\u672C\u4FE1\u606F",
+    headerExtra: ciType === 'network_link' && /*#__PURE__*/_react["default"].createElement(_SingleResourceStrategyLink["default"], {
+      id: id,
+      ciType: ciType,
+      name: baseInfo.resource.display_name
+    })
+  }, BaseInfoRender(type, baseInfo)), /*#__PURE__*/_react["default"].createElement(_BlockBox["default"], {
+    headerTitle: "\u5173\u952E\u6307\u6807"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].indicator
-  }, indicatorRender(type, indicator)))), /*#__PURE__*/_react["default"].createElement("div", {
-    className: _indexModule["default"]['block-box']
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: _indexModule["default"].title
-  }, /*#__PURE__*/_react["default"].createElement(_divider["default"], {
-    direction: "ver"
-  }), "\u6700\u8FD1\u7684\u544A\u8B66\u548C\u98CE\u9669"), /*#__PURE__*/_react["default"].createElement("div", {
-    className: _indexModule["default"].body
+  }, indicatorRender(type, indicator))), /*#__PURE__*/_react["default"].createElement(_BlockBox["default"], {
+    headerTitle: "\u6700\u8FD1\u7684\u544A\u8B66\u548C\u98CE\u9669"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].alarm
   }, /*#__PURE__*/_react["default"].createElement(_table["default"], {
     hasBorder: false,
     fixedHeader: true,
     columns: columns,
-    maxBodyHeight: 'auto',
+    maxBodyHeight: "auto",
     dataSource: alarmRiskList,
     emptyContent: /*#__PURE__*/_react["default"].createElement("div", {
       className: _indexModule["default"]['no-data']
     }, "\u6682\u65E0\u6570\u636E")
-  })))));
+  }))));
 }

package/lib/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.module.scss

@@ -1,23 +1,6 @@
 @import "~@alifd/next/variables.scss";
 
 .resource-overview {
-  .block-box {
-    color: #78849c;
-    overflow: hidden;
-    .title {
-      height: 20px;
-      line-height: 20px;
-      font-size: 14px;
-      font-weight: 600;
-      color: #4d6277;
-      margin-top: 16px;
-      :global {
-        .#{$css-prefix}divider-ver {
-          height: 1em;
-        }
-      }
-    }
-  }
   .base-info {
     margin-top: 16px;
     margin-right: -25px;

package/package.json

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