@riil-frontend/component-topology 13.0.5 → 13.0.8

package/es/networkTopo/hooks/viewer/useEdgeFlow.js

@@ -1,17 +1,17 @@
-import { useEffect } from 'react';
+import { useEffect } from "react";
 /**
  * 默认情况下，拓扑图不存在链路的动态效果
  * 未监控的链路，不展示动态效果
- * @param {*} props 
+ * @param {*} props
  */
 
 export default function useEdgeFlow(props) {
   var topo = props.topo;
-  var topoState = topo.store.useModelState('topoMod');
-  var displayConfig = topo.store.useModelState('displayConfig');
+  var topoState = topo.store.useModelState("topoMod");
+  var displayConfig = topo.store.useModelState("displayConfig");
   var graphLoaded = topoState.graphLoaded,
       viewState = topoState.viewState;
-  var isViewer = viewState !== 'edit';
+  var isViewer = viewState !== "edit";
   var edgeFlow = displayConfig.edgeFlow,
       edgeFlowDirection = displayConfig.edgeFlowDirection;
   var resources = topo.dataModel.useCis();
@@ -21,7 +21,7 @@ export default function useEdgeFlow(props) {
       var edgeFlowConfig = edgeFlow ? {
         type: edgeFlow,
         // 必填，支持传送带drip、光点point、箭头arrow
-        direction: !edgeFlowDirection || edgeFlowDirection === 'from' ? 'to' : 'from' // 流动方向，可为空. 默认上行目的到源
+        direction: !edgeFlowDirection || edgeFlowDirection === "from" ? "to" : "from" // 流动方向，可为空. 默认上行目的到源
 
       } : null;
       topo.getHtTopo().setGlobalEdgeFlow(edgeFlowConfig); // 未监控的链路，不展示动态效果
@@ -34,8 +34,12 @@ export default function useEdgeFlow(props) {
           var element = topo.getDataModel().getDataByTag(id);
           if (!element) return;
 
-          if (element instanceof ht.Edge && isNotMonite) {
-            element.s('flow', false);
+          if (element instanceof ht.Edge) {
+            var isBreak = element.a("linkbreak");
+
+            if (isNotMonite || isBreak) {
+              element.s("flow", false);
+            }
           }
         });
       }

package/es/style.js

@@ -11,14 +11,14 @@ import '@alifd/next/es/tab/style';
 import '@alifd/next/es/table/style';
 import '@riil-frontend/component-table-layout/es/style';
 import '@riil-frontend/component-pager/es/style';
-import '@alifd/next/es/button/style';
-import '@alifd/next/es/icon/style';
 import '@alifd/next/es/loading/style';
 import '@alifd/next/es/divider/style';
 import '@riil-frontend/component-no-data-page/es/style';
 
 import '@alifd/next/es/overlay/style';
 import '@alifd/next/es/checkbox/style';
+import '@alifd/next/es/button/style';
+import '@alifd/next/es/icon/style';
 import '@riil-frontend/component-crucial-link-topo/es/style';
 import '@alifd/next/es/switch/style';
 import '@alifd/next/es/input/style';

package/lib/core/hooks/useAlarm.js

@@ -15,17 +15,7 @@ var _useGraphAlarmDisplay = _interopRequireDefault(require("./useGraphAlarmDispl
 
 var _useTopoEventListener = _interopRequireDefault(require("./useTopoEventListener"));
 
-// 告警在活状态
-var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
-/**
- * 告警是否在活
- * @param {*} alarm 
- * @returns 
- */
-
-var isAlarmAlive = function isAlarmAlive(alarm) {
-  return showAlarmStatus.indexOf(alarm.status) >= 0;
-};
+var _alarmUtil = require("../utils/alarmUtil");
 
 var handleRiskData = function handleRiskData(topo, receivedData) {
   var _risks, _topo$viewProps, _topo$viewProps2;
@@ -35,7 +25,7 @@ var handleRiskData = function handleRiskData(topo, receivedData) {
   // 已关闭 closed
   var prevRisks = topo.store.getModelState('topoAlarm').risks;
 
-  var isLiveRisk = function isLiveRisk(data) {
+  var isRiskAlive = function isRiskAlive(data) {
     return ['recovered', 'closed'].indexOf(data.status) === -1;
   };
 
@@ -64,7 +54,7 @@ var handleRiskData = function handleRiskData(topo, receivedData) {
   (_risks = risks).push.apply(_risks, addRisks); // 过滤掉无权限、非在活的
 
 
-  risks = risks.filter(isLiveRisk).filter(hasCiPermission).sort(function (a, b) {
+  risks = risks.filter(isRiskAlive).filter(hasCiPermission).sort(function (a, b) {
     return a.executeTime - b.executeTime;
   });
 
@@ -149,7 +139,7 @@ function convertAlarmData(alarms) {
       // 数据id
       resourceId: resourceId,
       // 是否在活
-      alive: isAlarmAlive(alarm)
+      alive: (0, _alarmUtil.isAlarmAlive)(alarm)
     });
   });
 }

package/lib/core/hooks/useGraphAlarmDisplay.js

@@ -7,7 +7,7 @@ exports["default"] = useGraphAlarmDisplay;
 
 var _react = require("react");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _loglevel = _interopRequireDefault(require("loglevel"));
 
 var _htElementUtils = require("../../utils/htElementUtils");
 
@@ -15,14 +15,17 @@ var _showGraphManageStatusUtil = require("../utils/showGraphManageStatusUtil");
 
 var _useCmpLinkAlarm2 = _interopRequireDefault(require("./useCmpLinkAlarm"));
 
-// import useLinkAlarmDisplay from "./useLinkAlarmDisplay";
+var _useLinkAlarmDisplay2 = _interopRequireDefault(require("./useLinkAlarmDisplay"));
 
+var rlog = _loglevel["default"].getLogger('topo');
 /**
  * 获取ci的最高告警级别
  * @param {Array} alarmList
  * @param {*} risks
  * @returns
  */
+
+
 function getCiAlarmLevelMap(alarmList) {
   var ciIdLevelMap = {};
   alarmList.forEach(function (item) {
@@ -114,23 +117,27 @@ function useGraphAlarmDisplay(options) {
 
   var cmpRes = (0, _react.useMemo)(function () {
     return addCmpLinkOfflineStatusForDisplayLineColor(oldResources, cmpLinkRunStatus);
-  }, [oldResources, cmpLinkRunStatus]);
-  var resources = [].concat(cmpRes); // 拓扑链路特殊处理 暂时屏蔽这部分处理
-  // const {
-  //   // linkAlarmLevels,
-  //   linkRunStatus,
-  //   getlinkAlarmLevels,
-  // } = useLinkAlarmDisplay({ topo, resources: cmpRes, graphLoaded, alarmList });
-  // const linkAlarmLevels = getlinkAlarmLevels(alarmList, cmpRes);
-  // 排除掉处于断开状态的链路
-  // const resources = cmpRes.filter((item) => {
-  //   return !item.breakState;
-  // });
-  /// 屏蔽------------
+  }, [oldResources, cmpLinkRunStatus]); // const resources=[...cmpRes];
+  // 拓扑链路特殊处理 暂时屏蔽这部分处理
+
+  var _useLinkAlarmDisplay = (0, _useLinkAlarmDisplay2["default"])({
+    topo: topo,
+    resources: cmpRes,
+    graphLoaded: graphLoaded,
+    alarmList: alarmList
+  }),
+      linkRunStatus = _useLinkAlarmDisplay.linkRunStatus,
+      getlinkAlarmLevels = _useLinkAlarmDisplay.getlinkAlarmLevels;
+
+  var linkAlarmLevels = getlinkAlarmLevels(alarmList, cmpRes); // 排除掉处于断开状态的链路
+
+  var resources = cmpRes.filter(function (item) {
+    return !item.breakState;
+  }); /// 屏蔽------------
   // ci告警级别
 
   var cisEventLevel = (0, _react.useMemo)(function () {
-    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
+    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, linkAlarmLevels, risks.map(function (item) {
       var _item$resourceId;
 
       return {
@@ -188,14 +195,12 @@ function useGraphAlarmDisplay(options) {
         })) === null || _elementsAlarmLevels$ === void 0 ? void 0 : _elementsAlarmLevels$.level;
         element.a("alarmLevel", alarmLevel);
       });
-
-      _rlog["default"].debug("推送告警 => ht", {
+      rlog.debug("推送告警 => ht", {
         alarms: elementsAlarmLevels,
         relateTopoAlarmMap: relateTopoAlarm,
         relateTopoAlarms: relateTopoAlarms
       }); // 更新到ht拓扑
 
-
       (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, "推送告警");
       topo.view.loadAlarm(elementsAlarmLevels);
       (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, "推送告警");

package/lib/core/hooks/usePolling.js

@@ -143,6 +143,7 @@ var usePolling = function usePolling(props) {
                     position: 17,
                     icon: "resource.link.linkbreak"
                   });
+                  element === null || element === void 0 ? void 0 : element.a('linkbreak', true);
                   topo.dataModel.updateData([(0, _extends2["default"])({}, link, {
                     breakState: true
                   })]);

package/lib/core/models/Alarm.js

@@ -11,12 +11,12 @@ 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"));
-
-var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
+var _loglevel = _interopRequireDefault(require("loglevel"));
 
 var _utils = require("@riil-frontend/utils");
 
+var rlog = _loglevel["default"].getLogger('topo');
+
 var Alarm = /*#__PURE__*/function () {
   function Alarm() {
     this.topo = void 0;
@@ -94,8 +94,7 @@ var Alarm = /*#__PURE__*/function () {
       return;
     }
 
-    _componentTopologyUtils.rlog.info('Alarm.open 打开告警通道', id);
-
+    rlog.info('Alarm.open 打开告警通道', id);
     this.openTopoAlarm(id);
     this.hmGetTopoAlarmByDoc(id);
   }
@@ -115,10 +114,9 @@ var Alarm = /*#__PURE__*/function () {
       return;
     }
 
-    _componentTopologyUtils.rlog.info('关闭告警通道', currentTopoId); // 取消订阅告警推送
+    rlog.info('关闭告警通道', currentTopoId); // 取消订阅告警推送
     // 关闭告警推送通道
 
-
     this.closeTopoAlarm(currentTopoId);
   };
 
@@ -197,9 +195,7 @@ var Alarm = /*#__PURE__*/function () {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             result = this.getAlarms();
-
-            _componentTopologyUtils.rlog.debug('hmGetTopoAlarmByDoc', result);
-
+            rlog.debug('hmGetTopoAlarmByDoc', result);
             alarms = result.map(function (item) {
               return item.obj;
             });
@@ -333,9 +329,7 @@ var Alarm = /*#__PURE__*/function () {
 
           case 11:
             this.secretKey = _context5.sent;
-
-            _componentTopologyUtils.rlog.info('openTopoAlarm 打开拓扑告警推送-------------------开始');
-
+            rlog.info('openTopoAlarm 打开拓扑告警推送-------------------开始');
             this.updateState({
               alarmOpening: false,
               alarmIsOpened: true
@@ -346,9 +340,7 @@ var Alarm = /*#__PURE__*/function () {
           case 16:
             _context5.prev = 16;
             _context5.t0 = _context5["catch"](8);
-
-            _componentTopologyUtils.rlog.error('打开拓扑告警推送 失败');
-
+            rlog.error('打开拓扑告警推送 失败');
             this.updateState({
               alarmOpening: false
             });
@@ -394,9 +386,7 @@ var Alarm = /*#__PURE__*/function () {
 
           case 3:
             this.currentTopoId = null;
-
-            _componentTopologyUtils.rlog.debug('useAlarm.useEffect 告警WebSocket 结束');
-
+            rlog.debug('useAlarm.useEffect 告警WebSocket 结束');
             this.updateState({
               topoAlarmIsOpen: false,
               alarmOpening: false,
@@ -478,7 +468,7 @@ var Alarm = /*#__PURE__*/function () {
             resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
             alarmDispatchers = this.topo.store.getModelDispatchers('topoAlarm'); // 添加事件
 
-            console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
+            rlog.debug("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
             if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
               _context8.next = 25;
@@ -521,8 +511,7 @@ var Alarm = /*#__PURE__*/function () {
               break;
             }
 
-            _componentTopologyUtils.rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
-
+            rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
             _context8.prev = 13;
             _context8.next = 16;
             return alarmDispatchers.combAlarmData({
@@ -556,8 +545,7 @@ var Alarm = /*#__PURE__*/function () {
           case 22:
             _context8.prev = 22;
             _context8.t0 = _context8["catch"](13);
-
-            _componentTopologyUtils.rlog.error('告警发送异常', _context8.t0);
+            rlog.error('告警发送异常', _context8.t0);
 
           case 25:
           case "end":

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

package/lib/core/store/models/topoAlarm.js

@@ -11,14 +11,17 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _loglevel = _interopRequireDefault(require("loglevel"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
 /**
  * 告警
  */
-var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
+var rlog = _loglevel["default"].getLogger('topo'); // 在活告警状态
+
+
+var aliveAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
 
 var sortList = function sortList(a, b) {
   if (a.level === b.level) {
@@ -122,7 +125,7 @@ function _default(topo) {
 
                           if ((resIdsList || []).indexOf(rid) >= 0) {
                             if (record.indexOf(item.alertId) < 0) {
-                              if (showAlarmStatus.indexOf(item.status) >= 0) {
+                              if (aliveAlarmStatus.indexOf(item.status) >= 0) {
                                 // rlog.debug("这是一条新告警", item);
                                 record.push(item.alertId);
 
@@ -138,7 +141,7 @@ function _default(topo) {
                                   doc[rid] = [item];
                                 }
                               } else {
-                                _rlog["default"].warn("接收到异常或已关闭的告警", item);
+                                rlog.warn("接收到异常或已关闭的告警", item);
                               }
                             } else {
                               sliceTag = doc[rid].findIndex(function (x) {
@@ -152,7 +155,7 @@ function _default(topo) {
                               //   item
                               // );
 
-                              if (showAlarmStatus.indexOf(item.status) >= 0) {
+                              if (aliveAlarmStatus.indexOf(item.status) >= 0) {
                                 if (item.status === "change") {
                                   old = doc[rid][sliceTag];
 
@@ -164,10 +167,9 @@ function _default(topo) {
                                     }));
 
                                     doc[rid] = _newArr.sort(sortList);
-
-                                    _rlog["default"].debug("告警级别变更", doc[rid], item);
+                                    rlog.debug("告警级别变更", doc[rid], item);
                                   } else {
-                                    _rlog["default"].debug("接收到异常的重复告警", item);
+                                    rlog.debug("接收到异常的重复告警", item);
                                   }
                                 } else {// rlog.debug("重复告警", item);
                                 }
@@ -180,7 +182,7 @@ function _default(topo) {
                                   doc[rid] = _newArr2;
                                 }
 
-                                _rlog["default"].debug("该告警移除状态-status", item.status, doc[rid], doc);
+                                rlog.debug("该告警移除状态-status", item.status, doc[rid], doc);
 
                                 if (doc[rid].length === 0) {
                                   delete doc[rid];
@@ -221,14 +223,13 @@ function _default(topo) {
                       }); // 传递给HT时，链路要用r开头的id
                       // rlog.debug('xxxxxxxxxxxxxxxxxxxx', doc[id][0], alarmObj.status);
 
-                      return showAlarmStatus.indexOf(alarmObj.status) >= 0 ? alarmObj : null;
+                      return aliveAlarmStatus.indexOf(alarmObj.status) >= 0 ? alarmObj : null;
                     } else {
                       return null;
                     }
                   }));
                   eqFlag = _lodash["default"].isEqual(_lodash["default"].sortBy(alarmlist), _lodash["default"].sortBy(currentAlarmList));
-
-                  _rlog["default"].debug("告警归档结束", eqFlag, currentAlarmList, alarmlist, doc, record);
+                  rlog.debug("告警归档结束", eqFlag, currentAlarmList, alarmlist, doc, record);
 
                   _this2.update({
                     alarmDoc: doc,

package/lib/core/utils/alarmUtil.js

@@ -0,0 +1,17 @@
+"use strict";
+
+exports.__esModule = true;
+exports.isAlarmAlive = void 0;
+// 告警在活状态
+var Alarm_alive_Status = ["toDeal", "dealing", "change", "woDealing"];
+/**
+ * 告警是否在活
+ * @param {*} alarm 
+ * @returns 
+ */
+
+var isAlarmAlive = function isAlarmAlive(alarm) {
+  return Alarm_alive_Status.includes(alarm.status);
+};
+
+exports.isAlarmAlive = isAlarmAlive;

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js

@@ -19,6 +19,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _moment = _interopRequireDefault(require("moment"));
 
+var _createAppShared = require("create-app-shared");
+
 var _BlockBox = _interopRequireDefault(require("./BlockBox"));
 
 var _Link = _interopRequireDefault(require("../../../../../../../components/Link"));
@@ -57,7 +59,7 @@ function EventsCard(props) {
       log.debug('formatUrl(url)', url);
       topo.viewProps.jumpto(url);
     } else {
-      (0, _componentTopologyUtils.getHistory)().push(formatUrl(url));
+      ((0, _componentTopologyUtils.getHistory)() || _createAppShared.history).push(formatUrl(url));
     }
   }; // 告警table列配置
 
@@ -67,34 +69,19 @@ function EventsCard(props) {
     dataIndex: "title",
     key: "title",
     cell: function cell(value, index, record) {
-      return (
-        /*#__PURE__*/
-        // <div
-        //   className={styles["alarm-title"]}
-        //   title={value}
-        //   onClick={closeDetailDrawer}
-        // >
-        //   <Icon
-        //     type={record.icon}
-        //     size="xs"
-        //     className={`${styles["alarm-color-icon"]} ${record.className}`}
-        //   />
-        //   <Link to={formatUrl(record.link)}>{value}</Link>
-        // </div>
-        _react["default"].createElement("div", {
-          className: _indexModule["default"]['alarm-title'],
-          title: value,
-          onClick: function onClick() {
-            jumpTo(record.link);
-          }
-        }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
-          type: record.icon,
-          size: "xs",
-          className: _indexModule["default"]['alarm-color-icon'] + " " + record.className
-        }), /*#__PURE__*/_react["default"].createElement("span", {
-          className: _indexModule["default"].link
-        }, value))
-      );
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: _indexModule["default"]['alarm-title'],
+        title: value,
+        onClick: function onClick() {
+          jumpTo(record.link);
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+        type: record.icon,
+        size: "xs",
+        className: _indexModule["default"]['alarm-color-icon'] + " " + record.className
+      }), /*#__PURE__*/_react["default"].createElement("span", {
+        className: _indexModule["default"].link
+      }, value));
     }
   }, {
     title: "时间",