@riil-frontend/component-topology 4.0.19 → 4.0.21

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

@@ -1,25 +1,96 @@
 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$value;
+
   var value = props.value,
-      onChange = props.onChange;
+      onChange = props.onChange,
+      isNetworkTopo = props.isNetworkTopo;
+  console.log("LineExpandAllRadioGroup", value);
+
+  var _useState = useState(value === 1 ? "0" : "1"),
+      showType = _useState[0],
+      setShowType = _useState[1];
+
+  var _useState2 = useState((_plurals$value = plurals[value]) !== null && _plurals$value !== void 0 ? _plurals$value : []),
+      pluralType = _useState2[0],
+      setPluralType = _useState2[1];
 
   var handleTypeChange = function handleTypeChange(newValue) {
-    onChange(newValue === '1');
+    console.log("handleTypeChange", newValue);
+    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 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"))), 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";
 /**
  * 全局切换连线组展开折叠
  * 
@@ -15,12 +16,18 @@ function GlobalEdgeToggle(props) {
       displayConfigDispatchers = _topo$store$useModel[1];
 
   var handleChange = function handleChange(expanded) {
-    if (expanded) {
+    console.log("handleChange---expanded-expandAllEdges", expanded, expandAllEdges);
+
+    if (expanded !== 1) {
       topo.getHtTopo().expandAllEdgeGroups();
     } else {
       topo.getHtTopo().collapseAllEdgeGroups();
     }
 
+    showLinkByConfig({
+      topo: topo,
+      showType: expanded
+    });
     displayConfigDispatchers.update({
       expandAllEdges: expanded
     }); // 临时放这里，仅拓扑中心有

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.19" === 'string' ? "4.0.19" : null;
+var version = typeof "4.0.21" === 'string' ? "4.0.21" : 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: "网络接口",
 //   },
@@ -137,7 +139,7 @@ function _getLinksDetail() {
             interfaceCis = _context2.sent;
             _context2.next = 13;
             return getInterfaceObject(interfaceTypes.filter(function (item) {
-              return item !== 'ip';
+              return item !== "ip";
             }));
 
           case 13:
@@ -154,4 +156,55 @@ 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) {
+  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 = 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);
+          }
+        }
+      }
+    });
+  }
+};

package/es/core/utils/edgeUtil.js

@@ -1,4 +1,5 @@
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import { showLinkByConfig } from "../models/utils/linkUtils";
 /**
  * 根据配置更新连线展开折叠状态
  * 
@@ -15,7 +16,9 @@ export 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.debug('updateEdgeExpanded 折叠');
   } else {
@@ -23,6 +26,11 @@ export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
     rlog.debug('updateEdgeExpanded 展开');
   }
 
+  showLinkByConfig({
+    topo: topo,
+    showType: expandAllEdges
+  });
+
   if (topo.linkDynamicStyleExecutor) {
     topo.linkDynamicStyleExecutor.execute();
   }

package/es/core/viewer/components/plugins/ResourceDetail/components/ClusterMemberTable.js

@@ -16,7 +16,7 @@ export default function ClusterChildrenTable(props) {
       topo = props.topo;
   var datas = topo.dataModel.useDatas();
   var childrenIds = datas.filter(function (item) {
-    return item.ownerId === data.id;
+    return item.ownedCluster === data.id;
   }).map(function (item) {
     return item.id;
   });

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -73,7 +73,7 @@ export default function ResourceOverview(props) {
   var data = topo.dataModel.useDataById(id);
   var datas = topo.dataModel.useDatas();
   var childrenIds = datas.filter(function (item) {
-    return item.ownerId === data.id;
+    return item.ownedCluster === data.id;
   }).map(function (item) {
     return item.id;
   });

package/es/models/topoMod.js

@@ -439,10 +439,11 @@ export default function (topoApp) {
                     xxx = _yield$Promise$all[2];
                     rlog.debug("topoMod.initTopoData Ci属性指标元数据", ciTypeMap);
                     extraConfig = result.global.extraConfig;
-                    _context6.next = 49;
+                    rlog.debug("topoMod.initTopoData extraConfig", extraConfig);
+                    _context6.next = 50;
                     return dispatch.displayConfig.setConfig(extraConfig);
 
-                  case 49:
+                  case 50:
                     _combTopoData = combTopoData({
                       engine: topoApp,
                       data: result,
@@ -471,7 +472,7 @@ export default function (topoApp) {
                     rlog.info("topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ", endTime.diff(startTime, "seconds", true));
                     topoApp.options.onLoad();
 
-                  case 58:
+                  case 59:
                   case "end":
                     return _context6.stop();
                 }

package/es/topoCenter/components/TopoView.js

@@ -19,6 +19,7 @@ import ViewerTools from "./viewer/titlebar/ViewerTools";
 import useEdgeFlow from "../hooks/viewer/useEdgeFlow";
 import LinkTagV2 from "./viewer/displaySetting/LinkTagV2";
 import useEdgeExpand from "../hooks/useEdgeExpand";
+import { showLinkByConfig } from "../../core/models/utils/linkUtils";
 /**
  * 拓扑组件。变化无权限、无数据显示
  */
@@ -57,19 +58,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();
-                } // 更新链路动态样式
+                }
 
+                showLinkByConfig({
+                  topo: topo,
+                  showType: config.expandAllEdges
+                }); // 更新链路动态样式
 
                 if (topo.linkDynamicStyleExecutor) {
                   topo.linkDynamicStyleExecutor.execute();
                 }
 
-              case 2:
+              case 4:
               case "end":
                 return _context.stop();
             }

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

@@ -447,8 +447,9 @@ function AddLinkDrawer(props) {
     try {
       // 获取两个节点间的连线数据列表
       var edgesInNodes = getEdgesBetweenNodes(source, target);
+      var _isGroup = false; // linkType === "agg"
 
-      if (linkType === "agg") {
+      if (_isGroup) {
         // 聚合链路
         if (edgesInNodes.length === 0) {
           htTopo.createEdge(source, target, linkData);
@@ -547,9 +548,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;
@@ -559,7 +559,7 @@ function AddLinkDrawer(props) {
               config = topo.resourceConfig.getConfigFromHt(); // 新建后显示到图上
 
               if (!isAddMode) {
-                _context5.next = 31;
+                _context5.next = 30;
                 break;
               }
 
@@ -573,10 +573,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) {
@@ -591,12 +591,12 @@ function AddLinkDrawer(props) {
 
               _Message.success("创建成功");
 
-              _context5.next = 53;
+              _context5.next = 52;
               break;
 
-            case 31:
+            case 30:
               if (!(linkType === "exit")) {
-                _context5.next = 46;
+                _context5.next = 45;
                 break;
               }
 
@@ -622,27 +622,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.success("保存成功");
 
-            case 53:
+            case 52:
               editDispatchers.update({
                 addLinkIsOpen: false,
                 currentLink: null
               });
+              setLoading(false);
               topo.linkDynamicStyleExecutor.execute();
 
             case 55:
@@ -651,7 +652,7 @@ function AddLinkDrawer(props) {
 
             case 57:
               _context5.prev = 57;
-              _context5.t0 = _context5["catch"](15);
+              _context5.t0 = _context5["catch"](14);
               rlog.debug("保存链路信息异常", _context5.t0);
 
             case 60:
@@ -659,7 +660,7 @@ function AddLinkDrawer(props) {
               return _context5.stop();
           }
         }
-      }, _callee5, null, [[15, 57]]);
+      }, _callee5, null, [[14, 57]]);
     }));
 
     return function onSave(_x4) {

package/es/topoCenter/getTopoData.js

@@ -34,12 +34,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/es/topoCenter/hooks/editor/useDeleteEdges.js

@@ -42,14 +42,15 @@ export default (function (_ref) {
 
   var doDeleteLink = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               id = link.id;
-              isAgg = isAggLink(link);
+              isGroup = false; // isAggLink(link);
+
               _context.next = 4;
               return linkService.deleteLink(id);
 
@@ -73,7 +74,7 @@ export default (function (_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);
@@ -83,10 +84,10 @@ export default (function (_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/es/topoCenter/utils/exportData.js

@@ -21,7 +21,7 @@ function _ref() {
               id: topo.id,
               'nodes': nodes.filter(function (node) {
                 return !clusters.find(function (c) {
-                  return c.id === node.ownerId;
+                  return c.id === node.ownedCluster;
                 });
               }).map(function (node) {
                 var element = topo.getDataModel().getDataByTag(node.id);

package/es/utils/clusterUtil.js

@@ -56,17 +56,17 @@ export function processClusterChildrenNodes(nodes, groups) {
  */
 
 export function processClusterChildNode(node, groups) {
-  var ownerId = node.ownerId;
-  var ownerExisted = ownerId && groups.find(function (group) {
-    return group.id === ownerId;
+  var ownedCluster = node.ownedCluster;
+  var ownerExisted = ownedCluster && groups.find(function (group) {
+    return group.id === ownedCluster;
   });
 
-  if (!ownerId || !ownerExisted) {
+  if (!ownedCluster || !ownerExisted) {
     return node;
   }
 
   return _extends({}, node, {
-    groupId: ownerId,
+    groupId: ownedCluster,
     groupTag: null
   });
 }

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

@@ -9,29 +9,107 @@ 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$value;
+
   var value = props.value,
-      onChange = props.onChange;
+      onChange = props.onChange,
+      isNetworkTopo = props.isNetworkTopo;
+  console.log("LineExpandAllRadioGroup", value);
+
+  var _useState = (0, _react.useState)(value === 1 ? "0" : "1"),
+      showType = _useState[0],
+      setShowType = _useState[1];
+
+  var _useState2 = (0, _react.useState)((_plurals$value = _linkUtils.plurals[value]) !== null && _plurals$value !== void 0 ? _plurals$value : []),
+      pluralType = _useState2[0],
+      setPluralType = _useState2[1];
 
   var handleTypeChange = function handleTypeChange(newValue) {
-    onChange(newValue === '1');
+    console.log("handleTypeChange", newValue);
+    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 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"))), 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");
+
 /**
  * 全局切换连线组展开折叠
  * 
@@ -23,12 +25,18 @@ function GlobalEdgeToggle(props) {
       displayConfigDispatchers = _topo$store$useModel[1];
 
   var handleChange = function handleChange(expanded) {
-    if (expanded) {
+    console.log("handleChange---expanded-expandAllEdges", expanded, expandAllEdges);
+
+    if (expanded !== 1) {
       topo.getHtTopo().expandAllEdgeGroups();
     } else {
       topo.getHtTopo().collapseAllEdgeGroups();
     }
 
+    (0, _linkUtils.showLinkByConfig)({
+      topo: topo,
+      showType: expanded
+    });
     displayConfigDispatchers.update({
       expandAllEdges: expanded
     }); // 临时放这里，仅拓扑中心有