@riil-frontend/component-topology 12.0.0-dev.9 → 12.0.1

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();
         }
@@ -873,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;
@@ -935,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();
                   }
@@ -1015,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:
@@ -1051,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, _elements2, 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) {
@@ -1077,12 +1064,12 @@ var useTopoEdit = function useTopoEdit(params) {
               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); // 获取配置
 
@@ -1119,7 +1106,12 @@ var useTopoEdit = function useTopoEdit(params) {
             if ([].concat(newLink, newLinkGroup).length > 0) {
               _htTopo = topo.getHtTopo();
 
-              _htTopo.createElements(createElementsData);
+              _htTopo.createElements(createElementsData); // 临时放这里，仅拓扑中心有
+
+
+              if (topo.linkDynamicStyleExecutor) {
+                topo.linkDynamicStyleExecutor.execute();
+              }
             }
 
           case 24:

package/lib/core/models/Alarm.js

@@ -96,8 +96,7 @@ var Alarm = /*#__PURE__*/function () {
 
     _componentTopologyUtils.rlog.info('Alarm.open 打开告警通道', id);
 
-    this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
-
+    this.openTopoAlarm(id);
     this.hmGetTopoAlarmByDoc(id);
   }
   /**
@@ -227,85 +226,6 @@ var Alarm = /*#__PURE__*/function () {
     }
 
     return hmGetTopoAlarmByDoc;
-  }();
-
-  _proto.hmGetTopoAlarm = /*#__PURE__*/function () {
-    var _hmGetTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
-      var mainCiIdList, endTime, startTime, parms, result;
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            mainCiIdList = this.topo.dataModel.getDatas().filter(function (ci) {
-              return !!ci.operation;
-            }) // 过滤掉权限
-            .map(function (ci) {
-              return ci.id;
-            });
-
-            if (!(mainCiIdList.length === 0)) {
-              _context3.next = 4;
-              break;
-            }
-
-            this.updateState({
-              alarmData: [],
-              alarmPanelIsOpen: false
-            });
-            return _context3.abrupt("return");
-
-          case 4:
-            //rlog.debug("获取告警列表", mainCiIdList);
-            endTime = null; // new Date().valueOf();
-
-            startTime = null; // moment().subtract(1, "months").valueOf();
-
-            parms = {
-              mainCiIdList: mainCiIdList,
-              alertStatusList: ['toDeal', 'dealing'],
-              pageNum: 1,
-              pageSize: 10,
-              sortField: 'alertLevel',
-              alertLevelList: [],
-              orders: [{
-                property: 'alertLevel',
-                direction: 'ASC'
-              }, {
-                property: 'createTime',
-                direction: 'DESC'
-              }],
-              createTime: {
-                startTime: startTime,
-                endTime: endTime
-              }
-            };
-            _context3.next = 9;
-            return _topo["default"].getAlarmByIds(parms);
-
-          case 9:
-            result = _context3.sent;
-
-            _componentTopologyUtils.rlog.debug('getAlarmById-result', result); // if (alarmIsOpened) {
-            //   //this.topo.loadAlarm(result.datas);
-            //   this.handleAlarmEvent({ type: "alarm", data: result.datas });
-            // }
-            // this.updateState({
-            //   alarmData: result.datas.length > 0 ? result.datas : [],
-            //   alarmPanelIsOpen: result.datas.length > 0,
-            // });
-
-
-          case 11:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3, this);
-    }));
-
-    function hmGetTopoAlarm(_x2) {
-      return _hmGetTopoAlarm.apply(this, arguments);
-    }
-
-    return hmGetTopoAlarm;
   }()
   /**
    * 直接装载告警数据（可装载mock列表）
@@ -316,9 +236,9 @@ var Alarm = /*#__PURE__*/function () {
   _proto.setAlarmDataByMock =
   /*#__PURE__*/
   function () {
-    var _setAlarmDataByMock = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(datas) {
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    var _setAlarmDataByMock = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(datas) {
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             this.updateState({
               alarmData: datas.length > 0 ? datas : [],
@@ -327,12 +247,12 @@ var Alarm = /*#__PURE__*/function () {
 
           case 1:
           case "end":
-            return _context4.stop();
+            return _context3.stop();
         }
-      }, _callee4, this);
+      }, _callee3, this);
     }));
 
-    function setAlarmDataByMock(_x3) {
+    function setAlarmDataByMock(_x2) {
       return _setAlarmDataByMock.apply(this, arguments);
     }
 
@@ -347,10 +267,10 @@ var Alarm = /*#__PURE__*/function () {
   _proto.switchAlarmPopPanel =
   /*#__PURE__*/
   function () {
-    var _switchAlarmPopPanel = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(flag) {
+    var _switchAlarmPopPanel = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(flag) {
       var topoDispatchers;
-      return _regenerator["default"].wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             // console.log("switchAlarmPopPanel", flag);
             topoDispatchers = this.topo.store.getModelDispatchers('topoAlarm');
@@ -360,12 +280,12 @@ var Alarm = /*#__PURE__*/function () {
 
           case 2:
           case "end":
-            return _context5.stop();
+            return _context4.stop();
         }
-      }, _callee5, this);
+      }, _callee4, this);
     }));
 
-    function switchAlarmPopPanel(_x4) {
+    function switchAlarmPopPanel(_x3) {
       return _switchAlarmPopPanel.apply(this, arguments);
     }
 
@@ -381,21 +301,21 @@ var Alarm = /*#__PURE__*/function () {
   _proto.openTopoAlarm =
   /*#__PURE__*/
   function () {
-    var _openTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
+    var _openTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(id) {
       var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
 
-      return _regenerator["default"].wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regenerator["default"].wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             // 如果当前拓扑图开启中或已开启则退出
             _this$getState2 = this.getState(), alarmOpening = _this$getState2.alarmOpening, topoAlarmIsOpen = _this$getState2.topoAlarmIsOpen;
 
             if (!(this.currentTopoId === id && (topoAlarmIsOpen || alarmOpening))) {
-              _context6.next = 3;
+              _context5.next = 3;
               break;
             }
 
-            return _context6.abrupt("return");
+            return _context5.abrupt("return");
 
           case 3:
             this.currentTopoId = id;
@@ -403,16 +323,16 @@ var Alarm = /*#__PURE__*/function () {
               alarmOpening: true
             });
             alarmDispatchers = this.topo.store.getModelDispatchers('topoAlarm');
-            _context6.next = 8;
+            _context5.next = 8;
             return alarmDispatchers.resetAlarmDoc();
 
           case 8:
-            _context6.prev = 8;
-            _context6.next = 11;
+            _context5.prev = 8;
+            _context5.next = 11;
             return this.topo.serverApi.openTopoAlarm(id);
 
           case 11:
-            this.secretKey = _context6.sent;
+            this.secretKey = _context5.sent;
 
             _componentTopologyUtils.rlog.info('openTopoAlarm 打开拓扑告警推送-------------------开始');
 
@@ -420,12 +340,12 @@ var Alarm = /*#__PURE__*/function () {
               alarmOpening: false,
               alarmIsOpened: true
             });
-            _context6.next = 20;
+            _context5.next = 20;
             break;
 
           case 16:
-            _context6.prev = 16;
-            _context6.t0 = _context6["catch"](8);
+            _context5.prev = 16;
+            _context5.t0 = _context5["catch"](8);
 
             _componentTopologyUtils.rlog.error('打开拓扑告警推送 失败');
 
@@ -435,12 +355,12 @@ var Alarm = /*#__PURE__*/function () {
 
           case 20:
           case "end":
-            return _context6.stop();
+            return _context5.stop();
         }
-      }, _callee6, this, [[8, 16]]);
+      }, _callee5, this, [[8, 16]]);
     }));
 
-    function openTopoAlarm(_x5) {
+    function openTopoAlarm(_x4) {
       return _openTopoAlarm.apply(this, arguments);
     }
 
@@ -456,21 +376,21 @@ var Alarm = /*#__PURE__*/function () {
   _proto.closeTopoAlarm =
   /*#__PURE__*/
   function () {
-    var _closeTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(id) {
+    var _closeTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
       var _this$getState3, alarmIsOpened, alarmOpening;
 
-      return _regenerator["default"].wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regenerator["default"].wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
             // 如果未开启则退出
             _this$getState3 = this.getState(), alarmIsOpened = _this$getState3.alarmIsOpened, alarmOpening = _this$getState3.alarmOpening;
 
             if (!(!alarmIsOpened && !alarmOpening)) {
-              _context7.next = 3;
+              _context6.next = 3;
               break;
             }
 
-            return _context7.abrupt("return");
+            return _context6.abrupt("return");
 
           case 3:
             this.currentTopoId = null;
@@ -482,17 +402,17 @@ var Alarm = /*#__PURE__*/function () {
               alarmOpening: false,
               alarmPanelIsOpen: false
             });
-            _context7.next = 8;
+            _context6.next = 8;
             return this.topo.serverApi.closeTopoAlarm(id, this.secretKey);
 
           case 8:
           case "end":
-            return _context7.stop();
+            return _context6.stop();
         }
-      }, _callee7, this);
+      }, _callee6, this);
     }));
 
-    function closeTopoAlarm(_x6) {
+    function closeTopoAlarm(_x5) {
       return _closeTopoAlarm.apply(this, arguments);
     }
 
@@ -517,20 +437,20 @@ var Alarm = /*#__PURE__*/function () {
   _proto.restart =
   /*#__PURE__*/
   function () {
-    var _restart = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
+    var _restart = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
       var id;
-      return _regenerator["default"].wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regenerator["default"].wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             id = this.currentTopoId;
-            _context8.next = 3;
+            _context7.next = 3;
             return this.openTopoAlarm(id);
 
           case 3:
           case "end":
-            return _context8.stop();
+            return _context7.stop();
         }
-      }, _callee8, this);
+      }, _callee7, this);
     }));
 
     function restart() {
@@ -547,26 +467,28 @@ var Alarm = /*#__PURE__*/function () {
   _proto.handleAlarmEvent =
   /*#__PURE__*/
   function () {
-    var _handleAlarmEvent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(alertData) {
+    var _handleAlarmEvent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(alertData) {
       var _this$getState4, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche2, eqFlag, alarmlist, _this$topo$viewProps, _this$topo$viewProps2;
 
-      return _regenerator["default"].wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+      return _regenerator["default"].wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
             _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
             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;
+              _context8.next = 25;
               break;
             }
 
             sendAl = [];
             idsList = [].concat(nodeIdsList, linkIdsList);
-            operations = [];
+            operations = []; // console.log('idsList---------', idsList)
+
             idsList.forEach(function (idItem) {
               if (idItem.operation === null) {
                 operations.push(idItem.ciId);
@@ -576,6 +498,7 @@ var Alarm = /*#__PURE__*/function () {
               var _item$resourceId;
 
               var ciId = (_item$resourceId = item.resourceId) !== null && _item$resourceId !== void 0 ? _item$resourceId : item.ciId;
+              var isSub = false;
               var obj = {
                 id: ciId,
                 level: item.alertLevel,
@@ -584,7 +507,8 @@ 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) {
@@ -593,20 +517,20 @@ var Alarm = /*#__PURE__*/function () {
             }); // console.log("before-combAlarmData", sendAl, idsList);
 
             if (!(sendAl.length > 0)) {
-              _context9.next = 24;
+              _context8.next = 25;
               break;
             }
 
             _componentTopologyUtils.rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
 
-            _context9.prev = 12;
-            _context9.next = 15;
+            _context8.prev = 13;
+            _context8.next = 16;
             return alarmDispatchers.combAlarmData({
               alarmdata: sendAl
             });
 
-          case 15:
-            _yield$alarmDispatche2 = _context9.sent;
+          case 16:
+            _yield$alarmDispatche2 = _context8.sent;
             eqFlag = _yield$alarmDispatche2.eqFlag;
             alarmlist = _yield$alarmDispatche2.alarmlist;
 
@@ -626,23 +550,23 @@ var Alarm = /*#__PURE__*/function () {
               }
             }
 
-            _context9.next = 24;
+            _context8.next = 25;
             break;
 
-          case 21:
-            _context9.prev = 21;
-            _context9.t0 = _context9["catch"](12);
+          case 22:
+            _context8.prev = 22;
+            _context8.t0 = _context8["catch"](13);
 
-            _componentTopologyUtils.rlog.error('告警发送异常', _context9.t0);
+            _componentTopologyUtils.rlog.error('告警发送异常', _context8.t0);
 
-          case 24:
+          case 25:
           case "end":
-            return _context9.stop();
+            return _context8.stop();
         }
-      }, _callee9, this, [[12, 21]]);
+      }, _callee8, this, [[13, 22]]);
     }));
 
-    function handleAlarmEvent(_x7) {
+    function handleAlarmEvent(_x6) {
       return _handleAlarmEvent.apply(this, arguments);
     }
 

package/lib/core/models/AttributeMetricDisplay.js

@@ -539,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();
 
@@ -547,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/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.0.0-dev.9" === 'string' ? "12.0.0-dev.9" : null;
+var version = typeof "12.0.1" === 'string' ? "12.0.1" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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;

package/lib/core/models/cache/CiCache.js

@@ -32,14 +32,14 @@ var CiCache = /*#__PURE__*/function () {
   _proto.load =
   /*#__PURE__*/
   function () {
-    var _load = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids) {
+    var _load = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids, refreshCiCache) {
       var _this = this;
 
       var unloadCiIds, cis, map;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            unloadCiIds = ids.filter(function (id) {
+            unloadCiIds = refreshCiCache === true ? ids : ids.filter(function (id) {
               return !_this.ciMap[id];
             });
 
@@ -71,7 +71,7 @@ var CiCache = /*#__PURE__*/function () {
       }, _callee, this);
     }));
 
-    function load(_x) {
+    function load(_x, _x2) {
       return _load.apply(this, arguments);
     }
 

package/lib/core/models/topoData.js

@@ -124,7 +124,6 @@ function _saveTopo() {
           return topoService.bindResourceToTopo(topoId, {
             groups: groupInfo,
             linkIps: linkIps,
-            // exportLinkIdList,
             relateTopoIdList: relateTopoIdList
           });
 

package/lib/core/services/topo/basic.js

@@ -118,7 +118,7 @@ var _default = {
   * @param {Array} groups
   * @returns
   */
-  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList) {
+  getTopoDataByResource: function getTopoDataByResource(id, resources, groups) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var data, obj;
       return _regenerator["default"].wrap(function _callee$(_context) {
@@ -137,7 +137,7 @@ var _default = {
             obj = prepareGroupParams(data);
             _context.next = 5;
             return _componentTopologyUtils.request.post(API_ROOT + "/structure/byCondition/" + id, (0, _extends2["default"])({}, obj, {
-              exportLinkIdList: exportLinkIdList
+              exportLinkIdList: []
             }));
 
           case 5: