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

package/lib/core/editor/components/Toolbar/widgets/Layout/index.js

@@ -40,6 +40,11 @@ function Layout(props) {
       selection = _topo$store$useModelS.selection;
 
   var setDisabled = function setDisabled(data) {
+    if (topoShowType !== 'layers' && selection.length === 1) {
+      //中心节点布局，选中一个节点非分层情况下，需要星型和树形布局亮起来
+      return data == 'rectangle' || data == 'hierarchical';
+    }
+
     if (topoShowType == 'layers' && selection.length == 1 && !(0, _htElementDataUtil.isGroup)(selection[0])) {
       return data != 'rectangle';
     } else {
@@ -57,7 +62,11 @@ function Layout(props) {
 
 
     if (topoShowType != 'layers' && selection.length == 1) {
-      topo.getHtTopo().layoutInContainer(layouType);
+      if (layouType == 'hierarchical') {
+        topo.getHtTopo().layoutInContainer(layouType);
+      } else {
+        topo.getHtTopo().layoutTopoBySelectNode(layouType, selectionElements[0]);
+      }
     } // eslint-disable-next-line eqeqeq
 
 
@@ -72,7 +81,7 @@ function Layout(props) {
     topo.historyManager.beginTransaction();
     setLayout(v); // eslint-disable-next-line eqeqeq
 
-    if (topoShowType != 'layers' && ((_selection$ = selection[0]) === null || _selection$ === void 0 ? void 0 : _selection$.className) != 'ht.Node' || topoShowType == 'partition' && selection.length == 1 || topoShowType == 'layers' && selection.length == 1) {
+    if (topoShowType != 'layers' && ((_selection$ = selection[0]) === null || _selection$ === void 0 ? void 0 : _selection$.className) != 'ht.Node' || topoShowType == 'partition' && selection.length == 1 || topoShowType == 'layers' && selection.length == 1 || topoShowType !== 'layers' && selection.length === 1) {
       globalLayout(v);
     }
 
@@ -150,6 +159,11 @@ function isLayoutEnabled(props) {
 
   if (topoShowType !== 'layers' && !selection.length) {
     return true;
+  } //中心节点布局,选中一个节点不是分层的情况下，按钮亮起
+
+
+  if (topoShowType !== 'layers' && selection.length === 1) {
+    return true;
   }
 
   return false;

package/lib/core/hooks/useGraphAlarmDisplay.js

@@ -13,7 +13,13 @@ var _htElementUtils = require("../../utils/htElementUtils");
 
 var _showGraphManageStatusUtil = require("../utils/showGraphManageStatusUtil");
 
-function getCiAlarmLevels(alarmList, risks) {
+/**
+ * 获取ci的最高告警级别
+ * @param {Array} alarmList 
+ * @param {*} risks 
+ * @returns 
+ */
+function getCiAlarmLevelMap(alarmList, risks) {
   var ciIdLevelMap = {};
   [].concat(alarmList, risks.map(function (item) {
     var _item$resourceId;
@@ -31,13 +37,53 @@ function getCiAlarmLevels(alarmList, risks) {
 
     ciIdLevelMap[item.id] = level;
   });
+  return ciIdLevelMap;
+}
+
+function getGraphCiElementAlarmLevels(resources, alarmList, risks) {
+  var ciIdLevelMap = getCiAlarmLevelMap(alarmList, risks);
   return Object.keys(ciIdLevelMap).map(function (id) {
     return {
       id: id,
       level: ciIdLevelMap[id]
     };
+  }).filter(function (alarm) {
+    var resource = resources.find(function (item) {
+      return item.id === alarm.id;
+    });
+    return !!resource;
   });
 }
+/**
+ * 获得关联拓扑节点告警级别
+ * @param {*} topo 
+ * @param {*} relateTopoAlarm 
+ * @returns 
+ */
+
+
+function getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm) {
+  return Object.keys(relateTopoAlarm).map(function (topoId) {
+    var level = relateTopoAlarm[topoId];
+    var relateTopoNode = topo.getDataModel().getDatas().toArray().find(function (node) {
+      return "" + node.a('bindTopo') === "" + topoId;
+    });
+
+    if (!level || !relateTopoNode) {
+      return null;
+    }
+
+    return {
+      elementId: relateTopoNode.getId(),
+      level: level
+    };
+  }).filter(function (item) {
+    return !!item;
+  });
+} // 获取拓扑图元素最高告警级别。包含资源、链路、关联拓扑节点
+
+
+function getGraphElementAlarmLevels(resources) {}
 /**
  * 告警显示到ht拓扑
  * 
@@ -48,7 +94,6 @@ function getCiAlarmLevels(alarmList, risks) {
 function useGraphAlarmDisplay(options) {
   var topo = options.topo,
       alarmSwitch = options.alarmSwitch;
-  var store = topo.store;
   var topoState = topo.store.useModelState('topoMod');
   var graphLoaded = topoState.graphLoaded,
       viewState = topoState.viewState;
@@ -62,17 +107,7 @@ function useGraphAlarmDisplay(options) {
   var resources = topo.dataModel.useCis();
 
   function getCisEventLevel() {
-    return getCiAlarmLevels(alarmList || [], risks).filter(function (alarm) {
-      var resource = resources.find(function (item) {
-        return item.id === alarm.id;
-      });
-
-      if (!resource) {
-        return false;
-      }
-
-      return true;
-    });
+    return getGraphCiElementAlarmLevels(resources, alarmList || [], risks);
   }
 
   (0, _react.useEffect)(function () {
@@ -82,8 +117,8 @@ function useGraphAlarmDisplay(options) {
       resources: resources,
       isEditMode: isEditMode,
       graphLoaded: graphLoaded,
-      // 有告警且未监控时，此时开启告警静默，应当显示未监控图标
-      cisEventLevel: alarmSwitch === false ? [] : getCisEventLevel()
+      alarmSwitch: alarmSwitch,
+      cisEventLevel: getCisEventLevel()
     });
 
     function showAlarm() {
@@ -97,43 +132,30 @@ function useGraphAlarmDisplay(options) {
         return;
       }
 
-      var finalAlarms = getCisEventLevel(); // 将告警级别放入ht元素，便于测试
+      var finalAlarms = getCisEventLevel(); // 关联拓扑告警
+
+      var relateTopoAlarms = getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm);
+      var elementsAlarmLevels = [].concat(finalAlarms, relateTopoAlarms); // 将告警级别放入ht元素，便于测试
 
       (0, _htElementUtils.getElements)(topo.getDataModel()).filter(function (item) {
         return !!item.getTag();
       }).forEach(function (element) {
-        var _finalAlarms$find;
+        var _elementsAlarmLevels$;
 
-        var alarmLevel = (_finalAlarms$find = finalAlarms.find(function (item) {
-          return item.id === element.getTag();
-        })) === null || _finalAlarms$find === void 0 ? void 0 : _finalAlarms$find.level;
+        var alarmLevel = (_elementsAlarmLevels$ = elementsAlarmLevels.find(function (item) {
+          return item.id === element.getTag() || item.elementId === element.getId();
+        })) === null || _elementsAlarmLevels$ === void 0 ? void 0 : _elementsAlarmLevels$.level;
         element.a('alarmLevel', alarmLevel);
       });
-      var relateTopoAlarms = Object.keys(relateTopoAlarm).map(function (topoId) {
-        var level = relateTopoAlarm[topoId];
-        var relateTopoNode = topo.getDataModel().getDatas().toArray().find(function (node) {
-          return "" + node.a('bindTopo') === "" + topoId;
-        });
-
-        if (!level || !relateTopoNode) {
-          return null;
-        }
-
-        return {
-          elementId: relateTopoNode.getId(),
-          level: level
-        };
-      }).filter(function (item) {
-        return !!item;
-      });
 
-      _rlog["default"].debug('关联拓扑告警：推送ht', {
-        all: relateTopoAlarm,
+      _rlog["default"].debug('推送告警 => ht', {
+        alarms: elementsAlarmLevels,
+        relateTopoAlarmMap: relateTopoAlarm,
         relateTopoAlarms: relateTopoAlarms
       }); // 更新到ht拓扑
 
 
-      topo.view.loadAlarm([].concat(finalAlarms, relateTopoAlarms));
+      topo.view.loadAlarm(elementsAlarmLevels);
     }
 
     return function () {

package/lib/core/hooks/useTopoEdit.js

@@ -1001,11 +1001,12 @@ var useTopoEdit = function useTopoEdit(params) {
               break;
             }
 
+            topo.historyManager.endTransaction();
+
             _message["default"].error("关联资源失败");
 
-            _rlog["default"].warn("关联资源失败");
+            _rlog["default"].error("关联资源失败");
 
-            topo.historyManager.endTransaction();
             return _context9.abrupt("return", false);
 
           case 23:

package/lib/core/models/Alarm.js

@@ -557,25 +557,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 (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.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,
@@ -584,28 +593,31 @@ 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;
             }
 
             _componentTopologyUtils.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;
@@ -626,20 +638,20 @@ 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);
 
             _componentTopologyUtils.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/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.13" === 'string' ? "12.0.0-dev.13" : null;
+var version = typeof "12.0.0-dev.17" === 'string' ? "12.0.0-dev.17" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/cache/CiCache.d.ts

@@ -11,7 +11,7 @@ declare class CiCache {
      * @param ids {string[]}
      * @returns {Promise<Object>}
      */
-    load(ids: string[]): Promise<Object>;
+    load(ids: string[], refreshCiCache?: boolean): Promise<Object>;
     getCi(id: string): Object;
 }
 declare const _default: CiCache;

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

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