@riil-frontend/component-topology 12.1.0-dev.15 → 12.1.0-dev.17

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 (isEditMode && 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/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/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "12.1.0-dev.15" === 'string' ? "12.1.0-dev.15" : null;
+var version = typeof "12.1.0-dev.17" === 'string' ? "12.1.0-dev.17" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -508,38 +508,39 @@ var Topo = /*#__PURE__*/function () {
         while (1) switch (_context12.prev = _context12.next) {
           case 0:
             rlog.info('TopoApp.enterEditMode');
+            this.historyManager = null;
 
             if (!this.options.onSwitchToEditModeBegin) {
-              _context12.next = 4;
+              _context12.next = 5;
               break;
             }
 
-            _context12.next = 4;
+            _context12.next = 5;
             return this.options.onSwitchToEditModeBegin(this);
 
-          case 4:
+          case 5:
             topoDispatchers = this.store.getModelDispatchers('topoMod');
-            _context12.next = 7;
+            _context12.next = 8;
             return topoDispatchers.update({
               viewState: 'edit'
             });
 
-          case 7:
-            _context12.next = 9;
+          case 8:
+            _context12.next = 10;
             return this.view.switchToEditMode();
 
-          case 9:
+          case 10:
             updateEdgeExpanded(this);
 
             if (!this.options.onSwitchToEditMode) {
-              _context12.next = 13;
+              _context12.next = 14;
               break;
             }
 
-            _context12.next = 13;
+            _context12.next = 14;
             return this.options.onSwitchToEditMode(this);
 
-          case 13:
+          case 14:
             if (this.getDataModel()) {
               // 更新节点名称显示隐藏
               this.attributeMetricDisplay.updateNodesNameVisible();
@@ -549,7 +550,7 @@ var Topo = /*#__PURE__*/function () {
             iconManageDispatchers = this.store.getModelDispatchers('customIcon');
             iconManageDispatchers.loadEditorIcons();
 
-          case 16:
+          case 17:
           case "end":
             return _context12.stop();
         }
@@ -573,18 +574,19 @@ var Topo = /*#__PURE__*/function () {
             return this.view.switchToViewMode();
 
           case 2:
+            this.historyManager = null;
             editDispatchers = this.store.getModelDispatchers('topoConfig');
             editDispatchers.switchToViewMode(this.id);
 
             if (!this.options.onSwitchToViewMode) {
-              _context13.next = 7;
+              _context13.next = 8;
               break;
             }
 
-            _context13.next = 7;
+            _context13.next = 8;
             return this.options.onSwitchToViewMode(this);
 
-          case 7:
+          case 8:
           case "end":
             return _context13.stop();
         }

package/es/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -60,7 +60,7 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
         links = _topo$dataModel$getDa.links;
 
     var dataModel = this.topo.getDataModel();
-    (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '链路动态样式'); // 1、如果连线可见，设置线宽
+    (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '链路动态粗细'); // 1、如果连线可见，设置线宽
 
     links.forEach(function (link) {
       var edge = dataModel.getDataByTag(link.id);
@@ -69,7 +69,7 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
         edge.s('edge.width', _this.calcLinkEdgeWidth(link));
       }
     });
-    (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '链路动态样式');
+    (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '链路动态粗细');
   }
   /**
    * 处理单个连线组切换。有链路时设置

package/es/style.js

@@ -1,7 +1,7 @@
 import '@riil-frontend/component-topology-graph/es/style';
 import '@alifd/next/es/box/style';
-import '@riil-frontend/component-topology-utils/es/style';
 import '@alifd/next/es/message/style';
+import '@riil-frontend/component-topology-utils/es/style';
 import '@riil-frontend/utils/es/style';
 import '@riil-frontend/component-riil-event-emitter/es/style';
 import '@alifd/next/es/menu-button/style';

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 (isEditMode && 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/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/models/TopoApp.js

@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "12.1.0-dev.15" === 'string' ? "12.1.0-dev.15" : null;
+var version = typeof "12.1.0-dev.17" === 'string' ? "12.1.0-dev.17" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -540,37 +540,39 @@ var Topo = /*#__PURE__*/function () {
           case 0:
             _componentTopologyUtils.rlog.info('TopoApp.enterEditMode');
 
+            this.historyManager = null;
+
             if (!this.options.onSwitchToEditModeBegin) {
-              _context12.next = 4;
+              _context12.next = 5;
               break;
             }
 
-            _context12.next = 4;
+            _context12.next = 5;
             return this.options.onSwitchToEditModeBegin(this);
 
-          case 4:
+          case 5:
             topoDispatchers = this.store.getModelDispatchers('topoMod');
-            _context12.next = 7;
+            _context12.next = 8;
             return topoDispatchers.update({
               viewState: 'edit'
             });
 
-          case 7:
-            _context12.next = 9;
+          case 8:
+            _context12.next = 10;
             return this.view.switchToEditMode();
 
-          case 9:
+          case 10:
             (0, _edgeUtil.updateEdgeExpanded)(this);
 
             if (!this.options.onSwitchToEditMode) {
-              _context12.next = 13;
+              _context12.next = 14;
               break;
             }
 
-            _context12.next = 13;
+            _context12.next = 14;
             return this.options.onSwitchToEditMode(this);
 
-          case 13:
+          case 14:
             if (this.getDataModel()) {
               // 更新节点名称显示隐藏
               this.attributeMetricDisplay.updateNodesNameVisible();
@@ -580,7 +582,7 @@ var Topo = /*#__PURE__*/function () {
             iconManageDispatchers = this.store.getModelDispatchers('customIcon');
             iconManageDispatchers.loadEditorIcons();
 
-          case 16:
+          case 17:
           case "end":
             return _context12.stop();
         }
@@ -604,18 +606,19 @@ var Topo = /*#__PURE__*/function () {
             return this.view.switchToViewMode();
 
           case 2:
+            this.historyManager = null;
             editDispatchers = this.store.getModelDispatchers('topoConfig');
             editDispatchers.switchToViewMode(this.id);
 
             if (!this.options.onSwitchToViewMode) {
-              _context13.next = 7;
+              _context13.next = 8;
               break;
             }
 
-            _context13.next = 7;
+            _context13.next = 8;
             return this.options.onSwitchToViewMode(this);
 
-          case 7:
+          case 8:
           case "end":
             return _context13.stop();
         }

package/lib/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -67,7 +67,7 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
         links = _topo$dataModel$getDa.links;
 
     var dataModel = this.topo.getDataModel();
-    (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '链路动态样式'); // 1、如果连线可见，设置线宽
+    (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '链路动态粗细'); // 1、如果连线可见，设置线宽
 
     links.forEach(function (link) {
       var edge = dataModel.getDataByTag(link.id);
@@ -76,7 +76,7 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
         edge.s('edge.width', _this.calcLinkEdgeWidth(link));
       }
     });
-    (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '链路动态样式');
+    (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '链路动态粗细');
   }
   /**
    * 处理单个连线组切换。有链路时设置

package/lib/style.js

@@ -1,7 +1,7 @@
 require('@riil-frontend/component-topology-graph/lib/style');
 require('@alifd/next/lib/box/style');
-require('@riil-frontend/component-topology-utils/lib/style');
 require('@alifd/next/lib/message/style');
+require('@riil-frontend/component-topology-utils/lib/style');
 require('@riil-frontend/utils/lib/style');
 require('@riil-frontend/component-riil-event-emitter/lib/style');
 require('@alifd/next/lib/menu-button/style');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "12.1.0-dev.15",
+  "version": "12.1.0-dev.17",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -123,6 +123,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.1.0-dev.15/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.1.0-dev.17/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }