@riil-frontend/component-topology 4.0.20 → 4.0.21

package/lib/core/models/utils/linkUtils.js

@@ -8,6 +8,7 @@ exports.getInterfaceObject = void 0;
 exports.getLinksDetail = getLinksDetail;
 exports.isAggLink = isAggLink;
 exports.mergeLinksData = mergeLinksData;
+exports.showLinkByConfig = exports.plurals = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -23,6 +24,9 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _services = require("../../services");
 
+var _htElementUtils = require("../../../utils/htElementUtils");
+
+// 查询所有连线
 // const interfaceTypeMap = {
 //   "network.interface": {
 //     displayName: "网络接口",
@@ -158,7 +162,7 @@ function _getLinksDetail() {
             interfaceCis = _context2.sent;
             _context2.next = 13;
             return getInterfaceObject(interfaceTypes.filter(function (item) {
-              return item !== 'ip';
+              return item !== "ip";
             }));
 
           case 13:
@@ -175,4 +179,60 @@ function _getLinksDetail() {
   return _getLinksDetail.apply(this, arguments);
 }
 
-function buildTopoLinkData() {}
+function buildTopoLinkData() {}
+/**
+ * 链路显示模式
+ */
+
+
+var plurals = {
+  0: [],
+  1: [],
+  2: ["phy"],
+  3: ["agg"],
+  4: ["phy", "agg"]
+};
+exports.plurals = plurals;
+
+var showLinkByConfig = function showLinkByConfig(props) {
+  console.log("showLinkByConfig-----------------------------", props);
+  var topo = props.topo,
+      showType = props.showType; //const displayConfig = topo.store.getModelState("displayConfig");
+
+  var types = plurals[showType]; // 查询所有连线
+
+  var gv = topo.getGraphView();
+  var dm = gv.getDataModel();
+  var edges = (0, _htElementUtils.getEdges)(dm); // console.log("edges", edges);
+
+  var showPhy = types.indexOf("phy") >= 0;
+  var showAgg = types.indexOf("agg") >= 0;
+
+  if (Array.isArray(edges) && edges.length > 0) {
+    edges.map(function (edge) {
+      if (showType === 1) {
+        // 单链路全部显示
+        edge.s("2d.visible", true);
+      } else {
+        var d = topo.dataModel.getDataById(edge.getTag()); //console.log("edge", edge, d);
+        // 判断是否聚合链路
+
+        if (d.destination_type === "network.agg_interface" && d.source_type === "network.agg_interface") {
+          if (showAgg) {
+            edge.s("2d.visible", true);
+          } else {
+            edge.s("2d.visible", false);
+          }
+        } else {
+          if (showPhy) {
+            edge.s("2d.visible", true);
+          } else {
+            edge.s("2d.visible", false);
+          }
+        }
+      }
+    });
+  }
+};
+
+exports.showLinkByConfig = showLinkByConfig;

package/lib/core/utils/edgeUtil.js

@@ -7,6 +7,8 @@ exports.updateEdgeExpanded = void 0;
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _linkUtils = require("../models/utils/linkUtils");
+
 /**
  * 根据配置更新连线展开折叠状态
  * 
@@ -22,7 +24,9 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
   var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
       expandAllEdges = _topo$store$getModelS.expandAllEdges;
 
-  if (expandAllEdges === false) {
+  console.log("expandAllEdges----------", expandAllEdges);
+
+  if (expandAllEdges === 1) {
     htTopo.collapseAllEdgeGroups();
 
     _rlog["default"].debug('updateEdgeExpanded 折叠');
@@ -32,6 +36,11 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
     _rlog["default"].debug('updateEdgeExpanded 展开');
   }
 
+  (0, _linkUtils.showLinkByConfig)({
+    topo: topo,
+    showType: expandAllEdges
+  });
+
   if (topo.linkDynamicStyleExecutor) {
     topo.linkDynamicStyleExecutor.execute();
   }

package/lib/models/topoMod.js

@@ -461,10 +461,13 @@ function _default(topoApp) {
                     _rlog["default"].debug("topoMod.initTopoData Ci属性指标元数据", ciTypeMap);
 
                     extraConfig = result.global.extraConfig;
-                    _context6.next = 49;
+
+                    _rlog["default"].debug("topoMod.initTopoData extraConfig", extraConfig);
+
+                    _context6.next = 50;
                     return dispatch.displayConfig.setConfig(extraConfig);
 
-                  case 49:
+                  case 50:
                     _combTopoData = (0, _topoData.combTopoData)({
                       engine: topoApp,
                       data: result,
@@ -495,7 +498,7 @@ function _default(topoApp) {
 
                     topoApp.options.onLoad();
 
-                  case 58:
+                  case 59:
                   case "end":
                     return _context6.stop();
                 }

package/lib/topoCenter/components/TopoView.js

@@ -45,6 +45,8 @@ var _LinkTagV = _interopRequireDefault(require("./viewer/displaySetting/LinkTagV
 
 var _useEdgeExpand = _interopRequireDefault(require("../hooks/useEdgeExpand"));
 
+var _linkUtils = require("../../core/models/utils/linkUtils");
+
 var _excluded = ["topo", "titleBar", "onEnterEdit", "nodataPage", "notfoundPageProps", "noPermissionPageProps"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -87,19 +89,24 @@ function NetworkTopologyCore(props) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                // 单多链路切换
-                if (config.expandAllEdges !== false) {
+                console.log("hancleDisplaySettingOk", config.expandAllEdges); // 单多链路切换
+
+                if (config.expandAllEdges !== 1) {
                   topo.getHtTopo().expandAllEdgeGroups();
                 } else {
                   topo.getHtTopo().collapseAllEdgeGroups();
-                } // 更新链路动态样式
+                }
 
+                (0, _linkUtils.showLinkByConfig)({
+                  topo: topo,
+                  showType: config.expandAllEdges
+                }); // 更新链路动态样式
 
                 if (topo.linkDynamicStyleExecutor) {
                   topo.linkDynamicStyleExecutor.execute();
                 }
 
-              case 2:
+              case 4:
               case "end":
                 return _context.stop();
             }

package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js

@@ -478,8 +478,9 @@ function AddLinkDrawer(props) {
     try {
       // 获取两个节点间的连线数据列表
       var edgesInNodes = (0, _htElementUtils.getEdgesBetweenNodes)(source, target);
+      var _isGroup = false; // linkType === "agg"
 
-      if (linkType === "agg") {
+      if (_isGroup) {
         // 聚合链路
         if (edgesInNodes.length === 0) {
           htTopo.createEdge(source, target, linkData);
@@ -578,9 +579,8 @@ function AddLinkDrawer(props) {
               result = _context5.sent;
 
             case 13:
-              setLoading(false);
               linkType = data["network_link.connect_type"];
-              _context5.prev = 15;
+              _context5.prev = 14;
 
               if (!result) {
                 _context5.next = 55;
@@ -590,7 +590,7 @@ function AddLinkDrawer(props) {
               config = topo.resourceConfig.getConfigFromHt(); // 新建后显示到图上
 
               if (!isAddMode) {
-                _context5.next = 31;
+                _context5.next = 30;
                 break;
               }
 
@@ -604,10 +604,10 @@ function AddLinkDrawer(props) {
                 exportLinkIdList: exportLinkIdList
               })); // const linkType = data["network_link.connect_type"];
 
-              _context5.next = 24;
+              _context5.next = 23;
               return editDispatchers.fetchDataByConfig();
 
-            case 24:
+            case 23:
               _yield$editDispatcher = _context5.sent;
               elements = _yield$editDispatcher.elements;
               linkData = elements.find(function (element) {
@@ -622,12 +622,12 @@ function AddLinkDrawer(props) {
 
               _message["default"].success("创建成功");
 
-              _context5.next = 53;
+              _context5.next = 52;
               break;
 
-            case 31:
+            case 30:
               if (!(linkType === "exit")) {
-                _context5.next = 46;
+                _context5.next = 45;
                 break;
               }
 
@@ -653,27 +653,28 @@ function AddLinkDrawer(props) {
               topoDispatchers.update({
                 data: newData
               });
-              _context5.next = 52;
+              _context5.next = 51;
               break;
 
-            case 46:
+            case 45:
               _config = topo.resourceConfig.getConfigFromHt();
               topo.resourceConfig.updateConfig(_config);
-              _context5.next = 50;
+              _context5.next = 49;
               return editDispatchers.fetchDataByConfig();
 
-            case 50:
+            case 49:
               _yield$editDispatcher2 = _context5.sent;
               _elements = _yield$editDispatcher2.elements;
 
-            case 52:
+            case 51:
               _message["default"].success("保存成功");
 
-            case 53:
+            case 52:
               editDispatchers.update({
                 addLinkIsOpen: false,
                 currentLink: null
               });
+              setLoading(false);
               topo.linkDynamicStyleExecutor.execute();
 
             case 55:
@@ -682,7 +683,7 @@ function AddLinkDrawer(props) {
 
             case 57:
               _context5.prev = 57;
-              _context5.t0 = _context5["catch"](15);
+              _context5.t0 = _context5["catch"](14);
 
               _rlog["default"].debug("保存链路信息异常", _context5.t0);
 
@@ -691,7 +692,7 @@ function AddLinkDrawer(props) {
               return _context5.stop();
           }
         }
-      }, _callee5, null, [[15, 57]]);
+      }, _callee5, null, [[14, 57]]);
     }));
 
     return function onSave(_x4) {

package/lib/topoCenter/getTopoData.js

@@ -51,12 +51,8 @@ function _addLinkData() {
           case 3:
             links = _context.sent;
             return _context.abrupt("return", {
-              links: links.filter(function (link) {
-                return link.attributes['network_link.connect_type'] !== 'agg';
-              }),
-              linkGroups: links.filter(function (link) {
-                return link.attributes['network_link.connect_type'] === 'agg';
-              })
+              links: links,
+              linkGroups: []
             });
 
           case 5:

package/lib/topoCenter/hooks/editor/useDeleteEdges.js

@@ -57,14 +57,15 @@ var _default = function _default(_ref) {
 
   var doDeleteLink = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(link, edge) {
-      var id, isAgg, success, htTopo, edgesInNodes, edgeGroupData, edgeData, _topo$store$getModel, topoState, topoDispatchers, _topoState$data, links, linkGroups;
+      var id, isGroup, success, htTopo, edgesInNodes, edgeGroupData, edgeData, _topo$store$getModel, topoState, topoDispatchers, _topoState$data, links, linkGroups;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               id = link.id;
-              isAgg = (0, _linkUtils.isAggLink)(link);
+              isGroup = false; // isAggLink(link);
+
               _context.next = 4;
               return _link["default"].deleteLink(id);
 
@@ -88,7 +89,7 @@ var _default = function _default(_ref) {
               edgesInNodes = htTopo.getEdgeDatasInNodes(edge.getSource(), edge.getTarget());
 
               if (edgesInNodes.length >= 2) {
-                if (isAgg) {
+                if (isGroup) {
                   htTopo.setEdgeGroupData(edge.getSource(), edge.getTarget(), null);
                 } else {
                   htTopo.deleteEdge(edge);
@@ -98,10 +99,10 @@ var _default = function _default(_ref) {
                 edgeGroupData = htTopo.getEdgeGroupData(edge.getSource(), edge.getTarget());
                 edgeData = htTopo.getEdgeData(edge);
 
-                if (isAgg && edgeData) {
+                if (isGroup && edgeData) {
                   // 当前是连线组代理 且 有连线数据，清空组数据
                   htTopo.setEdgeGroupData(edge.getSource(), edge.getTarget(), null);
-                } else if (!isAgg && edgeGroupData) {
+                } else if (!isGroup && edgeGroupData) {
                   htTopo.setEdgeData(edge, null);
                 } else {
                   htTopo.deleteEdge(edge);

package/package.json

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