@riil-frontend/component-topology 12.0.0-dev.7 → 12.0.0-dev.9

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/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/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/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);

package/lib/networkTopo/components/Link/index.js

@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _ahooks = require("ahooks");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
 
@@ -107,7 +107,7 @@ var LinkDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _rlog["default"].debug('useTopoEdit.refreshLink');
+            _componentTopologyUtils.rlog.debug('useTopoEdit.refreshLink');
 
             _context.next = 3;
             return editDispatchers.fetchData();

package/lib/networkTopo/hooks/viewer/useRelateTopo.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _tree = require("../../../utils/tree");
 
@@ -34,7 +34,7 @@ function useRelateTopo(params) {
 
   function onEvent(event) {
     if (event.name === _componentTopologyGraph.TopoEvent.EVENT_DOUBLE_CLICK) {
-      _rlog["default"].debug('双击事件', event); // 在开锁状态下禁用：双击节点跳转到拓扑图、双击缩略图返回来源拓扑图
+      _componentTopologyUtils.rlog.debug('双击事件', event); // 在开锁状态下禁用：双击节点跳转到拓扑图、双击缩略图返回来源拓扑图
 
 
       if (!lock) {
@@ -75,14 +75,14 @@ function useRelateTopo(params) {
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _rlog["default"].info('打开关联拓扑图', topoId);
+            _componentTopologyUtils.rlog.info('打开关联拓扑图', topoId);
 
             if (checkTopoExisted(topoId)) {
               _context.next = 4;
               break;
             }
 
-            _rlog["default"].error('关联拓扑图不存在：', topoId);
+            _componentTopologyUtils.rlog.error('关联拓扑图不存在：', topoId);
 
             return _context.abrupt("return");
 

package/lib/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _clusterUtil = require("../../utils/clusterUtil");
 
@@ -101,7 +99,7 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
           edgeGroup.getEdgeGroupAgent().s('edge.width', _this.calcLinkEdgeWidth(link));
         }
       } else {
-        _rlog["default"].warn('动态链路样式执行：未找到聚合链路的ht元素', link);
+        _componentTopologyUtils.rlog.warn('动态链路样式执行：未找到聚合链路的ht元素', link);
       }
     }); // 3、如果连线组未关联链路并可见，设置线宽。
 
@@ -133,7 +131,7 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
           }
         }
       } catch (error) {
-        _rlog["default"].error('连线组未关联链路并可见，设置线宽：异常', edge, error);
+        _componentTopologyUtils.rlog.error('连线组未关联链路并可见，设置线宽：异常', edge, error);
       }
     });
     topo.historyManager && topo.historyManager.setDisabled(false, '链路动态样式');

package/lib/networkTopo/models/LinkTagsTipsBuilder.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 _htElementUtils = require("../../utils/htElementUtils");
 
@@ -167,7 +167,7 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
 
     var mergeData = this.buildData(data, linkChildren);
 
-    _rlog["default"].debug('buildEdgeGroupTagTagsAndTips', {
+    _componentTopologyUtils.rlog.debug('buildEdgeGroupTagTagsAndTips', {
       groupId: groupId,
       config: config,
       linkChildren: linkChildren,
@@ -231,7 +231,7 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
         });
         mergeData.metricMap[m.code] = calcFnMap[m.calcType](values);
       } catch (error) {
-        _rlog["default"].warn('连线组指标计算异常', error);
+        _componentTopologyUtils.rlog.warn('连线组指标计算异常', error);
       }
     }); // console.error(groupId, {config, linkChildrenData, mergeData})
 

package/lib/networkTopo/models/TopoCenter.js

@@ -15,7 +15,7 @@ var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _TopoApp2 = _interopRequireDefault(require("../../core/models/TopoApp"));
 

package/lib/networkTopo/services/model.js

@@ -20,8 +20,6 @@ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils")
 
 var _utils = require("@riil-frontend/utils");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-
 var _storage = require("../utils/storage");
 
 var _mdc = require("./mdc");
@@ -1162,7 +1160,7 @@ function _formatCiAttributes() {
               });
             }
           } catch (error) {
-            _rlog["default"].error('services=>model=>:', error);
+            _componentTopologyUtils.rlog.error('services=>model=>:', error);
           }
 
           return _context31.abrupt("return", meta);

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

@@ -15,8 +15,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-
 var _blacklist = _interopRequireDefault(require("./blacklist"));
 
 var _constants = require("./constants");
@@ -552,7 +550,7 @@ var _default = (0, _extends2["default"])({
       return _regenerator["default"].wrap(function _callee16$(_context16) {
         while (1) switch (_context16.prev = _context16.next) {
           case 0:
-            _rlog["default"].debug('saveTopoSettings', settings);
+            _componentTopologyUtils.rlog.debug('saveTopoSettings', settings);
 
             parm = {
               id: id,

package/lib/networkTopo/services/topo/ciInfo.js

@@ -9,8 +9,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _constants = require("./constants");

package/lib/networkTopo/store/functionAuth.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/networkTopo/store/topoCenter.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/networkTopo/store/topoTreeMod.js

@@ -13,7 +13,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 _tree = require("../../utils/tree");
 
@@ -165,7 +165,7 @@ function _default(topoApp) {
                     conditions = {};
                   }
 
-                  _rlog["default"].debug('editTopoOnTree', conditions);
+                  _componentTopologyUtils.rlog.debug('editTopoOnTree', conditions);
 
                   _context4.next = 4;
                   return topoApp.serverApi.editTopo({
@@ -236,7 +236,7 @@ function _default(topoApp) {
             return _regenerator["default"].wrap(function _callee5$(_context5) {
               while (1) switch (_context5.prev = _context5.next) {
                 case 0:
-                  _rlog["default"].debug('deleteTopoOnTree', conditions, state, dispatch.topoMod);
+                  _componentTopologyUtils.rlog.debug('deleteTopoOnTree', conditions, state, dispatch.topoMod);
 
                   currentTopoId = state.topoMod.topoId;
 
@@ -245,7 +245,7 @@ function _default(topoApp) {
                     break;
                   }
 
-                  _rlog["default"].debug('deleteTopo-currentTopo', conditions);
+                  _componentTopologyUtils.rlog.debug('deleteTopo-currentTopo', conditions);
 
                   _context5.next = 6;
                   return dispatch.topoMod.updateDelId("" + conditions);
@@ -304,7 +304,7 @@ function _default(topoApp) {
                     conditions = {};
                   }
 
-                  _rlog["default"].debug('setDefTopoOnTree', conditions);
+                  _componentTopologyUtils.rlog.debug('setDefTopoOnTree', conditions);
 
                   _context6.next = 4;
                   return topoApp.serverApi.setDefTopo(parseInt(conditions, 10));

package/lib/networkTopo/utils/exportData.js

@@ -11,8 +11,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 _clusterUtil = require("../../utils/clusterUtil");
 
 function _default(_x) {
@@ -57,7 +55,7 @@ function _ref() {
             })
           };
 
-          _rlog["default"].error('导出数据', params);
+          _componentTopologyUtils.rlog.error('导出数据', params);
 
           _context.next = 6;
           return _componentTopologyUtils.request.post('/topo/v1/api/structure/excel', params, {