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

package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js

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

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

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import TopoGraph, { TopoEvent } from '@riil-frontend/component-topology-graph';
 import PortalContainer from '@riil-frontend/component-topology-graph/es/components/PortalContainer';
-import { rlog } from '@riil-frontend/component-topology-utils'; // 通用
+import Logger from 'loglevel'; // 通用
 
 import showMessage from "../../utils/showMessage";
 import { TPL_TREE } from "../../../utils/template";
@@ -28,6 +28,7 @@ import editorStyles from "./editor.module.scss";
 import basicIcons from "../../common/icons/basicIcons";
 import HelpIcon from "../../editor/components/BottomFloatTool/HelpIcon";
 import { updateNodesNameVisible } from "../../models/utils/nodeNameVisibleUtil";
+var rlog = Logger.getLogger('topo');
 
 var Topology = function Topology(props) {
   var _classnames;
@@ -115,7 +116,7 @@ var Topology = function Topology(props) {
     }
   }, []);
   var handleGraphDataLoaded = useCallback(function () {
-    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()
@@ -125,13 +126,15 @@ var Topology = function Topology(props) {
     fixLink(topo);
     handleClusterNoPermission(topo);
     updateEdgeExpanded(topo);
+    topo.selectionModel.init();
     var htHistoryManager = topo.getDataModel().getHistoryManager();
 
-    if (htHistoryManager) {
+    if (topo.store.getState().topoMod.viewState === 'edit' && htHistoryManager) {
       topo.historyManager = new HistoryManager(topo, htHistoryManager);
+      topo.historyManager.clear();
+      rlog.info('TopoView.handleGraphDataLoaded: 初始化HistoryManager ', topo.historyManager.toString());
     }
 
-    topo.selectionModel.init();
     topoDispatchers.update({
       graphLoaded2: true
     });

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

@@ -4,6 +4,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _Button from "@alifd/next/es/button";
 import _Icon from "@alifd/next/es/icon";
 import React, { useMemo, useState } from 'react';
+import NoDataPage from '@riil-frontend/component-no-data-page';
 import Collapse from "../../../../../../components/collapse/Collapse";
 import CiTypeImagePanel from "./CiTypeImagePanel";
 import CustomImagePanel from "./CustomImagePanel";
@@ -106,12 +107,16 @@ export default function ImagePanel(props) {
     }].filter(function (panel) {
       return !panel.hidden;
     });
+
+    if (!panels.length) {
+      return /*#__PURE__*/React.createElement(NoDataPage, null);
+    }
+
     return /*#__PURE__*/React.createElement(Collapse, {
       accordion: true,
       defaultExpandedKeys: ['资源图片'],
       style: {
-        border: 'none',
-        minWidth: '300px'
+        border: 'none'
       },
       fullheight: true,
       noContentPadding: true
@@ -140,6 +145,9 @@ export default function ImagePanel(props) {
       width: '100%'
     }
   })), /*#__PURE__*/React.createElement(_Box, {
-    flex: 1
+    flex: 1,
+    style: {
+      minWidth: '300px'
+    }
   }, renderImageContent()));
 }

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

@@ -1,7 +1,8 @@
+import Logger from 'loglevel';
+var rlog = Logger.getLogger('topo');
 export default 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/es/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js

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

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

@@ -25,6 +25,10 @@ function initKeyboardShortcuts(props) {
 
   hotkeys('ctrl+v, command+v', function (event) {
     return handlePasteHotkey(event, props);
+  }); // 删除
+
+  hotkeys('delete', function (event) {
+    topoEdit.batchDeleteSelectedElement();
   });
 }
 

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

@@ -16,26 +16,30 @@ 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 themeConfig = THEMES.find(function (item) {
-          return item.name === theme;
-        });
+      var displayConfig = topo.store.getModelState('displayConfig');
+      var theme = displayConfig.canvasTheme || 'white';
+      var themeConfig = THEMES.find(function (item) {
+        return item.name === theme;
+      });
 
-        var _ThemeUtil2 = ThemeUtil({
-          topo: topo
-        }),
-            setElementTheme = _ThemeUtil2.setElementTheme;
+      var _ThemeUtil = ThemeUtil({
+        topo: topo
+      }),
+          setElementTheme = _ThemeUtil.setElementTheme;
 
-        setElementTheme(data, themeConfig); // 临时放这里，新加入节点按配置显示隐藏名称
+      setElementTheme(data, themeConfig); // 临时放这里，新加入节点按配置显示隐藏名称
+
+      setNewNodeNameVisible(topo, data);
+    }
 
-        setNewNodeNameVisible(topo, data);
+    function handleDataModelChangeListener(e) {
+      var kind = e.kind;
+
+      if (kind === 'add') {
+        handleAddElement(e);
       }
     }
 

package/es/core/hooks/useGraphAlarmDisplay.js

@@ -126,6 +126,8 @@ export default function useGraphAlarmDisplay(options) {
     });
 
     function showAlarm() {
+      var _topo$historyManager, _topo$historyManager2;
+
       if (!graphLoaded) {
         return;
       }
@@ -156,7 +158,9 @@ export default function useGraphAlarmDisplay(options) {
         relateTopoAlarms: relateTopoAlarms
       }); // 更新到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/es/core/hooks/usePolling.js

@@ -4,11 +4,12 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useEffect } from 'react';
 import { useRequest } from 'ahooks';
 import _ from 'lodash';
-import { rlog } from '@riil-frontend/component-topology-utils';
+import Logger from 'loglevel';
 import { useCbbEventListener } from '@riil-frontend/component-riil-event-emitter';
 import DictCache from "../models/cache/DictCache";
 import useCiAttributeChange from "./useCiAttributeChange";
 import useHtDataPropertyChangeListener from "./ht/useHtDataPropertyChangeListener";
+var rlog = Logger.getLogger('topo');
 /**
  * 轮询获取指标hooks
  * @param {*} props