@riil-frontend/component-topology 5.0.9 → 5.0.11

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

@@ -74,7 +74,7 @@ function DisplaySetting(props, ref) {
     name: "alarmListDefaultOpen",
     trueText: "\u9ED8\u8BA4\u5C55\u5F00",
     falseText: "\u9ED8\u8BA4\u6536\u8D77",
-    trueOptionDisabled: !field.getValue('alarmSwitch')
+    trueOptionDisabled: !field.getValue("alarmSwitch")
   })), /*#__PURE__*/React.createElement(_Form.Item, {
     label: /*#__PURE__*/React.createElement(Label, {
       label: "\u8D44\u6E90\u6807\u6CE8",
@@ -90,7 +90,7 @@ function DisplaySetting(props, ref) {
     }),
     patternTrigger: "onChange"
   }, linkTagConfig({
-    name: 'linkTag',
+    name: "linkTag",
     topo: topo
   })), /*#__PURE__*/React.createElement(_Form.Item, {
     label: /*#__PURE__*/React.createElement(Label, {
@@ -108,19 +108,20 @@ function DisplaySetting(props, ref) {
     }),
     patternTrigger: "onChange"
   }, linkTipConfig({
-    name: 'linkTip',
+    name: "linkTip",
     topo: topo
   })), showEdgeExpandConfig && /*#__PURE__*/React.createElement(_Form.Item, {
     label: /*#__PURE__*/React.createElement(LineExpandAllRadioGroup.Label, null),
     patternTrigger: "onChange"
   }, /*#__PURE__*/React.createElement(LineExpandAllRadioGroup, {
-    name: "expandAllEdges"
+    name: "expandAllEdges",
+    isNetworkTopo: isNetworkTopo
   })), showLinkConfig && /*#__PURE__*/React.createElement(_Form.Item, {
     label: "\u94FE\u8DEF\u52A8\u6001\u6548\u679C",
     patternTrigger: "onChange"
   }, /*#__PURE__*/React.createElement(EdgeFlow, {
     name: "edgeFlow"
-  })), showLinkConfig && field.getValue('edgeFlow') && /*#__PURE__*/React.createElement(_Form.Item, {
+  })), showLinkConfig && field.getValue("edgeFlow") && /*#__PURE__*/React.createElement(_Form.Item, {
     label: "\u94FE\u8DEF\u6D41\u5411",
     patternTrigger: "onChange"
   }, /*#__PURE__*/React.createElement(EdgeFlowDirection, {

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

@@ -1,25 +1,95 @@
 import _Balloon from "@alifd/next/es/balloon";
 import _Icon from "@alifd/next/es/icon";
+import _Checkbox from "@alifd/next/es/checkbox";
 import _Box from "@alifd/next/es/box";
 import _Radio from "@alifd/next/es/radio";
-import React from 'react';
+import React, { useEffect, useState, useRef } from 'react';
+import styles from "./ResourceDisplay/CommonCheckboxGroup.module.scss";
+import { plurals } from "../../models/utils/linkUtils";
 var LineExpandAllRadioGroup = /*#__PURE__*/React.forwardRef(function LineExpandAllRadioGroup(props, ref) {
+  var _plurals;
+
   var value = props.value,
-      onChange = props.onChange;
+      onChange = props.onChange,
+      isEdit = props.isEdit,
+      isNetworkTopo = props.isNetworkTopo;
+
+  var _useState = useState(value === 1 ? "0" : "1"),
+      showType = _useState[0],
+      setShowType = _useState[1];
+
+  var _useState2 = useState((_plurals = plurals[value !== null && value !== void 0 ? value : 2]) !== null && _plurals !== void 0 ? _plurals : []),
+      pluralType = _useState2[0],
+      setPluralType = _useState2[1];
 
   var handleTypeChange = function handleTypeChange(newValue) {
-    onChange(newValue === '1');
+    setShowType(newValue);
+
+    if (newValue === "1") {
+      setPluralType(["phy"]);
+      onChange(creatTypeValue(["phy"]));
+    } else {
+      onChange(creatTypeValue(newValue));
+    }
   };
 
-  return /*#__PURE__*/React.createElement(_Radio.Group, {
+  var handleShowTypeChange = function handleShowTypeChange(newValue) {
+    onChange(creatTypeValue(newValue));
+    console.log("handleShowTypeChange", newValue);
+    setPluralType(newValue);
+  };
+  /**
+   *
+   * @param {v} newValue
+   * @returns 0:都不显示，1:单链路，2：物理链路，3：聚合链路，4：物理&聚合链路
+   */
+
+
+  var creatTypeValue = function creatTypeValue(newValue) {
+    var v = 1;
+
+    if (Array.isArray(newValue)) {
+      if (newValue.length > 1) {
+        v = 4;
+      }
+
+      if (newValue.length === 1) {
+        v = newValue[0] === "phy" ? 2 : 3;
+      }
+
+      if (newValue.length === 0) {
+        v = 0;
+      }
+    }
+
+    return v;
+  };
+
+  return /*#__PURE__*/React.createElement(_Box, {
+    direction: "column"
+  }, /*#__PURE__*/React.createElement(_Box, {
+    flex: 1
+  }, /*#__PURE__*/React.createElement(_Radio.Group, {
     ref: ref,
-    value: value === false ? '0' : '1',
+    value: showType,
     onChange: handleTypeChange
   }, /*#__PURE__*/React.createElement(_Radio, {
     value: "0"
   }, "\u5355\u94FE\u8DEF"), /*#__PURE__*/React.createElement(_Radio, {
     value: "1"
-  }, "\u591A\u94FE\u8DEF"));
+  }, "\u591A\u94FE\u8DEF"))), !isEdit && showType === "1" ? /*#__PURE__*/React.createElement("div", {
+    className: styles.contaienr
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.checkboxGroupWrapper
+  }, /*#__PURE__*/React.createElement(_Checkbox.Group, {
+    value: pluralType,
+    itemDirection: "hoz",
+    onChange: handleShowTypeChange
+  }, /*#__PURE__*/React.createElement(_Checkbox, {
+    value: "phy"
+  }, "\u7269\u7406\u94FE\u8DEF"), /*#__PURE__*/React.createElement(_Checkbox, {
+    value: "agg"
+  }, "\u805A\u5408\u94FE\u8DEF")))) : "");
 });
 
 function Label(props) {

package/es/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import LineExpandAllRadioGroup from "../../../../../components/DisplaySettingDrawer/LineExpandAllRadioGroup";
+import { showLinkByConfig } from "../../../../../models/utils/linkUtils";
 /**
  * 全局切换连线组展开折叠
  * 
@@ -17,9 +18,17 @@ function GlobalEdgeToggle(props) {
   var handleChange = function handleChange(expanded) {
     topo.historyManager.beginTransaction();
 
-    if (expanded) {
+    if (expanded !== 1) {
+      showLinkByConfig({
+        topo: topo,
+        showType: 4
+      });
       topo.getHtTopo().expandAllEdgeGroups();
     } else {
+      showLinkByConfig({
+        topo: topo,
+        showType: 1
+      });
       topo.getHtTopo().collapseAllEdgeGroups();
     }
 
@@ -36,6 +45,7 @@ function GlobalEdgeToggle(props) {
 
   return /*#__PURE__*/React.createElement(LineExpandAllRadioGroup, {
     value: expandAllEdges,
+    isEdit: true,
     onChange: handleChange
   });
 }

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

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

@@ -4,7 +4,9 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from "@riil-frontend/component-topology-common/es/services/topo";
 import keyBy from "lodash/keyBy";
 import _ from "lodash";
-import { queryCisByIds, queryModelAsset } from "../../services"; // const interfaceTypeMap = {
+import { queryCisByIds, queryModelAsset } from "../../services"; // 查询所有连线
+
+import { getEdges } from "../../../utils/htElementUtils"; // const interfaceTypeMap = {
 //   "network.interface": {
 //     displayName: "网络接口",
 //   },
@@ -172,4 +174,54 @@ function _getLinksDetail() {
   return _getLinksDetail.apply(this, arguments);
 }
 
-export function buildTopoLinkData() {}
+export function buildTopoLinkData() {}
+/**
+ * 链路显示模式
+ */
+
+export var plurals = {
+  0: [],
+  1: [],
+  2: ["phy"],
+  3: ["agg"],
+  4: ["phy", "agg"]
+};
+export var showLinkByConfig = function showLinkByConfig(props) {
+  var _plurals$showType;
+
+  var topo = props.topo,
+      _props$showType = props.showType,
+      showType = _props$showType === void 0 ? 2 : _props$showType;
+  console.log("showLinkByConfig-----------------------------", props, showType); //const displayConfig = topo.store.getModelState("displayConfig");
+
+  var types = (_plurals$showType = plurals[showType]) !== null && _plurals$showType !== void 0 ? _plurals$showType : []; // 查询所有连线
+
+  var gv = topo.getGraphView();
+  var dm = gv.getDataModel();
+  var edges = 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);
+
+  if (Array.isArray(edges) && edges.length > 0) {
+    edges.map(function (edge) {
+      if (showType === 1 || showType === true) {
+        // 单链路全部显示
+        console.log("单链路全部显示", edge);
+        edge.s("2d.visible", true);
+      } else {
+        var _d$attributes, _d$attributes2;
+
+        var d = topo.dataModel.getDataById(edge.getTag());
+        console.log("edge", edge, d); // 判断是否聚合链路
+
+        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 {
+          edge.s("2d.visible", showPhy);
+        }
+      }
+    });
+  }
+};

package/es/core/utils/edgeUtil.js

@@ -1,26 +1,40 @@
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import { showLinkByConfig } from "../models/utils/linkUtils";
 /**
  * 根据配置更新连线展开折叠状态
- * 
- * @param {*} topo 
+ *
+ * @param {*} topo
  */
 
 export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
+  var _topo$store$getModelS = topo.store.getModelState("topoMod"),
+      viewState = _topo$store$getModelS.viewState;
+
+  var isEditMode = viewState === "edit";
   var htTopo = topo.getHtTopo();
 
   if (!htTopo) {
     return;
   }
 
-  var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
-      expandAllEdges = _topo$store$getModelS.expandAllEdges;
+  var _topo$store$getModelS2 = topo.store.getModelState("displayConfig"),
+      expandAllEdges = _topo$store$getModelS2.expandAllEdges; // console.log("expandAllEdges----------", expandAllEdges);
+
 
-  if (expandAllEdges === false) {
+  if (expandAllEdges === 1) {
+    showLinkByConfig({
+      topo: topo,
+      showType: 1
+    });
     htTopo.collapseAllEdgeGroups();
-    rlog.debug('updateEdgeExpanded 折叠');
+    rlog.debug("updateEdgeExpanded 折叠");
   } else {
+    showLinkByConfig({
+      topo: topo,
+      showType: isEditMode ? 4 : expandAllEdges
+    });
     htTopo.expandAllEdgeGroups();
-    rlog.debug('updateEdgeExpanded 展开');
+    rlog.debug("updateEdgeExpanded 展开");
   }
 
   if (topo.linkDynamicStyleExecutor) {

package/es/networkTopo/components/TopoView.js

@@ -18,6 +18,7 @@ import useEdgeFlow from "../hooks/viewer/useEdgeFlow";
 import LinkTip from "../../core/components/DisplaySettingDrawer/LinkTip";
 import LinkTagV2 from "./viewer/displaySetting/LinkTagV2";
 import useEdgeExpand from "../hooks/useEdgeExpand";
+import { showLinkByConfig } from "../../core/models/utils/linkUtils";
 /**
  * 拓扑组件。变化无权限、无数据显示
  */
@@ -57,7 +58,12 @@ function NetworkTopologyCore(props) {
             switch (_context.prev = _context.next) {
               case 0:
                 // 单多链路切换
-                if (config.expandAllEdges !== false) {
+                showLinkByConfig({
+                  topo: topo,
+                  showType: config.expandAllEdges
+                });
+
+                if (config.expandAllEdges !== 1) {
                   topo.getHtTopo().expandAllEdgeGroups();
                 } else {
                   topo.getHtTopo().collapseAllEdgeGroups();
@@ -68,7 +74,7 @@ function NetworkTopologyCore(props) {
                   topo.linkDynamicStyleExecutor.execute();
                 }
 
-              case 2:
+              case 3:
               case "end":
                 return _context.stop();
             }

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

@@ -97,7 +97,7 @@ function DisplaySetting(props, ref) {
     name: "alarmListDefaultOpen",
     trueText: "\u9ED8\u8BA4\u5C55\u5F00",
     falseText: "\u9ED8\u8BA4\u6536\u8D77",
-    trueOptionDisabled: !field.getValue('alarmSwitch')
+    trueOptionDisabled: !field.getValue("alarmSwitch")
   })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: /*#__PURE__*/_react["default"].createElement(Label, {
       label: "\u8D44\u6E90\u6807\u6CE8",
@@ -113,7 +113,7 @@ function DisplaySetting(props, ref) {
     }),
     patternTrigger: "onChange"
   }, linkTagConfig({
-    name: 'linkTag',
+    name: "linkTag",
     topo: topo
   })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: /*#__PURE__*/_react["default"].createElement(Label, {
@@ -131,19 +131,20 @@ function DisplaySetting(props, ref) {
     }),
     patternTrigger: "onChange"
   }, linkTipConfig({
-    name: 'linkTip',
+    name: "linkTip",
     topo: topo
   })), showEdgeExpandConfig && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: /*#__PURE__*/_react["default"].createElement(_LineExpandAllRadioGroup["default"].Label, null),
     patternTrigger: "onChange"
   }, /*#__PURE__*/_react["default"].createElement(_LineExpandAllRadioGroup["default"], {
-    name: "expandAllEdges"
+    name: "expandAllEdges",
+    isNetworkTopo: isNetworkTopo
   })), showLinkConfig && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u94FE\u8DEF\u52A8\u6001\u6548\u679C",
     patternTrigger: "onChange"
   }, /*#__PURE__*/_react["default"].createElement(_EdgeFlow["default"], {
     name: "edgeFlow"
-  })), showLinkConfig && field.getValue('edgeFlow') && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+  })), showLinkConfig && field.getValue("edgeFlow") && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u94FE\u8DEF\u6D41\u5411",
     patternTrigger: "onChange"
   }, /*#__PURE__*/_react["default"].createElement(_EdgeFlowDirection["default"], {

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

@@ -9,29 +9,106 @@ var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
 
 var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
 
+var _checkbox = _interopRequireDefault(require("@alifd/next/lib/checkbox"));
+
 var _box = _interopRequireDefault(require("@alifd/next/lib/box"));
 
 var _radio = _interopRequireDefault(require("@alifd/next/lib/radio"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+
+var _CommonCheckboxGroupModule = _interopRequireDefault(require("./ResourceDisplay/CommonCheckboxGroup.module.scss"));
+
+var _linkUtils = require("../../models/utils/linkUtils");
+
+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 LineExpandAllRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function LineExpandAllRadioGroup(props, ref) {
+  var _plurals;
+
   var value = props.value,
-      onChange = props.onChange;
+      onChange = props.onChange,
+      isEdit = props.isEdit,
+      isNetworkTopo = props.isNetworkTopo;
+
+  var _useState = (0, _react.useState)(value === 1 ? "0" : "1"),
+      showType = _useState[0],
+      setShowType = _useState[1];
+
+  var _useState2 = (0, _react.useState)((_plurals = _linkUtils.plurals[value !== null && value !== void 0 ? value : 2]) !== null && _plurals !== void 0 ? _plurals : []),
+      pluralType = _useState2[0],
+      setPluralType = _useState2[1];
 
   var handleTypeChange = function handleTypeChange(newValue) {
-    onChange(newValue === '1');
+    setShowType(newValue);
+
+    if (newValue === "1") {
+      setPluralType(["phy"]);
+      onChange(creatTypeValue(["phy"]));
+    } else {
+      onChange(creatTypeValue(newValue));
+    }
+  };
+
+  var handleShowTypeChange = function handleShowTypeChange(newValue) {
+    onChange(creatTypeValue(newValue));
+    console.log("handleShowTypeChange", newValue);
+    setPluralType(newValue);
   };
+  /**
+   *
+   * @param {v} newValue
+   * @returns 0:都不显示，1:单链路，2：物理链路，3：聚合链路，4：物理&聚合链路
+   */
 
-  return /*#__PURE__*/_react["default"].createElement(_radio["default"].Group, {
+
+  var creatTypeValue = function creatTypeValue(newValue) {
+    var v = 1;
+
+    if (Array.isArray(newValue)) {
+      if (newValue.length > 1) {
+        v = 4;
+      }
+
+      if (newValue.length === 1) {
+        v = newValue[0] === "phy" ? 2 : 3;
+      }
+
+      if (newValue.length === 0) {
+        v = 0;
+      }
+    }
+
+    return v;
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_box["default"], {
+    direction: "column"
+  }, /*#__PURE__*/_react["default"].createElement(_box["default"], {
+    flex: 1
+  }, /*#__PURE__*/_react["default"].createElement(_radio["default"].Group, {
     ref: ref,
-    value: value === false ? '0' : '1',
+    value: showType,
     onChange: handleTypeChange
   }, /*#__PURE__*/_react["default"].createElement(_radio["default"], {
     value: "0"
   }, "\u5355\u94FE\u8DEF"), /*#__PURE__*/_react["default"].createElement(_radio["default"], {
     value: "1"
-  }, "\u591A\u94FE\u8DEF"));
+  }, "\u591A\u94FE\u8DEF"))), !isEdit && showType === "1" ? /*#__PURE__*/_react["default"].createElement("div", {
+    className: _CommonCheckboxGroupModule["default"].contaienr
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: _CommonCheckboxGroupModule["default"].checkboxGroupWrapper
+  }, /*#__PURE__*/_react["default"].createElement(_checkbox["default"].Group, {
+    value: pluralType,
+    itemDirection: "hoz",
+    onChange: handleShowTypeChange
+  }, /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+    value: "phy"
+  }, "\u7269\u7406\u94FE\u8DEF"), /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+    value: "agg"
+  }, "\u805A\u5408\u94FE\u8DEF")))) : "");
 });
 
 function Label(props) {

package/lib/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _LineExpandAllRadioGroup = _interopRequireDefault(require("../../../../../components/DisplaySettingDrawer/LineExpandAllRadioGroup"));
 
+var _linkUtils = require("../../../../../models/utils/linkUtils");
+
 /**
  * 全局切换连线组展开折叠
  * 
@@ -25,9 +27,17 @@ function GlobalEdgeToggle(props) {
   var handleChange = function handleChange(expanded) {
     topo.historyManager.beginTransaction();
 
-    if (expanded) {
+    if (expanded !== 1) {
+      (0, _linkUtils.showLinkByConfig)({
+        topo: topo,
+        showType: 4
+      });
       topo.getHtTopo().expandAllEdgeGroups();
     } else {
+      (0, _linkUtils.showLinkByConfig)({
+        topo: topo,
+        showType: 1
+      });
       topo.getHtTopo().collapseAllEdgeGroups();
     }
 
@@ -44,6 +54,7 @@ function GlobalEdgeToggle(props) {
 
   return /*#__PURE__*/_react["default"].createElement(_LineExpandAllRadioGroup["default"], {
     value: expandAllEdges,
+    isEdit: true,
     onChange: handleChange
   });
 }

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

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

@@ -10,6 +10,7 @@ exports.isAggLink = isAggLink;
 exports.isCrucialLink = isCrucialLink;
 exports.isExitLink = isExitLink;
 exports.mergeLinksData = mergeLinksData;
+exports.showLinkByConfig = exports.plurals = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -25,6 +26,9 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _services = require("../../services");
 
+var _htElementUtils = require("../../../utils/htElementUtils");
+
+// 查询所有连线
 // const interfaceTypeMap = {
 //   "network.interface": {
 //     displayName: "网络接口",
@@ -197,4 +201,59 @@ 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) {
+  var _plurals$showType;
+
+  var topo = props.topo,
+      _props$showType = props.showType,
+      showType = _props$showType === void 0 ? 2 : _props$showType;
+  console.log("showLinkByConfig-----------------------------", props, showType); //const displayConfig = topo.store.getModelState("displayConfig");
+
+  var types = (_plurals$showType = plurals[showType]) !== null && _plurals$showType !== void 0 ? _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;
+  console.log("edges----types", showType, types, showPhy, showAgg);
+
+  if (Array.isArray(edges) && edges.length > 0) {
+    edges.map(function (edge) {
+      if (showType === 1 || showType === true) {
+        // 单链路全部显示
+        console.log("单链路全部显示", edge);
+        edge.s("2d.visible", true);
+      } else {
+        var _d$attributes, _d$attributes2;
+
+        var d = topo.dataModel.getDataById(edge.getTag());
+        console.log("edge", edge, d); // 判断是否聚合链路
+
+        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 {
+          edge.s("2d.visible", showPhy);
+        }
+      }
+    });
+  }
+};
+
+exports.showLinkByConfig = showLinkByConfig;

package/lib/core/utils/edgeUtil.js

@@ -7,29 +7,44 @@ exports.updateEdgeExpanded = void 0;
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _linkUtils = require("../models/utils/linkUtils");
+
 /**
  * 根据配置更新连线展开折叠状态
- * 
- * @param {*} topo 
+ *
+ * @param {*} topo
  */
 var updateEdgeExpanded = function updateEdgeExpanded(topo) {
+  var _topo$store$getModelS = topo.store.getModelState("topoMod"),
+      viewState = _topo$store$getModelS.viewState;
+
+  var isEditMode = viewState === "edit";
   var htTopo = topo.getHtTopo();
 
   if (!htTopo) {
     return;
   }
 
-  var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
-      expandAllEdges = _topo$store$getModelS.expandAllEdges;
+  var _topo$store$getModelS2 = topo.store.getModelState("displayConfig"),
+      expandAllEdges = _topo$store$getModelS2.expandAllEdges; // console.log("expandAllEdges----------", expandAllEdges);
+
 
-  if (expandAllEdges === false) {
+  if (expandAllEdges === 1) {
+    (0, _linkUtils.showLinkByConfig)({
+      topo: topo,
+      showType: 1
+    });
     htTopo.collapseAllEdgeGroups();
 
-    _rlog["default"].debug('updateEdgeExpanded 折叠');
+    _rlog["default"].debug("updateEdgeExpanded 折叠");
   } else {
+    (0, _linkUtils.showLinkByConfig)({
+      topo: topo,
+      showType: isEditMode ? 4 : expandAllEdges
+    });
     htTopo.expandAllEdgeGroups();
 
-    _rlog["default"].debug('updateEdgeExpanded 展开');
+    _rlog["default"].debug("updateEdgeExpanded 展开");
   }
 
   if (topo.linkDynamicStyleExecutor) {