@riil-frontend/component-topology 4.0.11 → 4.0.14

package/es/core/components/DisplaySettingDrawer/LinkTag.js

@@ -6,7 +6,7 @@ import BasicConfig from "./ResourceDisplay/BasicConfig"; // 默认中可配置
 
 var CommonOptions = [{
   value: 'metric:interface_totalbps',
-  label: '总流速'
+  label: '总速率'
 }, {
   value: 'metric:bandwidth_utilization',
   label: '带宽利用率'

package/es/core/components/DisplaySettingDrawer/LinkTip.js

@@ -11,7 +11,7 @@ var CommonOptions = [{
   label: '目的端口'
 }, {
   value: 'metric:interface_totalbps',
-  label: '总流速'
+  label: '总速率'
 }, {
   value: 'metric:bandwidth_utilization',
   label: '带宽利用率'

package/es/core/components/TopoView/topoView.js

@@ -128,8 +128,8 @@ var Topology = function Topology(props) {
   }, []);
   var handleGraphDataLoaded = useCallback(function () {
     rlog.info("TopoView.handleGraphDataLoaded", topoData, topo.getDataModel().getDatas().toArray());
-    fixLink(topo);
     upgradeV103GraphClusterNode(topo, topoData);
+    fixLink(topo);
     handleClusterNoPermission(topo);
     updateEdgeExpanded(topo);
     topoDispatchers.update({
@@ -142,8 +142,8 @@ var Topology = function Topology(props) {
   }, [topoData]);
   var handleGraphLoaded = useCallback(function () {
     rlog.info("TopoView.handleGraphLoaded", topoData, topo.getDataModel().getDatas().toArray());
-    fixLink(topo);
     upgradeV103GraphClusterNode(topo, topoData);
+    fixLink(topo);
     handleClusterNoPermission(topo);
     updateEdgeExpanded(topo);
     topoDispatchers.update({

package/es/core/models/Alarm.js

@@ -38,6 +38,7 @@ var Alarm = /*#__PURE__*/function () {
     var _open = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _this = this;
 
+      var nodeCount;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -50,23 +51,17 @@ var Alarm = /*#__PURE__*/function () {
               return _context.abrupt("return");
 
             case 2:
-              this.confirmLargeResourceCount(function () {
-                // 获得拓扑id
-                var id = _this.topo.id;
-
-                if (!id) {
-                  return;
-                }
-
-                rlog.info("Alarm.open 打开告警通道", id);
-
-                _this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
-
-
-                _this.hmGetTopoAlarmByDoc(id);
-              });
+              nodeCount = this.topo.dataModel.getNodes().length;
+
+              if (nodeCount < 1500 || this.topo.isEditMode()) {
+                this.doOpen();
+              } else {
+                this.confirmOpenWhenLargeResource(function () {
+                  _this.doOpen();
+                });
+              }
 
-            case 3:
+            case 4:
             case "end":
               return _context.stop();
           }
@@ -79,7 +74,21 @@ var Alarm = /*#__PURE__*/function () {
     }
 
     return open;
-  }()
+  }();
+
+  _proto.doOpen = function doOpen() {
+    // 获得拓扑id
+    var id = this.topo.id;
+
+    if (!id) {
+      return;
+    }
+
+    rlog.info("Alarm.open 打开告警通道", id);
+    this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
+
+    this.hmGetTopoAlarmByDoc(id);
+  }
   /**
    * 关闭告警。
    *
@@ -88,7 +97,14 @@ var Alarm = /*#__PURE__*/function () {
   ;
 
   _proto.close = function close() {
-    // 获得拓扑id
+    this.updateState({
+      alarmPanelIsOpen: false,
+      alarmData: [],
+      alarmList: [],
+      risks: [],
+      alarmRecord: []
+    }); // 获得拓扑id
+
     var currentTopoId = this.currentTopoId;
 
     if (!currentTopoId) {
@@ -98,31 +114,22 @@ var Alarm = /*#__PURE__*/function () {
     rlog.info("关闭告警通道", currentTopoId); // 取消订阅告警推送
     // 关闭告警推送通道
 
-    this.updateState({
-      alarmData: [],
-      alarmPanelIsOpen: false
-    });
     this.closeTopoAlarm(currentTopoId);
   } // 资源数量多时确认是否开启
+  // eslint-disable-next-line class-methods-use-this
   ;
 
-  _proto.confirmLargeResourceCount = function confirmLargeResourceCount(cb) {
-    var nodeCount = this.topo.dataModel.getNodes().length;
-
-    if (nodeCount < 1500 || this.topo.isEditMode()) {
-      cb();
-    } else {
-      _Dialog.confirm({
-        title: "提示",
-        messageProps: {
-          type: "warning"
-        },
-        content: "该拓扑图上节点较多，继续查询告警可能影响系统整体性能，是否暂不显示告警？",
-        onCancel: function onCancel() {
-          cb();
-        }
-      });
-    }
+  _proto.confirmOpenWhenLargeResource = function confirmOpenWhenLargeResource(cb) {
+    _Dialog.confirm({
+      title: "提示",
+      messageProps: {
+        type: "warning"
+      },
+      content: "该拓扑图上节点较多，继续查询告警可能影响系统整体性能，是否暂不显示告警？",
+      onCancel: function onCancel() {
+        cb();
+      }
+    });
   }
   /**
    * 查询当前拓扑图有权限资源的告警列表

package/es/core/models/GraphDataModel.js

@@ -1,14 +1,14 @@
-import { getEdges as _getEdges, getGroupDatas, getNodes as _getNodes } from "../../utils/htElementUtils";
+import { getEdges as _getEdges, getNodes as _getNodes } from "../../utils/htElementUtils";
 
-var TopoDataModel = /*#__PURE__*/function () {
-  function TopoDataModel(topo) {
+var GraphDataModel = /*#__PURE__*/function () {
+  function GraphDataModel(topo) {
     this.topo = topo;
   }
 
-  var _proto = TopoDataModel.prototype;
+  var _proto = GraphDataModel.prototype;
 
   _proto.getGroups = function getGroups() {
-    return getGroupDatas(this.topo.getDataModel());
+    return this.getGroups(this.topo.getDataModel());
   };
 
   _proto.getNodes = function getNodes() {
@@ -19,13 +19,7 @@ var TopoDataModel = /*#__PURE__*/function () {
     return _getEdges(this.topo.getDataModel());
   };
 
-  _proto.getLines = function getLines() {
-    return this.getEdges().filter(function (item) {
-      return !!item.id;
-    });
-  };
-
-  return TopoDataModel;
+  return GraphDataModel;
 }();
 
-export { TopoDataModel as default };
+export { GraphDataModel as default };

package/es/core/models/TopoApp.js

@@ -21,7 +21,7 @@ import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig"; // eslint-disable-next-line no-undef
 
-var version = typeof "4.0.11" === 'string' ? "4.0.11" : null;
+var version = typeof "4.0.14" === 'string' ? "4.0.14" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/hooks/useTopoEdit.js

@@ -404,9 +404,9 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   function findUNExistedLinkElements(elements) {
-    var existedLinkIds = resourceConfig.getAllEdgeResourceIds();
+    var dm = topo.getDataModel();
     var newLinkElements = elements.filter(function (element) {
-      return (element.type === "link" || element.type === "linkGroup") && existedLinkIds.indexOf(element.id) === -1;
+      return (element.type === "link" || element.type === "linkGroup") && !isExistedElement(topo.getHtTopo(), dm, element);
     });
     return newLinkElements;
   }

package/es/models/topoConfig.js

@@ -363,7 +363,7 @@ export default function (topoApp) {
 
                     return _context4.abrupt("return", {
                       topoData: topoData,
-                      elements: topoDataTrans,
+                      elements: JSON.parse(JSON.stringify(topoDataTrans)),
                       topoDataTrans: topoDataTrans
                     });
 

package/es/topoCenter/components/viewer/displaySetting/LinkTagV2.js

@@ -10,7 +10,7 @@ var CommonOptions = [{
   label: '无'
 }, {
   value: '1',
-  label: '总流速、带宽利用率',
+  label: '总速率、带宽利用率',
   options: {
     data: ['metric:interface_totalbps', 'metric:bandwidth_utilization']
   }

package/es/utils/clusterUtil.js

@@ -5,7 +5,7 @@ import _extends from "@babel/runtime/helpers/extends";
  */
 import { transformTopoElements } from "@riil-frontend/component-topology-graph/es/utils";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
-import { getGroups } from "./htElementUtils";
+import { getGroups, isExistedElement } from "./htElementUtils";
 import { findGroupChildren } from "./topoData";
 export function isCluster(node) {
   return !!node.cluster;
@@ -108,26 +108,27 @@ export function upgradeV103GraphClusterNode(topo, topoData) {
     // 查找图上未显示的集群、集群成员、关联的链路
     var topoDataTrans = transformTopoElements(topoData);
     var dm = topo.getDataModel();
-    var list = topoDataTrans.filter(function (data) {
-      return !dm.getDataByTag(data.id);
+    var unExistedList = topoDataTrans.filter(function (data) {
+      return !isExistedElement(topo.getHtTopo(), dm, data);
     });
 
-    if (!list.length) {
+    if (!unExistedList.length) {
       return;
     }
 
-    var groups = list.filter(function (item) {
+    rlog.error('集群1.0.2升级', unExistedList);
+    var groups = unExistedList.filter(function (item) {
       return item.type === 'group';
     });
     var createElementsData = {
       groups: groups,
-      nodes: list.filter(function (item) {
+      nodes: unExistedList.filter(function (item) {
         return item.type === 'node';
       }),
-      links: list.filter(function (item) {
+      links: unExistedList.filter(function (item) {
         return item.type === 'link';
       }),
-      linkGroups: list.filter(function (item) {
+      linkGroups: unExistedList.filter(function (item) {
         return item.type === 'linkGroup';
       })
     };

package/es/utils/htElementUtils.js

@@ -301,15 +301,13 @@ export function setElementRuntimeStyle(element, name, value) {
  */
 
 export function isExistedElement(htTopo, dataModel, data) {
-  var type = data.type,
-      id = data.id;
-
-  if (dataModel.getDataByTag(id)) {
+  if (dataModel.getDataByTag(data.id)) {
     return true;
-  }
+  } // 识别区域
+
 
   var element = getElements(dataModel).find(function (item) {
-    return item.a('tag') === data.tag;
+    return data.tag && item.a('tag') === data.tag;
   });
 
   if (element) {
@@ -317,5 +315,29 @@ export function isExistedElement(htTopo, dataModel, data) {
   } // 连线/连线组
 
 
+  var edges = getEdges(dataModel);
+
+  for (var i = 0; i < edges.length; i++) {
+    var edge = edges[i]; // 如果连线组折叠，判断子连线
+
+    var edgeData = htTopo.getEdgeData(edge);
+
+    if (edgeData) {
+      // eslint-disable-next-line no-underscore-dangle
+      var id = edgeData._attrObject.id;
+
+      if (id === data.id) {
+        return true;
+      }
+    } // 如果连线组展开，判断连线组
+    // eslint-disable-next-line no-underscore-dangle
+
+
+    if (edge.__edgeGroup && edge.__edgeGroup._tag === data.id) {
+      return true;
+    }
+  }
+
+  console.error(111, data);
   return false;
 }

package/lib/core/components/DisplaySettingDrawer/LinkTag.js

@@ -18,7 +18,7 @@ var _BasicConfig = _interopRequireDefault(require("./ResourceDisplay/BasicConfig
 // 默认中可配置内容包括总速率、带宽利用率、发送速率、发送带宽利用率、接收速率、接收带宽利用率
 var CommonOptions = [{
   value: 'metric:interface_totalbps',
-  label: '总流速'
+  label: '总速率'
 }, {
   value: 'metric:bandwidth_utilization',
   label: '带宽利用率'

package/lib/core/components/DisplaySettingDrawer/LinkTip.js

@@ -22,7 +22,7 @@ var CommonOptions = [{
   label: '目的端口'
 }, {
   value: 'metric:interface_totalbps',
-  label: '总流速'
+  label: '总速率'
 }, {
   value: 'metric:bandwidth_utilization',
   label: '带宽利用率'

package/lib/core/components/TopoView/topoView.js

@@ -163,8 +163,8 @@ var Topology = function Topology(props) {
   var handleGraphDataLoaded = (0, _react.useCallback)(function () {
     _rlog["default"].info("TopoView.handleGraphDataLoaded", topoData, topo.getDataModel().getDatas().toArray());
 
-    (0, _graphLinkUtil.fixLink)(topo);
     (0, _clusterUtil.upgradeV103GraphClusterNode)(topo, topoData);
+    (0, _graphLinkUtil.fixLink)(topo);
     (0, _clusterUtil.handleClusterNoPermission)(topo);
     (0, _edgeUtil.updateEdgeExpanded)(topo);
     topoDispatchers.update({
@@ -178,8 +178,8 @@ var Topology = function Topology(props) {
   var handleGraphLoaded = (0, _react.useCallback)(function () {
     _rlog["default"].info("TopoView.handleGraphLoaded", topoData, topo.getDataModel().getDatas().toArray());
 
-    (0, _graphLinkUtil.fixLink)(topo);
     (0, _clusterUtil.upgradeV103GraphClusterNode)(topo, topoData);
+    (0, _graphLinkUtil.fixLink)(topo);
     (0, _clusterUtil.handleClusterNoPermission)(topo);
     (0, _edgeUtil.updateEdgeExpanded)(topo);
     topoDispatchers.update({

package/lib/core/models/Alarm.js

@@ -51,6 +51,7 @@ var Alarm = /*#__PURE__*/function () {
     var _open = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _this = this;
 
+      var nodeCount;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -63,23 +64,17 @@ var Alarm = /*#__PURE__*/function () {
               return _context.abrupt("return");
 
             case 2:
-              this.confirmLargeResourceCount(function () {
-                // 获得拓扑id
-                var id = _this.topo.id;
-
-                if (!id) {
-                  return;
-                }
-
-                _rlog["default"].info("Alarm.open 打开告警通道", id);
-
-                _this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
-
-
-                _this.hmGetTopoAlarmByDoc(id);
-              });
+              nodeCount = this.topo.dataModel.getNodes().length;
+
+              if (nodeCount < 1500 || this.topo.isEditMode()) {
+                this.doOpen();
+              } else {
+                this.confirmOpenWhenLargeResource(function () {
+                  _this.doOpen();
+                });
+              }
 
-            case 3:
+            case 4:
             case "end":
               return _context.stop();
           }
@@ -92,7 +87,22 @@ var Alarm = /*#__PURE__*/function () {
     }
 
     return open;
-  }()
+  }();
+
+  _proto.doOpen = function doOpen() {
+    // 获得拓扑id
+    var id = this.topo.id;
+
+    if (!id) {
+      return;
+    }
+
+    _rlog["default"].info("Alarm.open 打开告警通道", id);
+
+    this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
+
+    this.hmGetTopoAlarmByDoc(id);
+  }
   /**
    * 关闭告警。
    *
@@ -101,7 +111,14 @@ var Alarm = /*#__PURE__*/function () {
   ;
 
   _proto.close = function close() {
-    // 获得拓扑id
+    this.updateState({
+      alarmPanelIsOpen: false,
+      alarmData: [],
+      alarmList: [],
+      risks: [],
+      alarmRecord: []
+    }); // 获得拓扑id
+
     var currentTopoId = this.currentTopoId;
 
     if (!currentTopoId) {
@@ -112,31 +129,22 @@ var Alarm = /*#__PURE__*/function () {
     // 关闭告警推送通道
 
 
-    this.updateState({
-      alarmData: [],
-      alarmPanelIsOpen: false
-    });
     this.closeTopoAlarm(currentTopoId);
   } // 资源数量多时确认是否开启
+  // eslint-disable-next-line class-methods-use-this
   ;
 
-  _proto.confirmLargeResourceCount = function confirmLargeResourceCount(cb) {
-    var nodeCount = this.topo.dataModel.getNodes().length;
-
-    if (nodeCount < 1500 || this.topo.isEditMode()) {
-      cb();
-    } else {
-      _dialog["default"].confirm({
-        title: "提示",
-        messageProps: {
-          type: "warning"
-        },
-        content: "该拓扑图上节点较多，继续查询告警可能影响系统整体性能，是否暂不显示告警？",
-        onCancel: function onCancel() {
-          cb();
-        }
-      });
-    }
+  _proto.confirmOpenWhenLargeResource = function confirmOpenWhenLargeResource(cb) {
+    _dialog["default"].confirm({
+      title: "提示",
+      messageProps: {
+        type: "warning"
+      },
+      content: "该拓扑图上节点较多，继续查询告警可能影响系统整体性能，是否暂不显示告警？",
+      onCancel: function onCancel() {
+        cb();
+      }
+    });
   }
   /**
    * 查询当前拓扑图有权限资源的告警列表

package/lib/core/models/GraphDataModel.js

@@ -5,15 +5,15 @@ exports["default"] = void 0;
 
 var _htElementUtils = require("../../utils/htElementUtils");
 
-var TopoDataModel = /*#__PURE__*/function () {
-  function TopoDataModel(topo) {
+var GraphDataModel = /*#__PURE__*/function () {
+  function GraphDataModel(topo) {
     this.topo = topo;
   }
 
-  var _proto = TopoDataModel.prototype;
+  var _proto = GraphDataModel.prototype;
 
   _proto.getGroups = function getGroups() {
-    return (0, _htElementUtils.getGroupDatas)(this.topo.getDataModel());
+    return this.getGroups(this.topo.getDataModel());
   };
 
   _proto.getNodes = function getNodes() {
@@ -24,13 +24,7 @@ var TopoDataModel = /*#__PURE__*/function () {
     return (0, _htElementUtils.getEdges)(this.topo.getDataModel());
   };
 
-  _proto.getLines = function getLines() {
-    return this.getEdges().filter(function (item) {
-      return !!item.id;
-    });
-  };
-
-  return TopoDataModel;
+  return GraphDataModel;
 }();
 
-exports["default"] = TopoDataModel;
+exports["default"] = GraphDataModel;

package/lib/core/models/TopoApp.js

@@ -50,7 +50,7 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "4.0.11" === 'string' ? "4.0.11" : null;
+var version = typeof "4.0.14" === 'string' ? "4.0.14" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/hooks/useTopoEdit.js

@@ -435,9 +435,9 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   function findUNExistedLinkElements(elements) {
-    var existedLinkIds = resourceConfig.getAllEdgeResourceIds();
+    var dm = topo.getDataModel();
     var newLinkElements = elements.filter(function (element) {
-      return (element.type === "link" || element.type === "linkGroup") && existedLinkIds.indexOf(element.id) === -1;
+      return (element.type === "link" || element.type === "linkGroup") && !(0, _htElementUtils.isExistedElement)(topo.getHtTopo(), dm, element);
     });
     return newLinkElements;
   }

package/lib/models/topoConfig.js

@@ -392,7 +392,7 @@ function _default(topoApp) {
 
                     return _context4.abrupt("return", {
                       topoData: topoData,
-                      elements: topoDataTrans,
+                      elements: JSON.parse(JSON.stringify(topoDataTrans)),
                       topoDataTrans: topoDataTrans
                     });
 

package/lib/topoCenter/components/viewer/displaySetting/LinkTagV2.js

@@ -23,7 +23,7 @@ var CommonOptions = [{
   label: '无'
 }, {
   value: '1',
-  label: '总流速、带宽利用率',
+  label: '总速率、带宽利用率',
   options: {
     data: ['metric:interface_totalbps', 'metric:bandwidth_utilization']
   }

package/lib/utils/clusterUtil.js

@@ -137,26 +137,28 @@ function upgradeV103GraphClusterNode(topo, topoData) {
     // 查找图上未显示的集群、集群成员、关联的链路
     var topoDataTrans = (0, _utils.transformTopoElements)(topoData);
     var dm = topo.getDataModel();
-    var list = topoDataTrans.filter(function (data) {
-      return !dm.getDataByTag(data.id);
+    var unExistedList = topoDataTrans.filter(function (data) {
+      return !(0, _htElementUtils.isExistedElement)(topo.getHtTopo(), dm, data);
     });
 
-    if (!list.length) {
+    if (!unExistedList.length) {
       return;
     }
 
-    var groups = list.filter(function (item) {
+    _rlog["default"].error('集群1.0.2升级', unExistedList);
+
+    var groups = unExistedList.filter(function (item) {
       return item.type === 'group';
     });
     var createElementsData = {
       groups: groups,
-      nodes: list.filter(function (item) {
+      nodes: unExistedList.filter(function (item) {
         return item.type === 'node';
       }),
-      links: list.filter(function (item) {
+      links: unExistedList.filter(function (item) {
         return item.type === 'link';
       }),
-      linkGroups: list.filter(function (item) {
+      linkGroups: unExistedList.filter(function (item) {
         return item.type === 'linkGroup';
       })
     };