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

package/es/core/hooks/useCmpLinkAlarm.js

@@ -1,27 +1,62 @@
+import _extends from "@babel/runtime/helpers/extends";
+import { useEffect, useMemo } from "react";
+
+function addCmpLinkOfflineStatusForDisplayLineColor(cis, cmpLinkRunStatusList) {
+  return cis.map(function (ci) {
+    var cmpLinkRunStatusData = cmpLinkRunStatusList.find(function (item) {
+      return item.id === ci.id;
+    });
+
+    if (cmpLinkRunStatusData) {
+      return _extends({}, ci, {
+        manageStatus: cmpLinkRunStatusData.runStatus === '2' ? 0 : 3
+      });
+    }
+
+    return ci;
+  });
+}
 /**
- * 分级链路
+ * 分级链路下級鏈路
  * @param {*} props 
  * @returns 
  */
+
+
 export default function useCmpLinkAlarm(props) {
   var topo = props.topo;
 
   var _topo$store$useModelS = topo.store.useModelState('topoBizMod'),
       attrsAndMetrics = _topo$store$useModelS.attrsAndMetrics;
 
-  var cmpLinkAlarmLevels = attrsAndMetrics.filter(function (item) {
-    return item.typeCode === 'network_link';
-  }) // 3:fault:重要故障; 4:urgently:紧急故障 』为红色
-  .filter(function (item) {
-    return ['3', '4'].includes(item.metrics.run_status);
-  }).map(function (item) {
-    return {
-      id: item.id,
-      level: 1
-    };
-  });
+  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 cmpLinkAlarmLevels = useMemo(function () {
+    return cmpLinkRunStatus // 3:fault:重要故障; 4:urgently:紧急故障 』为红色
+    .filter(function (item) {
+      return ['3', '4'].includes(item.runStatus);
+    }).map(function (item) {
+      return {
+        id: item.id,
+        level: 1
+      };
+    });
+  }, [cmpLinkRunStatus]);
   return {
-    cmpLinkAlarmLevels: cmpLinkAlarmLevels
+    cmpLinkRunStatus: cmpLinkRunStatus,
+    cmpLinkAlarmLevels: cmpLinkAlarmLevels,
+    addCmpLinkOfflineStatusForDisplayLineColor: addCmpLinkOfflineStatusForDisplayLineColor
   };
 }
 ;

package/es/core/hooks/useGraphAlarmDisplay.js

@@ -88,12 +88,18 @@ export default function useGraphAlarmDisplay(options) {
       risks = _topo$alarm$useState.risks,
       relateTopoAlarm = _topo$alarm$useState.relateTopoAlarm;
 
-  var resources = topo.dataModel.useCis();
+  var oldResources = topo.dataModel.useCis(); // 分级拓扑下级链路特殊处理
 
   var _useCmpLinkAlarm = useCmpLinkAlarm({
     topo: topo
   }),
-      cmpLinkAlarmLevels = _useCmpLinkAlarm.cmpLinkAlarmLevels;
+      cmpLinkAlarmLevels = _useCmpLinkAlarm.cmpLinkAlarmLevels,
+      cmpLinkRunStatus = _useCmpLinkAlarm.cmpLinkRunStatus,
+      addCmpLinkOfflineStatusForDisplayLineColor = _useCmpLinkAlarm.addCmpLinkOfflineStatusForDisplayLineColor;
+
+  var resources = useMemo(function () {
+    return addCmpLinkOfflineStatusForDisplayLineColor(oldResources, cmpLinkRunStatus);
+  }, [oldResources, cmpLinkRunStatus]); // ci告警级别
 
   var cisEventLevel = useMemo(function () {
     var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
@@ -106,19 +112,6 @@ export default function useGraphAlarmDisplay(options) {
     }));
     return getGraphCiElementAlarmLevels(resources, levels);
   }, [resources, alarmList, cmpLinkAlarmLevels, risks]);
-
-  function getCisEventLevel() {
-    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
-      var _item$resourceId2;
-
-      return {
-        id: (_item$resourceId2 = item.resourceId) !== null && _item$resourceId2 !== void 0 ? _item$resourceId2 : item.ciId,
-        level: 5
-      };
-    }));
-    return getGraphCiElementAlarmLevels(resources, levels);
-  }
-
   useEffect(function () {
     showAlarm();
     showManageStatus({
@@ -127,7 +120,7 @@ export default function useGraphAlarmDisplay(options) {
       isEditMode: isEditMode,
       graphLoaded: graphLoaded,
       alarmSwitch: alarmSwitch,
-      cisEventLevel: getCisEventLevel()
+      cisEventLevel: cisEventLevel
     });
 
     function showAlarm() {
@@ -139,12 +132,11 @@ export default function useGraphAlarmDisplay(options) {
         // 告警静默
         topo.view.loadAlarm([]);
         return;
-      }
+      } // 关联拓扑告警
 
-      var finalAlarms = getCisEventLevel(); // 关联拓扑告警
 
       var relateTopoAlarms = getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm);
-      var elementsAlarmLevels = [].concat(finalAlarms, relateTopoAlarms); // 将告警级别放入ht元素，便于测试
+      var elementsAlarmLevels = [].concat(cisEventLevel, relateTopoAlarms); // 将告警级别放入ht元素，便于测试
 
       getElements(topo.getDataModel()).filter(function (item) {
         return !!item.getTag();
@@ -171,5 +163,5 @@ export default function useGraphAlarmDisplay(options) {
         resources: resources
       });
     };
-  }, [graphLoaded, resources, alarmSwitch, alarmList, risks, relateTopoAlarm, cmpLinkAlarmLevels]);
+  }, [graphLoaded, resources, alarmSwitch, cisEventLevel, relateTopoAlarm]);
 }

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

package/es/core/utils/metricUtil.js

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import { metricValueFormat } from '@riil-frontend/utils';
 import DictCache from "../models/cache/DictCache";
 /**
@@ -15,16 +16,19 @@ export function formatMetric(val, metricModel) {
   if (metricModel) {
     var _result$value;
 
-    // 分级字典特殊处理
-    if (metricModel.dict && !DictCache.getDictObject()[metricModel.code]) {
-      val = metricModel.dict[val];
+    var dictObject = _extends({}, DictCache.getDictObject()); // 分级字典特殊处理
+
+
+    if (metricModel.dict) {
+      // val = metricModel.dict[val]
+      dictObject[metricModel.code] = metricModel.dict;
     }
 
     var result = metricValueFormat({
       value: val,
       dataType: metricModel.dataType,
       changeValue: metricModel.changeValue,
-      dict: DictCache.getDictObject(),
+      dict: dictObject,
       unit: metricModel.unit,
       code: metricModel.code
     });

package/lib/core/hooks/useCmpLinkAlarm.js

@@ -1,32 +1,70 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports["default"] = useCmpLinkAlarm;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = require("react");
+
+function addCmpLinkOfflineStatusForDisplayLineColor(cis, cmpLinkRunStatusList) {
+  return cis.map(function (ci) {
+    var cmpLinkRunStatusData = cmpLinkRunStatusList.find(function (item) {
+      return item.id === ci.id;
+    });
+
+    if (cmpLinkRunStatusData) {
+      return (0, _extends2["default"])({}, ci, {
+        manageStatus: cmpLinkRunStatusData.runStatus === '2' ? 0 : 3
+      });
+    }
+
+    return ci;
+  });
+}
 /**
- * 分级链路
+ * 分级链路下級鏈路
  * @param {*} props 
  * @returns 
  */
+
+
 function useCmpLinkAlarm(props) {
   var topo = props.topo;
 
   var _topo$store$useModelS = topo.store.useModelState('topoBizMod'),
       attrsAndMetrics = _topo$store$useModelS.attrsAndMetrics;
 
-  var cmpLinkAlarmLevels = attrsAndMetrics.filter(function (item) {
-    return item.typeCode === 'network_link';
-  }) // 3:fault:重要故障; 4:urgently:紧急故障 』为红色
-  .filter(function (item) {
-    return ['3', '4'].includes(item.metrics.run_status);
-  }).map(function (item) {
-    return {
-      id: item.id,
-      level: 1
-    };
-  });
+  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 cmpLinkAlarmLevels = (0, _react.useMemo)(function () {
+    return cmpLinkRunStatus // 3:fault:重要故障; 4:urgently:紧急故障 』为红色
+    .filter(function (item) {
+      return ['3', '4'].includes(item.runStatus);
+    }).map(function (item) {
+      return {
+        id: item.id,
+        level: 1
+      };
+    });
+  }, [cmpLinkRunStatus]);
   return {
-    cmpLinkAlarmLevels: cmpLinkAlarmLevels
+    cmpLinkRunStatus: cmpLinkRunStatus,
+    cmpLinkAlarmLevels: cmpLinkAlarmLevels,
+    addCmpLinkOfflineStatusForDisplayLineColor: addCmpLinkOfflineStatusForDisplayLineColor
   };
 }
 

package/lib/core/hooks/useGraphAlarmDisplay.js

@@ -99,12 +99,18 @@ function useGraphAlarmDisplay(options) {
       risks = _topo$alarm$useState.risks,
       relateTopoAlarm = _topo$alarm$useState.relateTopoAlarm;
 
-  var resources = topo.dataModel.useCis();
+  var oldResources = topo.dataModel.useCis(); // 分级拓扑下级链路特殊处理
 
   var _useCmpLinkAlarm = (0, _useCmpLinkAlarm2["default"])({
     topo: topo
   }),
-      cmpLinkAlarmLevels = _useCmpLinkAlarm.cmpLinkAlarmLevels;
+      cmpLinkAlarmLevels = _useCmpLinkAlarm.cmpLinkAlarmLevels,
+      cmpLinkRunStatus = _useCmpLinkAlarm.cmpLinkRunStatus,
+      addCmpLinkOfflineStatusForDisplayLineColor = _useCmpLinkAlarm.addCmpLinkOfflineStatusForDisplayLineColor;
+
+  var resources = (0, _react.useMemo)(function () {
+    return addCmpLinkOfflineStatusForDisplayLineColor(oldResources, cmpLinkRunStatus);
+  }, [oldResources, cmpLinkRunStatus]); // ci告警级别
 
   var cisEventLevel = (0, _react.useMemo)(function () {
     var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
@@ -117,19 +123,6 @@ function useGraphAlarmDisplay(options) {
     }));
     return getGraphCiElementAlarmLevels(resources, levels);
   }, [resources, alarmList, cmpLinkAlarmLevels, risks]);
-
-  function getCisEventLevel() {
-    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
-      var _item$resourceId2;
-
-      return {
-        id: (_item$resourceId2 = item.resourceId) !== null && _item$resourceId2 !== void 0 ? _item$resourceId2 : item.ciId,
-        level: 5
-      };
-    }));
-    return getGraphCiElementAlarmLevels(resources, levels);
-  }
-
   (0, _react.useEffect)(function () {
     showAlarm();
     (0, _showGraphManageStatusUtil.showManageStatus)({
@@ -138,7 +131,7 @@ function useGraphAlarmDisplay(options) {
       isEditMode: isEditMode,
       graphLoaded: graphLoaded,
       alarmSwitch: alarmSwitch,
-      cisEventLevel: getCisEventLevel()
+      cisEventLevel: cisEventLevel
     });
 
     function showAlarm() {
@@ -150,12 +143,11 @@ function useGraphAlarmDisplay(options) {
         // 告警静默
         topo.view.loadAlarm([]);
         return;
-      }
+      } // 关联拓扑告警
 
-      var finalAlarms = getCisEventLevel(); // 关联拓扑告警
 
       var relateTopoAlarms = getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm);
-      var elementsAlarmLevels = [].concat(finalAlarms, relateTopoAlarms); // 将告警级别放入ht元素，便于测试
+      var elementsAlarmLevels = [].concat(cisEventLevel, relateTopoAlarms); // 将告警级别放入ht元素，便于测试
 
       (0, _htElementUtils.getElements)(topo.getDataModel()).filter(function (item) {
         return !!item.getTag();
@@ -184,5 +176,5 @@ function useGraphAlarmDisplay(options) {
         resources: resources
       });
     };
-  }, [graphLoaded, resources, alarmSwitch, alarmList, risks, relateTopoAlarm, cmpLinkAlarmLevels]);
+  }, [graphLoaded, resources, alarmSwitch, cisEventLevel, relateTopoAlarm]);
 }

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

package/lib/core/utils/metricUtil.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.formatMetric = formatMetric;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _utils = require("@riil-frontend/utils");
 
 var _DictCache = _interopRequireDefault(require("../models/cache/DictCache"));
@@ -23,16 +25,18 @@ function formatMetric(val, metricModel) {
   if (metricModel) {
     var _result$value;
 
-    // 分级字典特殊处理
-    if (metricModel.dict && !_DictCache["default"].getDictObject()[metricModel.code]) {
-      val = metricModel.dict[val];
+    var dictObject = (0, _extends2["default"])({}, _DictCache["default"].getDictObject()); // 分级字典特殊处理
+
+    if (metricModel.dict) {
+      // val = metricModel.dict[val]
+      dictObject[metricModel.code] = metricModel.dict;
     }
 
     var result = (0, _utils.metricValueFormat)({
       value: val,
       dataType: metricModel.dataType,
       changeValue: metricModel.changeValue,
-      dict: _DictCache["default"].getDictObject(),
+      dict: dictObject,
       unit: metricModel.unit,
       code: metricModel.code
     });

package/package.json

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