@riil-frontend/component-topology 12.0.0-dev.29 → 12.0.0-dev.30

package/es/core/hooks/useCmpLinkAlarm.js

@@ -1,5 +1,9 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
-import { useEffect, useMemo } from "react";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useEffect, useState, useMemo } from "react";
+import { useRequest } from 'ahooks';
+import DictCache from "../models/cache/DictCache";
 
 function addCmpLinkOfflineStatusForDisplayLineColor(cis, cmpLinkRunStatusList) {
   return cis.map(function (ci) {
@@ -16,6 +20,15 @@ function addCmpLinkOfflineStatusForDisplayLineColor(cis, cmpLinkRunStatusList) {
     return ci;
   });
 }
+
+function getCmpLinIds(datas) {
+  var linkIds = datas.filter(function (item) {
+    return item.isSubResource && item.typeCode === 'network_link';
+  }).map(function (item) {
+    return item.ciId;
+  });
+  return linkIds;
+}
 /**
  * 分级链路下級鏈路
  * @param {*} props 
@@ -24,24 +37,21 @@ function addCmpLinkOfflineStatusForDisplayLineColor(cis, cmpLinkRunStatusList) {
 
 
 export default function useCmpLinkAlarm(props) {
-  var topo = props.topo;
+  var topo = props.topo,
+      resources = props.resources,
+      graphLoaded = props.graphLoaded;
 
   var _topo$store$useModelS = topo.store.useModelState('topoBizMod'),
       attrsAndMetrics = _topo$store$useModelS.attrsAndMetrics;
 
-  var cmpLinks = useMemo(function () {
-    return attrsAndMetrics.filter(function (item) {
-      return item.typeCode === 'network_link';
-    });
-  }, [attrsAndMetrics]);
-  var cmpLinkRunStatus = useMemo(function () {
-    return cmpLinks.map(function (item) {
-      return {
-        id: item.id,
-        runStatus: item.metrics.run_status
-      };
-    });
-  }, [cmpLinks]);
+  var _useState = useState(getCmpLinIds(resources)),
+      cmpLinkIds = _useState[0],
+      setCmpLinkIds = _useState[1];
+
+  var _useState2 = useState([]),
+      cmpLinkRunStatus = _useState2[0],
+      setCmpLinkRunStatus = _useState2[1];
+
   var cmpLinkAlarmLevels = useMemo(function () {
     return cmpLinkRunStatus // 3:fault:重要故障; 4:urgently:紧急故障 』为红色
     .filter(function (item) {
@@ -53,6 +63,90 @@ export default function useCmpLinkAlarm(props) {
       };
     });
   }, [cmpLinkRunStatus]);
+  useEffect(function () {
+    var ids = getCmpLinIds(resources);
+
+    if (cmpLinkIds.join(',') !== ids.join(',')) {
+      setCmpLinkIds(ids);
+    }
+  }, [resources]);
+
+  function getCmpLinkRunStatus(_x) {
+    return _getCmpLinkRunStatus.apply(this, arguments);
+  } // 轮询hooks
+
+
+  function _getCmpLinkRunStatus() {
+    _getCmpLinkRunStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(ids) {
+      var _yield$Promise$all, ciMetricsResult;
+
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (ids.length) {
+              _context.next = 2;
+              break;
+            }
+
+            return _context.abrupt("return", []);
+
+          case 2:
+            _context.t0 = Promise;
+            _context.t1 = // 查询指标值
+            topo.serverApi.ciInfo.batchQueryCiInfo({
+              ciId: [],
+              codes: ['run_status'],
+              relationId: ids.map(function (id) {
+                return {
+                  ciId: id,
+                  operation: "delete"
+                };
+              })
+            });
+            _context.next = 6;
+            return DictCache.init();
+
+          case 6:
+            _context.t2 = _context.sent;
+            _context.t3 = [_context.t1, _context.t2];
+            _context.next = 10;
+            return _context.t0.all.call(_context.t0, _context.t3);
+
+          case 10:
+            _yield$Promise$all = _context.sent;
+            ciMetricsResult = _yield$Promise$all[0];
+            return _context.abrupt("return", ciMetricsResult);
+
+          case 13:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return _getCmpLinkRunStatus.apply(this, arguments);
+  }
+
+  var _useRequest = useRequest(getCmpLinkRunStatus, {
+    pollingInterval: 60 * 1000,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
+    manual: true,
+    onSuccess: function onSuccess(result) {
+      setCmpLinkRunStatus(result.map(function (item) {
+        return {
+          id: "sub:" + item.id,
+          runStatus: item.metrics.run_status
+        };
+      }));
+    }
+  }),
+      run = _useRequest.run;
+
+  useEffect(function () {
+    if (graphLoaded) {
+      run(cmpLinkIds);
+    }
+  }, [graphLoaded, cmpLinkIds]);
   return {
     cmpLinkRunStatus: cmpLinkRunStatus,
     cmpLinkAlarmLevels: cmpLinkAlarmLevels,

package/es/core/hooks/useGraphAlarmDisplay.js

@@ -91,7 +91,9 @@ export default function useGraphAlarmDisplay(options) {
   var oldResources = topo.dataModel.useCis(); // 分级拓扑下级链路特殊处理
 
   var _useCmpLinkAlarm = useCmpLinkAlarm({
-    topo: topo
+    topo: topo,
+    resources: oldResources,
+    graphLoaded: graphLoaded
   }),
       cmpLinkAlarmLevels = _useCmpLinkAlarm.cmpLinkAlarmLevels,
       cmpLinkRunStatus = _useCmpLinkAlarm.cmpLinkRunStatus,

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

package/es/style.js

@@ -2,8 +2,8 @@ import '@riil-frontend/component-topology-graph/es/style';
 import '@alifd/next/es/box/style';
 import '@riil-frontend/component-topology-utils/es/style';
 import '@alifd/next/es/message/style';
-import '@riil-frontend/component-riil-event-emitter/es/style';
 import '@riil-frontend/utils/es/style';
+import '@riil-frontend/component-riil-event-emitter/es/style';
 import '@alifd/next/es/menu-button/style';
 import '@alifd/next/es/search/style';
 import '@alifd/next/es/drawer/style';

package/lib/core/hooks/useCmpLinkAlarm.js

@@ -5,10 +5,18 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = useCmpLinkAlarm;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _react = require("react");
 
+var _ahooks = require("ahooks");
+
+var _DictCache = _interopRequireDefault(require("../models/cache/DictCache"));
+
 function addCmpLinkOfflineStatusForDisplayLineColor(cis, cmpLinkRunStatusList) {
   return cis.map(function (ci) {
     var cmpLinkRunStatusData = cmpLinkRunStatusList.find(function (item) {
@@ -24,6 +32,15 @@ function addCmpLinkOfflineStatusForDisplayLineColor(cis, cmpLinkRunStatusList) {
     return ci;
   });
 }
+
+function getCmpLinIds(datas) {
+  var linkIds = datas.filter(function (item) {
+    return item.isSubResource && item.typeCode === 'network_link';
+  }).map(function (item) {
+    return item.ciId;
+  });
+  return linkIds;
+}
 /**
  * 分级链路下級鏈路
  * @param {*} props 
@@ -32,24 +49,21 @@ function addCmpLinkOfflineStatusForDisplayLineColor(cis, cmpLinkRunStatusList) {
 
 
 function useCmpLinkAlarm(props) {
-  var topo = props.topo;
+  var topo = props.topo,
+      resources = props.resources,
+      graphLoaded = props.graphLoaded;
 
   var _topo$store$useModelS = topo.store.useModelState('topoBizMod'),
       attrsAndMetrics = _topo$store$useModelS.attrsAndMetrics;
 
-  var cmpLinks = (0, _react.useMemo)(function () {
-    return attrsAndMetrics.filter(function (item) {
-      return item.typeCode === 'network_link';
-    });
-  }, [attrsAndMetrics]);
-  var cmpLinkRunStatus = (0, _react.useMemo)(function () {
-    return cmpLinks.map(function (item) {
-      return {
-        id: item.id,
-        runStatus: item.metrics.run_status
-      };
-    });
-  }, [cmpLinks]);
+  var _useState = (0, _react.useState)(getCmpLinIds(resources)),
+      cmpLinkIds = _useState[0],
+      setCmpLinkIds = _useState[1];
+
+  var _useState2 = (0, _react.useState)([]),
+      cmpLinkRunStatus = _useState2[0],
+      setCmpLinkRunStatus = _useState2[1];
+
   var cmpLinkAlarmLevels = (0, _react.useMemo)(function () {
     return cmpLinkRunStatus // 3:fault:重要故障; 4:urgently:紧急故障 』为红色
     .filter(function (item) {
@@ -61,6 +75,90 @@ function useCmpLinkAlarm(props) {
       };
     });
   }, [cmpLinkRunStatus]);
+  (0, _react.useEffect)(function () {
+    var ids = getCmpLinIds(resources);
+
+    if (cmpLinkIds.join(',') !== ids.join(',')) {
+      setCmpLinkIds(ids);
+    }
+  }, [resources]);
+
+  function getCmpLinkRunStatus(_x) {
+    return _getCmpLinkRunStatus.apply(this, arguments);
+  } // 轮询hooks
+
+
+  function _getCmpLinkRunStatus() {
+    _getCmpLinkRunStatus = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids) {
+      var _yield$Promise$all, ciMetricsResult;
+
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (ids.length) {
+              _context.next = 2;
+              break;
+            }
+
+            return _context.abrupt("return", []);
+
+          case 2:
+            _context.t0 = Promise;
+            _context.t1 = // 查询指标值
+            topo.serverApi.ciInfo.batchQueryCiInfo({
+              ciId: [],
+              codes: ['run_status'],
+              relationId: ids.map(function (id) {
+                return {
+                  ciId: id,
+                  operation: "delete"
+                };
+              })
+            });
+            _context.next = 6;
+            return _DictCache["default"].init();
+
+          case 6:
+            _context.t2 = _context.sent;
+            _context.t3 = [_context.t1, _context.t2];
+            _context.next = 10;
+            return _context.t0.all.call(_context.t0, _context.t3);
+
+          case 10:
+            _yield$Promise$all = _context.sent;
+            ciMetricsResult = _yield$Promise$all[0];
+            return _context.abrupt("return", ciMetricsResult);
+
+          case 13:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return _getCmpLinkRunStatus.apply(this, arguments);
+  }
+
+  var _useRequest = (0, _ahooks.useRequest)(getCmpLinkRunStatus, {
+    pollingInterval: 60 * 1000,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
+    manual: true,
+    onSuccess: function onSuccess(result) {
+      setCmpLinkRunStatus(result.map(function (item) {
+        return {
+          id: "sub:" + item.id,
+          runStatus: item.metrics.run_status
+        };
+      }));
+    }
+  }),
+      run = _useRequest.run;
+
+  (0, _react.useEffect)(function () {
+    if (graphLoaded) {
+      run(cmpLinkIds);
+    }
+  }, [graphLoaded, cmpLinkIds]);
   return {
     cmpLinkRunStatus: cmpLinkRunStatus,
     cmpLinkAlarmLevels: cmpLinkAlarmLevels,

package/lib/core/hooks/useGraphAlarmDisplay.js

@@ -102,7 +102,9 @@ function useGraphAlarmDisplay(options) {
   var oldResources = topo.dataModel.useCis(); // 分级拓扑下级链路特殊处理
 
   var _useCmpLinkAlarm = (0, _useCmpLinkAlarm2["default"])({
-    topo: topo
+    topo: topo,
+    resources: oldResources,
+    graphLoaded: graphLoaded
   }),
       cmpLinkAlarmLevels = _useCmpLinkAlarm.cmpLinkAlarmLevels,
       cmpLinkRunStatus = _useCmpLinkAlarm.cmpLinkRunStatus,

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

package/lib/style.js

@@ -2,8 +2,8 @@ require('@riil-frontend/component-topology-graph/lib/style');
 require('@alifd/next/lib/box/style');
 require('@riil-frontend/component-topology-utils/lib/style');
 require('@alifd/next/lib/message/style');
-require('@riil-frontend/component-riil-event-emitter/lib/style');
 require('@riil-frontend/utils/lib/style');
+require('@riil-frontend/component-riil-event-emitter/lib/style');
 require('@alifd/next/lib/menu-button/style');
 require('@alifd/next/lib/search/style');
 require('@alifd/next/lib/drawer/style');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "12.0.0-dev.29",
+  "version": "12.0.0-dev.30",
   "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.29/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.0.0-dev.30/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }