@riil-frontend/component-topology 12.0.0-dev.13 → 12.0.0-dev.16

package/es/core/components/AlarmListPanel/components/AlarmListItem.js

@@ -1,3 +1,5 @@
+import _Balloon from "@alifd/next/es/balloon";
+import _extends from "@babel/runtime/helpers/extends";
 import _List from "@alifd/next/es/list";
 import _Icon from "@alifd/next/es/icon";
 import React, { useState, useEffect } from 'react';
@@ -31,6 +33,7 @@ function AlarmListItem(props) {
   var topo = props.topo,
       alarmInfo = props.alarmInfo,
       onClick = props.onClick;
+  console.log("AlarmListPanel", topo, alarmInfo);
   return /*#__PURE__*/React.createElement(_List.Item, {
     className: styles.AlarmListItem,
     media: /*#__PURE__*/React.createElement(_Icon, {
@@ -85,10 +88,60 @@ function RiskListItem(props) {
   }, "\u67E5\u770B\u8BE6\u60C5"))));
 }
 
+function SubListItem(props) {
+  // 传入参数
+  var topo = props.topo,
+      alarmInfo = props.alarmInfo,
+      onClick = props.onClick;
+  var creatAlarmTips = topo.viewProps.creatAlarmTips;
+  var subNode = topo.getData().nodes.find(function (node) {
+    return node.ciId === alarmInfo.mainCiId;
+  });
+  var plarm = alarmInfo.cmpCode ? "\u3010" + subNode.sourceName + "\u3011" : "【本级平台】";
+  return /*#__PURE__*/React.createElement(_List.Item, {
+    className: styles.AlarmListItem,
+    media: /*#__PURE__*/React.createElement(_Icon, {
+      type: "gaojing-3",
+      size: "xs",
+      className: styles["alarm-color-icon"] + " alarm-color-icon-lv" + alarmInfo.alertLevel
+    })
+  }, /*#__PURE__*/React.createElement("span", {
+    className: styles.content
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.list,
+    onClick: function onClick() {
+      getNode(topo, alarmInfo);
+    }
+  }, "" + plarm + alarmInfo.alertObject + alarmInfo.alertTitle), alarmInfo.cmpCode ? /*#__PURE__*/React.createElement(_Balloon, {
+    trigger: /*#__PURE__*/React.createElement("span", {
+      className: styles.listLink
+    }, "\u67E5\u770B\u8BE6\u60C5"),
+    closable: true,
+    triggerType: "click",
+    align: "bl",
+    popupClassName: styles["enjoydata-alarm-table-balloon"],
+    popupStyle: {
+      maxWidth: "700px",
+      width: 530
+    }
+  }, creatAlarmTips(_extends({}, alarmInfo))) : /*#__PURE__*/React.createElement("div", {
+    className: styles.listLink
+  }, /*#__PURE__*/React.createElement(Link, {
+    onClick: onClick,
+    to: alarmLink(alarmInfo)
+  }, "\u67E5\u770B\u8BE6\u60C5"))));
+}
+
 function ListItem(props) {
-  var alarmInfo = props.alarmInfo;
-  var ListItemWidget = alarmInfo.eventType === 'risk' ? RiskListItem : AlarmListItem;
-  return /*#__PURE__*/React.createElement(ListItemWidget, props);
+  var topo = props.topo,
+      alarmInfo = props.alarmInfo;
+
+  if (topo.isCMPTopo) {
+    return /*#__PURE__*/React.createElement(SubListItem, props);
+  } else {
+    var ListItemWidget = alarmInfo.eventType === "risk" ? RiskListItem : AlarmListItem;
+    return /*#__PURE__*/React.createElement(ListItemWidget, props);
+  }
 }
 
 export default ListItem;

package/es/core/hooks/useTopoEdit.js

@@ -956,10 +956,11 @@ var useTopoEdit = function useTopoEdit(params) {
               break;
             }
 
+            topo.historyManager.endTransaction();
+
             _Message.error("关联资源失败");
 
-            rlog.warn("关联资源失败");
-            topo.historyManager.endTransaction();
+            rlog.error("关联资源失败");
             return _context9.abrupt("return", false);
 
           case 23:

package/es/core/models/Alarm.js

@@ -533,25 +533,34 @@ var Alarm = /*#__PURE__*/function () {
             resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
             resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
             alarmDispatchers = this.topo.store.getModelDispatchers('topoAlarm'); // 添加事件
-            // console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
+
+            console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
             if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
-              _context9.next = 24;
+              _context9.next = 27;
               break;
             }
 
             sendAl = [];
             idsList = [].concat(nodeIdsList, linkIdsList);
             operations = [];
+            console.log('idsList---------', idsList);
             idsList.forEach(function (idItem) {
               if (idItem.operation === null) {
                 operations.push(idItem.ciId);
               }
             });
             alertData.forEach(function (item, index) {
-              var _item$resourceId;
+              var _item$resourceId, _item$alertCode;
 
               var ciId = (_item$resourceId = item.resourceId) !== null && _item$resourceId !== void 0 ? _item$resourceId : item.ciId;
+              var isSub = false;
+
+              if ((_item$alertCode = item.alertCode) !== null && _item$alertCode !== void 0 && _item$alertCode.startsWith("cmp")) {
+                ciId = "sub:" + item.mainCiId;
+                isSub = true;
+              }
+
               var obj = {
                 id: ciId,
                 level: item.alertLevel,
@@ -560,27 +569,30 @@ var Alarm = /*#__PURE__*/function () {
                 obj: item,
                 info: item.alertType,
                 ciCode: item === null || item === void 0 ? void 0 : item.ciCode,
-                ruleId: item === null || item === void 0 ? void 0 : item.ruleId
+                ruleId: item === null || item === void 0 ? void 0 : item.ruleId,
+                isSub: isSub
               };
 
               if (resIdsList.indexOf(ciId) >= 0 && operations.indexOf(ciId) < 0) {
                 sendAl.push(obj);
-              }
-            }); // console.log("before-combAlarmData", sendAl, idsList);
+              } // const ciId = `${isSub}+${item.resourceId ?? item.ciId}`;
+
+            });
+            console.log("before-combAlarmData", sendAl, idsList);
 
             if (!(sendAl.length > 0)) {
-              _context9.next = 24;
+              _context9.next = 27;
               break;
             }
 
             rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
-            _context9.prev = 12;
-            _context9.next = 15;
+            _context9.prev = 15;
+            _context9.next = 18;
             return alarmDispatchers.combAlarmData({
               alarmdata: sendAl
             });
 
-          case 15:
+          case 18:
             _yield$alarmDispatche2 = _context9.sent;
             eqFlag = _yield$alarmDispatche2.eqFlag;
             alarmlist = _yield$alarmDispatche2.alarmlist;
@@ -601,19 +613,19 @@ var Alarm = /*#__PURE__*/function () {
               }
             }
 
-            _context9.next = 24;
+            _context9.next = 27;
             break;
 
-          case 21:
-            _context9.prev = 21;
-            _context9.t0 = _context9["catch"](12);
+          case 24:
+            _context9.prev = 24;
+            _context9.t0 = _context9["catch"](15);
             rlog.error('告警发送异常', _context9.t0);
 
-          case 24:
+          case 27:
           case "end":
             return _context9.stop();
         }
-      }, _callee9, this, [[12, 21]]);
+      }, _callee9, this, [[15, 24]]);
     }));
 
     function handleAlarmEvent(_x7) {

package/es/core/models/TopoApp.js

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

package/es/core/store/models/topoMod.js

@@ -208,76 +208,23 @@ export default function (topoApp) {
         enterEditMode: function enterEditMode(playload, rootState) {
           topoApp.enterEditMode();
         },
-        openDefaultTopoPage: function openDefaultTopoPage(conditions, rootState) {
-          var _this3 = this;
-
+        refreshPermission: function refreshPermission() {
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-            var topoId, treeData;
             return _regeneratorRuntime.wrap(function _callee3$(_context3) {
               while (1) switch (_context3.prev = _context3.next) {
                 case 0:
-                  if (conditions === void 0) {
-                    conditions = {};
-                  }
-
-                  topoId = rootState.topoTreeMod.defId;
-
-                  if (!topoId) {
-                    // 查找第一个
-                    treeData = rootState.topoTreeMod.treeData;
-                    loopTreeByKey(treeData, 'type', 1, function (item, index, arr) {
-                      if (!topoId) {
-                        topoId = item.id;
-                      }
-                    });
-                  } // 右侧切换拓扑图
-
-
-                  _this3.openTopoPage({
-                    id: topoId
-                  });
-
-                case 4:
-                case "end":
-                  return _context3.stop();
-              }
-            }, _callee3);
-          }))();
-        },
-        refreshPermission: function refreshPermission() {
-          var _this4 = this;
-
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-            return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-              while (1) switch (_context4.prev = _context4.next) {
-                case 0:
-                  _context4.next = 2;
+                  _context3.next = 2;
                   return dispatch.functionAuth.refresh();
 
                 case 2:
-                  _context4.next = 4;
-                  return _this4.refreshTopoTree();
-
-                case 4:
-                case "end":
-                  return _context4.stop();
-              }
-            }, _callee4);
-          }))();
-        },
-        refreshTopoTree: function refreshTopoTree() {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-            return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-              while (1) switch (_context5.prev = _context5.next) {
-                case 0:
-                  _context5.next = 2;
+                  _context3.next = 4;
                   return dispatch.topoTreeMod.refreshTree();
 
-                case 2:
+                case 4:
                 case "end":
-                  return _context5.stop();
+                  return _context3.stop();
               }
-            }, _callee5);
+            }, _callee3);
           }))();
         },
 
@@ -292,19 +239,19 @@ export default function (topoApp) {
          * @return {Promise<void>}
          */
         initTopoData: function initTopoData(props, state) {
-          var _this5 = this;
+          var _this3 = this;
 
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
             var _result$config;
 
             var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, graphConfig, topoConfig, extraConfig, _combTopoData, topoData, resAndMetrics, _yield$Promise$all, newData, endTime;
 
-            return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-              while (1) switch (_context6.prev = _context6.next) {
+            return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+              while (1) switch (_context4.prev = _context4.next) {
                 case 0:
                   startTime = moment();
                   topoId = props.topoId, data = props.data, linkToData = props.linkTo, refresh = props.refresh, clear = props.clear;
-                  _context6.next = 4;
+                  _context4.next = 4;
                   return topoApp.open(topoId);
 
                 case 4:
@@ -327,7 +274,7 @@ export default function (topoApp) {
                     });
                   }
 
-                  _this5.update(startState);
+                  _this3.update(startState);
 
                   dispatch.topoBizMod.update({
                     pollingSwitch: false
@@ -337,24 +284,24 @@ export default function (topoApp) {
                   permission = 'write';
 
                   if (!topoApp.options.usePermission) {
-                    _context6.next = 19;
+                    _context4.next = 19;
                     break;
                   }
 
-                  _context6.next = 14;
-                  return _this5.getTopoPermission({
+                  _context4.next = 14;
+                  return _this3.getTopoPermission({
                     id: topoId
                   });
 
                 case 14:
-                  permission = _context6.sent;
+                  permission = _context4.sent;
 
                   if (topoPermissonUtil.isReadable(permission)) {
-                    _context6.next = 19;
+                    _context4.next = 19;
                     break;
                   }
 
-                  _this5.update({
+                  _this3.update({
                     loading: false,
                     topoData: null,
                     data: null,
@@ -363,26 +310,26 @@ export default function (topoApp) {
                   });
 
                   topoApp.options.onLoad();
-                  return _context6.abrupt("return");
+                  return _context4.abrupt("return");
 
                 case 19:
                   if (!data) {
-                    _context6.next = 30;
+                    _context4.next = 30;
                     break;
                   }
 
                   graphConfig = {};
 
                   if (!topoId) {
-                    _context6.next = 27;
+                    _context4.next = 27;
                     break;
                   }
 
-                  _context6.next = 24;
+                  _context4.next = 24;
                   return topoService.getTopoData(topoId);
 
                 case 24:
-                  topoConfig = _context6.sent;
+                  topoConfig = _context4.sent;
                   if (!topoConfig) rlog.error("\u672A\u67E5\u8BE2\u5230\u62D3\u6251id " + topoId + " \u7684\u6570\u636E\uFF0C\u8BF7\u68C0\u67E5");
                   graphConfig = {
                     global: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.global,
@@ -392,23 +339,23 @@ export default function (topoApp) {
 
                 case 27:
                   result = _extends({}, data, graphConfig);
-                  _context6.next = 33;
+                  _context4.next = 33;
                   break;
 
                 case 30:
-                  _context6.next = 32;
+                  _context4.next = 32;
                   return topoApp.options.loadData(topoId, topoApp.serverApi);
 
                 case 32:
-                  result = _context6.sent;
+                  result = _context4.sent;
 
                 case 33:
                   if (result) {
-                    _context6.next = 37;
+                    _context4.next = 37;
                     break;
                   }
 
-                  _this5.update({
+                  _this3.update({
                     loading: false,
                     data: null,
                     globalConfig: null,
@@ -417,17 +364,17 @@ export default function (topoApp) {
                   });
 
                   topoApp.options.onLoad();
-                  return _context6.abrupt("return");
+                  return _context4.abrupt("return");
 
                 case 37:
                   result = parseTopoData(result);
                   rlog.debug('topoMod.initTopoData 查询数据完成', topoId, linkTo, result);
-                  _context6.next = 41;
+                  _context4.next = 41;
                   return dispatch.customIcon.loadCustomIcons();
 
                 case 41:
                   extraConfig = result.global.extraConfig;
-                  _context6.next = 44;
+                  _context4.next = 44;
                   return dispatch.displayConfig.setConfig(_extends({}, extraConfig, {
                     alarmSwitch: result.global.alarmSwitch,
                     alarmListDefaultOpen: result.global.alarmListDefaultOpen
@@ -441,8 +388,8 @@ export default function (topoApp) {
                     globalConfig: extraConfig
                   }), topoData = _combTopoData.topoData, resAndMetrics = _combTopoData.resAndMetrics; // rlog.debug("topoMod.initTopoData combTopoData", { topoData, resAndMetrics, });
 
-                  _context6.next = 47;
-                  return _this5.update({
+                  _context4.next = 47;
+                  return _this3.update({
                     currentTopo: topoData.config,
                     data: result,
                     globalConfig: extraConfig,
@@ -457,15 +404,15 @@ export default function (topoApp) {
 
                   topoApp.alarm.open(); // 加载标注悬浮框数据
 
-                  _context6.next = 52;
+                  _context4.next = 52;
                   return Promise.all([addLinkData(result), topoApp.ciTyeCache.load(getCiTypes(result)), topoApp.elementTagTipConfig.init(result) // 暂停新配置开发
                   ]);
 
                 case 52:
-                  _yield$Promise$all = _context6.sent;
+                  _yield$Promise$all = _context4.sent;
                   newData = _yield$Promise$all[0];
-                  _context6.next = 56;
-                  return _this5.update({
+                  _context4.next = 56;
+                  return _this3.update({
                     data: newData
                   });
 
@@ -478,15 +425,15 @@ export default function (topoApp) {
                   rlog.info('topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ', endTime.diff(startTime, 'seconds', true));
                   topoApp.options.onLoad();
 
-                  _this5.update({
+                  _this3.update({
                     loading: false
                   });
 
                 case 62:
                 case "end":
-                  return _context6.stop();
+                  return _context4.stop();
               }
-            }, _callee6);
+            }, _callee4);
           }))();
         },
 
@@ -494,21 +441,21 @@ export default function (topoApp) {
          * 刷新拓扑图
          */
         refreshTopo: function refreshTopo(payload, rootState) {
-          var _this6 = this;
+          var _this4 = this;
 
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
             var _payload, clear;
 
-            return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-              while (1) switch (_context7.prev = _context7.next) {
+            return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+              while (1) switch (_context5.prev = _context5.next) {
                 case 0:
                   if (payload === void 0) {
                     payload = {};
                   }
 
                   _payload = payload, clear = _payload.clear;
-                  _context7.next = 4;
-                  return _this6.initTopoData({
+                  _context5.next = 4;
+                  return _this4.initTopoData({
                     topoId: rootState.topoMod.topoId,
                     refresh: true,
                     clear: clear
@@ -516,18 +463,18 @@ export default function (topoApp) {
 
                 case 4:
                 case "end":
-                  return _context7.stop();
+                  return _context5.stop();
               }
-            }, _callee7);
+            }, _callee5);
           }))();
         },
         operationTopoPage: function operationTopoPage(conditions, state) {
-          var _this7 = this;
+          var _this5 = this;
 
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
             var td;
-            return _regeneratorRuntime.wrap(function _callee8$(_context8) {
-              while (1) switch (_context8.prev = _context8.next) {
+            return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+              while (1) switch (_context6.prev = _context6.next) {
                 case 0:
                   if (conditions === void 0) {
                     conditions = {};
@@ -535,7 +482,7 @@ export default function (topoApp) {
 
                   if (conditions.id === state.topoMod.topoId) {
                     if (conditions.type === 'delete') {
-                      _this7.update({
+                      _this5.update({
                         topoId: conditions.defId
                       });
                     }
@@ -547,7 +494,7 @@ export default function (topoApp) {
                         })
                       });
 
-                      _this7.update({
+                      _this5.update({
                         topoData: td
                       });
                     }
@@ -555,29 +502,29 @@ export default function (topoApp) {
 
                 case 2:
                 case "end":
-                  return _context8.stop();
+                  return _context6.stop();
               }
-            }, _callee8);
+            }, _callee6);
           }))();
         },
         openPermissionSetting: function openPermissionSetting(payload, rootState) {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
-            return _regeneratorRuntime.wrap(function _callee9$(_context9) {
-              while (1) switch (_context9.prev = _context9.next) {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
+            return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+              while (1) switch (_context7.prev = _context7.next) {
                 case 0:
                   dispatch.permissionSetting.open();
 
                 case 1:
                 case "end":
-                  return _context9.stop();
+                  return _context7.stop();
               }
-            }, _callee9);
+            }, _callee7);
           }))();
         },
         updateDelId: function updateDelId(conditions, state) {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
-            return _regeneratorRuntime.wrap(function _callee10$(_context10) {
-              while (1) switch (_context10.prev = _context10.next) {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+            return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+              while (1) switch (_context8.prev = _context8.next) {
                 case 0:
                   if (conditions === void 0) {
                     conditions = '';
@@ -587,49 +534,49 @@ export default function (topoApp) {
 
                 case 2:
                 case "end":
-                  return _context10.stop();
+                  return _context8.stop();
               }
-            }, _callee10);
+            }, _callee8);
           }))();
         },
         getTopoPermission: function getTopoPermission(playload, rootState) {
-          var _this8 = this;
+          var _this6 = this;
 
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
             var id, update, topoPermission;
-            return _regeneratorRuntime.wrap(function _callee11$(_context11) {
-              while (1) switch (_context11.prev = _context11.next) {
+            return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+              while (1) switch (_context9.prev = _context9.next) {
                 case 0:
                   id = playload.id, update = playload.update;
-                  _context11.prev = 1;
-                  _context11.next = 4;
+                  _context9.prev = 1;
+                  _context9.next = 4;
                   return topoApp.serverApi.auth.getTopoPermission(id);
 
                 case 4:
-                  topoPermission = _context11.sent;
+                  topoPermission = _context9.sent;
                   rlog.debug('查询拓扑权限', topoPermission);
-                  _context11.next = 11;
+                  _context9.next = 11;
                   break;
 
                 case 8:
-                  _context11.prev = 8;
-                  _context11.t0 = _context11["catch"](1);
-                  rlog.error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
+                  _context9.prev = 8;
+                  _context9.t0 = _context9["catch"](1);
+                  rlog.error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context9.t0); // 尚未区分拓扑图不存在还是接口请求报错
 
                 case 11:
                   if (update !== false) {
-                    _this8.update({
+                    _this6.update({
                       topoPermission: topoPermission
                     });
                   }
 
-                  return _context11.abrupt("return", topoPermission);
+                  return _context9.abrupt("return", topoPermission);
 
                 case 13:
                 case "end":
-                  return _context11.stop();
+                  return _context9.stop();
               }
-            }, _callee11, null, [[1, 8]]);
+            }, _callee9, null, [[1, 8]]);
           }))();
         }
       };

package/es/core/viewer/components/plugins/ViewerPlugin.js

@@ -8,8 +8,10 @@ export default function ViewerPlugin(props) {
   var topo = props.topo,
       viewerProps = props.viewerProps;
   var store = topo.store;
+  var alarmInfoDoc = viewerProps.alarmInfoDoc;
   useAlarm({
-    topo: topo
+    topo: topo,
+    alarmInfoDoc: alarmInfoDoc
   });
   useManageStatus({
     topo: topo