@riil-frontend/component-topology 9.0.0-a.1 → 9.0.0-a.11

package/lib/core/hooks/useCiAttributeChange.js

@@ -0,0 +1,70 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = useCiAttributeChange;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
+var _react = require("react");
+
+var _CiCache = _interopRequireDefault(require("../models/cache/CiCache"));
+
+var _useTopoEventListener = _interopRequireDefault(require("./useTopoEventListener"));
+
+function mergeData(cis, ciChangeData) {
+  if (!cis.find(function (item) {
+    return item.id === ciChangeData.id;
+  })) {
+    return cis;
+  }
+
+  return cis.map(function (ci) {
+    if (ci.id === ciChangeData.id) {
+      return (0, _extends2["default"])({}, ci, {
+        attributes: (0, _extends2["default"])({}, ci.attributes, ciChangeData.attributes)
+      });
+    }
+
+    return ci;
+  });
+}
+/**
+ * 监听ci属性变更
+ * 
+ * @param {*} props 
+ */
+
+
+function useCiAttributeChange(props) {
+  var topo = props.topo;
+  (0, _useTopoEventListener["default"])({
+    type: 'attribute',
+    onMessage: function onMessage(ciChangeData) {
+      // 更新拓扑数据
+      var topoData = topo.store.getModelState('topoMod').data;
+
+      if (topoData) {
+        var newData = (0, _extends2["default"])({}, topoData, {
+          nodes: mergeData(topoData.nodes, ciChangeData),
+          links: mergeData(topoData.links, ciChangeData),
+          linkGroups: mergeData(topoData.linkGroups, ciChangeData)
+        });
+        var topoDispatchers = topo.store.getModelDispatchers('topoMod');
+        topoDispatchers.update({
+          data: newData
+        });
+      } // 更新缓存
+
+
+      var ci = _CiCache["default"].getCi(ciChangeData.id);
+
+      if (ci) {
+        ci.attributes = (0, _extends2["default"])({}, ci.attributes, ciChangeData.attributes);
+      }
+    }
+  });
+}

package/lib/core/hooks/usePolling.js

@@ -7,10 +7,10 @@ exports["default"] = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _react = require("react");
 
 var _ahooks = require("ahooks");
@@ -19,6 +19,14 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
+
+var _componentRiilEventEmitter = require("@riil-frontend/component-riil-event-emitter");
+
+var _DictCache = _interopRequireDefault(require("../models/cache/DictCache"));
+
+var _useCiAttributeChange = _interopRequireDefault(require("./useCiAttributeChange"));
+
 /**
  * 轮询获取指标hooks
  * @param {*} props
@@ -26,12 +34,156 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 var usePolling = function usePolling(props) {
   var topo = props.topo;
   var store = topo.store;
+  (0, _useCiAttributeChange["default"])({
+    topo: topo
+  });
   var bizState = store.useModelState('topoBizMod');
   var resAndMetrics = bizState.resAndMetrics,
       pollingSwitch = bizState.pollingSwitch;
   var displayConfig = topo.store.useModelState('displayConfig');
   var resourceOverviewState = topo.store.useModelState('topoBaseInfoOverview');
-  var resIdsList = resAndMetrics === null || resAndMetrics === void 0 ? void 0 : resAndMetrics.resIdsList; // 轮询hooks
+  var resIdsList = resAndMetrics === null || resAndMetrics === void 0 ? void 0 : resAndMetrics.resIdsList;
+  /**
+   * 查询拓扑图资源的属性指标
+   * 
+   * @returns {array}
+   */
+
+  function fetchData() {
+    return _fetchData.apply(this, arguments);
+  }
+  /**
+   * 
+   * @returns {{id, attributes: object[], metrics: object[]}[]} 属性和指标
+   */
+
+
+  function _fetchData() {
+    _fetchData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var _topo$store$getModelS, resIdsList, nodeIdsList, codes, param, _yield$Promise$all, ciMetricResult, transformLinkData;
+
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              transformLinkData = function _transformLinkData(data) {
+                var _topo$dataModel$getDa = topo.dataModel.getData(),
+                    links = _topo$dataModel$getDa.links,
+                    linkGroups = _topo$dataModel$getDa.linkGroups;
+
+                var link = [].concat(links, linkGroups).find(function (item) {
+                  return item.id === data.id;
+                });
+
+                if (!link) {
+                  return data;
+                }
+
+                return (0, _extends2["default"])({}, data, {
+                  attributeMap: link.attributes || {}
+                });
+              };
+
+              _topo$store$getModelS = topo.store.getModelState('topoBizMod').resAndMetrics, resIdsList = _topo$store$getModelS.resIdsList, nodeIdsList = _topo$store$getModelS.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
+              // 无资源，不查询
+
+              if (resIdsList.length) {
+                _context.next = 4;
+                break;
+              }
+
+              return _context.abrupt("return", []);
+
+            case 4:
+              // 需要查询的指标列表
+              codes = topo.attributeMetricDisplay.getResourceMetricCodes();
+              param = {
+                ciId: nodeIdsList,
+                codes: codes,
+                // 过滤掉不需要查询的
+                relationId: topo.attributeMetricDisplay.getEdges().map(function (edge) {
+                  return {
+                    ciId: edge.id,
+                    operation: edge.operation
+                  };
+                })
+              };
+              _context.t0 = Promise;
+              _context.t1 = // 查询指标值
+              _topo["default"].ciInfo.batchQueryCiInfo(param);
+              _context.next = 10;
+              return _DictCache["default"].init();
+
+            case 10:
+              _context.t2 = _context.sent;
+              _context.t3 = [_context.t1, _context.t2];
+              _context.next = 14;
+              return _context.t0.all.call(_context.t0, _context.t3);
+
+            case 14:
+              _yield$Promise$all = _context.sent;
+              ciMetricResult = _yield$Promise$all[0];
+              return _context.abrupt("return", ciMetricResult.map(function (data) {
+                var ci = topo.dataModel.getDataById(data.id);
+                var resultData = (0, _extends2["default"])({}, data, ci, {
+                  attributeMap: (0, _extends2["default"])({}, (ci === null || ci === void 0 ? void 0 : ci.attributes) || {})
+                });
+                resultData = transformLinkData(resultData); // 特殊处理：ipv6 从ipv6_address_list取第一个
+
+                // 特殊处理：ipv6 从ipv6_address_list取第一个
+                if (resultData.attributeMap.ipv6_address_list && !resultData.attributeMap.ipv6_address) {
+                  resultData.attributeMap.ipv6_address = (resultData.attributeMap.ipv6_address_list || '').split(',')[0];
+                }
+
+                return resultData;
+              }));
+
+            case 17:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+    return _fetchData.apply(this, arguments);
+  }
+
+  function refresh() {
+    return _refresh.apply(this, arguments);
+  } // 轮询hooks
+
+
+  function _refresh() {
+    _refresh = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var data;
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              if (!(!pollingSwitch || !(resAndMetrics !== null && resAndMetrics !== void 0 && resAndMetrics.resIdsList.length))) {
+                _context2.next = 2;
+                break;
+              }
+
+              return _context2.abrupt("return");
+
+            case 2:
+              _context2.next = 4;
+              return fetchData();
+
+            case 4:
+              data = _context2.sent;
+              return _context2.abrupt("return", data);
+
+            case 6:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+    return _refresh.apply(this, arguments);
+  }
 
   var _useRequest = (0, _ahooks.useRequest)(refresh, {
     pollingInterval: 60 * 1000,
@@ -42,30 +194,13 @@ var usePolling = function usePolling(props) {
       if (result) {
         var dd = _lodash["default"].cloneDeep(result);
 
-        topo.attributeMetricDisplay.loadAttributeAndMetric(dd);
+        topo.attributeMetricDisplay.loadData(dd);
       }
     }
   }),
       loading = _useRequest.loading,
       startPoll = _useRequest.run,
-      stopPoll = _useRequest.cancel;
-
-  function convertData(data) {
-    return data.map(function (item) {
-      return (0, _extends2["default"])({}, item, {
-        attributes: convertAttrMap(item.attributes),
-        metrics: convertAttrMap(item.metrics)
-      });
-    });
-  }
-
-  function convertAttrMap(attrs) {
-    var map = {};
-    attrs.forEach(function (attr) {
-      map[attr.code] = attr.value;
-    });
-    return map;
-  } // 需要刷新数据的场景：显示模式、资源变化、配置变化、开关开启、概览
+      stopPoll = _useRequest.cancel; // 需要刷新数据的场景：显示模式、资源变化、配置变化、开关开启、概览
 
 
   (0, _react.useEffect)(function () {
@@ -87,46 +222,16 @@ var usePolling = function usePolling(props) {
         stopPoll();
       }
     };
-  }, [pollingSwitch, resIdsList, displayConfig, resourceOverviewState.id, resourceOverviewState.metricCodes]);
-  /**
-   * 
-   * @returns {{id, attributes: object[], metrics: object[]}[]} 属性和指标
-   */
-
-  function refresh() {
-    return _refresh.apply(this, arguments);
-  }
-
-  function _refresh() {
-    _refresh = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!(!pollingSwitch || !(resAndMetrics !== null && resAndMetrics !== void 0 && resAndMetrics.resIdsList.length))) {
-                _context.next = 2;
-                break;
-              }
-
-              return _context.abrupt("return");
-
-            case 2:
-              _context.next = 4;
-              return topo.attributeMetricDisplay.fetchData();
-
-            case 4:
-              return _context.abrupt("return", _context.sent);
-
-            case 5:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee);
-    }));
-    return _refresh.apply(this, arguments);
-  }
+  }, [pollingSwitch, resIdsList, displayConfig, resourceOverviewState.id, resourceOverviewState.metricCodes]); // 属性变更监听更新
 
+  (0, _componentRiilEventEmitter.useCbbEventListener)('topo', {
+    name: 'topo',
+    onMessage: function onMessage(message) {
+      if (message.type === 'attribute') {
+        var data = message.data;
+      }
+    }
+  });
   return {
     startPoll: startPoll,
     stopPoll: stopPoll

package/lib/core/hooks/useTopoEventListener.js

@@ -5,29 +5,15 @@ exports["default"] = useTopoEventListener;
 
 var _react = require("react");
 
-var n = 0;
+var _topoEventListener = require("../event/topoEventListener");
 
 function useTopoEventListener(props) {
   var type = props.type,
       onMessage = props.onMessage;
-  var eventListenerName = (0, _react.useMemo)(function () {
-    return "topo_" + n++;
-  }, []);
   (0, _react.useEffect)(function () {
-    var EE = window.EE;
-
-    if (EE) {
-      window.EE.on('topo', eventListenerName, function (data) {
-        if (data.type === type) {
-          onMessage(data.data);
-        }
-      });
-    }
-
+    var listener = (0, _topoEventListener.createTopoEventListener)(type, onMessage);
     return function () {
-      if (EE) {
-        window.EE.removeListener('topo', eventListenerName);
-      }
+      listener.close();
     };
   }, [type, onMessage]);
 }

package/lib/core/models/Alarm.js

@@ -19,8 +19,8 @@ var _componentRiilEventEmitter = require("@riil-frontend/component-riil-event-em
 
 var _utils = require("@riil-frontend/utils");
 
-// import moment from "moment";
-// import { alarmListDemo } from "./mocks";
+var _topoEventListener = require("../event/topoEventListener");
+
 var Alarm = /*#__PURE__*/function () {
   function Alarm() {
     this.topo = void 0;
@@ -394,8 +394,6 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _openTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
-      var _this2 = this;
-
       var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
 
       return _regenerator["default"].wrap(function _callee6$(_context6) {
@@ -427,20 +425,13 @@ var Alarm = /*#__PURE__*/function () {
 
             case 10:
               this.secretKey = _context6.sent;
-
               // rlog.debug("openTopoAlarm 获取初始化告警-------------------开始");
-              _componentRiilEventEmitter.EE.on("topo", "topo", function (data, other) {
-                _rlog["default"].debug("openTopoAlarm 获取初始化告警------收到信息", data);
-
-                _this2.handleAlarmEvent(data);
-              });
-
               this.updateState({
                 alarmOpening: false,
                 alarmIsOpened: true
               });
 
-            case 13:
+            case 12:
             case "end":
               return _context6.stop();
           }
@@ -486,17 +477,15 @@ var Alarm = /*#__PURE__*/function () {
 
               _rlog["default"].debug("useAlarm.useEffect 告警WebSocket 结束");
 
-              _componentRiilEventEmitter.EE.removeListener("topo", "topo");
-
               this.updateState({
                 topoAlarmIsOpen: false,
                 alarmOpening: false,
                 alarmPanelIsOpen: false
               });
-              _context7.next = 9;
+              _context7.next = 8;
               return this.topo.serverApi.closeTopoAlarm(id, this.secretKey);
 
-            case 9:
+            case 8:
             case "end":
               return _context7.stop();
           }