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

package/lib/core/editor/components/settings/propertyViews/layer/SettingTab/Setting.js

@@ -19,7 +19,7 @@ var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _AlignSetting = _interopRequireDefault(require("../../../common/AlignSetting"));
 
@@ -47,7 +47,7 @@ function LayerSettingTab(props) {
         return;
       }
 
-      _rlog["default"].debug(values[name], value);
+      _componentTopologyUtils.rlog.debug(values[name], value);
 
       var newValues = field.getValues();
 
@@ -62,7 +62,7 @@ function LayerSettingTab(props) {
   var alignOnChange = function alignOnChange(v) {
     topo.historyManager.beginTransaction();
 
-    _rlog["default"].debug('setAlignmentBySelectionNodes', v);
+    _componentTopologyUtils.rlog.debug('setAlignmentBySelectionNodes', v);
 
     topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(v);
 

package/lib/core/editor/components/settings/propertyViews/view/hooks/useBackgroundSizeConfig.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _react = require("react");
 
@@ -27,7 +27,7 @@ var _default = function _default(props) {
       setSize = _useState[1];
 
   (0, _react.useEffect)(function () {
-    _rlog["default"].info('设置背景图：初始化大小', getSizeFromCurrent());
+    _componentTopologyUtils.rlog.info('设置背景图：初始化大小', getSizeFromCurrent());
 
     setSize(getSizeFromCurrent());
   }, [current]);

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

@@ -44,8 +44,10 @@ function unbindKeyboardShortcuts(props) {
 
 function useKeyboardShortcut(props) {
   (0, _react.useEffect)(function () {
+    (0, _copyElementUtil.initPasteEventListener)();
     initKeyboardShortcuts(props);
     return function () {
+      (0, _copyElementUtil.destroyPasteEventListener)();
       unbindKeyboardShortcuts(props);
     };
   }, []);

package/lib/core/editor/store/background.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 /**
  * 背景图

package/lib/core/editor/store/historyManager.js

@@ -7,7 +7,7 @@ exports["default"] = _default;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 /**
  * 动态设置链路样式 Model

package/lib/core/editor/store/topoEdit.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 /**
  * 拓扑编辑 Model

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

@@ -3,22 +3,39 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
+exports.destroyPasteEventListener = destroyPasteEventListener;
 exports.handleCopyHotkey = handleCopyHotkey;
 exports.handlePasteHotkey = handlePasteHotkey;
+exports.initPasteEventListener = initPasteEventListener;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _clipboardUtil = require("../../../utils/clipboardUtil");
+
 function handleCopyHotkey(event, options) {
   var target = event.target || event.srcElement;
   var tagName = target.tagName;
 
   if (tagName !== 'BODY') {
-    copy(options);
+    copy(options.topo);
   }
 }
 
+function initPasteEventListener() {
+  document.addEventListener("paste", handlePasteEventListener);
+}
+
+function destroyPasteEventListener() {
+  document.removeEventListener("paste", handlePasteEventListener);
+}
+
+function handlePasteEventListener(e) {
+  var clipdata = e.clipboardData || window.clipboardData;
+  console.log("主动粘贴", clipdata.getData("text/plain"));
+}
+
 function handlePasteHotkey(event, options) {
   var target = event.target || event.srcElement;
   var tagName = target.tagName;
@@ -28,8 +45,7 @@ function handlePasteHotkey(event, options) {
   }
 }
 
-function copy(options) {
-  var topo = options.topo;
+function copy(topo) {
   var gv = topo.getHtTopo().getGraphView();
   var dm = gv.dm();
   var sm = dm.sm();
@@ -113,14 +129,14 @@ function doPaste(topo, clipboardText) {
   var parseDm = new ht.DataModel();
   var parseSerializer = new ht.JSONSerializer(parseDm);
   parseSerializer.deserialize(clipboardText);
-  var elements = parseDm.getDatas().toArray(); // 添加到拓扑图
+  var elements = parseDm.getDatas().toArray();
+  parseDm.clear(); // 添加到拓扑图
 
   var gv = topo.getHtTopo().getGraphView();
   var dm = gv.dm();
   elements.forEach(function (d) {
     dm.add(d);
-  });
-  parseDm.clear(); // 粘贴之后进行处理
+  }); // 粘贴之后进行处理
 
   var sm = dm.sm();
   sm.cs();
@@ -134,6 +150,8 @@ function doPaste(topo, clipboardText) {
   // TODO
   // gv.translate(-60, -60)
 
+
+  copy(topo);
 }
 
 function isPasetToOriginTopo() {
@@ -150,9 +168,11 @@ function _writeClipboard() {
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          navigator.clipboard.writeText(text);
+          localStorage.setItem('topo.copy.text', text);
 
-        case 1:
+          _clipboardUtil.clipboard.writeText(text);
+
+        case 2:
         case "end":
           return _context2.stop();
       }
@@ -170,7 +190,7 @@ function _readClipboard() {
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          return _context3.abrupt("return", navigator.clipboard.readText());
+          return _context3.abrupt("return", localStorage.getItem('topo.copy.text'));
 
         case 1:
         case "end":

package/lib/core/hooks/__tests__/useCiAttributeChange.test.js

@@ -0,0 +1 @@
+"use strict";

package/lib/core/hooks/ht/useHtDataPropertyChangeListener.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports["default"] = useHtDataPropertyChangeListener;
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _react = require("react");
 

package/lib/core/hooks/useCiAttributeChange.js

@@ -7,29 +7,52 @@ exports["default"] = useCiAttributeChange;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _CiCache = _interopRequireDefault(require("../models/cache/CiCache"));
 
 var _useTopoEventListener = _interopRequireDefault(require("./useTopoEventListener"));
 
+function ciExistTopo(topoData, ciChangeData) {
+  if (!topoData) {
+    return false;
+  }
+
+  var ciIds = [].concat(topoData.nodes, topoData.links, topoData.linkGroups).map(function (data) {
+    return data.ciId || data.id;
+  });
+  return ciIds.includes(ciChangeData.id);
+}
+
 function mergeData(cis, ciChangeData) {
-  if (!cis.find(function (item) {
-    return item.id === ciChangeData.id || item.ciId === ciChangeData.id;
-  })) {
+  var matchData = function matchData(item) {
+    return (item.ciId || item.id) === ciChangeData.id;
+  };
+
+  if (!cis.find(matchData)) {
     return cis;
   }
 
   return cis.map(function (ci) {
-    if (ci.id === ciChangeData.id) {
-      return (0, _extends2["default"])({}, ci, {
-        attributes: (0, _extends2["default"])({}, ci.attributes, ciChangeData.attributes)
-      });
+    if (!matchData(ci)) {
+      return ci;
     }
 
-    return ci;
+    return (0, _extends2["default"])({}, ci, {
+      id: ci.id,
+      attributes: (0, _extends2["default"])({}, ci.attributes, ciChangeData.attributes)
+    });
   });
 }
+
+function mergeTopoData(topoData, ciChangeData) {
+  var newData = (0, _extends2["default"])({}, topoData, {
+    nodes: mergeData(topoData.nodes, ciChangeData),
+    links: mergeData(topoData.links, ciChangeData),
+    linkGroups: mergeData(topoData.linkGroups, ciChangeData)
+  });
+  return newData;
+}
 /**
  * 监听ci属性变更
  * 
@@ -45,12 +68,8 @@ function useCiAttributeChange(props) {
       // 更新拓扑数据
       var topoData = topo.store.getModelState('topoMod').data;
 
-      if (topoData) {
-        var newData = (0, _extends2["default"])({}, topoData, {
-          nodes: mergeData(topoData.nodes, ciChangeData),
-          links: mergeData(topoData.links, ciChangeData),
-          linkGroups: mergeData(topoData.linkGroups, ciChangeData)
-        });
+      if (ciExistTopo(topoData, ciChangeData)) {
+        var newData = mergeTopoData(topoData, ciChangeData);
         var topoDispatchers = topo.store.getModelDispatchers('topoMod');
         topoDispatchers.update({
           data: newData

package/lib/core/hooks/useManageStatus.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = useManageStatus;
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _react = require("react");
 

package/lib/core/hooks/usePolling.js

@@ -17,7 +17,7 @@ var _ahooks = require("ahooks");
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _componentRiilEventEmitter = require("@riil-frontend/component-riil-event-emitter");
 
@@ -227,7 +227,7 @@ var usePolling = function usePolling(props) {
 
   (0, _react.useEffect)(function () {
     if (topo.options.enableDefaultMetricLoader) {
-      _rlog["default"].debug('usePolling.useEffect: 开始轮询', {
+      _componentTopologyUtils.rlog.debug('usePolling.useEffect: 开始轮询', {
         pollingSwitch: pollingSwitch,
         resIdsList: resIdsList,
         resourceOverviewState: resourceOverviewState,
@@ -239,7 +239,7 @@ var usePolling = function usePolling(props) {
 
     return function () {
       if (loading) {
-        _rlog["default"].debug('usePolling.useEffect: 结束轮询', resAndMetrics);
+        _componentTopologyUtils.rlog.debug('usePolling.useEffect: 结束轮询', resAndMetrics);
 
         stopPoll();
       }

package/lib/core/hooks/useResourceConfig.js

@@ -56,9 +56,7 @@ function _default(props) {
     return {
       resources: config.resources,
       groups: config.groups,
-      exportLinkIdList: config.exportLinkIdList,
-      relateTopoIdList: config.relateTopoIdList //linkIps: config.linkIps,
-
+      relateTopoIdList: config.relateTopoIdList
     };
   };
 

package/lib/core/hooks/useTopoEdit.js

@@ -383,33 +383,26 @@ var useTopoEdit = function useTopoEdit(params) {
     var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(node) {
       var _node$getEdges$toArra, _node$getEdges;
 
-      var config, edges, exportLinkIdList;
+      var edges;
       return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            config = resourceConfig.getConfig(); // console.log("删除关联在节点上的出口链路- node, config", node, config);
+            // console.log("删除关联在节点上的出口链路- node, config", node, config);
+            edges = (_node$getEdges$toArra = (_node$getEdges = node.getEdges()) === null || _node$getEdges === void 0 ? void 0 : _node$getEdges.toArray()) !== null && _node$getEdges$toArra !== void 0 ? _node$getEdges$toArra : [];
 
-            edges = (_node$getEdges$toArra = (_node$getEdges = node.getEdges()) === null || _node$getEdges === void 0 ? void 0 : _node$getEdges.toArray()) !== null && _node$getEdges$toArra !== void 0 ? _node$getEdges$toArra : []; // const exLink = [];
+            if (edges.length > 0) {
+              edges.map(function (edge) {
+                if (edge.getTag()) {
+                  var link = topo.dataModel.getDataById(edge.getTag());
 
-            if (!(edges.length > 0)) {
-              _context4.next = 8;
-              break;
+                  if (link && (0, _linkUtils.isExitLink)(link)) {
+                    topo.getGraphView().dm().remove(edge);
+                  }
+                }
+              });
             }
 
-            exportLinkIdList = [].concat(config.exportLinkIdList); //console.log("删除关联在节点上的出口链路- edges", edges,exportLinkIdList);
-
-            edges.map(function (edge) {
-              if (edge.a("dtype") === "link" && exportLinkIdList.indexOf(edge.getTag()) >= 0) {
-                // exLink.push(edge);
-                topo.getGraphView().dm().remove(edge);
-                exportLinkIdList.splice(config.exportLinkIdList.indexOf(edge.getTag()), 1);
-              }
-            });
-            config.exportLinkIdList = exportLinkIdList;
-            _context4.next = 8;
-            return resourceConfig.updateConfig(config);
-
-          case 8:
+          case 2:
           case "end":
             return _context4.stop();
         }
@@ -591,7 +584,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _bindViewResources() {
     _bindViewResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(data) {
-      var config, _yield$editDispatcher3, elements;
+      var config, result, _elements;
 
       return _regenerator["default"].wrap(function _callee12$(_context12) {
         while (1) switch (_context12.prev = _context12.next) {
@@ -607,15 +600,19 @@ var useTopoEdit = function useTopoEdit(params) {
             return editDispatchers.fetchDataByConfig();
 
           case 6:
-            _yield$editDispatcher3 = _context12.sent;
-            elements = _yield$editDispatcher3.elements;
-            saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO, elements); // 临时放这里，仅拓扑中心有
+            result = _context12.sent;
+            console.log("fetchDataByConfig", result);
 
-            if (topo.linkDynamicStyleExecutor) {
-              topo.linkDynamicStyleExecutor.execute();
+            if (result) {
+              _elements = result.elements;
+              saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO, _elements); // 临时放这里，仅拓扑中心有
+
+              if (topo.linkDynamicStyleExecutor) {
+                topo.linkDynamicStyleExecutor.execute();
+              }
             }
 
-          case 10:
+          case 9:
           case "end":
             return _context12.stop();
         }
@@ -630,7 +627,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _addLayerResources() {
     _addLayerResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(group, newResourceIds) {
-      var _yield$editDispatcher4, elements, newElements;
+      var _yield$editDispatcher3, elements, newElements;
 
       return _regenerator["default"].wrap(function _callee13$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
@@ -645,8 +642,8 @@ var useTopoEdit = function useTopoEdit(params) {
             return editDispatchers.fetchDataByConfig();
 
           case 5:
-            _yield$editDispatcher4 = _context13.sent;
-            elements = _yield$editDispatcher4.elements;
+            _yield$editDispatcher3 = _context13.sent;
+            elements = _yield$editDispatcher3.elements;
             // 2022-11-10 修复 添加资源后分层重新布局问题，仅布局新增资源。替换api topo.updateElements(data)
             newElements = findUNExistedElements(elements);
 
@@ -869,7 +866,9 @@ var useTopoEdit = function useTopoEdit(params) {
                 return _regenerator["default"].wrap(function _callee8$(_context8) {
                   while (1) switch (_context8.prev = _context8.next) {
                     case 0:
-                      dm = htTopo.getGraphView().dm(); // 创建
+                      dm = htTopo.getGraphView().dm(); // 移除旧节点。先删除后创建，解决ip节点替换ping资源后链路丢失问题
+
+                      dm.remove(node); // 创建
 
                       newLinkElements = findUNExistedLinkElements(elements);
                       createElementsData = null;
@@ -931,22 +930,13 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
                       sm = htTopo.getGraphView().sm();
-                      sm.setSelection([newElement]); // 移除旧节点
-
-                      dm.remove(node); // saveBind(TopoEvent.DATA_TYPE_RESOURCE_SINGLE, newDatas);
-                      // node.a("customName", null);
-                      // 删除关联在节点上的出口链路
-
-                      _context8.next = 12;
-                      return deleteExLink(node);
+                      sm.setSelection([newElement]); // 临时放这里，仅拓扑中心有
 
-                    case 12:
-                      // 临时放这里，仅拓扑中心有
                       if (topo.linkDynamicStyleExecutor) {
                         topo.linkDynamicStyleExecutor.execute();
                       }
 
-                    case 13:
+                    case 11:
                     case "end":
                       return _context8.stop();
                   }
@@ -1047,7 +1037,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _relateNodeIp() {
     _relateNodeIp = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15(txtValue, nodeElement) {
-      var dm, isUnique, ip, configObj, configData, _elements, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
+      var dm, isUnique, ipNodeData, configObj, configData, _elements2, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
 
       return _regenerator["default"].wrap(function _callee15$(_context15) {
         while (1) switch (_context15.prev = _context15.next) {
@@ -1069,16 +1059,16 @@ var useTopoEdit = function useTopoEdit(params) {
             isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, txtValue, nodeElement); // 获取关联链路
 
             if (!isUnique) {
-              _context15.next = 23;
+              _context15.next = 24;
               break;
             }
 
-            ip = (0, _exitLinkUtil.buildIpNode)(txtValue);
+            ipNodeData = (0, _exitLinkUtil.buildIpNode)(txtValue);
             _context15.next = 8;
             return deleteExLink(nodeElement);
 
           case 8:
-            nodeElement.a(ip);
+            nodeElement.a(ipNodeData);
             nodeElement.setName(txtValue);
             nodeElement.setTag("ip:" + txtValue); // 获取配置
 
@@ -1093,8 +1083,8 @@ var useTopoEdit = function useTopoEdit(params) {
           case 16:
             configData = _context15.sent;
             // console.log("configData",configObj, configData);
-            _elements = configData.elements;
-            newLinkElements = findUNExistedLinkElements(_elements); // console.log("configData", configData, newLinkElements);
+            _elements2 = configData.elements;
+            newLinkElements = findUNExistedLinkElements(_elements2); // console.log("configData", configData, newLinkElements);
 
             newLink = newLinkElements.filter(function (item) {
               return item.type === "link";
@@ -1109,15 +1099,21 @@ var useTopoEdit = function useTopoEdit(params) {
               nodes: [],
               links: newLink,
               linkGroups: newLinkGroup
-            }; // console.log("createElementsData", createElementsData);
+            };
+            console.log("createElementsData", createElementsData);
 
             if ([].concat(newLink, newLinkGroup).length > 0) {
               _htTopo = topo.getHtTopo();
 
-              _htTopo.createElements(createElementsData);
+              _htTopo.createElements(createElementsData); // 临时放这里，仅拓扑中心有
+
+
+              if (topo.linkDynamicStyleExecutor) {
+                topo.linkDynamicStyleExecutor.execute();
+              }
             }
 
-          case 23:
+          case 24:
           case "end":
             return _context15.stop();
         }

package/lib/core/models/Alarm.js

@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _utils = require("@riil-frontend/utils");
 
@@ -94,7 +94,7 @@ var Alarm = /*#__PURE__*/function () {
       return;
     }
 
-    _rlog["default"].info('Alarm.open 打开告警通道', id);
+    _componentTopologyUtils.rlog.info('Alarm.open 打开告警通道', id);
 
     this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
 
@@ -116,7 +116,7 @@ var Alarm = /*#__PURE__*/function () {
       return;
     }
 
-    _rlog["default"].info('关闭告警通道', currentTopoId); // 取消订阅告警推送
+    _componentTopologyUtils.rlog.info('关闭告警通道', currentTopoId); // 取消订阅告警推送
     // 关闭告警推送通道
 
 
@@ -199,7 +199,7 @@ var Alarm = /*#__PURE__*/function () {
           case 0:
             result = this.getAlarms();
 
-            _rlog["default"].debug('hmGetTopoAlarmByDoc', result);
+            _componentTopologyUtils.rlog.debug('hmGetTopoAlarmByDoc', result);
 
             alarms = result.map(function (item) {
               return item.obj;
@@ -284,7 +284,7 @@ var Alarm = /*#__PURE__*/function () {
           case 9:
             result = _context3.sent;
 
-            _rlog["default"].debug('getAlarmById-result', result); // if (alarmIsOpened) {
+            _componentTopologyUtils.rlog.debug('getAlarmById-result', result); // if (alarmIsOpened) {
             //   //this.topo.loadAlarm(result.datas);
             //   this.handleAlarmEvent({ type: "alarm", data: result.datas });
             // }
@@ -414,7 +414,7 @@ var Alarm = /*#__PURE__*/function () {
           case 11:
             this.secretKey = _context6.sent;
 
-            _rlog["default"].info('openTopoAlarm 打开拓扑告警推送-------------------开始');
+            _componentTopologyUtils.rlog.info('openTopoAlarm 打开拓扑告警推送-------------------开始');
 
             this.updateState({
               alarmOpening: false,
@@ -427,7 +427,7 @@ var Alarm = /*#__PURE__*/function () {
             _context6.prev = 16;
             _context6.t0 = _context6["catch"](8);
 
-            _rlog["default"].error('打开拓扑告警推送 失败');
+            _componentTopologyUtils.rlog.error('打开拓扑告警推送 失败');
 
             this.updateState({
               alarmOpening: false
@@ -475,7 +475,7 @@ var Alarm = /*#__PURE__*/function () {
           case 3:
             this.currentTopoId = null;
 
-            _rlog["default"].debug('useAlarm.useEffect 告警WebSocket 结束');
+            _componentTopologyUtils.rlog.debug('useAlarm.useEffect 告警WebSocket 结束');
 
             this.updateState({
               topoAlarmIsOpen: false,
@@ -597,7 +597,7 @@ var Alarm = /*#__PURE__*/function () {
               break;
             }
 
-            _rlog["default"].debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
+            _componentTopologyUtils.rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
 
             _context9.prev = 12;
             _context9.next = 15;
@@ -633,7 +633,7 @@ var Alarm = /*#__PURE__*/function () {
             _context9.prev = 21;
             _context9.t0 = _context9["catch"](12);
 
-            _rlog["default"].error('告警发送异常', _context9.t0);
+            _componentTopologyUtils.rlog.error('告警发送异常', _context9.t0);
 
           case 24:
           case "end":