@riil-frontend/component-topology 12.0.0-dev.21 → 12.0.0-dev.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,11 +467,11 @@ 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;
@@ -561,7 +481,7 @@ var Alarm = /*#__PURE__*/function () {
             console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
             if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
-              _context9.next = 27;
+              _context8.next = 27;
               break;
             }
 
@@ -575,16 +495,10 @@ var Alarm = /*#__PURE__*/function () {
               }
             });
             alertData.forEach(function (item, index) {
-              var _item$resourceId, _item$alertCode;
+              var _item$resourceId;
 
               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,
@@ -599,26 +513,25 @@ var Alarm = /*#__PURE__*/function () {
 
               if (resIdsList.indexOf(ciId) >= 0 && operations.indexOf(ciId) < 0) {
                 sendAl.push(obj);
-              } // const ciId = `${isSub}+${item.resourceId ?? item.ciId}`;
-
+              }
             });
             console.log("before-combAlarmData", sendAl, idsList);
 
             if (!(sendAl.length > 0)) {
-              _context9.next = 27;
+              _context8.next = 27;
               break;
             }
 
             _componentTopologyUtils.rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
 
-            _context9.prev = 15;
-            _context9.next = 18;
+            _context8.prev = 15;
+            _context8.next = 18;
             return alarmDispatchers.combAlarmData({
               alarmdata: sendAl
             });
 
           case 18:
-            _yield$alarmDispatche2 = _context9.sent;
+            _yield$alarmDispatche2 = _context8.sent;
             eqFlag = _yield$alarmDispatche2.eqFlag;
             alarmlist = _yield$alarmDispatche2.alarmlist;
 
@@ -638,23 +551,23 @@ var Alarm = /*#__PURE__*/function () {
               }
             }
 
-            _context9.next = 27;
+            _context8.next = 27;
             break;
 
           case 24:
-            _context9.prev = 24;
-            _context9.t0 = _context9["catch"](15);
+            _context8.prev = 24;
+            _context8.t0 = _context8["catch"](15);
 
-            _componentTopologyUtils.rlog.error('告警发送异常', _context9.t0);
+            _componentTopologyUtils.rlog.error('告警发送异常', _context8.t0);
 
           case 27:
           case "end":
-            return _context9.stop();
+            return _context8.stop();
         }
-      }, _callee9, this, [[15, 24]]);
+      }, _callee8, this, [[15, 24]]);
     }));
 
-    function handleAlarmEvent(_x7) {
+    function handleAlarmEvent(_x6) {
       return _handleAlarmEvent.apply(this, arguments);
     }
 

package/lib/core/models/AttributeMetricDisplay.js

@@ -541,7 +541,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       });
     });
 
-    _componentTopologyUtils.rlog.debug('推送标注 => ht 失败', elementTagsAndTips);
+    _componentTopologyUtils.rlog.debug('推送标注 => ht', elementTagsAndTips);
 
     var htTopo = topo.getHtTopo();
 

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

package/lib/core/viewer/components/titlebar/widgets/AlarmButton.js

@@ -15,11 +15,7 @@ var _useEventData = _interopRequireDefault(require("../../../../hooks/useEventDa
 
 function AlarmButton(props) {
   var topo = props.topo;
-
-  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
-      alarmState = _topo$store$useModel[0],
-      alarmDispatchers = _topo$store$useModel[1];
-
+  var alarmState = topo.store.useModelState("topoAlarm");
   var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
   var alarmData = (0, _useEventData["default"])({
     topo: topo

package/lib/utils/ciRefAttributeTranslateUtil.js

@@ -30,7 +30,7 @@ function getCiRefAttributesMap(ciDatas, ciTypeMap) {
     var id = ciData.id;
     var attributeMap = ciData.attributeMap || ciData.attributes;
     ciRefAttributeMap[id] = [];
-    var typeCode = ciData.typeCode || ciData.ciType;
+    var typeCode = ciData.ciType || ciData.typeCode;
     var ciTypeMeta = ciTypeMap[typeCode];
 
     if (ciTypeMeta) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "12.0.0-dev.21",
+  "version": "12.0.0-dev.24",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -123,6 +123,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.0.0-dev.21/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.0.0-dev.24/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }