@riil-frontend/component-topology 12.0.0-dev.4 → 12.0.0-dev.41

package/es/core/models/Alarm.js

@@ -2,7 +2,7 @@ import _Dialog from "@alifd/next/es/dialog";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { isAvailableArray } from '@riil-frontend/utils';
 
 var Alarm = /*#__PURE__*/function () {
@@ -83,8 +83,7 @@ var Alarm = /*#__PURE__*/function () {
     }
 
     rlog.info('Alarm.open 打开告警通道', id);
-    this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
-
+    this.openTopoAlarm(id);
     this.hmGetTopoAlarmByDoc(id);
   }
   /**
@@ -211,83 +210,6 @@ var Alarm = /*#__PURE__*/function () {
     }
 
     return hmGetTopoAlarmByDoc;
-  }();
-
-  _proto.hmGetTopoAlarm = /*#__PURE__*/function () {
-    var _hmGetTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id) {
-      var mainCiIdList, endTime, startTime, parms, result;
-      return _regeneratorRuntime.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 topoService.getAlarmByIds(parms);
-
-          case 9:
-            result = _context3.sent;
-            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列表）
@@ -298,9 +220,9 @@ var Alarm = /*#__PURE__*/function () {
   _proto.setAlarmDataByMock =
   /*#__PURE__*/
   function () {
-    var _setAlarmDataByMock = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(datas) {
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    var _setAlarmDataByMock = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(datas) {
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             this.updateState({
               alarmData: datas.length > 0 ? datas : [],
@@ -309,12 +231,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);
     }
 
@@ -329,10 +251,10 @@ var Alarm = /*#__PURE__*/function () {
   _proto.switchAlarmPopPanel =
   /*#__PURE__*/
   function () {
-    var _switchAlarmPopPanel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(flag) {
+    var _switchAlarmPopPanel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(flag) {
       var topoDispatchers;
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             // console.log("switchAlarmPopPanel", flag);
             topoDispatchers = this.topo.store.getModelDispatchers('topoAlarm');
@@ -342,12 +264,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);
     }
 
@@ -363,21 +285,21 @@ var Alarm = /*#__PURE__*/function () {
   _proto.openTopoAlarm =
   /*#__PURE__*/
   function () {
-    var _openTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(id) {
+    var _openTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(id) {
       var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
 
-      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime.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;
@@ -385,27 +307,27 @@ 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;
             rlog.info('openTopoAlarm 打开拓扑告警推送-------------------开始');
             this.updateState({
               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);
             rlog.error('打开拓扑告警推送 失败');
             this.updateState({
               alarmOpening: false
@@ -413,12 +335,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);
     }
 
@@ -434,21 +356,21 @@ var Alarm = /*#__PURE__*/function () {
   _proto.closeTopoAlarm =
   /*#__PURE__*/
   function () {
-    var _closeTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(id) {
+    var _closeTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(id) {
       var _this$getState3, alarmIsOpened, alarmOpening;
 
-      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regeneratorRuntime.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;
@@ -458,17 +380,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);
     }
 
@@ -493,20 +415,20 @@ var Alarm = /*#__PURE__*/function () {
   _proto.restart =
   /*#__PURE__*/
   function () {
-    var _restart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+    var _restart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
       var id;
-      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regeneratorRuntime.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() {
@@ -523,26 +445,28 @@ var Alarm = /*#__PURE__*/function () {
   _proto.handleAlarmEvent =
   /*#__PURE__*/
   function () {
-    var _handleAlarmEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(alertData) {
+    var _handleAlarmEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+      return _regeneratorRuntime.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 (!(isAvailableArray(alertData) && 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);
@@ -552,6 +476,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,
@@ -560,7 +485,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) {
@@ -569,19 +495,19 @@ var Alarm = /*#__PURE__*/function () {
             }); // console.log("before-combAlarmData", sendAl, idsList);
 
             if (!(sendAl.length > 0)) {
-              _context9.next = 24;
+              _context8.next = 25;
               break;
             }
 
             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;
 
@@ -601,22 +527,22 @@ var Alarm = /*#__PURE__*/function () {
               }
             }
 
-            _context9.next = 24;
+            _context8.next = 25;
             break;
 
-          case 21:
-            _context9.prev = 21;
-            _context9.t0 = _context9["catch"](12);
-            rlog.error('告警发送异常', _context9.t0);
+          case 22:
+            _context8.prev = 22;
+            _context8.t0 = _context8["catch"](13);
+            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/es/core/models/AttributeMetricDisplay.js

@@ -1,12 +1,13 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { DEFAULT_NODE_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay";
 import { isMonitoring } from "../utils/manageStatusUtil";
 import AttributeFormatter from "./attributeFormatter";
 import DictCache from "./cache/DictCache";
 import { getNodesNameVisible as _getNodesNameVisible, updateNodesNameVisible as _updateNodesNameVisible } from "./utils/nodeNameVisibleUtil";
+import { translateCisRefAttributeName } from "../../utils/ciRefAttributeTranslateUtil";
 
 function isGraphField(item) {
   return item.type === 'graph';
@@ -331,7 +332,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
             }); // 翻译引用属性
 
             _context.next = 4;
-            return this.translateRefAttribute(ciDatas);
+            return translateCisRefAttributeName(ciDatas);
 
           case 4:
             ciDatas = _context.sent;
@@ -461,8 +462,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
                   };
                 }
               });
@@ -522,15 +525,21 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       return _extends({}, item, {
         tags: tags
       });
-    }); // rlog.debug(`AttributeMetricDisplay.updateTagsTips ${new Date().toLocaleString()}`, elementTagsAndTips);
-
+    });
+    rlog.debug('推送标注 => ht', elementTagsAndTips);
     var htTopo = topo.getHtTopo();
 
     if (htTopo) {
       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) {
+        rlog.error('推送标注 => ht 失败', error);
+      }
+
       (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
     }
   }

package/es/core/models/HistoryManager.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 var ht = window.ht;
 
 var HistoryManager = /*#__PURE__*/function () {

package/es/core/models/SelectionModel.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import useHtElements from "../common/hooks/useHtElements";
 import ignoreList from "./selection/ignoreList";
 

package/es/core/models/TopoApp.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { setRequest } from '@riil-frontend/component-topology-utils';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { cloneDeep } from 'lodash';
 import topoService from "../services/topo";
 import CiTypeCache from "./cache/CiTypeCache";
@@ -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.0.0-dev.4" === 'string' ? "12.0.0-dev.4" : null;
+var version = typeof "12.0.0-dev.41" === 'string' ? "12.0.0-dev.41" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -1,4 +1,4 @@
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default function graphTransform(options) {
   var item = options.item,
       ciData = options.ciData,

package/es/core/models/attributeFormatter/index.js

@@ -1,4 +1,4 @@
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import attributeTransform from "./formatter/attributeTransform";
 import metricTransform from "./formatter/metricTransform";
 import ciTypeAttrTransform from "./formatter/ciTypeAttrTransform";

package/es/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/es/core/models/cache/CiCache.js

@@ -23,14 +23,14 @@ var CiCache = /*#__PURE__*/function () {
   _proto.load =
   /*#__PURE__*/
   function () {
-    var _load = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(ids) {
+    var _load = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(ids, refreshCiCache) {
       var _this = this;
 
       var unloadCiIds, cis, map;
       return _regeneratorRuntime.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];
             });
 
@@ -62,7 +62,7 @@ var CiCache = /*#__PURE__*/function () {
       }, _callee, this);
     }));
 
-    function load(_x) {
+    function load(_x, _x2) {
       return _load.apply(this, arguments);
     }
 

package/es/core/models/cache/CiTypeCache.js

@@ -3,7 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import keyBy from 'lodash/keyBy';
 /**
  * Ci类型属性、指标缓存
@@ -106,6 +106,10 @@ var CiTypeCache = /*#__PURE__*/function () {
     this.ciTypeMap = cache;
   };
 
+  _proto.getCiTypeMap = function getCiTypeMap() {
+    return this.ciTypeMap;
+  };
+
   _proto.getCiType = function getCiType(typeCode) {
     return this.ciTypeMap[typeCode];
   };

package/es/core/models/cache/DictCache.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { dictFormat } from '@riil-frontend/utils';
 import * as modelService from '@riil-frontend/component-topology-common/es/services/model';
-import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 /**
  * 数据字典缓存
  */

package/es/core/models/plugins/resourceWebControllUrl.js

@@ -2,7 +2,7 @@ import _Message from "@alifd/next/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default function (topo) {
   var resourceUrlMap = {};
   var currentId = null;

package/es/core/models/tagstips/ElementTagTipConfig.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import keyBy from 'lodash/keyBy';
-import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { getLinkMtCodes, getMtCodeCiTypeMap, getNodeMtCodes } from "./utils";
 import { getMetricsByMonitorTemplateCodes } from "../../services/topo/tagtip";
 /**

package/es/core/models/topoData.js

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

package/es/core/services/alarm.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default {
   /**
    * 查询告警列表，包含主资源和子组件告警

package/es/core/services/index.js

@@ -16,7 +16,7 @@ function _queryCisByIds() {
           return commonQueryCiDataByIds(ids, {
             orders: [],
             pageIndex: 1,
-            pageSize: 100000
+            pageSize: 10000
           });
 
         case 2: