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

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

@@ -9,32 +9,70 @@ import BlockBox from "./BlockBox";
 import Link from "../../../../../../../components/Link";
 import service from "../../../../../../services/overview";
 import styles from "./index.module.scss";
+import { getHistory } from '@riil-frontend/component-topology-utils';
 
 function formatUrl(url) {
-  return url;
+  var _window, _window$location;
+
+  console.log(url);
+  var prefix = '/default/pagecenter';
+
+  if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
+    return url.split(prefix)[1];
+  } else {
+    return url;
+  }
 }
 
 function EventsCard(props) {
   var alarmRiskList = props.alarmRiskList,
       closeDetailDrawer = props.closeDetailDrawer,
-      onHandleAlarm = props.onHandleAlarm; // 告警table列配置
+      onHandleAlarm = props.onHandleAlarm;
+
+  var jumpTo = function jumpTo(url) {
+    closeDetailDrawer();
+
+    if (topo.viewProps.jumpto) {
+      topo.viewProps.jumpto(formatUrl(url));
+    } else {
+      getHistory().push(formatUrl(url));
+    }
+  }; // 告警table列配置
+
 
   var columns = [{
     title: "描述",
     dataIndex: "title",
     key: "title",
     cell: function cell(value, index, record) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: styles["alarm-title"],
-        title: value,
-        onClick: closeDetailDrawer
-      }, /*#__PURE__*/React.createElement(_Icon, {
-        type: record.icon,
-        size: "xs",
-        className: styles["alarm-color-icon"] + " " + record.className
-      }), /*#__PURE__*/React.createElement(Link, {
-        to: formatUrl(record.link)
-      }, value));
+      return (
+        /*#__PURE__*/
+        // <div
+        //   className={styles["alarm-title"]}
+        //   title={value}
+        //   onClick={closeDetailDrawer}
+        // >
+        //   <Icon
+        //     type={record.icon}
+        //     size="xs"
+        //     className={`${styles["alarm-color-icon"]} ${record.className}`}
+        //   />
+        //   <Link to={formatUrl(record.link)}>{value}</Link>
+        // </div>
+        React.createElement("div", {
+          className: styles['alarm-title'],
+          title: value,
+          onClick: function onClick() {
+            jumpTo(record.link);
+          }
+        }, /*#__PURE__*/React.createElement(_Icon, {
+          type: record.icon,
+          size: "xs",
+          className: styles['alarm-color-icon'] + " " + record.className
+        }), /*#__PURE__*/React.createElement("span", {
+          className: styles.link
+        }, value))
+      );
     }
   }, {
     title: "时间",

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.module.scss

@@ -1,7 +1,7 @@
 .container {
   width: 100%;
   height: 100%;
-  min-height: 250px;
+  min-height: 260px;
   position: relative;
   .floatBox{
     position: absolute;

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss

@@ -154,3 +154,11 @@
   background-color: transparent;
   border-color: transparent;
 }
+.link{
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: var(--color-link-1);
+  cursor: pointer;
+}

package/es/networkTopo/models/EdgeGroupTagTipBuilder.js

@@ -1,4 +1,4 @@
-import { getEdgeGroupAgents, getEdgeGroups } from "../../utils/htElementUtils";
+import { getEdgeGroups } from "../../utils/htElementUtils";
 import { getEdgeGroupLinkIdConfig } from "../utils/edgeGroupTagUtil";
 
 var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
@@ -16,11 +16,11 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
 
     var topo = this.topo;
     var dm = this.topo.getDataModel();
-    var edgeGroupAgents = getEdgeGroupAgents(dm);
-    var edgeGroupsTagsTips = edgeGroupAgents.map(function (edgeGroupAgent) {
-      // 获取配置的链路
-      var linkId = getEdgeGroupLinkIdConfig(edgeGroupAgent, topo);
-      var edgeGroupId = [edgeGroupAgent.getSource().getId(), edgeGroupAgent.getTarget().getId()];
+    var edgeGroupsTagsTips = getEdgeGroups(dm).map(function (edgeGroup) {
+      var edge = edgeGroup.getEdges().getArray()[0]; // 获取配置的链路
+
+      var linkId = getEdgeGroupLinkIdConfig(edge, topo);
+      var edgeGroupId = [edge.getSourceAgent().getId(), edge.getTargetAgent().getId()];
       var data = {
         tags: [],
         tips: []
@@ -31,7 +31,7 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
       }
 
       return {
-        htId: edgeGroupAgent.getId(),
+        htId: edge.getId(),
         edgeGroupId: edgeGroupId,
         tags: data.tags,
         tips: data.tips,

package/es/networkTopo/utils/edgeGroupTagUtil.js

@@ -55,8 +55,8 @@ export function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
   });
 }
 export function getEdgeGroupConfigId(edgeGroup) {
-  var sourceNode = edgeGroup.getSource();
-  var targetNode = edgeGroup.getTarget();
+  var sourceNode = edgeGroup.getSourceAgent();
+  var targetNode = edgeGroup.getTargetAgent();
   var sourceId = sourceNode.a('uuid');
   var targetId = targetNode.a('uuid');
   return [sourceId, targetId].sort().join(',');

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/es/utils/topoData.js

@@ -190,7 +190,7 @@ function buildGlobal(_ref2) {
       // 是否可编辑----控制[编辑]按钮
       moveable: true,
       // 节点是否可移动
-      toggleGroupByDblClick: true
+      toggleGroupByDblClick: false
     }, (result === null || result === void 0 ? void 0 : (_result$global2 = result.global) === null || _result$global2 === void 0 ? void 0 : _result$global2.control) || {}, (result === null || result === void 0 ? void 0 : (_result$customGlobal = result.customGlobal) === null || _result$customGlobal === void 0 ? void 0 : _result$customGlobal.control) || {}),
     topoDisplayConfig: _extends({
       // alarmSwitch: (result.global || {}).alarmSwitch ?? true,

package/lib/core/components/AlarmListPanel/components/AlarmListItem.js

@@ -50,8 +50,8 @@ function AlarmListItem(props) {
   // 传入参数
   var topo = props.topo,
       alarmInfo = props.alarmInfo,
-      onClick = props.onClick;
-  console.log("AlarmListPanel", topo, alarmInfo);
+      onClick = props.onClick; // console.log("AlarmListPanel", topo, alarmInfo);
+
   return /*#__PURE__*/_react["default"].createElement(_list["default"].Item, {
     className: _indexModule["default"].AlarmListItem,
     media: /*#__PURE__*/_react["default"].createElement(_icon["default"], {

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/components/Toolbar/widgets/Layout/index.js

@@ -162,7 +162,7 @@ function isLayoutEnabled(props) {
   } //中心节点布局,选中一个节点不是分层的情况下，按钮亮起
 
 
-  if (topoShowType !== 'layers' && selection.length === 1) {
+  if (topoShowType !== 'layers' && selection.length === 1 && ((0, _htElementDataUtil.isNode)(selection[0]) || (0, _htElementDataUtil.isGroup)(selection[0]))) {
     return true;
   }
 

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: