@riil-frontend/component-topology 12.1.0-dev.1 → 12.1.0-dev.10

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

@@ -24,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(); // 选中的连线
 
@@ -34,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);

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