@riil-frontend/component-topology 3.5.0-a.9 → 3.5.2

package/lib/core/models/Alarm.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
+var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
@@ -23,6 +25,7 @@ var Alarm = /*#__PURE__*/function () {
   function Alarm() {
     this.topo = void 0;
     this.currentTopoId = void 0;
+    this.secretKey = null;
     this.alarmSwitch = true;
   }
 
@@ -46,7 +49,8 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _open = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var id;
+      var _this = this;
+
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -59,25 +63,23 @@ var Alarm = /*#__PURE__*/function () {
               return _context.abrupt("return");
 
             case 2:
-              // 获得拓扑id
-              id = this.topo.id;
+              this.confirmLargeResourceCount(function () {
+                // 获得拓扑id
+                var id = _this.topo.id;
 
-              if (id) {
-                _context.next = 5;
-                break;
-              }
-
-              return _context.abrupt("return");
+                if (!id) {
+                  return;
+                }
 
-            case 5:
-              _rlog["default"].info("Alarm.open 打开告警通道", id); // 订阅告警推送
+                _rlog["default"].info("Alarm.open 打开告警通道", id);
 
+                _this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
 
-              this.hmGetTopoAlarm(id); // 打开告警推送通道
 
-              this.openTopoAlarm(id);
+                _this.hmGetTopoAlarmByDoc(id);
+              });
 
-            case 8:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -115,36 +117,112 @@ var Alarm = /*#__PURE__*/function () {
       alarmPanelIsOpen: false
     });
     this.closeTopoAlarm(currentTopoId);
-  };
-
-  _proto.getAlarms = function getAlarms() {}
-  /**
-   * 增加告警
-   */
+  } // 资源数量多时确认是否开启
   ;
 
-  _proto.addAlarms = function addAlarms() {}
+  _proto.confirmLargeResourceCount = function confirmLargeResourceCount(cb) {
+    var nodeCount = this.topo.dataModel.getNodes().length;
+
+    if (nodeCount < 1500 || this.topo.isEditMode()) {
+      cb();
+    } else {
+      _dialog["default"].confirm({
+        title: "提示",
+        messageProps: {
+          type: "warning"
+        },
+        content: "该拓扑图上节点较多，继续查询告警可能影响系统整体性能，是否开启告警静默？",
+        onCancel: function onCancel() {
+          cb();
+        }
+      });
+    }
+  }
   /**
-   * 移除告警
+   * 查询当前拓扑图有权限资源的告警列表
+   *
+   * @returns 告警列表
    */
   ;
 
-  _proto.removeAlarms = function removeAlarms() {};
+  _proto.getAlarms = function getAlarms() {
+    var _this$getState = this.getState(),
+        ciAlarmsMap = _this$getState.alarmDoc;
 
-  _proto.hmGetTopoAlarm = /*#__PURE__*/function () {
-    var _hmGetTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(id) {
-      var _this$topo$store$getS, data, resAndMetrics, topoData, _this$getState, alarmIsOpened, alarmOpening, nodeIdsList, linkIdsList, resIdsList, mainCiIdList, endTime, startTime, parms, result;
+    var cis = this.topo.dataModel.getCis();
+    var alarms = [];
+    cis.filter(function (ci) {
+      var _ci$permission;
+
+      return (_ci$permission = ci.permission) === null || _ci$permission === void 0 ? void 0 : _ci$permission.readable;
+    }).forEach(function (ci) {
+      var _alarms;
 
+      var ciAlarms = ciAlarmsMap[ci.id] || [];
+
+      (_alarms = alarms).push.apply(_alarms, ciAlarms);
+    }); // 按告警由高到低、产生时间从后到前
+
+    alarms = alarms.sort(function (a, b) {
+      return a.obj.createTime - b.obj.createTime;
+    }).sort(function (a, b) {
+      return a.level > b.level ? 1 : -1;
+    });
+    return alarms;
+  };
+
+  _proto.hmGetTopoAlarmByDoc = /*#__PURE__*/function () {
+    var _hmGetTopoAlarmByDoc = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(id) {
+      var result, alarms;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              _this$topo$store$getS = this.topo.store.getState().topoMod, data = _this$topo$store$getS.data, resAndMetrics = _this$topo$store$getS.resAndMetrics, topoData = _this$topo$store$getS.topoData;
-              _this$getState = this.getState(), alarmIsOpened = _this$getState.alarmIsOpened, alarmOpening = _this$getState.alarmOpening; // const { nodes, links } = data;
+              result = this.getAlarms();
+
+              _rlog["default"].debug("hmGetTopoAlarmByDoc", result);
 
-              nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList, resIdsList = resAndMetrics.resIdsList;
+              alarms = result.map(function (item) {
+                return item.obj;
+              });
+              this.updateState({
+                alarmData: alarms.length > 0 ? alarms : [],
+                alarmPanelIsOpen: alarms.length > 0
+              });
 
-              _rlog["default"].debug("获取告警列表--resAndMetrics,topoData,data", this.topo, resAndMetrics, topoData, data);
+            case 4:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2, this);
+    }));
+
+    function hmGetTopoAlarmByDoc(_x) {
+      return _hmGetTopoAlarmByDoc.apply(this, arguments);
+    }
+
+    return hmGetTopoAlarmByDoc;
+  }();
+
+  _proto.hmGetTopoAlarm = /*#__PURE__*/function () {
+    var _hmGetTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
+      var _this$topo$store$getS, data, resAndMetrics, topoData, _this$getState2, alarmIsOpened, alarmOpening, nodeIdsList, linkIdsList, resIdsList, mainCiIdList, endTime, startTime, parms, result;
+
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              _this$topo$store$getS = this.topo.store.getState().topoMod, data = _this$topo$store$getS.data, resAndMetrics = _this$topo$store$getS.resAndMetrics, topoData = _this$topo$store$getS.topoData;
+              _this$getState2 = this.getState(), alarmIsOpened = _this$getState2.alarmIsOpened, alarmOpening = _this$getState2.alarmOpening; // const { nodes, links } = data;
+
+              nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList, resIdsList = resAndMetrics.resIdsList; // rlog.debug(
+              //   "获取告警列表--resAndMetrics,topoData,data",
+              //   this.topo,
+              //   resAndMetrics,
+              //   topoData,
+              //   data
+              // );
 
               mainCiIdList = this.topo.dataModel.getDatas().filter(function (ci) {
                 return !!ci.operation;
@@ -154,7 +232,7 @@ var Alarm = /*#__PURE__*/function () {
               });
 
               if (!(mainCiIdList.length === 0)) {
-                _context2.next = 8;
+                _context3.next = 7;
                 break;
               }
 
@@ -162,11 +240,10 @@ var Alarm = /*#__PURE__*/function () {
                 alarmData: [],
                 alarmPanelIsOpen: false
               });
-              return _context2.abrupt("return");
-
-            case 8:
-              _rlog["default"].debug("获取告警列表", mainCiIdList);
+              return _context3.abrupt("return");
 
+            case 7:
+              //rlog.debug("获取告警列表", mainCiIdList);
               endTime = null; // new Date().valueOf();
 
               startTime = null; // moment().subtract(1, "months").valueOf();
@@ -178,38 +255,43 @@ var Alarm = /*#__PURE__*/function () {
                 pageSize: 10,
                 sortField: "alertLevel",
                 alertLevelList: [],
-                sortOrder: "asc",
+                orders: [{
+                  property: "alertLevel",
+                  direction: "ASC"
+                }, {
+                  property: "createTime",
+                  direction: "DESC"
+                }],
                 createTime: {
                   startTime: startTime,
                   endTime: endTime
                 }
               };
-              _context2.next = 14;
+              _context3.next = 12;
               return _topo["default"].getAlarmByIds(parms);
 
-            case 14:
-              result = _context2.sent;
+            case 12:
+              result = _context3.sent;
 
               _rlog["default"].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,
+              // });
 
 
-              this.updateState({
-                alarmData: result.datas.length > 0 ? result.datas : [],
-                alarmPanelIsOpen: result.datas.length > 0
-              });
-
-            case 17:
+            case 14:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, this);
+      }, _callee3, this);
     }));
 
-    function hmGetTopoAlarm(_x) {
+    function hmGetTopoAlarm(_x2) {
       return _hmGetTopoAlarm.apply(this, arguments);
     }
 
@@ -224,10 +306,10 @@ var Alarm = /*#__PURE__*/function () {
   _proto.setAlarmDataByMock =
   /*#__PURE__*/
   function () {
-    var _setAlarmDataByMock = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(datas) {
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
+    var _setAlarmDataByMock = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(datas) {
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
               this.updateState({
                 alarmData: datas.length > 0 ? datas : [],
@@ -236,13 +318,13 @@ var Alarm = /*#__PURE__*/function () {
 
             case 1:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3, this);
+      }, _callee4, this);
     }));
 
-    function setAlarmDataByMock(_x2) {
+    function setAlarmDataByMock(_x3) {
       return _setAlarmDataByMock.apply(this, arguments);
     }
 
@@ -257,11 +339,11 @@ var Alarm = /*#__PURE__*/function () {
   _proto.switchAlarmPopPanel =
   /*#__PURE__*/
   function () {
-    var _switchAlarmPopPanel = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(flag) {
+    var _switchAlarmPopPanel = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(flag) {
       var topoDispatchers;
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
+      return _regenerator["default"].wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
               console.log("switchAlarmPopPanel", flag);
               topoDispatchers = this.topo.store.getModelDispatchers("topoAlarm");
@@ -271,13 +353,13 @@ var Alarm = /*#__PURE__*/function () {
 
             case 3:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
         }
-      }, _callee4, this);
+      }, _callee5, this);
     }));
 
-    function switchAlarmPopPanel(_x3) {
+    function switchAlarmPopPanel(_x4) {
       return _switchAlarmPopPanel.apply(this, arguments);
     }
 
@@ -293,24 +375,24 @@ var Alarm = /*#__PURE__*/function () {
   _proto.openTopoAlarm =
   /*#__PURE__*/
   function () {
-    var _openTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(id) {
-      var _this = this;
+    var _openTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
+      var _this2 = this;
 
-      var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
+      var _this$getState3, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
 
-      return _regenerator["default"].wrap(function _callee5$(_context5) {
+      return _regenerator["default"].wrap(function _callee6$(_context6) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context6.prev = _context6.next) {
             case 0:
               // 如果当前拓扑图开启中或已开启则退出
-              _this$getState2 = this.getState(), alarmOpening = _this$getState2.alarmOpening, topoAlarmIsOpen = _this$getState2.topoAlarmIsOpen;
+              _this$getState3 = this.getState(), alarmOpening = _this$getState3.alarmOpening, topoAlarmIsOpen = _this$getState3.topoAlarmIsOpen;
 
               if (!(this.currentTopoId === id && (topoAlarmIsOpen || alarmOpening))) {
-                _context5.next = 3;
+                _context6.next = 3;
                 break;
               }
 
-              return _context5.abrupt("return");
+              return _context6.abrupt("return");
 
             case 3:
               this.currentTopoId = id;
@@ -318,19 +400,21 @@ var Alarm = /*#__PURE__*/function () {
                 alarmOpening: true
               });
               alarmDispatchers = this.topo.store.getModelDispatchers("topoAlarm");
-              _context5.next = 8;
+              _context6.next = 8;
               return alarmDispatchers.resetAlarmDoc();
 
             case 8:
-              _context5.next = 10;
+              _context6.next = 10;
               return _topo["default"].openTopoAlarm(id);
 
             case 10:
+              this.secretKey = _context6.sent;
+
               // rlog.debug("openTopoAlarm 获取初始化告警-------------------开始");
               _componentRiilEventEmitter.EE.on("topo", "topo", function (data, other) {
                 _rlog["default"].debug("openTopoAlarm 获取初始化告警------收到信息", data);
 
-                _this.handleAlarmEvent(data);
+                _this2.handleAlarmEvent(data);
               });
 
               this.updateState({
@@ -338,15 +422,15 @@ var Alarm = /*#__PURE__*/function () {
                 alarmIsOpened: true
               });
 
-            case 12:
+            case 13:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
         }
-      }, _callee5, this);
+      }, _callee6, this);
     }));
 
-    function openTopoAlarm(_x4) {
+    function openTopoAlarm(_x5) {
       return _openTopoAlarm.apply(this, arguments);
     }
 
@@ -362,22 +446,22 @@ var Alarm = /*#__PURE__*/function () {
   _proto.closeTopoAlarm =
   /*#__PURE__*/
   function () {
-    var _closeTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
-      var _this$getState3, alarmIsOpened, alarmOpening;
+    var _closeTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(id) {
+      var _this$getState4, alarmIsOpened, alarmOpening;
 
-      return _regenerator["default"].wrap(function _callee6$(_context6) {
+      return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
               // 如果未开启则退出
-              _this$getState3 = this.getState(), alarmIsOpened = _this$getState3.alarmIsOpened, alarmOpening = _this$getState3.alarmOpening;
+              _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened, alarmOpening = _this$getState4.alarmOpening;
 
               if (!(!alarmIsOpened && !alarmOpening)) {
-                _context6.next = 3;
+                _context7.next = 3;
                 break;
               }
 
-              return _context6.abrupt("return");
+              return _context7.abrupt("return");
 
             case 3:
               this.currentTopoId = null;
@@ -391,18 +475,18 @@ var Alarm = /*#__PURE__*/function () {
                 alarmOpening: false,
                 alarmPanelIsOpen: false
               });
-              _context6.next = 9;
-              return _topo["default"].closeTopoAlarm(id);
+              _context7.next = 9;
+              return _topo["default"].closeTopoAlarm(id, this.secretKey);
 
             case 9:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
         }
-      }, _callee6, this);
+      }, _callee7, this);
     }));
 
-    function closeTopoAlarm(_x5) {
+    function closeTopoAlarm(_x6) {
       return _closeTopoAlarm.apply(this, arguments);
     }
 
@@ -427,22 +511,22 @@ var Alarm = /*#__PURE__*/function () {
   _proto.restart =
   /*#__PURE__*/
   function () {
-    var _restart = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
+    var _restart = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
       var id;
-      return _regenerator["default"].wrap(function _callee7$(_context7) {
+      return _regenerator["default"].wrap(function _callee8$(_context8) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context8.prev = _context8.next) {
             case 0:
               id = this.currentTopoId;
-              _context7.next = 3;
+              _context8.next = 3;
               return this.openTopoAlarm(id);
 
             case 3:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
         }
-      }, _callee7, this);
+      }, _callee8, this);
     }));
 
     function restart() {
@@ -459,14 +543,14 @@ var Alarm = /*#__PURE__*/function () {
   _proto.handleAlarmEvent =
   /*#__PURE__*/
   function () {
-    var _handleAlarmEvent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(alertData) {
-      var _this$getState4, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _this$topo$viewProps, _yield$alarmDispatche, eqFlag, alarmlist;
+    var _handleAlarmEvent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(alertData) {
+      var _this$getState5, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche, eqFlag, alarmlist, _this$topo$viewProps;
 
-      return _regenerator["default"].wrap(function _callee8$(_context8) {
+      return _regenerator["default"].wrap(function _callee9$(_context9) {
         while (1) {
-          switch (_context8.prev = _context8.next) {
+          switch (_context9.prev = _context9.next) {
             case 0:
-              _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
+              _this$getState5 = this.getState(), alarmIsOpened = _this$getState5.alarmIsOpened;
               resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
               resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
               alarmDispatchers = this.topo.store.getModelDispatchers("topoAlarm"); // 添加事件
@@ -474,7 +558,7 @@ var Alarm = /*#__PURE__*/function () {
               console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
               if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
-                _context8.next = 26;
+                _context9.next = 25;
                 break;
               }
 
@@ -496,7 +580,9 @@ var Alarm = /*#__PURE__*/function () {
                   alertId: item.alertId,
                   status: item.status,
                   obj: item,
-                  info: item.alertType
+                  info: item.alertType,
+                  ciCode: item === null || item === void 0 ? void 0 : item.ciCode,
+                  ruleId: item === null || item === void 0 ? void 0 : item.ruleId
                 };
 
                 if (resIdsList.indexOf(ciId) >= 0 && operations.indexOf(ciId) < 0) {
@@ -507,52 +593,51 @@ var Alarm = /*#__PURE__*/function () {
               }); // rlog.debug("before-combAlarmData", al, bizState);
 
               if (!(sendAl.length > 0)) {
-                _context8.next = 26;
+                _context9.next = 25;
                 break;
               }
 
               _rlog["default"].debug("过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl", alarmIsOpened, sendAl);
 
-              _context8.prev = 13;
-              _context8.next = 16;
+              _context9.prev = 13;
+              _context9.next = 16;
               return alarmDispatchers.combAlarmData({
                 alarmdata: sendAl
               });
 
             case 16:
-              _yield$alarmDispatche = _context8.sent;
+              _yield$alarmDispatche = _context9.sent;
               eqFlag = _yield$alarmDispatche.eqFlag;
               alarmlist = _yield$alarmDispatche.alarmlist;
 
-              if ((_this$topo$viewProps = this.topo.viewProps) !== null && _this$topo$viewProps !== void 0 && _this$topo$viewProps.onAlarm) {
-                // 通知所有告警
-                this.topo.viewProps.onAlarm(sendAl.map(function (item) {
-                  return item.obj;
-                }));
-              }
-
               if (alarmIsOpened && !eqFlag) {
-                this.hmGetTopoAlarm();
+                this.hmGetTopoAlarmByDoc(); // 通知所有告警
+
+                if ((_this$topo$viewProps = this.topo.viewProps) !== null && _this$topo$viewProps !== void 0 && _this$topo$viewProps.onAlarm) {
+                  this.topo.viewProps.onAlarm(this.getAlarms().map(function (item) {
+                    return item.obj;
+                  }));
+                }
               }
 
-              _context8.next = 26;
+              _context9.next = 25;
               break;
 
-            case 23:
-              _context8.prev = 23;
-              _context8.t0 = _context8["catch"](13);
+            case 22:
+              _context9.prev = 22;
+              _context9.t0 = _context9["catch"](13);
 
-              _rlog["default"].error("告警发送异常", _context8.t0);
+              _rlog["default"].error("告警发送异常", _context9.t0);
 
-            case 26:
+            case 25:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
         }
-      }, _callee8, this, [[13, 23]]);
+      }, _callee9, this, [[13, 22]]);
     }));
 
-    function handleAlarmEvent(_x6) {
+    function handleAlarmEvent(_x7) {
       return _handleAlarmEvent.apply(this, arguments);
     }
 

package/lib/core/models/DataModel.js

@@ -40,13 +40,27 @@ var DataModel = /*#__PURE__*/function () {
     return [];
   };
 
-  _proto.useResources = function useResources() {
+  _proto.getCis = function getCis() {
+    var datas = this.getDatas();
+    return datas.filter(function (item) {
+      return item.type !== 'group';
+    });
+  };
+
+  _proto.useCis = function useCis() {
     var datas = this.useDatas();
     return datas.filter(function (item) {
       return item.type !== 'group';
     });
   };
 
+  _proto.useDataById = function useDataById(id) {
+    var datas = this.useDatas();
+    return datas.filter(function (item) {
+      return item.id === id;
+    })[0];
+  };
+
   _proto.getDataById = function getDataById(id) {
     return this.getDatas().find(function (item) {
       return item.id === id;

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "3.5.0-a.9" === 'string' ? "3.5.0-a.9" : null;
+var version = typeof "3.5.2" === 'string' ? "3.5.2" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -551,7 +551,7 @@ var Topo = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _enterEditMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12() {
-      var topoDispatchers, editDispatchers, iconManageDispatchers;
+      var topoDispatchers, iconManageDispatchers;
       return _regenerator["default"].wrap(function _callee12$(_context12) {
         while (1) {
           switch (_context12.prev = _context12.next) {
@@ -579,8 +579,6 @@ var Topo = /*#__PURE__*/function () {
 
             case 9:
               (0, _edgeUtil.updateEdgeExpanded)(this);
-              editDispatchers = this.store.getModelDispatchers('topoConfig');
-              editDispatchers.switchToEditMode();
 
               if (this.options.onSwitchToEditMode) {
                 this.options.onSwitchToEditMode(this);
@@ -590,7 +588,7 @@ var Topo = /*#__PURE__*/function () {
               iconManageDispatchers = this.store.getModelDispatchers('customIcon');
               iconManageDispatchers.loadEditorIcons();
 
-            case 15:
+            case 13:
             case "end":
               return _context12.stop();
           }
@@ -667,7 +665,7 @@ var Topo = /*#__PURE__*/function () {
     return triggerSaveEvent;
   }()
   /**
-   * 后续待优化，移除该接口，由ht提供原子接口获取相关数据
+   * FIXME 待优化，移除该接口，由ht提供原子接口获取相关数据
    */
   ;