@riil-frontend/component-topology 5.0.5 → 5.0.7

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

@@ -49,6 +49,8 @@ var _attributeFormatter = require("../../../../../../models/attributeFormatter")
 
 var _LinkTopoCard = _interopRequireDefault(require("./components/LinkTopo/LinkTopoCard"));
 
+var _rlog = require("@riil-frontend/component-topology-utils/lib/rlog");
+
 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; }
@@ -195,8 +197,8 @@ function ResourceOverview(props) {
 
 
   var baseInfoCol = (0, _react.useMemo)(function () {
-    var col = [];
-    console.log('baseInfoCol', ciTypeMeta, props);
+    var col = []; // console.log('baseInfoCol', ciTypeMeta, props);
+
     if (type === 'node') col.push({
       title: '图片名称',
       dataIndex: 'imageName'
@@ -236,7 +238,7 @@ function ResourceOverview(props) {
   }, [id, ciTypeMeta, type, isDevice]); // 指标可选项
 
   var metricCol = (0, _react.useMemo)(function () {
-    console.log('monitorMetricModels', monitorMetricModels);
+    // console.log('monitorMetricModels', monitorMetricModels);
     return (monitorMetricModels === null || monitorMetricModels === void 0 ? void 0 : monitorMetricModels.map(function (item) {
       return {
         title: item.name,
@@ -581,15 +583,15 @@ function ResourceOverview(props) {
 
             case 7:
               attributeMap = _context5.sent;
-              console.log('getAttribute', attributeMap);
+              // console.log('getAttribute', attributeMap);
               col = col.filter(function (item) {
                 return !item.hidden;
               });
               _iterator = _createForOfIteratorHelperLoose(col);
 
-            case 11:
+            case 10:
               if ((_step = _iterator()).done) {
-                _context5.next = 48;
+                _context5.next = 47;
                 break;
               }
 
@@ -597,10 +599,10 @@ 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' ? 32 : 36;
+              _context5.next = _context5.t0 === 'display_name' ? 17 : _context5.t0 === 'ciName' ? 21 : _context5.t0 === 'res_address' ? 24 : _context5.t0 === 'imageName' ? 31 : 35;
               break;
 
-            case 18:
+            case 17:
               link = "/default/pagecenter/resDetail/view/" + id + "?resId=" + id + "&domainCode=" + ciTypeMeta.domain + "&title=" + attributeMap.display_name + "&ciCode=" + ciType; // 资源跳转链接
 
               value = /*#__PURE__*/_react["default"].createElement("span", {
@@ -611,18 +613,18 @@ function ResourceOverview(props) {
                 to: formatUrl(link)
               }, attributeMap.display_name || '-'));
               contentTitle = attributeMap.display_name || '-';
-              return _context5.abrupt("break", 37);
+              return _context5.abrupt("break", 36);
 
-            case 22:
+            case 21:
               value = ciTypeMeta.displayName;
               contentTitle = value;
-              return _context5.abrupt("break", 37);
+              return _context5.abrupt("break", 36);
 
-            case 25:
-              _context5.next = 27;
+            case 24:
+              _context5.next = 26;
               return getAddressFormat(attributeMap);
 
-            case 27:
+            case 26:
               address = _context5.sent;
               owned_computer_room = attributeMap.owned_computer_room, owned_cabinet = attributeMap.owned_cabinet; // 跳转3D机房定位设备
 
@@ -642,18 +644,18 @@ function ResourceOverview(props) {
               }
 
               contentTitle = address;
-              return _context5.abrupt("break", 37);
+              return _context5.abrupt("break", 36);
 
-            case 32:
+            case 31:
               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", 37);
+              return _context5.abrupt("break", 36);
 
-            case 36:
-              return _context5.abrupt("break", 37);
+            case 35:
+              return _context5.abrupt("break", 36);
 
-            case 37:
+            case 36:
               // 拿翻译字段属性数据
               if (attributeMap[item.dataIndex] && attributeMap[item.dataIndex + ".name"]) {
                 value = attributeMap[item.dataIndex + ".name"];
@@ -689,15 +691,15 @@ function ResourceOverview(props) {
                 contentTitle: contentTitle
               }));
 
-            case 46:
-              _context5.next = 11;
+            case 45:
+              _context5.next = 10;
               break;
 
-            case 48:
+            case 47:
               settBaseInfoInitLoading(false);
               setBaseInfo(infoData);
 
-            case 50:
+            case 49:
             case "end":
               return _context5.stop();
           }
@@ -791,13 +793,13 @@ function ResourceOverview(props) {
         while (1) {
           switch (_context7.prev = _context7.next) {
             case 0:
-              console.log('metricColChange col', col);
+              // console.log('metricColChange col', col);
               col = (_col2 = col) === null || _col2 === void 0 ? void 0 : _col2.filter(function (item) {
                 return !item.hidden;
               });
 
               if ((_col3 = col) !== null && _col3 !== void 0 && _col3.length) {
-                _context7.next = 5;
+                _context7.next = 4;
                 break;
               }
 
@@ -805,7 +807,7 @@ function ResourceOverview(props) {
 
               return _context7.abrupt("return");
 
-            case 5:
+            case 4:
               codes = col.map(function (item) {
                 return item.dataIndex;
               });
@@ -828,12 +830,14 @@ function ResourceOverview(props) {
               }
 
               setMetricInitLoading(true);
-              _context7.next = 12;
+              _context7.next = 11;
               return _overview["default"].getMetricList(params);
 
-            case 12:
+            case 11:
               metricList = _context7.sent;
-              console.log('metricColChange', metricList, monitorMetricModels);
+
+              _rlog.rlog.debug('metricColChange', metricList, monitorMetricModels);
+
               setMetric(col.map(function (item, key) {
                 return {
                   code: item.dataIndex,
@@ -858,7 +862,7 @@ function ResourceOverview(props) {
                 }, 60000);
               }
 
-            case 17:
+            case 16:
             case "end":
               return _context7.stop();
           }
@@ -909,7 +913,8 @@ function ResourceOverview(props) {
       }
     }
 
-    console.log('defaultCols', type, ciType, baseInfo, keyIndicators);
+    _rlog.rlog.debug('defaultCols', type, ciType, baseInfo, keyIndicators);
+
     return {
       baseInfo: baseInfo,
       keyIndicators: keyIndicators

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

@@ -13,6 +13,8 @@ var _ahooks = require("ahooks");
 
 var _services = require("../services");
 
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
 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; }
@@ -42,7 +44,8 @@ function useMetricPolling(_ref) {
       setData((0, _extends2["default"])({}, data, {
         linkMetrics: result
       }));
-      console.info('链路拓扑指标轮询', result);
+
+      _rlog["default"].info('链路拓扑指标轮询', result);
     }
   });
   var queryInterfaceMetricsRequest = (0, _ahooks.useRequest)(_services.queryLinkInterfacesLatestMetrics, {
@@ -52,24 +55,27 @@ function useMetricPolling(_ref) {
     manual: true,
     onSuccess: function onSuccess(result) {
       setData((0, _extends2["default"])({}, data, result));
-      console.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 结果', result);
+
+      _rlog["default"].info('链路拓扑指标轮询 queryInterfaceMetricsRequest 结果', result);
     }
   });
   var linkMetricCodesStr = linkMetricCodes.map(function (item) {
     return item;
   }).sort().join(',');
   (0, _react.useEffect)(function () {
-    console.info('链路拓扑指标轮询 切换', {
+    _rlog["default"].info('链路拓扑指标轮询 切换', {
       linkCi: linkCi,
       linkMetricCodes: linkMetricCodes
     });
+
     queryLinkMetricsRequest.run(linkCi, linkMetricCodes);
     return function () {};
   }, [linkId, linkMetricCodesStr]);
   (0, _react.useEffect)(function () {
-    console.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {
+    _rlog["default"].info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {
       linkCi: linkCi
     });
+
     queryInterfaceMetricsRequest.run(linkCi);
     return function () {};
   }, [linkId]);

package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js

@@ -26,8 +26,7 @@ function LinkPropertyView(props) {
       linkGroups = _topo$store$useModelS.linkGroups;
   var link = [].concat(links, linkGroups).find(function (item) {
     return item.id === edge.getTag();
-  });
-  console.log('LinkPropertyView', link);
+  }); // console.log('LinkPropertyView',link)
 
   if (link) {
     var readable = link.permission.readable;

package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js

@@ -100,10 +100,8 @@ function AddLinkDrawer(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              console.log('getPortsById', id, currentLink);
-
               if (id) {
-                _context.next = 3;
+                _context.next = 2;
                 break;
               }
 
@@ -112,25 +110,25 @@ function AddLinkDrawer(props) {
                 portsDoc: {}
               });
 
-            case 3:
-              _context.next = 5;
+            case 2:
+              _context.next = 4;
               return _server["default"].getPortsById(id);
 
-            case 5:
+            case 4:
               result = _context.sent;
-              _context.next = 8;
+              _context.next = 7;
               return _server["default"].queryLinksByNodeId(id);
 
-            case 8:
+            case 7:
               links = _context.sent;
               ifTypes = result.map(function (item) {
                 return item.type;
               }); // console.log("端口类型列表", ifTypes);
 
-              _context.next = 12;
+              _context.next = 11;
               return (0, _linkUtils.getInterfaceObject)(ifTypes);
 
-            case 12:
+            case 11:
               ifDoc = _context.sent;
               // console.log("端口类型字典", ifDoc);
               usedPorts = [];
@@ -166,7 +164,7 @@ function AddLinkDrawer(props) {
                 portsDoc: portsDoc
               });
 
-            case 19:
+            case 18:
             case "end":
               return _context.stop();
           }

package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js

@@ -262,9 +262,8 @@ function EditLinkInfo(props) {
           obj['destination_id'] = ''; // 目的端口
 
           obj['destination_type'] = 'ip';
-        }
+        } // console.log('保存数据-obj', obj);
 
-        console.log('保存数据-obj', obj);
 
         if (isAdd) {
           obj['network_link.network_category'] = 'CAN';

package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/server.js

@@ -109,28 +109,28 @@ var _default = {
                 currentPage: 1,
                 pageSize: 9999
               };
-              jsonParm = JSON.stringify(parm);
-              console.log("查询当前节点关联的链路", parm, jsonParm);
-              _context3.prev = 4;
-              _context3.next = 7;
+              jsonParm = JSON.stringify(parm); // console.log("查询当前节点关联的链路",  parm, jsonParm);
+
+              _context3.prev = 3;
+              _context3.next = 6;
               return _componentTopologyUtils.request.post("/mdc/v1/api/cmdb/commonQueryCiData", jsonParm);
 
-            case 7:
+            case 6:
               result = _context3.sent;
               return _context3.abrupt("return", result);
 
-            case 11:
-              _context3.prev = 11;
-              _context3.t0 = _context3["catch"](4);
+            case 10:
+              _context3.prev = 10;
+              _context3.t0 = _context3["catch"](3);
 
               _rlog["default"].error("查询可关联链路", _context3.t0);
 
-            case 14:
+            case 13:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3, null, [[4, 11]]);
+      }, _callee3, null, [[3, 10]]);
     }))();
   },
 

package/lib/networkTopo/components/editor/propertyViews/edge/link/BindExitLinkSelect.js

@@ -89,7 +89,12 @@ function BindExitLinkSelect(props) {
   }();
 
   (0, _react.useEffect)(function () {
-    console.log("CommonEdgePropertyView-edge", edge, edge.getSource().getTag(), edge.getTarget());
+    // console.log(
+    //   "CommonEdgePropertyView-edge",
+    //   edge,
+    //   edge.getSource().getTag(),
+    //   edge.getTarget()
+    // );
     var ids = [edge.getSource().getTag(), edge.getTarget().getTag()];
     getLinkByNodes(ids);
   }, [edge]);
@@ -149,15 +154,20 @@ function BindExitLinkSelect(props) {
 
               aobj = edge.getAttrObject();
               edge.setAttrObject((0, _extends2["default"])({}, aobj, exitLink));
-              edge.setTag(data.id);
-              console.log("bindExitLink------------", target, target.getTag(), data["network_link.destination_ipv4"], exitLink);
+              edge.setTag(data.id); // console.log(
+              //   "bindExitLink------------",
+              //   target,
+              //   target.getTag(),
+              //   data["network_link.destination_ipv4"],
+              //   exitLink
+              // );
 
               _rlog["default"].debug("fetchDataByConfig", elements);
 
               setLoading(false);
               topo.historyManager.endTransaction();
 
-            case 24:
+            case 23:
             case "end":
               return _context2.stop();
           }

package/lib/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -100,7 +100,7 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
           edgeGroup.getEdgeGroupAgent().s('edge.width', _this.calcLinkEdgeWidth(link));
         }
       } else {
-        console.warn('未找到聚合链路的ht元素', link);
+        _rlog["default"].warn('动态链路样式执行：未找到聚合链路的ht元素', link);
       }
     }); // 3、如果连线组未关联链路并可见，设置线宽。
 

package/lib/networkTopo/services/link.js

@@ -185,28 +185,28 @@ var _default = {
                 currentPage: 1,
                 pageSize: 99
               };
-              jsonParm = JSON.stringify(parm);
-              console.log("queryAssociatedlinks", ids, parm, jsonParm);
-              _context5.prev = 7;
-              _context5.next = 10;
+              jsonParm = JSON.stringify(parm); // console.log("queryAssociatedlinks", ids, parm, jsonParm);
+
+              _context5.prev = 6;
+              _context5.next = 9;
               return _componentTopologyUtils.request.post("/mdc/v1/api/cmdb/commonQueryCiData", jsonParm);
 
-            case 10:
+            case 9:
               result = _context5.sent;
               return _context5.abrupt("return", result);
 
-            case 14:
-              _context5.prev = 14;
-              _context5.t0 = _context5["catch"](7);
+            case 13:
+              _context5.prev = 13;
+              _context5.t0 = _context5["catch"](6);
 
               _rlog["default"].error("查询可关联链路", _context5.t0);
 
-            case 17:
+            case 16:
             case "end":
               return _context5.stop();
           }
         }
-      }, _callee5, null, [[7, 14]]);
+      }, _callee5, null, [[6, 13]]);
     }))();
   }
 };

package/lib/utils/topoData.js

@@ -550,8 +550,8 @@ function getCiModSet(params) {
         icon: ciTypeObj.icon,
         list: ciModfilter(ciTypeObj, globalConfig, "node", ciTypeObj.code)
       };
-    });
-    console.log("modSet--------------------", modSet);
+    }); // console.log("modSet--------------------", modSet);
+
     return modSet;
   }
 

package/package.json

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