@riil-frontend/component-topology 4.0.0-beta.19 → 4.0.0-beta.21

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "4.0.0-beta.19" === 'string' ? "4.0.0-beta.19" : null;
+var version = typeof "4.0.0-beta.21" === 'string' ? "4.0.0-beta.21" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/hooks/useAlarm.js

@@ -21,8 +21,7 @@ export default function useAlarm(options) {
     // 非在活状态：
     // 已修复 recovered
     // 已关闭 closed
-    var risks = [];
-    var originData = topo.store.getModelState('topoAlarm').risks;
+    var prevRisks = topo.store.getModelState('topoAlarm').risks;
 
     var isLiveRisk = function isLiveRisk(data) {
       return ['recovered', 'closed'].indexOf(data.status) === -1;
@@ -34,33 +33,33 @@ export default function useAlarm(options) {
       var ciId = (_data$resourceId = data.resourceId) !== null && _data$resourceId !== void 0 ? _data$resourceId : data.ciId;
       var ci = topo.dataModel.getDataById(ciId);
       return ci && ci.operation;
-    }; // 过滤掉无权限、非在活的
+    }; // 合并
 
 
-    receivedData = receivedData.filter(isLiveRisk).filter(hasCiPermission);
+    var risks = prevRisks.map(function (risk) {
+      var newRisk = receivedData.find(function (item) {
+        return item.id === risk.id;
+      });
+      return newRisk || risk;
+    }); // 新的
+
     var addRisks = receivedData.filter(function (risk) {
-      return !originData.find(function (item) {
+      return !prevRisks.find(function (item) {
         return item.id === risk.id;
       });
     });
 
-    (_risks = risks).push.apply(_risks, addRisks);
+    (_risks = risks).push.apply(_risks, addRisks); // 过滤掉无权限、非在活的
 
-    originData.forEach(function (risk) {
-      var newRisk = receivedData.find(function (item) {
-        return item.id === risk.id;
-      });
 
-      if (!newRisk) {
-        risks.push(risk);
-      } else if (newRisk && isLiveRisk(newRisk)) {
-        risks.push(newRisk);
-      }
-    });
-    risks = risks.sort(function (a, b) {
+    risks = risks.filter(isLiveRisk).filter(hasCiPermission).sort(function (a, b) {
       return a.executeTime - b.executeTime;
     });
-    rlog.debug('更新风险', risks);
+    rlog.debug('更新风险', {
+      prevRisks: prevRisks,
+      receivedData: receivedData,
+      risks: risks
+    });
     topo.store.getModelDispatchers('topoAlarm').update({
       risks: risks
     });

package/es/hooks/useGraphAlarmDisplay.js

@@ -12,9 +12,9 @@ function getCiAlarmLevels(alarmList, risks) {
       level: 5
     };
   })).forEach(function (item) {
-    var level = ciIdLevelMap[item.id];
+    var level = ciIdLevelMap[item.id]; // 优先显示高等级告警。值小的等级高
 
-    if (!level || level < item.level) {
+    if (!level || item.level < level) {
       level = item.level;
     }
 

package/es/utils/topoData.js

@@ -86,32 +86,13 @@ export function formatGroup(group) {
 
 export function formatGroups(groups) {
   return groups.map(formatGroup);
-}
-/**
- *
- * @param attributes {array|object}
- * @return {object}
- */
-
-function nodeAttributesAdapter(attributes) {
-  if (Array.isArray(attributes)) {
-    var map = {};
-    attributes.forEach(function (attr) {
-      map[attr.code] = attr.value;
-    });
-    return map;
-  }
-
-  return attributes || {};
 } // 格式化节点
 
-
 var tfNode = function tfNode(engine, node) {
-  var attributes = nodeAttributesAdapter(node.attributes); // rlog.debug('tfNode---------',node);
+  var attributes = node.attributes; // rlog.debug('tfNode---------',node);
 
-  var result = _extends({
-    ipAddress: attributes.ipAddress || null
-  }, node, {
+  var result = _extends({}, node, {
+    ipAddress: node.ipAddress || attributes.ipAddress || attributes.ipv4_address || null,
     operation: node.hasOwnProperty("operation") ? node.operation : null,
     metrics: [],
     attributes: [],

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "4.0.0-beta.19" === 'string' ? "4.0.0-beta.19" : null;
+var version = typeof "4.0.0-beta.21" === 'string' ? "4.0.0-beta.21" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/hooks/useAlarm.js

@@ -31,8 +31,7 @@ function useAlarm(options) {
     // 非在活状态：
     // 已修复 recovered
     // 已关闭 closed
-    var risks = [];
-    var originData = topo.store.getModelState('topoAlarm').risks;
+    var prevRisks = topo.store.getModelState('topoAlarm').risks;
 
     var isLiveRisk = function isLiveRisk(data) {
       return ['recovered', 'closed'].indexOf(data.status) === -1;
@@ -44,34 +43,34 @@ function useAlarm(options) {
       var ciId = (_data$resourceId = data.resourceId) !== null && _data$resourceId !== void 0 ? _data$resourceId : data.ciId;
       var ci = topo.dataModel.getDataById(ciId);
       return ci && ci.operation;
-    }; // 过滤掉无权限、非在活的
+    }; // 合并
 
 
-    receivedData = receivedData.filter(isLiveRisk).filter(hasCiPermission);
+    var risks = prevRisks.map(function (risk) {
+      var newRisk = receivedData.find(function (item) {
+        return item.id === risk.id;
+      });
+      return newRisk || risk;
+    }); // 新的
+
     var addRisks = receivedData.filter(function (risk) {
-      return !originData.find(function (item) {
+      return !prevRisks.find(function (item) {
         return item.id === risk.id;
       });
     });
 
-    (_risks = risks).push.apply(_risks, addRisks);
+    (_risks = risks).push.apply(_risks, addRisks); // 过滤掉无权限、非在活的
 
-    originData.forEach(function (risk) {
-      var newRisk = receivedData.find(function (item) {
-        return item.id === risk.id;
-      });
 
-      if (!newRisk) {
-        risks.push(risk);
-      } else if (newRisk && isLiveRisk(newRisk)) {
-        risks.push(newRisk);
-      }
-    });
-    risks = risks.sort(function (a, b) {
+    risks = risks.filter(isLiveRisk).filter(hasCiPermission).sort(function (a, b) {
       return a.executeTime - b.executeTime;
     });
 
-    _rlog["default"].debug('更新风险', risks);
+    _rlog["default"].debug('更新风险', {
+      prevRisks: prevRisks,
+      receivedData: receivedData,
+      risks: risks
+    });
 
     topo.store.getModelDispatchers('topoAlarm').update({
       risks: risks

package/lib/hooks/useGraphAlarmDisplay.js

@@ -21,9 +21,9 @@ function getCiAlarmLevels(alarmList, risks) {
       level: 5
     };
   })).forEach(function (item) {
-    var level = ciIdLevelMap[item.id];
+    var level = ciIdLevelMap[item.id]; // 优先显示高等级告警。值小的等级高
 
-    if (!level || level < item.level) {
+    if (!level || item.level < level) {
       level = item.level;
     }
 

package/lib/utils/topoData.js

@@ -127,33 +127,14 @@ function formatGroup(group) {
 
 function formatGroups(groups) {
   return groups.map(formatGroup);
-}
-/**
- *
- * @param attributes {array|object}
- * @return {object}
- */
-
-
-function nodeAttributesAdapter(attributes) {
-  if (Array.isArray(attributes)) {
-    var map = {};
-    attributes.forEach(function (attr) {
-      map[attr.code] = attr.value;
-    });
-    return map;
-  }
-
-  return attributes || {};
 } // 格式化节点
 
 
 var tfNode = function tfNode(engine, node) {
-  var attributes = nodeAttributesAdapter(node.attributes); // rlog.debug('tfNode---------',node);
+  var attributes = node.attributes; // rlog.debug('tfNode---------',node);
 
-  var result = (0, _extends2["default"])({
-    ipAddress: attributes.ipAddress || null
-  }, node, {
+  var result = (0, _extends2["default"])({}, node, {
+    ipAddress: node.ipAddress || attributes.ipAddress || attributes.ipv4_address || null,
     operation: node.hasOwnProperty("operation") ? node.operation : null,
     metrics: [],
     attributes: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "4.0.0-beta.19",
+  "version": "4.0.0-beta.21",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -114,6 +114,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@4.0.0-beta.19/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@4.0.0-beta.21/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }