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

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/useKeyboardShortcut.js

@@ -34,6 +34,10 @@ function initKeyboardShortcuts(props) {
 
   (0, _hotkeysJs["default"])('ctrl+v, command+v', function (event) {
     return (0, _copyElementUtil.handlePasteHotkey)(event, props);
+  }); // 删除
+
+  (0, _hotkeysJs["default"])('delete', function (event) {
+    topoEdit.batchDeleteSelectedElement();
   });
 }
 

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

package/lib/core/hooks/useResourceConfig.js

@@ -55,8 +55,7 @@ function _default(props) {
     var config = getConfigFromHt();
     return {
       resources: config.resources,
-      groups: config.groups,
-      relateTopoIdList: config.relateTopoIdList
+      groups: config.groups
     };
   };