@riil-frontend/component-topology 12.0.0-dev.2 → 12.0.0-dev.20

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss

@@ -1,10 +1,30 @@
 @import '~@alifd/next/variables.scss';
 
 .lineBox{
-  width: 236px;
   background: #FFFFFF;
   border-radius: 4px;
   margin-bottom: -7px;
+
+  .endPointSelect {
+    min-width: 0;
+    width: 64px;
+    :global {
+      .#{$css-prefix}select-inner {
+        min-width:0 !important;
+      }
+    }
+  }
+
+  .lineMoldSelect {
+    min-width: 0;
+    width: 88px;
+    :global {
+      .#{$css-prefix}select-inner {
+        min-width:0 !important;
+      }
+    }
+  }
+
   :global {
     .#{$css-prefix}form-item:first-child{
       margin-top: 0;

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js

@@ -55,6 +55,14 @@ var LINE_TYPE_OPTIONS = [{
 // },
 ];
 
+if (localStorage.getItem('topo.test.edge.customType') === 'true') {
+  LINE_TYPE_OPTIONS.push({
+    value: 'points',
+    label: '自由线形',
+    icon: 'topo_linear_icon_pointsline'
+  });
+}
+
 var LineType = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   var value = props.value,
       onChange = props.onChange,

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js

@@ -69,7 +69,7 @@ function EdgeTypeButton(props) {
       return;
     }
 
-    (0, _edgeTypeStyleUtil.setEdgesAndChildren)(topo, edges, function (edge) {
+    (0, _edgeTypeStyleUtil.updateEdgesData)(topo, edges, function (edge) {
       if (name === 'startPoint') {
         // 删除设置
         ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].forEach(function (iconName) {

package/lib/core/editor/components/Toolbar/widgets/Layout/index.js

@@ -40,6 +40,11 @@ function Layout(props) {
       selection = _topo$store$useModelS.selection;
 
   var setDisabled = function setDisabled(data) {
+    if (topoShowType !== 'layers' && selection.length === 1) {
+      //中心节点布局，选中一个节点非分层情况下，需要星型和树形布局亮起来
+      return data == 'rectangle' || data == 'hierarchical';
+    }
+
     if (topoShowType == 'layers' && selection.length == 1 && !(0, _htElementDataUtil.isGroup)(selection[0])) {
       return data != 'rectangle';
     } else {
@@ -57,7 +62,11 @@ function Layout(props) {
 
 
     if (topoShowType != 'layers' && selection.length == 1) {
-      topo.getHtTopo().layoutInContainer(layouType);
+      if (layouType == 'hierarchical') {
+        topo.getHtTopo().layoutInContainer(layouType);
+      } else {
+        topo.getHtTopo().layoutTopoBySelectNode(layouType, selectionElements[0]);
+      }
     } // eslint-disable-next-line eqeqeq
 
 
@@ -72,7 +81,7 @@ function Layout(props) {
     topo.historyManager.beginTransaction();
     setLayout(v); // eslint-disable-next-line eqeqeq
 
-    if (topoShowType != 'layers' && ((_selection$ = selection[0]) === null || _selection$ === void 0 ? void 0 : _selection$.className) != 'ht.Node' || topoShowType == 'partition' && selection.length == 1 || topoShowType == 'layers' && selection.length == 1) {
+    if (topoShowType != 'layers' && ((_selection$ = selection[0]) === null || _selection$ === void 0 ? void 0 : _selection$.className) != 'ht.Node' || topoShowType == 'partition' && selection.length == 1 || topoShowType == 'layers' && selection.length == 1 || topoShowType !== 'layers' && selection.length === 1) {
       globalLayout(v);
     }
 
@@ -150,6 +159,11 @@ function isLayoutEnabled(props) {
 
   if (topoShowType !== 'layers' && !selection.length) {
     return true;
+  } //中心节点布局,选中一个节点不是分层的情况下，按钮亮起
+
+
+  if (topoShowType !== 'layers' && selection.length === 1) {
+    return true;
   }
 
   return false;

package/lib/core/editor/components/settings/common/NodeSizeInput/NodeSizeInput.js

@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _SizeInput = _interopRequireDefault(require("../SizeInput"));
 
@@ -58,7 +58,7 @@ function NodeSizeInput(props) {
     };
     updateSizeRatioCurrentSize(ratioInfo);
 
-    _rlog["default"].debug('initSizeRatio', ratioInfo);
+    _componentTopologyUtils.rlog.debug('initSizeRatio', ratioInfo);
 
     return ratioInfo;
   }
@@ -84,7 +84,7 @@ function NodeSizeInput(props) {
         // 首次没有比例时，初始化当前节点比例
         ratioInfo = initSizeRatio();
 
-        _rlog["default"].debug('首次没有比例时，初始化当前节点比例', ratioInfo);
+        _componentTopologyUtils.rlog.debug('首次没有比例时，初始化当前节点比例', ratioInfo);
       } else {
         // 修改后，非锁定方式调整比例（画图调整节点大小，未开启锁定修改），重新初始化比例
         var prevSize = ratioInfo.size;
@@ -92,7 +92,7 @@ function NodeSizeInput(props) {
         if (value.width !== prevSize.width || value.height !== prevSize.height) {
           ratioInfo = initSizeRatio();
 
-          _rlog["default"].debug('修改后，重新初始化比例', ratioInfo);
+          _componentTopologyUtils.rlog.debug('修改后，重新初始化比例', ratioInfo);
         }
       }
 
@@ -109,7 +109,7 @@ function NodeSizeInput(props) {
         size: newSize
       });
 
-      _rlog["default"].debug('按比例更新', name, attrValue, ratio, value, newSize, ratioInfo);
+      _componentTopologyUtils.rlog.debug('按比例更新', name, attrValue, ratio, value, newSize, ratioInfo);
     }
 
     onChange(newSize);

package/lib/core/editor/components/settings/common/SizeInput/NodeSizeInput.js

@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _NodeSizeNumberPicker = _interopRequireDefault(require("./NodeSizeNumberPicker"));
 

package/lib/core/editor/components/settings/propertyViews/layer/BasicSetting.js

@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _react = _interopRequireWildcard(require("react"));
 

package/lib/core/editor/components/settings/propertyViews/layer/SettingTab/Setting.js

@@ -19,7 +19,7 @@ var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _AlignSetting = _interopRequireDefault(require("../../../common/AlignSetting"));
 
@@ -47,7 +47,7 @@ function LayerSettingTab(props) {
         return;
       }
 
-      _rlog["default"].debug(values[name], value);
+      _componentTopologyUtils.rlog.debug(values[name], value);
 
       var newValues = field.getValues();
 
@@ -62,7 +62,7 @@ function LayerSettingTab(props) {
   var alignOnChange = function alignOnChange(v) {
     topo.historyManager.beginTransaction();
 
-    _rlog["default"].debug('setAlignmentBySelectionNodes', v);
+    _componentTopologyUtils.rlog.debug('setAlignmentBySelectionNodes', v);
 
     topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(v);
 

package/lib/core/editor/components/settings/propertyViews/view/hooks/useBackgroundSizeConfig.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 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 _react = require("react");
 
@@ -27,7 +27,7 @@ var _default = function _default(props) {
       setSize = _useState[1];
 
   (0, _react.useEffect)(function () {
-    _rlog["default"].info('设置背景图：初始化大小', getSizeFromCurrent());
+    _componentTopologyUtils.rlog.info('设置背景图：初始化大小', getSizeFromCurrent());
 
     setSize(getSizeFromCurrent());
   }, [current]);

package/lib/core/editor/hooks/useKeyboardShortcut.js

@@ -44,8 +44,10 @@ function unbindKeyboardShortcuts(props) {
 
 function useKeyboardShortcut(props) {
   (0, _react.useEffect)(function () {
+    (0, _copyElementUtil.initPasteEventListener)();
     initKeyboardShortcuts(props);
     return function () {
+      (0, _copyElementUtil.destroyPasteEventListener)();
       unbindKeyboardShortcuts(props);
     };
   }, []);

package/lib/core/editor/store/background.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");
 
 /**
  * 背景图

package/lib/core/editor/store/historyManager.js

@@ -7,7 +7,7 @@ exports["default"] = _default;
 
 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/editor/store/topoEdit.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/editor/utils/copyElementUtil.js

@@ -3,8 +3,10 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
+exports.destroyPasteEventListener = destroyPasteEventListener;
 exports.handleCopyHotkey = handleCopyHotkey;
 exports.handlePasteHotkey = handlePasteHotkey;
+exports.initPasteEventListener = initPasteEventListener;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -21,6 +23,19 @@ function handleCopyHotkey(event, options) {
   }
 }
 
+function initPasteEventListener() {
+  document.addEventListener("paste", handlePasteEventListener);
+}
+
+function destroyPasteEventListener() {
+  document.removeEventListener("paste", handlePasteEventListener);
+}
+
+function handlePasteEventListener(e) {
+  var clipdata = e.clipboardData || window.clipboardData;
+  console.log("主动粘贴", clipdata.getData("text/plain"));
+}
+
 function handlePasteHotkey(event, options) {
   var target = event.target || event.srcElement;
   var tagName = target.tagName;

package/lib/core/editor/utils/edgeTypeStyleUtil.js

@@ -4,8 +4,8 @@ exports.__esModule = true;
 exports.getEdgesBySelection = getEdgesBySelection;
 exports.isNodeAllEdges = isNodeAllEdges;
 exports.loopEdgesAndChildren = loopEdgesAndChildren;
-exports.setEdgesAndChildren = setEdgesAndChildren;
 exports.setEdgesType = setEdgesType;
+exports.updateEdgesData = updateEdgesData;
 
 var _htElementUtils = require("../../../utils/htElementUtils");
 
@@ -117,17 +117,19 @@ function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
  * 设置连线及子连线。带回退事务控制
  * @param {*} topo 
  * @param {*} edges 
- * @param {*} operateEdgeFn 
+ * @param {*} updateEdgeFn 
  */
 
 
-function setEdgesAndChildren(topo, edges, operateEdgeFn) {
+function updateEdgesData(topo, edges, updateEdgeFn) {
   topo.historyManager.beginTransaction();
-  loopEdgesAndChildren(topo, edges, operateEdgeFn);
+  edges.forEach(function (edge) {
+    updateEdgeFn(edge);
+  });
   topo.historyManager.endTransaction();
 }
 /**
- * 批量设置连线线形
+ * 批量设置连线线形。带回退事务控制
  * 
  * @param {*} edges 
  * @param {*} type 
@@ -137,7 +139,7 @@ function setEdgesAndChildren(topo, edges, operateEdgeFn) {
 
 function setEdgesType(edges, type, topo) {
   var htTopo = topo.getHtTopo();
-  setEdgesAndChildren(topo, edges, function (edge) {
+  updateEdgesData(topo, edges, function (edge) {
     htTopo.setGraphLinear(edge, {
       type: type
     });

package/lib/core/hooks/__tests__/useCiAttributeChange.test.js

@@ -0,0 +1 @@
+"use strict";

package/lib/core/hooks/ht/useHtDataPropertyChangeListener.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports["default"] = useHtDataPropertyChangeListener;
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _react = require("react");
 

package/lib/core/hooks/useCiAttributeChange.js

@@ -7,15 +7,26 @@ exports["default"] = useCiAttributeChange;
 
 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 _CiCache = _interopRequireDefault(require("../models/cache/CiCache"));
 
 var _useTopoEventListener = _interopRequireDefault(require("./useTopoEventListener"));
 
+function ciExistTopo(topoData, ciChangeData) {
+  if (!topoData) {
+    return false;
+  }
+
+  var ciIds = [].concat(topoData.nodes, topoData.links, topoData.linkGroups).map(function (data) {
+    return data.ciId || data.id;
+  });
+  return ciIds.includes(ciChangeData.id);
+}
+
 function mergeData(cis, ciChangeData) {
   var matchData = function matchData(item) {
-    return item.id === ciChangeData.id || item.ciId === ciChangeData.id;
+    return (item.ciId || item.id) === ciChangeData.id;
   };
 
   if (!cis.find(matchData)) {
@@ -23,16 +34,25 @@ function mergeData(cis, ciChangeData) {
   }
 
   return cis.map(function (ci) {
-    if (matchData(ci)) {
-      return (0, _extends2["default"])({}, ci, {
-        id: ci.id,
-        attributes: (0, _extends2["default"])({}, ci.attributes, ciChangeData.attributes)
-      });
+    if (!matchData(ci)) {
+      return ci;
     }
 
-    return ci;
+    return (0, _extends2["default"])({}, ci, {
+      id: ci.id,
+      attributes: (0, _extends2["default"])({}, ci.attributes, ciChangeData.attributes)
+    });
   });
 }
+
+function mergeTopoData(topoData, ciChangeData) {
+  var newData = (0, _extends2["default"])({}, topoData, {
+    nodes: mergeData(topoData.nodes, ciChangeData),
+    links: mergeData(topoData.links, ciChangeData),
+    linkGroups: mergeData(topoData.linkGroups, ciChangeData)
+  });
+  return newData;
+}
 /**
  * 监听ci属性变更
  * 
@@ -48,12 +68,8 @@ function useCiAttributeChange(props) {
       // 更新拓扑数据
       var topoData = topo.store.getModelState('topoMod').data;
 
-      if (topoData) {
-        var newData = (0, _extends2["default"])({}, topoData, {
-          nodes: mergeData(topoData.nodes, ciChangeData),
-          links: mergeData(topoData.links, ciChangeData),
-          linkGroups: mergeData(topoData.linkGroups, ciChangeData)
-        });
+      if (ciExistTopo(topoData, ciChangeData)) {
+        var newData = mergeTopoData(topoData, ciChangeData);
         var topoDispatchers = topo.store.getModelDispatchers('topoMod');
         topoDispatchers.update({
           data: newData

package/lib/core/hooks/useGraphAlarmDisplay.js

@@ -13,7 +13,13 @@ var _htElementUtils = require("../../utils/htElementUtils");
 
 var _showGraphManageStatusUtil = require("../utils/showGraphManageStatusUtil");
 
-function getCiAlarmLevels(alarmList, risks) {
+/**
+ * 获取ci的最高告警级别
+ * @param {Array} alarmList 
+ * @param {*} risks 
+ * @returns 
+ */
+function getCiAlarmLevelMap(alarmList, risks) {
   var ciIdLevelMap = {};
   [].concat(alarmList, risks.map(function (item) {
     var _item$resourceId;
@@ -31,13 +37,53 @@ function getCiAlarmLevels(alarmList, risks) {
 
     ciIdLevelMap[item.id] = level;
   });
+  return ciIdLevelMap;
+}
+
+function getGraphCiElementAlarmLevels(resources, alarmList, risks) {
+  var ciIdLevelMap = getCiAlarmLevelMap(alarmList, risks);
   return Object.keys(ciIdLevelMap).map(function (id) {
     return {
       id: id,
       level: ciIdLevelMap[id]
     };
+  }).filter(function (alarm) {
+    var resource = resources.find(function (item) {
+      return item.id === alarm.id;
+    });
+    return !!resource;
   });
 }
+/**
+ * 获得关联拓扑节点告警级别
+ * @param {*} topo 
+ * @param {*} relateTopoAlarm 
+ * @returns 
+ */
+
+
+function getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm) {
+  return Object.keys(relateTopoAlarm).map(function (topoId) {
+    var level = relateTopoAlarm[topoId];
+    var relateTopoNode = topo.getDataModel().getDatas().toArray().find(function (node) {
+      return "" + node.a('bindTopo') === "" + topoId;
+    });
+
+    if (!level || !relateTopoNode) {
+      return null;
+    }
+
+    return {
+      elementId: relateTopoNode.getId(),
+      level: level
+    };
+  }).filter(function (item) {
+    return !!item;
+  });
+} // 获取拓扑图元素最高告警级别。包含资源、链路、关联拓扑节点
+
+
+function getGraphElementAlarmLevels(resources) {}
 /**
  * 告警显示到ht拓扑
  * 
@@ -48,7 +94,6 @@ function getCiAlarmLevels(alarmList, risks) {
 function useGraphAlarmDisplay(options) {
   var topo = options.topo,
       alarmSwitch = options.alarmSwitch;
-  var store = topo.store;
   var topoState = topo.store.useModelState('topoMod');
   var graphLoaded = topoState.graphLoaded,
       viewState = topoState.viewState;
@@ -62,17 +107,7 @@ function useGraphAlarmDisplay(options) {
   var resources = topo.dataModel.useCis();
 
   function getCisEventLevel() {
-    return getCiAlarmLevels(alarmList || [], risks).filter(function (alarm) {
-      var resource = resources.find(function (item) {
-        return item.id === alarm.id;
-      });
-
-      if (!resource) {
-        return false;
-      }
-
-      return true;
-    });
+    return getGraphCiElementAlarmLevels(resources, alarmList || [], risks);
   }
 
   (0, _react.useEffect)(function () {
@@ -82,8 +117,8 @@ function useGraphAlarmDisplay(options) {
       resources: resources,
       isEditMode: isEditMode,
       graphLoaded: graphLoaded,
-      // 有告警且未监控时，此时开启告警静默，应当显示未监控图标
-      cisEventLevel: alarmSwitch === false ? [] : getCisEventLevel()
+      alarmSwitch: alarmSwitch,
+      cisEventLevel: getCisEventLevel()
     });
 
     function showAlarm() {
@@ -97,43 +132,30 @@ function useGraphAlarmDisplay(options) {
         return;
       }
 
-      var finalAlarms = getCisEventLevel(); // 将告警级别放入ht元素，便于测试
+      var finalAlarms = getCisEventLevel(); // 关联拓扑告警
+
+      var relateTopoAlarms = getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm);
+      var elementsAlarmLevels = [].concat(finalAlarms, relateTopoAlarms); // 将告警级别放入ht元素，便于测试
 
       (0, _htElementUtils.getElements)(topo.getDataModel()).filter(function (item) {
         return !!item.getTag();
       }).forEach(function (element) {
-        var _finalAlarms$find;
+        var _elementsAlarmLevels$;
 
-        var alarmLevel = (_finalAlarms$find = finalAlarms.find(function (item) {
-          return item.id === element.getTag();
-        })) === null || _finalAlarms$find === void 0 ? void 0 : _finalAlarms$find.level;
+        var alarmLevel = (_elementsAlarmLevels$ = elementsAlarmLevels.find(function (item) {
+          return item.id === element.getTag() || item.elementId === element.getId();
+        })) === null || _elementsAlarmLevels$ === void 0 ? void 0 : _elementsAlarmLevels$.level;
         element.a('alarmLevel', alarmLevel);
       });
-      var relateTopoAlarms = Object.keys(relateTopoAlarm).map(function (topoId) {
-        var level = relateTopoAlarm[topoId];
-        var relateTopoNode = topo.getDataModel().getDatas().toArray().find(function (node) {
-          return "" + node.a('bindTopo') === "" + topoId;
-        });
-
-        if (!level || !relateTopoNode) {
-          return null;
-        }
-
-        return {
-          elementId: relateTopoNode.getId(),
-          level: level
-        };
-      }).filter(function (item) {
-        return !!item;
-      });
 
-      _rlog["default"].debug('关联拓扑告警：推送ht', {
-        all: relateTopoAlarm,
+      _rlog["default"].debug('推送告警 => ht', {
+        alarms: elementsAlarmLevels,
+        relateTopoAlarmMap: relateTopoAlarm,
         relateTopoAlarms: relateTopoAlarms
       }); // 更新到ht拓扑
 
 
-      topo.view.loadAlarm([].concat(finalAlarms, relateTopoAlarms));
+      topo.view.loadAlarm(elementsAlarmLevels);
     }
 
     return function () {

package/lib/core/hooks/useManageStatus.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = useManageStatus;
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _react = require("react");
 

package/lib/core/hooks/usePolling.js

@@ -17,7 +17,7 @@ var _ahooks = require("ahooks");
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _componentRiilEventEmitter = require("@riil-frontend/component-riil-event-emitter");
 
@@ -227,7 +227,7 @@ var usePolling = function usePolling(props) {
 
   (0, _react.useEffect)(function () {
     if (topo.options.enableDefaultMetricLoader) {
-      _rlog["default"].debug('usePolling.useEffect: 开始轮询', {
+      _componentTopologyUtils.rlog.debug('usePolling.useEffect: 开始轮询', {
         pollingSwitch: pollingSwitch,
         resIdsList: resIdsList,
         resourceOverviewState: resourceOverviewState,
@@ -239,7 +239,7 @@ var usePolling = function usePolling(props) {
 
     return function () {
       if (loading) {
-        _rlog["default"].debug('usePolling.useEffect: 结束轮询', resAndMetrics);
+        _componentTopologyUtils.rlog.debug('usePolling.useEffect: 结束轮询', resAndMetrics);
 
         stopPoll();
       }

package/lib/core/hooks/useResourceConfig.js

@@ -56,9 +56,7 @@ function _default(props) {
     return {
       resources: config.resources,
       groups: config.groups,
-      exportLinkIdList: config.exportLinkIdList,
-      relateTopoIdList: config.relateTopoIdList //linkIps: config.linkIps,
-
+      relateTopoIdList: config.relateTopoIdList
     };
   };