@riil-frontend/component-topology 13.0.0-dev.1 → 13.0.0-dev.3

package/lib/core/editor/components/Toolbar/widgets/FontFamilyWidget.js

@@ -7,9 +7,9 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _DropdownMenu = _interopRequireDefault(require("./components/DropdownMenu"));
+var _FontFamilySelect = _interopRequireDefault(require("./components/FontFamilySelect"));
 
-var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter.js"));
+var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter"));
 
 var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
 
@@ -17,31 +17,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
-function FontFamilySelect(props) {
-  var value = props.value,
-      onChange = props.onChange;
-  var items = ['宋体', '微软雅黑', '黑体', 'Arial'];
-  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
-    value: (items.includes(value) ? value : null) || '',
-    valueRender: function valueRender(val) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        style: {
-          width: 48
-        }
-      }, val || '微软雅黑');
-    },
-    onSelect: onChange
-  }, items.map(function (item) {
-    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
-      key: item
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      style: {
-        fontFamily: item
-      }
-    }, item));
-  }));
-}
-
 function FontFamilyWidget(props) {
   var topo = props.topo,
       showLabel = props.showLabel,
@@ -51,7 +26,7 @@ function FontFamilyWidget(props) {
     label: "\u5B57\u4F53",
     tooltip: "\u5B57\u4F53",
     showLabel: showLabel
-  }, /*#__PURE__*/_react["default"].createElement(FontFamilySelect, {
+  }, /*#__PURE__*/_react["default"].createElement(_FontFamilySelect["default"], {
     value: style.fontFamily,
     onChange: function onChange(val) {
       topo.historyManager.beginTransaction();

package/lib/core/editor/components/Toolbar/widgets/FontSizeWidget.js

@@ -7,9 +7,9 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _DropdownMenu = _interopRequireDefault(require("./components/DropdownMenu"));
+var _FontSizeSelect = _interopRequireDefault(require("./components/FontSizeSelect"));
 
-var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter.js"));
+var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter"));
 
 var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
 
@@ -17,31 +17,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
-function FontSizeSelect(props) {
-  var value = props.value,
-      disabled = props.disabled,
-      onChange = props.onChange;
-  var items = [12, 14, 16, 18, 20, 24, 30, 36, 48, 60, 80];
-  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
-    value: "" + (value || ''),
-    valueRender: function valueRender(val) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        style: {
-          width: 18
-        }
-      }, val || 20);
-    },
-    disabled: disabled,
-    onSelect: function onSelect(val) {
-      return onChange(parseInt(val, 10));
-    }
-  }, items.map(function (item) {
-    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
-      key: item
-    }, item);
-  }));
-}
-
 function FontSizeWidget(props) {
   var topo = props.topo,
       showLabel = props.showLabel,
@@ -57,7 +32,7 @@ function FontSizeWidget(props) {
     tooltip: "\u5B57\u53F7",
     showLabel: showLabel,
     disabled: disabled
-  }, /*#__PURE__*/_react["default"].createElement(FontSizeSelect, {
+  }, /*#__PURE__*/_react["default"].createElement(_FontSizeSelect["default"], {
     value: style.fontSize,
     disabled: disabled,
     onChange: function onChange(val) {

package/lib/core/editor/components/Toolbar/widgets/FontStyleButton.js

@@ -7,39 +7,16 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _variables = _interopRequireDefault(require("@alifd/theme-19926/variables.js"));
+var _FontStyleSelect = _interopRequireDefault(require("./components/FontStyleSelect"));
 
-var _htElementUtils = require("../../../../../utils/htElementUtils");
-
-var _DropdownMenu = _interopRequireDefault(require("./components/DropdownMenu"));
-
-var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter.js"));
+var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter"));
 
 var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
 
-var _Tooltip = _interopRequireDefault(require("../components/Tooltip"));
-
 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; }
 
-var items = [{
-  key: 'bold',
-  label: '加粗',
-  icon: 'bold',
-  tooltip: '加粗'
-}, {
-  key: 'italic',
-  label: '斜体',
-  icon: 'Italics',
-  tooltip: '斜体'
-}, {
-  key: 'underline',
-  label: '下划线',
-  icon: 'Underline',
-  tooltip: '下划线'
-}];
-
 function buildValue(obj) {
   return Object.keys(obj).filter(function (key) {
     return !!obj[key];
@@ -107,39 +84,12 @@ function FontStyleButton(props) {
     tooltip: "\u6587\u5B57\u6837\u5F0F\uFF08\u52A0\u7C97\u3001\u659C\u4F53\u3001\u4E0B\u5212\u7EBF\uFF09",
     disabled: disabled,
     showLabel: showLabel
-  }, /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_FontStyleSelect["default"], {
     value: value,
-    valueRender: function valueRender() {
-      return /*#__PURE__*/_react["default"].createElement("img", {
-        src: "/img/topo/editor/toolbar/bold/" + (disabled ? 'Disable' : 'Normal') + ".svg",
-        alt: ""
-      });
-    },
-    multiple: true,
     disabled: disabled,
-    onSelect: handleSelect
-  }, items.map(function (item) {
-    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
-      key: item.key,
-      disabled: fieldDisabled[item.key]
-    }, /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
-      trigger: /*#__PURE__*/_react["default"].createElement("div", {
-        style: {
-          display: 'flex',
-          alignItems: 'center'
-        }
-      }, /*#__PURE__*/_react["default"].createElement("img", {
-        src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
-        alt: ""
-      }), /*#__PURE__*/_react["default"].createElement("span", {
-        style: fieldDisabled[item.key] ? {} : {
-          color: _variables["default"]['$color-text1-4']
-        }
-      }, item.label)),
-      align: "r",
-      popupStyle: {}
-    }, item.tooltip));
-  })));
+    fieldDisabled: fieldDisabled,
+    onChange: handleSelect
+  }));
 }
 
 var _default = (0, _textStyleSettingRouter["default"])(FontStyleButton, {

package/lib/core/editor/components/Toolbar/widgets/components/FontFamilySelect.js

@@ -0,0 +1,38 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
+
+function FontFamilySelect(props) {
+  var value = props.value,
+      onChange = props.onChange;
+  var items = ['宋体', '微软雅黑', '黑体', 'Arial'];
+  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
+    value: (items.includes(value) ? value : null) || '',
+    valueRender: function valueRender(val) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          width: 48
+        }
+      }, val || '微软雅黑');
+    },
+    onSelect: onChange
+  }, items.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
+      key: item
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      style: {
+        fontFamily: item
+      }
+    }, item));
+  }));
+}
+
+var _default = FontFamilySelect;
+exports["default"] = _default;

package/lib/core/editor/components/Toolbar/widgets/components/FontSizeSelect.js

@@ -0,0 +1,38 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
+
+function FontSizeSelect(props) {
+  var value = props.value,
+      disabled = props.disabled,
+      onChange = props.onChange;
+  var items = [12, 14, 16, 18, 20, 24, 30, 36, 48, 60, 80];
+  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
+    value: "" + (value || ''),
+    valueRender: function valueRender(val) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          width: 18
+        }
+      }, val || 20);
+    },
+    disabled: disabled,
+    onSelect: function onSelect(val) {
+      return onChange(parseInt(val, 10));
+    }
+  }, items.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
+      key: item
+    }, item);
+  }));
+}
+
+var _default = FontSizeSelect;
+exports["default"] = _default;

package/lib/core/editor/components/Toolbar/widgets/components/FontStyleSelect.js

@@ -0,0 +1,83 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _variables = _interopRequireDefault(require("@alifd/theme-19926/variables.js"));
+
+var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
+
+var _Tooltip = _interopRequireDefault(require("../../components/Tooltip"));
+
+var items = [{
+  key: 'bold',
+  label: '加粗',
+  icon: 'bold',
+  tooltip: '加粗'
+}, {
+  key: 'italic',
+  label: '斜体',
+  icon: 'Italics',
+  tooltip: '斜体'
+}, {
+  key: 'underline',
+  label: '下划线',
+  icon: 'Underline',
+  tooltip: '下划线'
+}];
+
+function buildValue(obj) {
+  return Object.keys(obj).filter(function (key) {
+    return !!obj[key];
+  });
+}
+
+var fields = ['bold', 'italic', 'underline'];
+
+function FontStyleSelect(props) {
+  var value = props.value,
+      disabled = props.disabled,
+      onChange = props.onChange,
+      _props$fieldDisabled = props.fieldDisabled,
+      fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled;
+  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
+    value: value,
+    valueRender: function valueRender() {
+      return /*#__PURE__*/_react["default"].createElement("img", {
+        src: "/img/topo/editor/toolbar/bold/" + (disabled ? 'Disable' : 'Normal') + ".svg",
+        alt: ""
+      });
+    },
+    multiple: true,
+    disabled: disabled,
+    onSelect: onChange
+  }, items.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
+      key: item.key,
+      disabled: !!fieldDisabled[item.key]
+    }, /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
+      trigger: /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          display: 'flex',
+          alignItems: 'center'
+        }
+      }, /*#__PURE__*/_react["default"].createElement("img", {
+        src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
+        alt: ""
+      }), /*#__PURE__*/_react["default"].createElement("span", {
+        style: fieldDisabled[item.key] ? {} : {
+          color: _variables["default"]['$color-text1-4']
+        }
+      }, item.label)),
+      align: "r",
+      popupStyle: {}
+    }, item.tooltip));
+  }));
+}
+
+var _default = FontStyleSelect;
+exports["default"] = _default;

package/lib/core/editor/components/settings/core/updateElementProperty.js

@@ -1,12 +1,17 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports["default"] = updateElementProperty;
 
+var _loglevel = _interopRequireDefault(require("loglevel"));
+
+var rlog = _loglevel["default"].getLogger('topo');
+
 function updateElementProperty(topo, name, value) {
-  // const element = topo.getDataModel().getDataById(selection[0].id);
   var element = topo.getSelectionModel().getFirstData();
-  console.info("updateElementProperty", topo.getSelectionModel().getSelection(), {
+  rlog.debug("updateElementProperty. ", {
     element: element,
     name: name,
     value: value

package/lib/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js

@@ -32,13 +32,13 @@ function GlobalEdgeToggle(props) {
         topo: topo,
         showType: 4
       });
-      topo.getHtTopo().expandAllEdgeGroups();
+      topo.getHtTopo().toggleAllEdgeGroups(true);
     } else {
       (0, _linkUtils.showLinkByConfig)({
         topo: topo,
         showType: 1
       });
-      topo.getHtTopo().collapseAllEdgeGroups();
+      topo.getHtTopo().toggleAllEdgeGroups(false);
     }
 
     displayConfigDispatchers.update({

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

@@ -26,27 +26,31 @@ function useNewElementTheme(props) {
       inited = true;
     }
 
-    function handleDataModelChangeListener(e) {
-      var kind = e.kind,
-          data = e.data;
+    function handleAddElement(e) {
+      var data = e.data; // 设置主题样式
 
-      if (kind === 'add') {
-        // 设置主题样式
-        var displayConfig = topo.store.getModelState('displayConfig');
-        var theme = displayConfig.canvasTheme || 'white';
+      var displayConfig = topo.store.getModelState('displayConfig');
+      var theme = displayConfig.canvasTheme || 'white';
 
-        var themeConfig = _themes["default"].find(function (item) {
-          return item.name === theme;
-        });
+      var themeConfig = _themes["default"].find(function (item) {
+        return item.name === theme;
+      });
 
-        var _ThemeUtil2 = (0, _themeUtil["default"])({
-          topo: topo
-        }),
-            setElementTheme = _ThemeUtil2.setElementTheme;
+      var _ThemeUtil = (0, _themeUtil["default"])({
+        topo: topo
+      }),
+          setElementTheme = _ThemeUtil.setElementTheme;
 
-        setElementTheme(data, themeConfig); // 临时放这里，新加入节点按配置显示隐藏名称
+      setElementTheme(data, themeConfig); // 临时放这里，新加入节点按配置显示隐藏名称
+
+      (0, _nodeNameVisibleUtil.setNewNodeNameVisible)(topo, data);
+    }
 
-        (0, _nodeNameVisibleUtil.setNewNodeNameVisible)(topo, data);
+    function handleDataModelChangeListener(e) {
+      var kind = e.kind;
+
+      if (kind === 'add') {
+        handleAddElement(e);
       }
     }
 

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

@@ -3,7 +3,6 @@
 exports.__esModule = true;
 exports.getEdgesBySelection = getEdgesBySelection;
 exports.isNodeAllEdges = isNodeAllEdges;
-exports.loopEdgesAndChildren = loopEdgesAndChildren;
 exports.setEdgesType = setEdgesType;
 exports.updateEdgesData = updateEdgesData;
 
@@ -25,6 +24,14 @@ function getEdgesBySelection(topo) {
     return nodeIds;
   };
 
+  function getVisibleEdgesInNodes(gv, nodes) {
+    var nodeIds = getChildrenNodeIds(nodes);
+    var dm = gv.getDataModel();
+    return (0, _htElementUtils.getEdges)(dm).filter(function (edge) {
+      return nodeIds.includes(edge.getSource().getId()) && nodeIds.includes(edge.getTarget().getId());
+    }).filter(_htElementUtils.isEdgeVisible);
+  }
+
   var getSelectedEdges = function getSelectedEdges(gv) {
     var selection = gv.getSelectionModel().getSelection().toArray(); // 选中的连线
 
@@ -35,14 +42,8 @@ function getEdgesBySelection(topo) {
     var nodes = selection.filter(function (element) {
       return element instanceof ht.Node;
     });
-    var nodeIds = getChildrenNodeIds(nodes);
-    var dm = gv.getDataModel();
-    (0, _htElementUtils.getEdges)(dm).forEach(function (edge) {
-      if (nodeIds.find(function (nodeId) {
-        return nodeId === edge.getSource().getId();
-      }) && nodeIds.find(function (nodeId) {
-        return nodeId === edge.getTarget().getId();
-      }) && !edges.find(function (item) {
+    getVisibleEdgesInNodes(gv, nodes).forEach(function (edge) {
+      if (!edges.find(function (item) {
         return item === edge;
       })) {
         edges.push(edge);
@@ -89,30 +90,6 @@ function isNodeAllEdges(topo) {
   });
   return inEdges;
 }
-/**
- * 遍历连线及子连线
- * @param {*} topo 
- * @param {*} edges 
- * @param {*} operateEdgeFn 
- */
-
-
-function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
-  var htTopo = topo.getHtTopo();
-  edges.forEach(function (edge) {
-    operateEdgeFn(edge);
-
-    if (edge.isEdgeGroupAgent()) {
-      // 连线组折叠时同时设置子连线
-      var edgeChildren = edge.getEdgeGroup().getEdges().toArray();
-      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), true);
-      edgeChildren.forEach(function (edgeChild) {
-        operateEdgeFn(edgeChild);
-      });
-      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), false);
-    }
-  });
-}
 /**
  * 设置连线及子连线。带回退事务控制
  * @param {*} topo 

package/lib/core/hooks/useGraphAlarmDisplay.js

@@ -137,6 +137,8 @@ function useGraphAlarmDisplay(options) {
     });
 
     function showAlarm() {
+      var _topo$historyManager, _topo$historyManager2;
+
       if (!graphLoaded) {
         return;
       }
@@ -169,7 +171,9 @@ function useGraphAlarmDisplay(options) {
       }); // 更新到ht拓扑
 
 
+      (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '推送告警');
       topo.view.loadAlarm(elementsAlarmLevels);
+      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '推送告警');
     }
 
     return function () {

package/lib/core/hooks/usePolling.js

@@ -17,7 +17,7 @@ var _ahooks = require("ahooks");
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
+var _loglevel = _interopRequireDefault(require("loglevel"));
 
 var _componentRiilEventEmitter = require("@riil-frontend/component-riil-event-emitter");
 
@@ -27,10 +27,13 @@ var _useCiAttributeChange = _interopRequireDefault(require("./useCiAttributeChan
 
 var _useHtDataPropertyChangeListener = _interopRequireDefault(require("./ht/useHtDataPropertyChangeListener"));
 
+var rlog = _loglevel["default"].getLogger('topo');
 /**
  * 轮询获取指标hooks
  * @param {*} props
  */
+
+
 var usePolling = function usePolling(props) {
   var topo = props.topo;
   var store = topo.store;
@@ -227,20 +230,18 @@ var usePolling = function usePolling(props) {
 
   (0, _react.useEffect)(function () {
     if (topo.options.enableDefaultMetricLoader) {
-      _componentTopologyUtils.rlog.debug('usePolling.useEffect: 开始轮询', {
+      rlog.debug('usePolling.useEffect: 开始轮询', {
         pollingSwitch: pollingSwitch,
         resIdsList: resIdsList,
         resourceOverviewState: resourceOverviewState,
         resAndMetrics: resAndMetrics
       });
-
       startPoll();
     }
 
     return function () {
       if (loading) {
-        _componentTopologyUtils.rlog.debug('usePolling.useEffect: 结束轮询', resAndMetrics);
-
+        rlog.debug('usePolling.useEffect: 结束轮询', resAndMetrics);
         stopPoll();
       }
     };