@riil-frontend/component-topology 12.0.0-dev.1 → 12.0.0-dev.11

package/lib/core/services/index.js

@@ -29,7 +29,7 @@ function _queryCisByIds() {
           return (0, _cmdb.commonQueryCiDataByIds)(ids, {
             orders: [],
             pageIndex: 1,
-            pageSize: 100000
+            pageSize: 10000
           });
 
         case 2:

package/lib/core/services/topo/basic.js

@@ -118,7 +118,7 @@ var _default = {
   * @param {Array} groups
   * @returns
   */
-  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList) {
+  getTopoDataByResource: function getTopoDataByResource(id, resources, groups) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var data, obj;
       return _regenerator["default"].wrap(function _callee$(_context) {
@@ -137,7 +137,7 @@ var _default = {
             obj = prepareGroupParams(data);
             _context.next = 5;
             return _componentTopologyUtils.request.post(API_ROOT + "/structure/byCondition/" + id, (0, _extends2["default"])({}, obj, {
-              exportLinkIdList: exportLinkIdList
+              exportLinkIdList: []
             }));
 
           case 5:

package/lib/core/store/models/customIcon.js

@@ -15,7 +15,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
@@ -202,7 +202,7 @@ function _default(engine) {
 
           var id = (0, _icon.getCustomIconIdFromHtId)(htIconId);
 
-          _rlog["default"].debug("\u5220\u9664\u56FE\u6807: " + id);
+          _componentTopologyUtils.rlog.debug("\u5220\u9664\u56FE\u6807: " + id);
 
           _dialog["default"].confirm({
             title: '删除',
@@ -246,7 +246,7 @@ function _default(engine) {
                       _context5.prev = 9;
                       _context5.t0 = _context5["catch"](0);
 
-                      _rlog["default"].warn('删除图标失败', _context5.t0);
+                      _componentTopologyUtils.rlog.warn('删除图标失败', _context5.t0);
 
                     case 12:
                     case "end":

package/lib/core/store/models/displayConfig.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 /**
  * 动态设置链路样式 Model

package/lib/core/store/models/selection.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 /**
  * 拓扑图 Model

package/lib/core/store/models/topoBaseInfoOverview.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 

package/lib/core/store/models/topoBizMod.js

@@ -13,7 +13,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 function _default(engine) {
   return {

package/lib/core/store/models/topoConfig.js

@@ -53,7 +53,6 @@ var initialState = {
     "static": []
   },
   groups: [],
-  exportLinkIdList: [],
   // config: {
   //   view: null,
   //   groups: [],
@@ -260,18 +259,17 @@ function _default(topoApp) {
           var _this2 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-            var editState, resources, _editState$groups, groups, _editState$ipNodes, ipNodes, query, data;
+            var editState, resources, _editState$groups, groups, query, data;
 
             return _regenerator["default"].wrap(function _callee2$(_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
                   editState = rootState.topoConfig;
-                  resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes;
+                  resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups;
                   query = {
                     id: rootState.topoMod.topoId,
                     resources: resources,
-                    groups: groups,
-                    ipNodes: ipNodes
+                    groups: groups
                   };
                   _context2.next = 5;
                   return _this2.getTopoByConditions(query);
@@ -322,14 +320,14 @@ function _default(topoApp) {
           var _this4 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-            var topoId, resources, groups, exportLinkIdList, ipNodes, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
+            var topoId, resources, groups, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
 
             return _regenerator["default"].wrap(function _callee4$(_context4) {
               while (1) switch (_context4.prev = _context4.next) {
                 case 0:
                   _rlog["default"].debug("getTopoByConditions--------", params);
 
-                  topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList, ipNodes = params.ipNodes;
+                  topoId = params.id, resources = params.resources, groups = params.groups;
                   viewConditions = (0, _topoData2.resToConditions)(resources);
                   groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
                     return (0, _extends2["default"])({}, group, {
@@ -341,7 +339,7 @@ function _default(topoApp) {
                   _rlog["default"].debug("getTopoByConditions--------", viewConditions, groupInfo);
 
                   _context4.next = 7;
-                  return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList, ipNodes);
+                  return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo);
 
                 case 7:
                   data = _context4.sent;
@@ -484,8 +482,7 @@ function _default(topoApp) {
             return _regenerator["default"].wrap(function _callee8$(_context8) {
               while (1) switch (_context8.prev = _context8.next) {
                 case 0:
-                  ids = data.ids, ip = data.ip; // console.log("queryAllLinkByIp", ids, ip);
-
+                  ids = data.ids, ip = data.ip;
                   _context8.next = 3;
                   return _networkLink["default"].queryLinksByIp(ids, ip);
 

package/lib/core/store/models/topoGraphView.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 

package/lib/core/store/models/topoMod.js

@@ -15,7 +15,7 @@ var _moment = _interopRequireDefault(require("moment"));
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _topoData = require("../../../utils/topoData");
 
@@ -85,7 +85,7 @@ function _default(topoApp) {
                   type = params.type || 'view';
                   id = params.id || topoModState.topoId || '';
 
-                  _rlog["default"].debug("topoMod.init \u521D\u59CB\u5316(" + id + ")...", {
+                  _componentTopologyUtils.rlog.debug("topoMod.init \u521D\u59CB\u5316(" + id + ")...", {
                     params: params,
                     rootState: rootState
                   });
@@ -117,7 +117,7 @@ function _default(topoApp) {
                     loading: false
                   });
 
-                  _rlog["default"].debug('topoMod.initTopoCenter 初始化完成', {
+                  _componentTopologyUtils.rlog.debug('topoMod.initTopoCenter 初始化完成', {
                     rootState: rootState
                   });
 
@@ -401,7 +401,7 @@ function _default(topoApp) {
 
                 case 24:
                   topoConfig = _context6.sent;
-                  if (!topoConfig) _rlog["default"].error("\u672A\u67E5\u8BE2\u5230\u62D3\u6251id " + topoId + " \u7684\u6570\u636E\uFF0C\u8BF7\u68C0\u67E5");
+                  if (!topoConfig) _componentTopologyUtils.rlog.error("\u672A\u67E5\u8BE2\u5230\u62D3\u6251id " + topoId + " \u7684\u6570\u636E\uFF0C\u8BF7\u68C0\u67E5");
                   graphConfig = {
                     global: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.global,
                     customGlobal: data.global,
@@ -440,7 +440,7 @@ function _default(topoApp) {
                 case 37:
                   result = (0, _topoData.parseTopoData)(result);
 
-                  _rlog["default"].debug('topoMod.initTopoData 查询数据完成', topoId, linkTo, result);
+                  _componentTopologyUtils.rlog.debug('topoMod.initTopoData 查询数据完成', topoId, linkTo, result);
 
                   _context6.next = 41;
                   return dispatch.customIcon.loadCustomIcons();
@@ -496,7 +496,7 @@ function _default(topoApp) {
                   topoApp.onTopoDataLoaded(topoData);
                   endTime = (0, _moment["default"])();
 
-                  _rlog["default"].info('topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ', endTime.diff(startTime, 'seconds', true));
+                  _componentTopologyUtils.rlog.info('topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ', endTime.diff(startTime, 'seconds', true));
 
                   topoApp.options.onLoad();
 
@@ -605,7 +605,7 @@ function _default(topoApp) {
                     conditions = '';
                   }
 
-                  _rlog["default"].debug('updateDelId', conditions);
+                  _componentTopologyUtils.rlog.debug('updateDelId', conditions);
 
                 case 2:
                 case "end":
@@ -630,7 +630,7 @@ function _default(topoApp) {
                 case 4:
                   topoPermission = _context11.sent;
 
-                  _rlog["default"].debug('查询拓扑权限', topoPermission);
+                  _componentTopologyUtils.rlog.debug('查询拓扑权限', topoPermission);
 
                   _context11.next = 11;
                   break;
@@ -639,7 +639,7 @@ function _default(topoApp) {
                   _context11.prev = 8;
                   _context11.t0 = _context11["catch"](1);
 
-                  _rlog["default"].error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
+                  _componentTopologyUtils.rlog.error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
 
 
                 case 11:

package/lib/core/store/models/viewer/lock.js

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 /**
  * 锁定

package/lib/core/store/models/viewer/resourceDetail.js

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 /**
  * 资源概览

package/lib/core/store/models/viewer/resourceWebControllUrlSetting.js

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 

package/lib/core/utils/edgeUtil.js

@@ -45,7 +45,8 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
     htTopo.expandAllEdgeGroups();
     (0, _linkUtils.showLinkByConfig)({
       topo: topo,
-      showType: isEditMode ? 4 : expandAllEdges
+      showType: expandAllEdges,
+      isEditMode: isEditMode
     });
 
     _rlog["default"].debug("updateEdgeExpanded 展开-isEditMode", isEditMode);

package/lib/core/utils/metricUtil.js

@@ -21,6 +21,13 @@ function formatMetric(val, metricModel) {
   }
 
   if (metricModel) {
+    var _result$value;
+
+    // 分级字典特殊处理
+    if (metricModel.dict && !_DictCache["default"].getDictObject()[metricModel.code]) {
+      val = metricModel.dict[val];
+    }
+
     var result = (0, _utils.metricValueFormat)({
       value: val,
       dataType: metricModel.dataType,
@@ -29,7 +36,7 @@ function formatMetric(val, metricModel) {
       unit: metricModel.unit,
       code: metricModel.code
     });
-    return result.value + " " + (result.value === '-' ? '' : result.unit);
+    return ((_result$value = result.value) !== null && _result$value !== void 0 ? _result$value : '') + " " + (result.value === '-' ? '' : result.unit);
   } else {
     return "" + val;
   }

package/lib/core/utils/showMessage.js

@@ -7,7 +7,7 @@ exports["default"] = showMessage;
 
 var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var MSG_TYPES = {
   info: 'notice',
@@ -19,7 +19,7 @@ function showMessage(type, title, content) {
   var msgType = MSG_TYPES[type];
 
   if (!msgType) {
-    _rlog["default"].error('TopoView', 'Invalid message type!');
+    _componentTopologyUtils.rlog.error('TopoView', 'Invalid message type!');
 
     msgType = MSG_TYPES.info;
   }

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

@@ -60,6 +60,7 @@ function ResourceDetail(props) {
 
   if (tabBodys.length === 1) {
     return /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData, {
+      resourceDetailProps: viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps,
       userId: userId,
       style: {
         overflowY: 'auto',

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

@@ -37,32 +37,31 @@ function EventsCard(props) {
       onHandleAlarm = props.onHandleAlarm; // 告警table列配置
 
   var columns = [{
-    title: '描述',
-    dataIndex: 'title',
-    key: 'title',
+    title: "描述",
+    dataIndex: "title",
+    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,
         onClick: closeDetailDrawer
       }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
         type: record.icon,
         size: "xs",
-        className: _indexModule["default"]['alarm-color-icon'] + " " + record.className
-      }), /*#__PURE__*/_react["default"].createElement("a", {
-        className: _indexModule["default"].link,
-        href: formatUrl(record.link)
+        className: _indexModule["default"]["alarm-color-icon"] + " " + record.className
+      }), /*#__PURE__*/_react["default"].createElement(_Link["default"], {
+        to: formatUrl(record.link)
       }, value));
     }
   }, {
-    title: '时间',
-    dataIndex: 'time',
-    key: 'time',
+    title: "时间",
+    dataIndex: "time",
+    key: "time",
     width: 144,
     cell: function cell(value, index, record) {
       return /*#__PURE__*/_react["default"].createElement("div", {
-        title: (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss')
-      }, (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss'));
+        title: (0, _moment["default"])(value).format("YYYY-MM-DD HH:mm:ss")
+      }, (0, _moment["default"])(value).format("YYYY-MM-DD HH:mm:ss"));
     }
   } // 临时屏蔽告警操作列，后续版本按权限显示 2023-3-6 20:23:45
   // {

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

@@ -918,7 +918,9 @@ function ResourceOverview(props) {
     metricColChange: metricColChange,
     metricCodes: metric.map(function (item) {
       return item.code;
-    })
+    }),
+    getOverviewConfig: resourceOverviewProps.getOverviewConfig,
+    saveOverviewConfig: resourceOverviewProps.saveOverviewConfig
   }) : /*#__PURE__*/_react["default"].createElement(_BlockBox["default"], {
     headerTitle: "\u5173\u952E\u6307\u6807",
     headerExtra: /*#__PURE__*/_react["default"].createElement(_Configurator["default"], {

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

@@ -41,8 +41,8 @@ function LinkTopoCard(props) {
       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 analysisUrl = "../../default/trafficControl/linkConfigure?id=" + encodeURIComponent(data.attributes.display_name) + "&num=0";
+  var linkDetailsUrl = "/default/pagecenter/linkDetail/view/" + data.id + "?resId=" + data.id + "&domainCode=network&title=" + encodeURIComponent(data.attributes.display_name) + "&ciCode=network_link&tabByComType=uicbb-res-crucial-link-flow";
 
   var isOpenFlows = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
@@ -113,6 +113,8 @@ function LinkTopoCard(props) {
       defaultCol: isCrucial ? ['remote_ping_delayed', 'remote_ping_discards_rate'] : [],
       max: 5,
       columns: metricCol,
+      getOverviewConfig: props.getOverviewConfig,
+      saveOverviewConfig: props.saveOverviewConfig,
       onChange: metricColChange
     })
   }, /*#__PURE__*/_react["default"].createElement(_LinkTopo["default"], {

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

@@ -13,7 +13,7 @@ var _ahooks = require("ahooks");
 
 var _services = require("../services");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 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); }
 
@@ -62,7 +62,7 @@ function useMetricPolling(_ref) {
     onSuccess: function onSuccess(result) {
       setData((0, _extends2["default"])({}, data, result));
 
-      _rlog["default"].info('链路拓扑指标轮询', result);
+      _componentTopologyUtils.rlog.info('链路拓扑指标轮询', result);
     }
   });
   var queryInterfaceMetricsRequest = (0, _ahooks.useRequest)(_services.queryLinkInterfacesLatestMetrics, {
@@ -73,7 +73,7 @@ function useMetricPolling(_ref) {
     onSuccess: function onSuccess(result) {
       setData((0, _extends2["default"])({}, data, result));
 
-      _rlog["default"].info('链路拓扑指标轮询 queryInterfaceMetricsRequest 结果', result);
+      _componentTopologyUtils.rlog.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 结果', result);
     }
   });
   var linkMetricCodesStr = codes.map(function (item) {
@@ -81,7 +81,7 @@ function useMetricPolling(_ref) {
   }).sort().join(',');
   (0, _react.useEffect)(function () {
     if (linkId) {
-      _rlog["default"].info('链路拓扑指标轮询 切换', {
+      _componentTopologyUtils.rlog.info('链路拓扑指标轮询 切换', {
         linkCi: linkCi,
         codes: codes
       });
@@ -96,7 +96,7 @@ function useMetricPolling(_ref) {
   }).sort().join(',');
   (0, _react.useEffect)(function () {
     if (linkId) {
-      _rlog["default"].info('链路拓扑指标勾选rtt|重传率 轮询', {
+      _componentTopologyUtils.rlog.info('链路拓扑指标勾选rtt|重传率 轮询', {
         linkCi: linkCi,
         retansRatioNetDelayRatioCodes: retansRatioNetDelayRatioCodes
       });
@@ -110,7 +110,7 @@ function useMetricPolling(_ref) {
   }, [linkId, retansRatioNetDelayRatioCodesStr]);
   (0, _react.useEffect)(function () {
     if (linkId) {
-      _rlog["default"].info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {
+      _componentTopologyUtils.rlog.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {
         linkCi: linkCi
       });
 

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

@@ -18,8 +18,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-
 var _CiTypeCache = _interopRequireDefault(require("../../../../../../../../../models/cache/CiTypeCache"));
 
 var _constants = require("../constants");
@@ -92,7 +90,7 @@ function _queryLinkLatestMetrics() {
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          _rlog["default"].debug('链路拓扑指标轮询 queryLinkLatestMetrics', linkCi, linkMetricCodes);
+          _componentTopologyUtils.rlog.debug('链路拓扑指标轮询 queryLinkLatestMetrics', linkCi, linkMetricCodes);
 
           if (linkMetricCodes.length) {
             _context3.next = 3;
@@ -189,7 +187,7 @@ function _queryLinkInterfacesLatestMetrics() {
 
           _linkCi$attributes = linkCi.attributes, sourceType = _linkCi$attributes.source_type, sourceId = _linkCi$attributes.source_id, destinationId = _linkCi$attributes.destination_id, destinationType = _linkCi$attributes.destination_type;
 
-          _rlog["default"].debug('查询链路接口指标', linkCi); // 查询指标模型
+          _componentTopologyUtils.rlog.debug('查询链路接口指标', linkCi); // 查询指标模型
 
 
           typeCodes = [sourceType];
@@ -223,7 +221,7 @@ function _queryLinkInterfacesLatestMetrics() {
             }
           };
 
-          _rlog["default"].debug('查询链路接口指标 结果', linkCi);
+          _componentTopologyUtils.rlog.debug('查询链路接口指标 结果', linkCi);
 
           return _context4.abrupt("return", resultData);
 

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

@@ -46,7 +46,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!isAppTopo) {
-              _context.next = 9;
+              _context.next = 10;
               break;
             }
 
@@ -61,27 +61,29 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
             alarmList = _yield$resourceOvervi2.alarms;
             alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
               return {
-                type: 'alarm',
-                icon: 'gaojing-3',
+                alarmInfo: item,
+                type: "alarm",
+                icon: "gaojing-3",
                 className: "alarm-color-icon-lv" + item.alertLevel,
                 title: "[" + item.alertObject + "] " + item.alertTitle,
-                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + encodeURI(encodeURI(item.alertObject)) + "&ruleId=" + item.ruleId,
                 time: item.createTime,
                 status: item.status,
                 params: [{
                   alertId: item.alertId,
-                  status: 'dealing',
+                  status: "dealing",
                   userId: userId,
                   isBaseAlert: false
                 }]
               };
             })) || [];
+            console.log("setAlarmRiskList", alarmList);
             setAlarmRiskList(alarmList);
-            _context.next = 24;
+            _context.next = 25;
             break;
 
-          case 9:
-            _context.next = 11;
+          case 10:
+            _context.next = 12;
             return _alarm["default"].getAlarmByIds([id].concat(childrenIds), {
               alertStatusList: ['toDeal', 'woDealing', 'dealing'],
               // toDeal: 待处理, dealing：处理中
@@ -91,7 +93,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
               sortOrder: 'asc'
             });
 
-          case 11:
+          case 12:
             _yield$alarmService$g2 = _context.sent;
             _alarmList2 = _yield$alarmService$g2.datas;
             // 2022-07-16 后端不支持多列排序，暂通过前端实现,按创建时间倒序
@@ -100,28 +102,28 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
             });
             _alarmList2 = _alarmList2.map(function (item) {
               return {
-                type: 'alarm',
-                icon: 'gaojing-3',
+                type: "alarm",
+                icon: "gaojing-3",
                 className: "alarm-color-icon-lv" + item.alertLevel,
                 title: "" + item.alertObject + item.alertTitle,
-                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + encodeURI(encodeURI(item.alertObject)) + "&ruleId=" + item.ruleId,
                 time: item.createTime,
                 status: item.status,
                 params: [{
                   alertId: item.alertId,
-                  status: 'dealing',
+                  status: "dealing",
                   userId: userId,
                   isBaseAlert: false
                 }]
               };
             }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
 
-            _context.next = 17;
+            _context.next = 18;
             return _overview["default"].queryAllComponentsByCiId(id);
 
-          case 17:
+          case 18:
             AllComponentsByCiId = _context.sent;
-            _context.next = 20;
+            _context.next = 21;
             return _overview["default"].getRiskByIds({
               ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
                 return item.id;
@@ -131,7 +133,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
               pageSize: 10000
             });
 
-          case 20:
+          case 21:
             _yield$service$getRis2 = _context.sent;
             riskList = _yield$service$getRis2.content;
             riskList = riskList.map(function (item) {
@@ -147,7 +149,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
 
             setAlarmRiskList([].concat(_alarmList2, riskList));
 
-          case 24:
+          case 25:
           case "end":
             return _context.stop();
         }

package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js

@@ -15,7 +15,7 @@ var _ahooks = require("ahooks");
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _react = require("react");
 
@@ -43,7 +43,7 @@ function _queryWebConsoleUrlById() {
           _context2.prev = 8;
           _context2.t0 = _context2["catch"](0);
 
-          _rlog["default"].error('资源web控制台.加载数据异常', _context2.t0);
+          _componentTopologyUtils.rlog.error('资源web控制台.加载数据异常', _context2.t0);
 
         case 11:
           return _context2.abrupt("return", null);