@riil-frontend/component-topology 12.1.0-dev.9 → 12.1.2

package/es/utils/htElementUtils.js

@@ -115,15 +115,6 @@ export function getNodeData(element) {
 export function getEdges(dataModel) {
   return getElements(dataModel).filter(isValidEdge);
 }
-/**
- * 是否连线组
- * @param {ht.Edge} edge
- * @returns
- */
-
-export function isEdgeGroup(edge) {
-  return isEdge(edge) && edge.a('x.edgegroup.isEdgeGroup');
-}
 /**
  * 是否连线组代理
  * @param {*} edge
@@ -131,16 +122,7 @@ export function isEdgeGroup(edge) {
  */
 
 export function isEdgeGroupAgent(edge) {
-  return isEdgeGroup(edge);
-}
-/**
- * TODO
- * @param {*} edge 
- * @returns 
- */
-
-export function isEdgeGroupExpanded(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
+  return isEdge(edge) && edge.a('x.edgegroup.isEdgeGroup');
 }
 export function isEdgeVisible(edge) {
   return edge.s('2d.visible') || edge.s('2d.visible') === undefined;
@@ -160,7 +142,9 @@ export function getEdgesBetweenNodes(node1, node2) {
     return edges;
   }
 
-  node1Edges.toArray().filter(isValidEdge).forEach(function (edge) {
+  node1Edges.toArray().filter(isValidEdge).filter(function (edge) {
+    return !isEdgeGroupAgent(edge);
+  }).forEach(function (edge) {
     var isEdgeBetweenNodes = edge.getSource().getTag() === node2.getTag() || edge.getTarget().getTag() === node2.getTag();
 
     if (isEdgeBetweenNodes) {
@@ -169,63 +153,6 @@ export function getEdgesBetweenNodes(node1, node2) {
   });
   return edges;
 }
-/**
- * 获得节点间的连线组，连线<=1时返回null
- * @returns
- */
-
-export function getEdgeGroupByNodes(node1, node2) {
-  var htEdgeGroup = null;
-  getEdgesBetweenNodes(node1, node2).forEach(function (edge) {
-    if (!htEdgeGroup) {
-      htEdgeGroup = edge.getEdgeGroup();
-    }
-  });
-
-  if (!htEdgeGroup) {
-    return null;
-  }
-
-  return new EdgeGroup(htEdgeGroup);
-}
-/**
- * 获得节点间的连线组，连线<=1时返回null
- * @returns
- */
-
-export function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
-  var node1 = dataModel.getDataByTag(nodeTag1);
-  var node2 = dataModel.getDataByTag(nodeTag2);
-
-  if (!node1 || !node2) {
-    console.warn("getEdgeGroupByNodes 未找到节点", {
-      node1: node1,
-      node2: node2,
-      nodeTag1: nodeTag1,
-      nodeTag2: nodeTag2
-    });
-    return null;
-  }
-
-  return getEdgeGroupByNodes(node1, node2);
-}
-/**
- * 获得连线组连线列表
- * @param {*} dataModel 
- * @returns 
- */
-
-export function getEdgeGroups(dataModel) {
-  var edgeGroups = [];
-  getEdges(dataModel).forEach(function (edge) {
-    var group = edge.getEdgeGroup();
-
-    if (group && !edgeGroups.includes(group)) {
-      edgeGroups.push(group);
-    }
-  });
-  return edgeGroups;
-}
 /**
  * 获得连线组连线列表
  * @param {*} dataModel 
@@ -237,7 +164,7 @@ export function getEdgeGroupAgents(dataModel) {
 }
 export function getEdgeDatas(dataModel) {
   return getEdges(dataModel).filter(function (edge) {
-    return !isEdgeGroup(edge);
+    return !isEdgeGroupAgent(edge);
   }).map(function (element) {
     var _element$getSource, _element$getTarget;
 
@@ -341,9 +268,13 @@ export function setElementRuntimeStyle(element, name, value) {
 }
 /**
  * 判断拓扑图是否存在元素
+ * 
+ * @param {*} dataModel 
+ * @param {{id?: string, tag?: string}} data 
+ * @returns 
  */
 
-export function isExistedElement(htTopo, dataModel, data) {
+export function containsElement(dataModel, data) {
   if (dataModel.getDataByTag(data.id)) {
     return true;
   } // 识别区域
@@ -352,34 +283,5 @@ export function isExistedElement(htTopo, dataModel, data) {
   var element = getElements(dataModel).find(function (item) {
     return data.tag && item.a("tag") === data.tag;
   });
-
-  if (element) {
-    return true;
-  } // 连线/连线组
-
-
-  var edges = getEdges(dataModel);
-
-  for (var i = 0; i < edges.length; i++) {
-    var edge = edges[i]; // 如果连线组折叠，判断子连线
-
-    var edgeData = htTopo.getEdgeData(edge);
-
-    if (edgeData) {
-      // eslint-disable-next-line no-underscore-dangle
-      var id = edgeData._attrObject.id;
-
-      if (id === data.id) {
-        return true;
-      }
-    } // 如果连线组展开，判断连线组
-    // eslint-disable-next-line no-underscore-dangle
-
-
-    if (edge.__edgeGroup && edge.__edgeGroup._tag === data.id) {
-      return true;
-    }
-  }
-
-  return false;
+  return !!element;
 }

package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -83,7 +83,7 @@ function ResourceSelectDrawer(props) {
             _context.t0 = _context["catch"](1);
             setLoading(false);
 
-            _componentTopologyUtils.rlog.error('ResourceSelectDrawer.handleOk', _context.t0);
+            _componentTopologyUtils.rlog.error('ResourceSelectDrawer.handleOk', _context.t0, _context.t0.stack);
 
           case 13:
           case "end":

package/lib/core/components/TopoView/topoView.js

@@ -19,7 +19,7 @@ var _componentTopologyGraph = _interopRequireWildcard(require("@riil-frontend/co
 
 var _PortalContainer = _interopRequireDefault(require("@riil-frontend/component-topology-graph/es/components/PortalContainer"));
 
-var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
+var _loglevel = _interopRequireDefault(require("loglevel"));
 
 var _showMessage = _interopRequireDefault(require("../../utils/showMessage"));
 
@@ -66,6 +66,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 通用
 // 显示模式
 // 编辑模式
+var rlog = _loglevel["default"].getLogger('topo');
+
 var Topology = function Topology(props) {
   var _classnames;
 
@@ -138,40 +140,39 @@ var Topology = function Topology(props) {
   (0, _react.useEffect)(function () {
     // 拓扑退出注销
     return function () {
-      _componentTopologyUtils.rlog.info('TopoView 退出');
-
+      rlog.info('TopoView 退出');
       topo.selectionModel.destroy();
       topoDispatchers.reset();
     };
   }, []);
   var onGraphCreated = (0, _react.useCallback)(function (topoClient) {
     topo.view.onCreatedView(topoClient);
-
-    _componentTopologyUtils.rlog.info('TopoView.onGraphCreated');
+    rlog.info('TopoView.onGraphCreated');
 
     if (onReady) {
       onReady();
     }
   }, []);
   var handleGraphDataLoaded = (0, _react.useCallback)(function () {
-    _componentTopologyUtils.rlog.info('TopoView.handleGraphDataLoaded', new Date().toString(), {
+    rlog.info('TopoView.handleGraphDataLoaded: 数据加载完成', new Date().toString(), {
       topoMod: topo.store.getState().topoMod,
       topoData: topoData,
       htElements: topo.getDataModel().getDatas().toArray()
     });
-
     (0, _nodeNameVisibleUtil.updateNodesNameVisible)(topo);
     (0, _clusterUtil.upgradeV103GraphClusterNode)(topo, topoData);
     (0, _graphLinkUtil.fixLink)(topo);
     (0, _clusterUtil.handleClusterNoPermission)(topo);
     (0, _edgeUtil.updateEdgeExpanded)(topo);
+    topo.selectionModel.init();
     var htHistoryManager = topo.getDataModel().getHistoryManager();
 
-    if (htHistoryManager) {
+    if (topo.store.getState().topoMod.viewState === 'edit' && htHistoryManager) {
       topo.historyManager = new _HistoryManager["default"](topo, htHistoryManager);
+      topo.historyManager.clear();
+      rlog.info('TopoView.handleGraphDataLoaded: 初始化HistoryManager ', topo.historyManager.toString());
     }
 
-    topo.selectionModel.init();
     topoDispatchers.update({
       graphLoaded2: true
     });
@@ -181,12 +182,11 @@ var Topology = function Topology(props) {
     }
   }, [topoData]);
   var handleGraphLoaded = (0, _react.useCallback)(function () {
-    _componentTopologyUtils.rlog.info('TopoView.handleGraphLoaded', new Date().toString(), {
+    rlog.info('TopoView.handleGraphLoaded', new Date().toString(), {
       topoMod: topo.store.getState().topoMod,
       topoData: topoData,
       htElements: topo.getDataModel().getDatas().toArray()
     });
-
     (0, _nodeNameVisibleUtil.updateNodesNameVisible)(topo);
     (0, _clusterUtil.upgradeV103GraphClusterNode)(topo, topoData);
     (0, _graphLinkUtil.fixLink)(topo);
@@ -223,8 +223,7 @@ var Topology = function Topology(props) {
   }, [topoData]);
 
   var rightEventHandle = function rightEventHandle(event) {
-    _componentTopologyUtils.rlog.debug('右键事件', event);
-
+    rlog.debug('右键事件', event);
     var contextMenu = topo.view.contextMenu;
 
     if (contextMenu.containsCommand(event.data.id)) {
@@ -233,8 +232,7 @@ var Topology = function Topology(props) {
   };
 
   var onRefresh = function onRefresh(e) {
-    _componentTopologyUtils.rlog.debug('TopoView:onRefresh', e);
-
+    rlog.debug('TopoView:onRefresh', e);
     onRefreshTopo ? onRefreshTopo() : topoDispatchers.refreshTopo();
   };
   /**
@@ -244,8 +242,7 @@ var Topology = function Topology(props) {
 
 
   var handleEvent = function handleEvent(event) {
-    _componentTopologyUtils.rlog.debug('TopoView:onEvent', event);
-
+    rlog.debug('TopoView:onEvent', event);
     onEvent && onEvent(event);
     topoEdit.onEvent(event);
 
@@ -272,8 +269,7 @@ var Topology = function Topology(props) {
         break;
 
       case _componentTopologyGraph.TopoEvent.EVENT_CONTEXT_TOOL:
-        _componentTopologyUtils.rlog.debug('自定义工具栏事件', event);
-
+        rlog.debug('自定义工具栏事件', event);
         break;
 
       default:

package/lib/core/editor/components/Sidebar/views/ImagePanel/ImagePanel.js

@@ -17,6 +17,8 @@ var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _componentNoDataPage = _interopRequireDefault(require("@riil-frontend/component-no-data-page"));
+
 var _Collapse = _interopRequireDefault(require("../../../../../../components/collapse/Collapse"));
 
 var _CiTypeImagePanel = _interopRequireDefault(require("./CiTypeImagePanel"));
@@ -130,12 +132,16 @@ function ImagePanel(props) {
     }].filter(function (panel) {
       return !panel.hidden;
     });
+
+    if (!panels.length) {
+      return /*#__PURE__*/_react["default"].createElement(_componentNoDataPage["default"], null);
+    }
+
     return /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
       accordion: true,
       defaultExpandedKeys: ['资源图片'],
       style: {
-        border: 'none',
-        minWidth: '300px'
+        border: 'none'
       },
       fullheight: true,
       noContentPadding: true
@@ -164,6 +170,9 @@ function ImagePanel(props) {
       width: '100%'
     }
   })), /*#__PURE__*/_react["default"].createElement(_box["default"], {
-    flex: 1
+    flex: 1,
+    style: {
+      minWidth: '300px'
+    }
   }, renderImageContent()));
 }

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