@riil-frontend/component-topology 12.1.0-dev.9 → 13.0.0-dev.1

package/es/utils/htElementUtils.js

@@ -115,14 +115,8 @@ export function getNodeData(element) {
 export function getEdges(dataModel) {
   return getElements(dataModel).filter(isValidEdge);
 }
-/**
- * 是否连线组
- * @param {ht.Edge} edge
- * @returns
- */
-
-export function isEdgeGroup(edge) {
-  return isEdge(edge) && edge.a('x.edgegroup.isEdgeGroup');
+export function isEdgeGroupExpanded(edge) {
+  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
 }
 /**
  * 是否连线组代理
@@ -131,19 +125,7 @@ export function isEdgeGroup(edge) {
  */
 
 export function isEdgeGroupAgent(edge) {
-  return isEdgeGroup(edge);
-}
-/**
- * TODO
- * @param {*} edge 
- * @returns 
- */
-
-export function isEdgeGroupExpanded(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
-}
-export function isEdgeVisible(edge) {
-  return edge.s('2d.visible') || edge.s('2d.visible') === undefined;
+  return isEdge(edge) && edge.getEdgeGroup() && edge.isEdgeGroupAgent();
 }
 /**
  * 获得两个节点间的连线列表
@@ -209,12 +191,6 @@ export function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
 
   return getEdgeGroupByNodes(node1, node2);
 }
-/**
- * 获得连线组连线列表
- * @param {*} dataModel 
- * @returns 
- */
-
 export function getEdgeGroups(dataModel) {
   var edgeGroups = [];
   getEdges(dataModel).forEach(function (edge) {
@@ -226,19 +202,11 @@ export function getEdgeGroups(dataModel) {
   });
   return edgeGroups;
 }
-/**
- * 获得连线组连线列表
- * @param {*} dataModel 
- * @returns 
- */
-
 export function getEdgeGroupAgents(dataModel) {
   return getEdges(dataModel).filter(isEdgeGroupAgent);
 }
 export function getEdgeDatas(dataModel) {
-  return getEdges(dataModel).filter(function (edge) {
-    return !isEdgeGroup(edge);
-  }).map(function (element) {
+  return getEdges(dataModel).map(function (element) {
     var _element$getSource, _element$getTarget;
 
     return _extends({}, element.getAttrObject(), {

package/lib/core/editor/components/Sidebar/views/ImagePanel/ImagePanel.js

@@ -17,6 +17,8 @@ var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _componentNoDataPage = _interopRequireDefault(require("@riil-frontend/component-no-data-page"));
+
 var _Collapse = _interopRequireDefault(require("../../../../../../components/collapse/Collapse"));
 
 var _CiTypeImagePanel = _interopRequireDefault(require("./CiTypeImagePanel"));
@@ -130,12 +132,16 @@ function ImagePanel(props) {
     }].filter(function (panel) {
       return !panel.hidden;
     });
+
+    if (!panels.length) {
+      return /*#__PURE__*/_react["default"].createElement(_componentNoDataPage["default"], null);
+    }
+
     return /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
       accordion: true,
       defaultExpandedKeys: ['资源图片'],
       style: {
-        border: 'none',
-        minWidth: '300px'
+        border: 'none'
       },
       fullheight: true,
       noContentPadding: true
@@ -164,6 +170,9 @@ function ImagePanel(props) {
       width: '100%'
     }
   })), /*#__PURE__*/_react["default"].createElement(_box["default"], {
-    flex: 1
+    flex: 1,
+    style: {
+      minWidth: '300px'
+    }
   }, renderImageContent()));
 }

package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js

@@ -53,14 +53,14 @@ function EdgeColorButton(props) {
     });
   };
 
-  var getCustomLines = function getCustomLines(list) {
+  var getLines = function getLines(list) {
     return list.filter(_edgeUtil.isCustomEdge);
   };
 
   (0, _react.useEffect)(function () {
     if (graphLoaded) {
       var edges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
-      var list = getCustomLines(edges);
+      var list = getLines(edges);
       setLineWidth(1); // eslint-disable-next-line eqeqeq
 
       if (selection.length == 1 && list.length === 1) {

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js

@@ -48,11 +48,20 @@ var LINE_TYPE_OPTIONS = [{
   value: 'doublearc',
   label: '双弧线',
   icon: 'topo_linear_icon_arcline'
-}, {
-  value: 'points',
-  label: '自由线形',
-  icon: 'topo_linear_icon_pointsline'
-}];
+} // {
+//   value: 'points',
+//   label: '自由线形',
+//   icon: 'topo_linear_icon_pointsline',
+// },
+];
+
+if (localStorage.getItem('topo.test.edge.customType') === 'true') {
+  LINE_TYPE_OPTIONS.push({
+    value: 'points',
+    label: '自由线形',
+    icon: 'topo_linear_icon_pointsline'
+  });
+}
 
 var LineType = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   var value = props.value,

package/lib/core/editor/components/Toolbar/widgets/FontFamilyWidget.js

@@ -7,9 +7,9 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _FontFamilySelect = _interopRequireDefault(require("./components/FontFamilySelect"));
+var _DropdownMenu = _interopRequireDefault(require("./components/DropdownMenu"));
 
-var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter"));
+var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter.js"));
 
 var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
 
@@ -17,6 +17,31 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function FontFamilySelect(props) {
+  var value = props.value,
+      onChange = props.onChange;
+  var items = ['宋体', '微软雅黑', '黑体', 'Arial'];
+  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
+    value: (items.includes(value) ? value : null) || '',
+    valueRender: function valueRender(val) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          width: 48
+        }
+      }, val || '微软雅黑');
+    },
+    onSelect: onChange
+  }, items.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
+      key: item
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      style: {
+        fontFamily: item
+      }
+    }, item));
+  }));
+}
+
 function FontFamilyWidget(props) {
   var topo = props.topo,
       showLabel = props.showLabel,
@@ -26,7 +51,7 @@ function FontFamilyWidget(props) {
     label: "\u5B57\u4F53",
     tooltip: "\u5B57\u4F53",
     showLabel: showLabel
-  }, /*#__PURE__*/_react["default"].createElement(_FontFamilySelect["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(FontFamilySelect, {
     value: style.fontFamily,
     onChange: function onChange(val) {
       topo.historyManager.beginTransaction();

package/lib/core/editor/components/Toolbar/widgets/FontSizeWidget.js

@@ -7,9 +7,9 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _FontSizeSelect = _interopRequireDefault(require("./components/FontSizeSelect"));
+var _DropdownMenu = _interopRequireDefault(require("./components/DropdownMenu"));
 
-var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter"));
+var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter.js"));
 
 var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
 
@@ -17,6 +17,31 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function FontSizeSelect(props) {
+  var value = props.value,
+      disabled = props.disabled,
+      onChange = props.onChange;
+  var items = [12, 14, 16, 18, 20, 24, 30, 36, 48, 60, 80];
+  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
+    value: "" + (value || ''),
+    valueRender: function valueRender(val) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          width: 18
+        }
+      }, val || 20);
+    },
+    disabled: disabled,
+    onSelect: function onSelect(val) {
+      return onChange(parseInt(val, 10));
+    }
+  }, items.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
+      key: item
+    }, item);
+  }));
+}
+
 function FontSizeWidget(props) {
   var topo = props.topo,
       showLabel = props.showLabel,
@@ -32,7 +57,7 @@ function FontSizeWidget(props) {
     tooltip: "\u5B57\u53F7",
     showLabel: showLabel,
     disabled: disabled
-  }, /*#__PURE__*/_react["default"].createElement(_FontSizeSelect["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(FontSizeSelect, {
     value: style.fontSize,
     disabled: disabled,
     onChange: function onChange(val) {

package/lib/core/editor/components/Toolbar/widgets/FontStyleButton.js

@@ -7,16 +7,39 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _FontStyleSelect = _interopRequireDefault(require("./components/FontStyleSelect"));
+var _variables = _interopRequireDefault(require("@alifd/theme-19926/variables.js"));
 
-var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter"));
+var _htElementUtils = require("../../../../../utils/htElementUtils");
+
+var _DropdownMenu = _interopRequireDefault(require("./components/DropdownMenu"));
+
+var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter.js"));
 
 var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
 
+var _Tooltip = _interopRequireDefault(require("../components/Tooltip"));
+
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+var items = [{
+  key: 'bold',
+  label: '加粗',
+  icon: 'bold',
+  tooltip: '加粗'
+}, {
+  key: 'italic',
+  label: '斜体',
+  icon: 'Italics',
+  tooltip: '斜体'
+}, {
+  key: 'underline',
+  label: '下划线',
+  icon: 'Underline',
+  tooltip: '下划线'
+}];
+
 function buildValue(obj) {
   return Object.keys(obj).filter(function (key) {
     return !!obj[key];
@@ -84,12 +107,39 @@ function FontStyleButton(props) {
     tooltip: "\u6587\u5B57\u6837\u5F0F\uFF08\u52A0\u7C97\u3001\u659C\u4F53\u3001\u4E0B\u5212\u7EBF\uFF09",
     disabled: disabled,
     showLabel: showLabel
-  }, /*#__PURE__*/_react["default"].createElement(_FontStyleSelect["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
     value: value,
+    valueRender: function valueRender() {
+      return /*#__PURE__*/_react["default"].createElement("img", {
+        src: "/img/topo/editor/toolbar/bold/" + (disabled ? 'Disable' : 'Normal') + ".svg",
+        alt: ""
+      });
+    },
+    multiple: true,
     disabled: disabled,
-    fieldDisabled: fieldDisabled,
-    onChange: handleSelect
-  }));
+    onSelect: handleSelect
+  }, items.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
+      key: item.key,
+      disabled: fieldDisabled[item.key]
+    }, /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
+      trigger: /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          display: 'flex',
+          alignItems: 'center'
+        }
+      }, /*#__PURE__*/_react["default"].createElement("img", {
+        src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
+        alt: ""
+      }), /*#__PURE__*/_react["default"].createElement("span", {
+        style: fieldDisabled[item.key] ? {} : {
+          color: _variables["default"]['$color-text1-4']
+        }
+      }, item.label)),
+      align: "r",
+      popupStyle: {}
+    }, item.tooltip));
+  })));
 }
 
 var _default = (0, _textStyleSettingRouter["default"])(FontStyleButton, {

package/lib/core/editor/utils/edgeTypeStyleUtil.js

@@ -3,6 +3,7 @@
 exports.__esModule = true;
 exports.getEdgesBySelection = getEdgesBySelection;
 exports.isNodeAllEdges = isNodeAllEdges;
+exports.loopEdgesAndChildren = loopEdgesAndChildren;
 exports.setEdgesType = setEdgesType;
 exports.updateEdgesData = updateEdgesData;
 
@@ -24,14 +25,6 @@ function getEdgesBySelection(topo) {
     return nodeIds;
   };
 
-  function getVisibleEdgesInNodes(gv, nodes) {
-    var nodeIds = getChildrenNodeIds(nodes);
-    var dm = gv.getDataModel();
-    return (0, _htElementUtils.getEdges)(dm).filter(function (edge) {
-      return nodeIds.includes(edge.getSource().getId()) && nodeIds.includes(edge.getTarget().getId());
-    }).filter(_htElementUtils.isEdgeVisible);
-  }
-
   var getSelectedEdges = function getSelectedEdges(gv) {
     var selection = gv.getSelectionModel().getSelection().toArray(); // 选中的连线
 
@@ -42,8 +35,14 @@ function getEdgesBySelection(topo) {
     var nodes = selection.filter(function (element) {
       return element instanceof ht.Node;
     });
-    getVisibleEdgesInNodes(gv, nodes).forEach(function (edge) {
-      if (!edges.find(function (item) {
+    var nodeIds = getChildrenNodeIds(nodes);
+    var dm = gv.getDataModel();
+    (0, _htElementUtils.getEdges)(dm).forEach(function (edge) {
+      if (nodeIds.find(function (nodeId) {
+        return nodeId === edge.getSource().getId();
+      }) && nodeIds.find(function (nodeId) {
+        return nodeId === edge.getTarget().getId();
+      }) && !edges.find(function (item) {
         return item === edge;
       })) {
         edges.push(edge);
@@ -90,6 +89,30 @@ function isNodeAllEdges(topo) {
   });
   return inEdges;
 }
+/**
+ * 遍历连线及子连线
+ * @param {*} topo 
+ * @param {*} edges 
+ * @param {*} operateEdgeFn 
+ */
+
+
+function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
+  var htTopo = topo.getHtTopo();
+  edges.forEach(function (edge) {
+    operateEdgeFn(edge);
+
+    if (edge.isEdgeGroupAgent()) {
+      // 连线组折叠时同时设置子连线
+      var edgeChildren = edge.getEdgeGroup().getEdges().toArray();
+      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), true);
+      edgeChildren.forEach(function (edgeChild) {
+        operateEdgeFn(edgeChild);
+      });
+      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), false);
+    }
+  });
+}
 /**
  * 设置连线及子连线。带回退事务控制
  * @param {*} topo 

package/lib/core/hooks/useTopoEdit.js

@@ -127,6 +127,10 @@ var useTopoEdit = function useTopoEdit(params) {
             return topoDispatchers.setTopoType(_template.TPL_TREE);
 
           case 7:
+            // 更新配置
+            // resourceConfig.updateConfig(config);
+            // 更新配置对应的资源、链路
+            // editDispatchers.fetchDataByConfig();
             topo.historyManager.endTransaction();
 
           case 8:

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.1.0-dev.9" === 'string' ? "12.1.0-dev.9" : null;
+var version = typeof "13.0.0-dev.1" === 'string' ? "13.0.0-dev.1" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -218,29 +218,37 @@ var Topo = /*#__PURE__*/function () {
 
   _proto.getData = function getData() {
     return {
-      groups: (0, _htElementUtils.getGroupDatas)(this.getDataModel()),
-      nodes: (0, _htElementUtils.getNodes)(this.getDataModel()).filter(function (node) {
-        return !!node.getTag();
-      }).map(_htElementUtils.getNodeData),
+      groups: this.getGroups(),
+      nodes: this.getNodes(),
+      lines: this.getLines(),
       customNodes: (0, _htElementUtils.getNodeDatas)(this.getDataModel()).filter(function (item) {
         return !item.id;
       }),
-      lines: (0, _htElementUtils.getEdgeDatas)(this.getDataModel()).filter(function (item) {
-        return !!item.id;
-      }),
-      customLines: (0, _htElementUtils.getEdgeDatas)(this.getDataModel()).filter(function (item) {
+      customLines: this.getEdges().filter(function (item) {
         return !item.id;
       })
     };
-  }
-  /**
-   * @deprecated 待移除。uicbb有使用
-   * @returns 
-   */
-  ;
+  };
+
+  _proto.getGroups = function getGroups() {
+    return (0, _htElementUtils.getGroupDatas)(this.getDataModel());
+  };
+
+  _proto.getNodes = function getNodes() {
+    var nodes = (0, _htElementUtils.getNodes)(this.getDataModel()).filter(function (node) {
+      return !!node.getTag();
+    });
+    return nodes.map(_htElementUtils.getNodeData);
+  };
 
   _proto.getLines = function getLines() {
-    return this.getData().lines;
+    return this.getEdges().filter(function (item) {
+      return !!item.id;
+    });
+  };
+
+  _proto.getEdges = function getEdges() {
+    return (0, _htElementUtils.getEdgeDatas)(this.getDataModel());
   }
   /**
    * 全量更新数据
@@ -299,19 +307,18 @@ var Topo = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _addElements = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(elements) {
-      var prevData, data;
+      var data;
       return _regenerator["default"].wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            prevData = this.getData();
             data = {
-              groups: [].concat(prevData.groups, elements.groups || []),
-              nodes: [].concat(prevData.nodes, elements.nodes || []),
-              lines: [].concat(prevData.lines, elements.lines || [])
+              groups: [].concat(this.getGroups(), elements.groups || []),
+              nodes: [].concat(this.getNodes(), elements.nodes || []),
+              lines: [].concat(this.getLines(), elements.lines || [])
             };
             this.updateElements(data); // TODO 更新store，触发属性、指标模型加载，更新指标
 
-          case 3:
+          case 2:
           case "end":
             return _context5.stop();
         }

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

@@ -6,7 +6,6 @@ exports.__esModule = true;
 exports.buildTopoLinkData = buildTopoLinkData;
 exports.compatibleWith = void 0;
 exports.getLinksDetail = getLinksDetail;
-exports.isAggLink = isAggLink;
 exports.isCrucialLink = isCrucialLink;
 exports.isExitLink = isExitLink;
 exports.mergeExportLinkData = void 0;
@@ -23,6 +22,8 @@ var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
+var _services = require("../../services");
+
 var _htElementUtils = require("../../../utils/htElementUtils");
 
 var _CiTypeCache = _interopRequireDefault(require("../cache/CiTypeCache"));
@@ -55,21 +56,7 @@ function isCrucialLink(link) {
 
 
 function isExitLink(link) {
-  var _link$attributes;
-
-  return (link === null || link === void 0 ? void 0 : (_link$attributes = link.attributes) === null || _link$attributes === void 0 ? void 0 : _link$attributes.destination_type) === "ip";
-}
-/**
- * 是否聚合链路
- * @param {*} link 
- * @returns 
- */
-
-
-function isAggLink(link) {
-  var _link$attributes2, _link$attributes3;
-
-  return (link === null || link === void 0 ? void 0 : (_link$attributes2 = link.attributes) === null || _link$attributes2 === void 0 ? void 0 : _link$attributes2.destination_type) === "network.agg_interface" && (link === null || link === void 0 ? void 0 : (_link$attributes3 = link.attributes) === null || _link$attributes3 === void 0 ? void 0 : _link$attributes3.source_type) === "network.agg_interface";
+  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes["destination_id"]);
 }
 
 function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc) {
@@ -120,7 +107,7 @@ function _getLinksDetail() {
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (links !== null && links !== void 0 && links.length) {
+          if (!(!links || !links.length)) {
             _context.next = 2;
             break;
           }
@@ -128,6 +115,9 @@ function _getLinksDetail() {
           return _context.abrupt("return", []);
 
         case 2:
+          // const linkCis = await topoService.relation.batchQueryRelation(
+          //   links.map((link) => link.id)
+          // );
           linkCis = links;
           interfaceIds = [].concat(linkCis.map(function (item) {
             return item.attributes.source_id;
@@ -186,8 +176,7 @@ var plurals = {
   2: ["phy"],
   3: ["agg"],
   4: ["phy", "agg"]
-}; // 待办：移到网络拓扑组件
-
+};
 exports.plurals = plurals;
 
 var showLinkByConfig = function showLinkByConfig(props) {
@@ -201,29 +190,31 @@ var showLinkByConfig = function showLinkByConfig(props) {
 
   var gv = topo.getGraphView();
   var dm = gv.getDataModel();
-  var edges = (0, _htElementUtils.getEdges)(dm).filter(function (edge) {
-    return !(0, _htElementUtils.isEdgeGroup)(edge);
-  }); // console.log("edges", edges);
+  var edges = (0, _htElementUtils.getEdges)(dm); // console.log("edges", edges);
 
   var showPhy = types.indexOf("phy") >= 0;
   var showAgg = types.indexOf("agg") >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
 
-  edges.forEach(function (edge) {
-    if (showType === 1 || showType === true) {
-      // 单链路全部显示
-      // console.log("单链路全部显示", edge);
-      edge.s("x.visible", true);
-    } else {
-      var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
-
-      if (isAggLink(d)) {
-        edge.s("x.visible", showAgg);
+  if (Array.isArray(edges) && edges.length > 0) {
+    edges.forEach(function (edge) {
+      if (showType === 1 || showType === true) {
+        // 单链路全部显示
+        // console.log("单链路全部显示", edge);
+        edge.s("2d.visible", true);
       } else {
-        // console.log("edge", edge, d, showAgg);
-        edge.s("x.visible", showPhy);
+        var _d$attributes, _d$attributes2;
+
+        var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
+
+        if ((d === null || d === void 0 ? void 0 : (_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === "network.agg_interface" && (d === null || d === void 0 ? void 0 : (_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === "network.agg_interface") {
+          edge.s("2d.visible", showAgg);
+        } else {
+          // console.log("edge", edge, d, showAgg);
+          edge.s("2d.visible", showPhy);
+        }
       }
-    }
-  });
+    });
+  }
 };
 
 exports.showLinkByConfig = showLinkByConfig;

package/lib/core/utils/edgeUtil.js

@@ -10,14 +10,12 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _linkUtils = require("../models/utils/linkUtils");
 
-var _htElementUtils = require("../../utils/htElementUtils");
-
 /**
  * 是否手工连线
  * @param {*} edge 
  */
 function isCustomEdge(edge) {
-  return !(0, _htElementUtils.isEdgeGroup)(edge) && (edge.a('type') == 'line' || !edge.a('type'));
+  return !edge.isEdgeGroupAgent() && (edge.a('type') == 'line' || !edge.a('type'));
 }
 /**
  * 根据配置更新连线展开折叠状态