@riil-frontend/component-topology 12.0.0-dev.2 → 12.0.0-dev.21

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]); // 移除旧节点
+                      sm.setSelection([newElement]); // 临时放这里，仅拓扑中心有
 
-                      dm.remove(node); // saveBind(TopoEvent.DATA_TYPE_RESOURCE_SINGLE, newDatas);
-                      // node.a("customName", null);
-                      // 删除关联在节点上的出口链路
-
-                      _context8.next = 12;
-                      return deleteExLink(node);
-
-                    case 12:
-                      // 临时放这里，仅拓扑中心有
                       if (topo.linkDynamicStyleExecutor) {
                         topo.linkDynamicStyleExecutor.execute();
                       }
 
-                    case 13:
+                    case 11:
                     case "end":
                       return _context8.stop();
                   }
@@ -1011,11 +1001,12 @@ var useTopoEdit = function useTopoEdit(params) {
               break;
             }
 
+            topo.historyManager.endTransaction();
+
             _message["default"].error("关联资源失败");
 
-            _rlog["default"].warn("关联资源失败");
+            _rlog["default"].error("关联资源失败");
 
-            topo.historyManager.endTransaction();
             return _context9.abrupt("return", false);
 
           case 23:
@@ -1047,7 +1038,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 +1060,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 +1084,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 +1100,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,
@@ -557,25 +557,34 @@ var Alarm = /*#__PURE__*/function () {
             resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
             resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
             alarmDispatchers = this.topo.store.getModelDispatchers('topoAlarm'); // 添加事件
-            // console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
+
+            console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
             if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
-              _context9.next = 24;
+              _context9.next = 27;
               break;
             }
 
             sendAl = [];
             idsList = [].concat(nodeIdsList, linkIdsList);
             operations = [];
+            console.log('idsList---------', idsList);
             idsList.forEach(function (idItem) {
               if (idItem.operation === null) {
                 operations.push(idItem.ciId);
               }
             });
             alertData.forEach(function (item, index) {
-              var _item$resourceId;
+              var _item$resourceId, _item$alertCode;
 
               var ciId = (_item$resourceId = item.resourceId) !== null && _item$resourceId !== void 0 ? _item$resourceId : item.ciId;
+              var isSub = false;
+
+              if ((_item$alertCode = item.alertCode) !== null && _item$alertCode !== void 0 && _item$alertCode.startsWith("cmp")) {
+                ciId = "sub:" + item.mainCiId;
+                isSub = true;
+              }
+
               var obj = {
                 id: ciId,
                 level: item.alertLevel,
@@ -584,28 +593,31 @@ var Alarm = /*#__PURE__*/function () {
                 obj: item,
                 info: item.alertType,
                 ciCode: item === null || item === void 0 ? void 0 : item.ciCode,
-                ruleId: item === null || item === void 0 ? void 0 : item.ruleId
+                ruleId: item === null || item === void 0 ? void 0 : item.ruleId,
+                isSub: isSub
               };
 
               if (resIdsList.indexOf(ciId) >= 0 && operations.indexOf(ciId) < 0) {
                 sendAl.push(obj);
-              }
-            }); // console.log("before-combAlarmData", sendAl, idsList);
+              } // const ciId = `${isSub}+${item.resourceId ?? item.ciId}`;
+
+            });
+            console.log("before-combAlarmData", sendAl, idsList);
 
             if (!(sendAl.length > 0)) {
-              _context9.next = 24;
+              _context9.next = 27;
               break;
             }
 
-            _rlog["default"].debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
+            _componentTopologyUtils.rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
 
-            _context9.prev = 12;
-            _context9.next = 15;
+            _context9.prev = 15;
+            _context9.next = 18;
             return alarmDispatchers.combAlarmData({
               alarmdata: sendAl
             });
 
-          case 15:
+          case 18:
             _yield$alarmDispatche2 = _context9.sent;
             eqFlag = _yield$alarmDispatche2.eqFlag;
             alarmlist = _yield$alarmDispatche2.alarmlist;
@@ -626,20 +638,20 @@ var Alarm = /*#__PURE__*/function () {
               }
             }
 
-            _context9.next = 24;
+            _context9.next = 27;
             break;
 
-          case 21:
-            _context9.prev = 21;
-            _context9.t0 = _context9["catch"](12);
+          case 24:
+            _context9.prev = 24;
+            _context9.t0 = _context9["catch"](15);
 
-            _rlog["default"].error('告警发送异常', _context9.t0);
+            _componentTopologyUtils.rlog.error('告警发送异常', _context9.t0);
 
-          case 24:
+          case 27:
           case "end":
             return _context9.stop();
         }
-      }, _callee9, this, [[12, 21]]);
+      }, _callee9, this, [[15, 24]]);
     }));
 
     function handleAlarmEvent(_x7) {

package/lib/core/models/AttributeMetricDisplay.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");
 
 var _ResourceInfoDisplay = require("../../constants/ResourceInfoDisplay");
 
@@ -23,6 +23,8 @@ var _DictCache = _interopRequireDefault(require("./cache/DictCache"));
 
 var _nodeNameVisibleUtil = require("./utils/nodeNameVisibleUtil");
 
+var _ciRefAttributeTranslateUtil = require("../../utils/ciRefAttributeTranslateUtil");
+
 function isGraphField(item) {
   return item.type === 'graph';
 }
@@ -346,7 +348,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
             }); // 翻译引用属性
 
             _context.next = 4;
-            return this.translateRefAttribute(ciDatas);
+            return (0, _ciRefAttributeTranslateUtil.translateCisRefAttributeName)(ciDatas);
 
           case 4:
             ciDatas = _context.sent;
@@ -449,7 +451,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                   });
                 });
               } else {
-                _rlog["default"].warn("\u63A8\u9001\u5C5E\u6027\u6307\u6807\u6570\u636E\uFF1A\u672A\u67E5\u8BE2\u5230ciType " + ciType, ciData);
+                _componentTopologyUtils.rlog.warn("\u63A8\u9001\u5C5E\u6027\u6307\u6807\u6570\u636E\uFF1A\u672A\u67E5\u8BE2\u5230ciType " + ciType, ciData);
               }
             });
             refIds = Object.keys(refIdMap);
@@ -474,8 +476,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                 var refCi = refCiMap[refAttrs.id];
 
                 if (refCi) {
+                  // 引用ci名称获取规则：如果ci是树形结构（例如区域），取 tree_name_path；非树形，取display_name
+                  var displayName = refCi.attributes.tree_name_path || refCi.attributes.display_name;
                   attributeMap[refAttrs.attrCode + "_object"] = {
-                    displayName: refCi.attributes.display_name
+                    displayName: displayName
                   };
                 }
               });
@@ -535,7 +539,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       return (0, _extends2["default"])({}, item, {
         tags: tags
       });
-    }); // rlog.debug(`AttributeMetricDisplay.updateTagsTips ${new Date().toLocaleString()}`, elementTagsAndTips);
+    });
+
+    _componentTopologyUtils.rlog.debug('推送标注 => ht 失败', elementTagsAndTips);
 
     var htTopo = topo.getHtTopo();
 
@@ -543,7 +549,13 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       var _topo$historyManager, _topo$historyManager2;
 
       (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '加载标注');
-      htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
+
+      try {
+        htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
+      } catch (error) {
+        _componentTopologyUtils.rlog.error('推送标注 => ht 失败', error);
+      }
+
       (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
     }
   }

package/lib/core/models/HistoryManager.js

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 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 ht = window.ht;
 
@@ -20,7 +20,7 @@ var HistoryManager = /*#__PURE__*/function () {
     this.htHistoryManager = htHistoryManager;
     htHistoryManager.clear();
 
-    _rlog["default"].info('HistoryManager 初始化', htHistoryManager);
+    _componentTopologyUtils.rlog.info('HistoryManager 初始化', htHistoryManager);
 
     this.updateStore = this.updateStore.bind(this);
     this.init();
@@ -70,7 +70,7 @@ var HistoryManager = /*#__PURE__*/function () {
   _proto.setDisabled = function setDisabled(disabled, message) {
     this.htHistoryManager.setDisabled(disabled);
 
-    _rlog["default"].debug("HistoryManager.setDisabled " + (disabled ? '禁用' : '启用') + (message ? "(" + message + ")" : '') + ": " + this.toString(), this.getHistories());
+    _componentTopologyUtils.rlog.debug("HistoryManager.setDisabled " + (disabled ? '禁用' : '启用') + (message ? "(" + message + ")" : '') + ": " + this.toString(), this.getHistories());
   };
 
   _proto.beginTransaction = function beginTransaction() {
@@ -105,7 +105,7 @@ var HistoryManager = /*#__PURE__*/function () {
       });
     });
 
-    _rlog["default"].debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
+    _componentTopologyUtils.rlog.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
   };
 
   _proto.addStoreHistory = function addStoreHistory() {
@@ -131,7 +131,7 @@ var HistoryManager = /*#__PURE__*/function () {
         data: storeChanged
       });
 
-      _rlog["default"].debug('HistoryManager.addStoreHistory', storeChanged);
+      _componentTopologyUtils.rlog.debug('HistoryManager.addStoreHistory', storeChanged);
     }
 
     this.storeHistory = [];
@@ -141,7 +141,7 @@ var HistoryManager = /*#__PURE__*/function () {
     this.addStoreHistory();
     this.htHistoryManager.endTransaction();
 
-    _rlog["default"].debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
+    _componentTopologyUtils.rlog.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
   };
 
   _proto.clear = function clear() {
@@ -185,7 +185,7 @@ var HistoryManager = /*#__PURE__*/function () {
       return;
     }
 
-    _rlog["default"].debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
+    _componentTopologyUtils.rlog.debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
 
     var storeHistory = this.getCurrentStoreHistory(true);
 
@@ -204,7 +204,7 @@ var HistoryManager = /*#__PURE__*/function () {
   _proto.redo = function redo() {
     var _this4 = this;
 
-    _rlog["default"].debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
+    _componentTopologyUtils.rlog.debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
 
     var storeHistory = this.getCurrentStoreHistory(false);
 

package/lib/core/models/SelectionModel.js

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 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 _useHtElements = _interopRequireDefault(require("../common/hooks/useHtElements"));
 
@@ -33,7 +33,7 @@ var SelectionModel = /*#__PURE__*/function () {
 
         _this.updateStoreSelection(selectionArr);
       } catch (e) {
-        _rlog["default"].error('updateSelection error', e);
+        _componentTopologyUtils.rlog.error('updateSelection error', e);
       }
     };
 
@@ -103,7 +103,7 @@ var SelectionModel = /*#__PURE__*/function () {
   };
 
   _proto.handleSelectionChange = function handleSelectionChange(e) {
-    _rlog["default"].info('Selection handleSelectionChange', e);
+    _componentTopologyUtils.rlog.info('Selection handleSelectionChange', e);
 
     this.updateSelection();
   };
@@ -130,7 +130,7 @@ var SelectionModel = /*#__PURE__*/function () {
   };
 
   _proto.initListener = function initListener() {
-    _rlog["default"].info('Selection initListener');
+    _componentTopologyUtils.rlog.info('Selection initListener');
 
     var dataModel = this.topo.getDataModel();
     var selectionModel = this.topo.getSelectionModel();
@@ -143,7 +143,7 @@ var SelectionModel = /*#__PURE__*/function () {
       return;
     }
 
-    _rlog["default"].info('Selection removeListener');
+    _componentTopologyUtils.rlog.info('Selection removeListener');
 
     var dataModel = this.topo.getDataModel();
     var selectionModel = this.topo.getSelectionModel();

package/lib/core/models/TopoApp.js

@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-
 var _lodash = require("lodash");
 
 var _topo = _interopRequireDefault(require("../services/topo"));
@@ -56,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "12.0.0-dev.2" === 'string' ? "12.0.0-dev.2" : null;
+var version = typeof "12.0.0-dev.21" === 'string' ? "12.0.0-dev.21" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -384,7 +382,7 @@ var Topo = /*#__PURE__*/function () {
       return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _rlog["default"].info('TopoApp.open 打开拓扑图', id); // 如果是切换拓扑图，注销原拓扑图
+            _componentTopologyUtils.rlog.info('TopoApp.open 打开拓扑图', id); // 如果是切换拓扑图，注销原拓扑图
 
 
             lastId = this.id;
@@ -414,7 +412,7 @@ var Topo = /*#__PURE__*/function () {
       return _regenerator["default"].wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
-            _rlog["default"].info('关闭拓扑图', this.id);
+            _componentTopologyUtils.rlog.info('关闭拓扑图', this.id);
 
             if (this.id) {
               _context8.next = 3;
@@ -547,7 +545,7 @@ var Topo = /*#__PURE__*/function () {
       return _regenerator["default"].wrap(function _callee12$(_context12) {
         while (1) switch (_context12.prev = _context12.next) {
           case 0:
-            _rlog["default"].info('TopoApp.enterEditMode');
+            _componentTopologyUtils.rlog.info('TopoApp.enterEditMode');
 
             if (!this.options.onSwitchToEditModeBegin) {
               _context12.next = 4;

package/lib/core/models/attributeFormatter/formatter/graphTransform.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports["default"] = graphTransform;
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 function graphTransform(options) {
   var item = options.item,
@@ -17,7 +15,7 @@ function graphTransform(options) {
     var node = topo.getDataModel().getDataByTag(ciData.id);
     value = (node === null || node === void 0 ? void 0 : node.a('customName')) || (node === null || node === void 0 ? void 0 : node.a('name')) || '-';
   } catch (error) {
-    _rlog["default"].error(error);
+    _componentTopologyUtils.rlog.error(error);
   }
 
   return {

package/lib/core/models/attributeFormatter/index.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 _attributeTransform = _interopRequireDefault(require("./formatter/attributeTransform"));
 

package/lib/core/models/cache/CiCache.d.ts

@@ -11,7 +11,7 @@ declare class CiCache {
      * @param ids {string[]}
      * @returns {Promise<Object>}
      */
-    load(ids: string[]): Promise<Object>;
+    load(ids: string[], refreshCiCache?: boolean): Promise<Object>;
     getCi(id: string): Object;
 }
 declare const _default: CiCache;