@riil-frontend/component-topology 12.0.0-dev.3 → 12.0.0-dev.31

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

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

@@ -21,8 +21,10 @@ function ViewerPlugin(props) {
   var topo = props.topo,
       viewerProps = props.viewerProps;
   var store = topo.store;
+  var alarmInfoDoc = viewerProps.alarmInfoDoc;
   (0, _useAlarm["default"])({
-    topo: topo
+    topo: topo,
+    alarmInfoDoc: alarmInfoDoc
   });
   (0, _useManageStatus["default"])({
     topo: topo

package/lib/core/viewer/components/titlebar/widgets/AlarmButton.js

@@ -15,11 +15,7 @@ var _useEventData = _interopRequireDefault(require("../../../../hooks/useEventDa
 
 function AlarmButton(props) {
   var topo = props.topo;
-
-  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
-      alarmState = _topo$store$useModel[0],
-      alarmDispatchers = _topo$store$useModel[1];
-
+  var alarmState = topo.store.useModelState("topoAlarm");
   var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
   var alarmData = (0, _useEventData["default"])({
     topo: topo

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/components/TopoView.js

@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _index = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/components/NoDataPage/index"));
 
@@ -31,13 +31,9 @@ var _useRelateTopo = _interopRequireDefault(require("../hooks/viewer/useRelateTo
 
 var _useEdgeFlow = _interopRequireDefault(require("../hooks/viewer/useEdgeFlow"));
 
-var _useEdgeExpand = _interopRequireDefault(require("../hooks/useEdgeExpand"));
-
 var _excluded = ["topo", "viewerProps", "titleBar", "nodataPage", "notfoundPageProps", "noPermissionPageProps"];
 
-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; }
+// import useEdgeExpand from "../hooks/useEdgeExpand";
 
 /**
  * 拓扑组件。变化无权限、无数据显示
@@ -60,10 +56,8 @@ function NetworkTopologyCore(props) {
   });
   (0, _useEdgeFlow["default"])({
     topo: topo
-  });
-  (0, _useEdgeExpand["default"])({
-    topo: topo
-  });
+  }); // useEdgeExpand({ topo })
+
   var relateTopo = (0, _useRelateTopo["default"])({
     topo: topo
   });
@@ -92,10 +86,7 @@ function NetworkTopologyCore(props) {
       });
     } else if (!topoId) {
       return null;
-    } // if (loading) {
-    //   return null;
-    // }
-
+    }
 
     if (!loading) {
       // 加载完成后

package/lib/networkTopo/hooks/useEdgeExpand.js

@@ -23,9 +23,8 @@ function useEdgeExpand(props) {
           data = e.data;
 
       if (data instanceof ht.Group && property === 'expanded') {
-        (0, _edgeUtil.updateEdgeExpanded)(topo);
-        setTimeout(function () {
-          (0, _edgeUtil.updateEdgeExpanded)(topo);
+        // updateEdgeExpanded(topo)
+        setTimeout(function () {// updateEdgeExpanded(topo)
         }, 100);
       }
     }

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");
@@ -25,7 +23,7 @@ var _model = require("../model");
 
 var _exitLinkUtil = require("../../utils/exitLinkUtil");
 
-var _excluded = ["groups", "resources", "exportLinkIdList"];
+var _excluded = ["groups", "resources"];
 var API_ROOT = _constants.TOPO_API_ROOT;
 /**
  * 拓扑图（看做一个容器）的“父容器”ID
@@ -482,11 +480,11 @@ var _default = (0, _extends2["default"])({
   */
   bindResourceToTopo: function bindResourceToTopo(id, config) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14() {
-      var groups, resources, exportLinkIdList, otherConfig, newGroups, obj;
+      var groups, resources, otherConfig, newGroups, obj;
       return _regenerator["default"].wrap(function _callee14$(_context14) {
         while (1) switch (_context14.prev = _context14.next) {
           case 0:
-            groups = config.groups, resources = config.resources, exportLinkIdList = config.exportLinkIdList, otherConfig = (0, _objectWithoutPropertiesLoose2["default"])(config, _excluded);
+            groups = config.groups, resources = config.resources, otherConfig = (0, _objectWithoutPropertiesLoose2["default"])(config, _excluded);
             newGroups = Array.isArray(groups) ? groups : [];
 
             if (resources) {
@@ -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