@riil-frontend/component-topology 2.15.45 → 2.15.48

package/lib/core/models/attributeFormatter/index.js

@@ -152,7 +152,7 @@ var AttributeFormatter = /*#__PURE__*/function () {
       type: item.type,
       code: item.code,
       // 属性code
-      name: '图上名称',
+      name: '图片名称',
       // 属性名称
       value: value // 属性值
 

package/lib/core/models/topoFactory.js

@@ -2,7 +2,7 @@
 
 exports.__esModule = true;
 exports["default"] = void 0;
-var n = 0;
+var n = 1;
 
 var TopoFactory = /*#__PURE__*/function () {
   function TopoFactory() {
@@ -12,7 +12,7 @@ var TopoFactory = /*#__PURE__*/function () {
   var _proto = TopoFactory.prototype;
 
   _proto.add = function add(name, topo) {
-    var uid = name || "" + n++;
+    var uid = name || "topo" + n++;
     this.map[uid] = topo;
     return uid;
   };

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

@@ -116,10 +116,10 @@ function BaseInfoRender(type, data) {
       label: '目的IP地址：',
       objKey: 'destination_ipv4'
     }, {
-      label: '源接口：',
+      label: '源端口：',
       objKey: 'source_Interface'
     }, {
-      label: '目的接口：',
+      label: '目的端口：',
       objKey: 'destination_Interface'
     }]
   };
@@ -226,8 +226,8 @@ function ResourceOverview(props) {
     destination_ipv4: '',
     // 目的IP地址
     source_Interface: '',
-    // 源接口
-    destination_Interface: '' // 目的接口
+    // 源端口
+    destination_Interface: '' // 目的端口
 
   }),
       baseInfo = _useState[0],
@@ -255,9 +255,9 @@ function ResourceOverview(props) {
 
   function _init() {
     _init = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var _topo$options$resourc, _attributeMap$source_, _attributeMap$destina;
+      var _topo$options$resourc, _modelAttributeMap$ow, _modelAttributeMap$, _modelAttributeMap$2, _modelAttributeMap$3, _modelAttributeMap$di, _modelAttributeMap$ip, _modelAttributeMap$as, _modelAttributeMap$5, _modelAttributeMap$6, _modelAttributeMap$so, _attributeMap$source_, _modelAttributeMap$de, _attributeMap$destina;
 
-      var ciTypeMeta, link, linkConnectType, _ciTypeMeta, modelMetrics, ciName, modelAttributeMap, domain, topModelMetrics, isAppTopoFlag, _findItem, attributeMap, metrics, res_address, _attributeMap$, rated_bandwidth, _modelAttributeMap$;
+      var ciTypeMeta, link, linkConnectType, _ciTypeMeta, modelMetrics, ciName, modelAttributeMap, domain, topModelMetrics, isAppTopoFlag, _findItem, attributeMap, metrics, res_address, _attributeMap$, rated_bandwidth, _modelAttributeMap$4;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
@@ -296,11 +296,12 @@ function ResourceOverview(props) {
               // 拓扑（默认） ---------------------------
               // 基本信息
               _findItem = (0, _topoData.findItem)(attrsAndMetrics, 'id', id), attributeMap = _findItem.attributeMap, metrics = _findItem.metrics;
-              console.log('基本信息', attributeMap, attrsAndMetrics); // 位置
+              console.log('基本信息', attributeMap, attrsAndMetrics, modelAttributeMap); // userVisible
+              // 位置
 
               res_address = false;
 
-              if (!modelAttributeMap['owned_computer_room']) {
+              if (!((_modelAttributeMap$ow = modelAttributeMap['owned_computer_room']) !== null && _modelAttributeMap$ow !== void 0 && _modelAttributeMap$ow.userVisible)) {
                 _context.next = 19;
                 break;
               }
@@ -314,7 +315,7 @@ function ResourceOverview(props) {
               break;
 
             case 19:
-              if (modelAttributeMap[ciType + ".computer_room"] || modelAttributeMap[ciType + ".area"]) {
+              if ((_modelAttributeMap$ = modelAttributeMap[ciType + ".computer_room"]) !== null && _modelAttributeMap$ !== void 0 && _modelAttributeMap$.userVisible || (_modelAttributeMap$2 = modelAttributeMap[ciType + ".area"]) !== null && _modelAttributeMap$2 !== void 0 && _modelAttributeMap$2.userVisible) {
                 res_address = attributeMap[ciType + ".computer_room "] || attributeMap[ciType + ".area"] ? " " + (((_attributeMap$ = attributeMap[ciType + ".area_object"]) === null || _attributeMap$ === void 0 ? void 0 : _attributeMap$.displayName) || '') + " " + (attributeMap[ciType + ".computer_room"] || '') : false;
               }
 
@@ -322,30 +323,30 @@ function ResourceOverview(props) {
               // 链路带宽(取实际带宽)
               rated_bandwidth = false;
 
-              if (modelAttributeMap[ciType + ".actual_bandwidth"]) {
-                rated_bandwidth = attributeMap[ciType + ".actual_bandwidth"] ? attributeMap[ciType + ".actual_bandwidth"] + " " + ((_modelAttributeMap$ = modelAttributeMap[ciType + ".actual_bandwidth"]) === null || _modelAttributeMap$ === void 0 ? void 0 : _modelAttributeMap$.unit) : '';
+              if ((_modelAttributeMap$3 = modelAttributeMap[ciType + ".actual_bandwidth"]) !== null && _modelAttributeMap$3 !== void 0 && _modelAttributeMap$3.userVisible) {
+                rated_bandwidth = attributeMap[ciType + ".actual_bandwidth"] ? attributeMap[ciType + ".actual_bandwidth"] + " " + ((_modelAttributeMap$4 = modelAttributeMap[ciType + ".actual_bandwidth"]) === null || _modelAttributeMap$4 === void 0 ? void 0 : _modelAttributeMap$4.unit) : '';
               }
 
               setBaseInfo({
                 // 资源
                 //display_name: modelAttributeMap['display_name'] ? attributeMap.display_name : false,
-                resource: modelAttributeMap['display_name'] ? {
+                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['ipv4_address'] ? attributeMap.ipv4_address : false,
-                asset_number: modelAttributeMap['asset_number'] ? 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,
                 // 链路
                 rated_bandwidth: rated_bandwidth,
-                source_ipv4: modelAttributeMap[ciType + ".source_ipv4"] ? attributeMap[ciType + ".source_ipv4"] : false,
-                destination_ipv4: modelAttributeMap[ciType + ".destination_ipv4"] ? attributeMap[ciType + ".destination_ipv4"] : false,
-                source_Interface: modelAttributeMap['source_id'] ? (_attributeMap$source_ = attributeMap.source_id_object) === null || _attributeMap$source_ === void 0 ? void 0 : _attributeMap$source_.displayName : false,
-                destination_Interface: modelAttributeMap['destination_id'] ? (_attributeMap$destina = attributeMap.destination_id_object) === null || _attributeMap$destina === void 0 ? void 0 : _attributeMap$destina.displayName : false
+                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
               }); // 资源/链路-关键指标 数据 metrics，模型 topo.ciTyeCache.getCiType(ciType)
 
               setIndicator(topModelMetrics.map(function (item) {
@@ -375,7 +376,7 @@ function ResourceOverview(props) {
 
   function _initAppTopo() {
     _initAppTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(topModelMetrics, modelAttributeMap, ciName, domain) {
-      var _topo$options$resourc2, _alarmList;
+      var _topo$options$resourc2, _modelAttributeMap$ow2, _modelAttributeMap$7, _modelAttributeMap$8, _modelAttributeMap$di2, _modelAttributeMap$ip2, _modelAttributeMap$as2, _alarmList;
 
       var _yield$topo$options$r, metrics, alarmList, attributeMap, res_address, _attributeMap$2;
 
@@ -407,7 +408,7 @@ function ResourceOverview(props) {
               // 位置
               res_address = false;
 
-              if (!modelAttributeMap['owned_computer_room']) {
+              if (!((_modelAttributeMap$ow2 = modelAttributeMap['owned_computer_room']) !== null && _modelAttributeMap$ow2 !== void 0 && _modelAttributeMap$ow2.userVisible)) {
                 _context2.next = 17;
                 break;
               }
@@ -421,7 +422,7 @@ function ResourceOverview(props) {
               break;
 
             case 17:
-              if (modelAttributeMap[ciType + ".computer_room"] || modelAttributeMap[ciType + ".area"]) {
+              if ((_modelAttributeMap$7 = modelAttributeMap[ciType + ".computer_room"]) !== null && _modelAttributeMap$7 !== void 0 && _modelAttributeMap$7.userVisible || (_modelAttributeMap$8 = modelAttributeMap[ciType + ".area"]) !== null && _modelAttributeMap$8 !== void 0 && _modelAttributeMap$8.userVisible) {
                 res_address = attributeMap[ciType + ".computer_room "] || attributeMap[ciType + ".area"] ? " " + (((_attributeMap$2 = attributeMap[ciType + ".area_object"]) === null || _attributeMap$2 === void 0 ? void 0 : _attributeMap$2.displayName) || '') + " " + (attributeMap[ciType + ".computer_room"] || '') : false;
               }
 
@@ -429,14 +430,14 @@ function ResourceOverview(props) {
               setBaseInfo({
                 // 资源
                 //display_name: modelAttributeMap['display_name'] ? attributeMap.display_name : false,
-                resource: modelAttributeMap['display_name'] ? {
+                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['ipv4_address'] ? attributeMap.ipv4_address : false,
-                asset_number: modelAttributeMap['asset_number'] ? 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,
 
@@ -594,7 +595,7 @@ function ResourceOverview(props) {
                 pageNum: 1,
                 pageSize: 999,
                 sortField: "alertLevel",
-                sortOrder: "asc"
+                sortOrder: "desc"
               });
 
             case 2:

package/package.json

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